sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

[kamailio] core: rewrite add_interfaces() with getifaddrs() based implementation (#447)

by celan69

To make IPV6 work with Solaris, add_interfaces() had to be modified. I decided to reimplement it with a getifaddrs() based implementation, which is available from Solaris 11 upwards, and also on FreeBSD and Linux. By default, the latter continues to use the netlink based variant. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/447 -- Commit Summary -- * core: rewrite add_interfaces() with getifaddrs() based implementation -- File Changes -- M Makefile.defs (2) M socket_info.c (142) -- Patch Links -- https://github.com/kamailio/kamailio/pull/447.patch https://github.com/kamailio/kamailio/pull/447.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/447

8 years, 11 months

git:master:d5b22f5b: Merge pull request #447 from celan69/getifaddrs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d5b22f5b3a880076b725e18c6e521b75c55aa249 URL: https://github.com/kamailio/kamailio/commit/d5b22f5b3a880076b725e18c6e521b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-04T22:54:07+01:00 Merge pull request #447 from celan69/getifaddrs core: rewrite add_interfaces() with getifaddrs() based implementation --- Modified: Makefile.defs Modified: socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/d5b22f5b3a880076b725e18c6e521b7… Patch: https://github.com/kamailio/kamailio/commit/d5b22f5b3a880076b725e18c6e521b7…

8 years, 11 months

git:master:424ac4db: core: rewrite add_interfaces() with getifaddrs() based implementation

by Christian Kuehnke

Module: kamailio Branch: master Commit: 424ac4dba745dd728e225895f9fb40e287ec365f URL: https://github.com/kamailio/kamailio/commit/424ac4dba745dd728e225895f9fb40e… Author: Christian Kuehnke <christian(a)kuehnke.de> Committer: Christian Kuehnke <christian(a)kuehnke.de> Date: 2015-12-16T18:47:36+01:00 core: rewrite add_interfaces() with getifaddrs() based implementation To make IPV6 work with Solaris, add_interfaces() had to be modified. I decided to reimplement it with a getifaddrs() based implementation, which is available from Solaris 11 upwards, and also on FreeBSD and Linux. By default, the latter continues to use the netlink based variant. --- Modified: Makefile.defs Modified: socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/424ac4dba745dd728e225895f9fb40e… Patch: https://github.com/kamailio/kamailio/commit/424ac4dba745dd728e225895f9fb40e…

8 years, 11 months

git:master:96d0b4ec: presence_xml: safety checks for pkg alloc and buffer size

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 96d0b4ecff3cd680861bbc2ac02151a77cb05cae URL: https://github.com/kamailio/kamailio/commit/96d0b4ecff3cd680861bbc2ac02151a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-04T19:19:35+01:00 presence_xml: safety checks for pkg alloc and buffer size --- Modified: modules/presence_xml/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/96d0b4ecff3cd680861bbc2ac02151a… Patch: https://github.com/kamailio/kamailio/commit/96d0b4ecff3cd680861bbc2ac02151a… --- diff --git a/modules/presence_xml/notify_body.c b/modules/presence_xml/notify_body.c index f10305c..bba3687 100644 --- a/modules/presence_xml/notify_body.c +++ b/modules/presence_xml/notify_body.c @@ -78,12 +78,31 @@ str* pres_agg_nbody_empty(str* pres_user, str* pres_domain) { str* n_body= NULL; + str* body_array; + char* body; + LM_DBG("creating empty presence for [pres_user]=%.*s [pres_domain]= %.*s\n", pres_user->len, pres_user->s, pres_domain->len, pres_domain->s); - str* body_array = (str*)pkg_malloc(sizeof(str)); - char* body = (char*)pkg_malloc(PRESENCE_EMPTY_BODY_SIZE); - sprintf(body, PRESENCE_EMPTY_BODY, pres_user->len, pres_user->s); + if(pres_user->len+sizeof(PRESENCE_EMPTY_BODY) + >= PRESENCE_EMPTY_BODY_SIZE - 1) { + LM_ERR("insufficient buffer to add user (its len is: %d)\n", + pres_user->len); + return NULL; + } + body_array = (str*)pkg_malloc(sizeof(str)); + if(body_array==NULL) { + LM_ERR("no more pkg\n"); + return NULL; + } + + body = (char*)pkg_malloc(PRESENCE_EMPTY_BODY_SIZE); + if(body_array==NULL) { + LM_ERR("no more pkg\n"); + pkg_free(body_array); + return NULL; + } + snprintf(body, PRESENCE_EMPTY_BODY_SIZE, PRESENCE_EMPTY_BODY, pres_user->len, pres_user->s); body_array->s = body; body_array->len = strlen(body); @@ -91,11 +110,10 @@ str* pres_agg_nbody_empty(str* pres_user, str* pres_domain) n_body= agregate_xmls(pres_user, pres_domain, &body_array, 1); LM_DBG("[n_body]=%p\n", n_body); if(n_body) { - LM_DBG("[*n_body]=%.*s\n",n_body->len, n_body->s); + LM_DBG("[*n_body]=%.*s\n", n_body->len, n_body->s); } - if(n_body== NULL) - { - LM_ERR("while aggregating body\n"); + if(n_body== NULL) { + LM_ERR("while aggregating body for: %.*s\n", pres_user->len, pres_user->s); } pkg_free(body);

8 years, 11 months

git:master:26fddd6d: Merge pull request #460 from kamailio/lazedo/presence_xml_fix_dummy

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 26fddd6d6eb604113a2ea9288c48d78a53dbed55 URL: https://github.com/kamailio/kamailio/commit/26fddd6d6eb604113a2ea9288c48d78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-04T19:07:43+01:00 Merge pull request #460 from kamailio/lazedo/presence_xml_fix_dummy presence_xml: fix pres_agg_nbody_empty --- Modified: modules/presence_xml/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/26fddd6d6eb604113a2ea9288c48d78… Patch: https://github.com/kamailio/kamailio/commit/26fddd6d6eb604113a2ea9288c48d78… --- diff --git a/modules/presence_xml/notify_body.c b/modules/presence_xml/notify_body.c index 2730038..f10305c 100644 --- a/modules/presence_xml/notify_body.c +++ b/modules/presence_xml/notify_body.c @@ -58,15 +58,20 @@ void free_xml_body(char* body) body= NULL; } -#define PRESENCE_EMPTY_BODY_SIZE 512 +#define PRESENCE_EMPTY_BODY_SIZE 1024 -#define PRESENCE_EMPTY_BODY "<presence> \ -<tuple id=\"615293b33c62dec073e05d9421e9f48b\">\ +#define PRESENCE_EMPTY_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ +<presence xmlns=\"urn:ietf:params:xml:ns:pidf\" xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" xmlns:c=\"urn:ietf:params:xml:ns:pidf:cipid\" entity=\"%.*s\"> \ +<tuple xmlns=\"urn:ietf:params:xml:ns:pidf\" id=\"615293b33c62dec073e05d9421e9f48b\">\ <status>\ <basic>open</basic>\ </status>\ </tuple>\ <note xmlns=\"urn:ietf:params:xml:ns:pidf\">Available</note>\ +<dm:person xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" id=\"1\">\ +<rpid:activities/>\ +<dm:note>Available</dm:note>\ +</dm:person>\ </presence>" str* pres_agg_nbody_empty(str* pres_user, str* pres_domain) @@ -78,7 +83,7 @@ str* pres_agg_nbody_empty(str* pres_user, str* pres_domain) str* body_array = (str*)pkg_malloc(sizeof(str)); char* body = (char*)pkg_malloc(PRESENCE_EMPTY_BODY_SIZE); - sprintf(body, PRESENCE_EMPTY_BODY); + sprintf(body, PRESENCE_EMPTY_BODY, pres_user->len, pres_user->s); body_array->s = body; body_array->len = strlen(body);

8 years, 11 months

git:master:bb2c9ea0: presence_xml: fix pres_agg_nbody_empty

by lazedo

Module: kamailio Branch: master Commit: bb2c9ea0b70a428dd115da5fa2c0e6482d9db7dc URL: https://github.com/kamailio/kamailio/commit/bb2c9ea0b70a428dd115da5fa2c0e64… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2016-01-04T16:12:46Z presence_xml: fix pres_agg_nbody_empty we were sending the presence element without the entity attribute. it seems some UAs dislike this --- Modified: modules/presence_xml/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/bb2c9ea0b70a428dd115da5fa2c0e64… Patch: https://github.com/kamailio/kamailio/commit/bb2c9ea0b70a428dd115da5fa2c0e64… --- diff --git a/modules/presence_xml/notify_body.c b/modules/presence_xml/notify_body.c index 2730038..f10305c 100644 --- a/modules/presence_xml/notify_body.c +++ b/modules/presence_xml/notify_body.c @@ -58,15 +58,20 @@ void free_xml_body(char* body) body= NULL; } -#define PRESENCE_EMPTY_BODY_SIZE 512 +#define PRESENCE_EMPTY_BODY_SIZE 1024 -#define PRESENCE_EMPTY_BODY "<presence> \ -<tuple id=\"615293b33c62dec073e05d9421e9f48b\">\ +#define PRESENCE_EMPTY_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ +<presence xmlns=\"urn:ietf:params:xml:ns:pidf\" xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" xmlns:c=\"urn:ietf:params:xml:ns:pidf:cipid\" entity=\"%.*s\"> \ +<tuple xmlns=\"urn:ietf:params:xml:ns:pidf\" id=\"615293b33c62dec073e05d9421e9f48b\">\ <status>\ <basic>open</basic>\ </status>\ </tuple>\ <note xmlns=\"urn:ietf:params:xml:ns:pidf\">Available</note>\ +<dm:person xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" id=\"1\">\ +<rpid:activities/>\ +<dm:note>Available</dm:note>\ +</dm:person>\ </presence>" str* pres_agg_nbody_empty(str* pres_user, str* pres_domain) @@ -78,7 +83,7 @@ str* pres_agg_nbody_empty(str* pres_user, str* pres_domain) str* body_array = (str*)pkg_malloc(sizeof(str)); char* body = (char*)pkg_malloc(PRESENCE_EMPTY_BODY_SIZE); - sprintf(body, PRESENCE_EMPTY_BODY); + sprintf(body, PRESENCE_EMPTY_BODY, pres_user->len, pres_user->s); body_array->s = body; body_array->len = strlen(body);

8 years, 11 months

[kamailio] presence_xml: fix pres_agg_nbody_empty (#460)

by lazedo

we were sending the presence element without the entity attribute. it seems some UAs dislike this You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/460 -- Commit Summary -- * presence_xml: fix pres_agg_nbody_empty -- File Changes -- M modules/presence_xml/notify_body.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/460.patch https://github.com/kamailio/kamailio/pull/460.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/460

8 years, 11 months

Using Kamailio as a webrtc gateway

by suganthi karthick

Hi, I need to implement a WebRTC gateway for an existing conference bridge. The clients application can be a JsSIP client (SIP over websocket or JSON over websocket). The WebRTC gateway has to support Signaling and ICE and DTLS. Can I use Kamailio as a base for this development? Thanks Suganthi

8 years, 11 months

Re: [sr-dev] [kamailio] Merge pull request #459 from kamailio/lazedo/db_text_replace (d0372a1)

by foucse

Conflicts ! Auto-merging modules/presence/notify.c CONFLICT (add/add): Merge conflict in modules/presence/notify.c Auto-merging modules/db_text/dbtext.h CONFLICT (add/add): Merge conflict in modules/db_text/dbtext.h Auto-merging modules/db_text/dbtext.c CONFLICT (add/add): Merge conflict in modules/db_text/dbtext.c Auto-merging modules/db_text/dbt_base.c CONFLICT (add/add): Merge conflict in modules/db_text/dbt_base.c Automatic merge failed; fix conflicts and then commit the result. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe5692…

8 years, 11 months

git:master:d0372a13: Merge pull request #459 from kamailio/lazedo/db_text_replace

by lazedo

Module: kamailio Branch: master Commit: d0372a132767cf08dd8786692fe56922bbceece2 URL: https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe5692… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2016-01-04T10:18:08Z Merge pull request #459 from kamailio/lazedo/db_text_replace db_text: add support for replace --- Modified: modules/db_text/dbt_base.c Modified: modules/db_text/dbtext.c Modified: modules/db_text/dbtext.h --- Diff: https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe5692… Patch: https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe5692… --- diff --git a/modules/db_text/dbt_base.c b/modules/db_text/dbt_base.c index 6d70ce5..4ab9a16 100644 --- a/modules/db_text/dbt_base.c +++ b/modules/db_text/dbt_base.c @@ -617,3 +617,132 @@ int dbt_update(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, return -1; } +int dbt_replace(db1_con_t* _h, db_key_t* _k, db_val_t* _v, + int _n, int _nk, int _m) +{ + dbt_table_p _tbc = NULL; + dbt_row_p _drp = NULL; + int i, j; + int *lkey=NULL, *lres=NULL; + + if (!_h || !CON_TABLE(_h) || _nk <= 0) + { + LM_ERR("invalid parameters\n"); + return -1; + } + + ((dbt_con_p)_h->tail)->affected = 0; + + /* lock database */ + _tbc = dbt_db_get_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + if(!_tbc) + { + LM_ERR("table %.*s does not exist!\n", CON_TABLE(_h)->len, CON_TABLE(_h)->s); + return -1; + } + + if(_k) + { + lkey = dbt_get_refs(_tbc, _k, _nk); + if(!lkey) + goto error; + } + lres = dbt_get_refs(_tbc, _k, _n); + if(!lres) + goto error; + _drp = _tbc->rows; + while(_drp) + { + if(dbt_row_match(_tbc, _drp, lkey, NULL, _v, _nk)) + { // update fields + for(i=0; i<_n; i++) + { + if(dbt_is_neq_type(_tbc->colv[lres[i]]->type, _v[i].type)) + { + LM_ERR("incompatible types!\n"); + goto error; + } + + if(dbt_row_update_val(_drp, &(_v[i]), + _tbc->colv[lres[i]]->type, lres[i])) + { + LM_ERR("cannot set v[%d] in c[%d]!\n", + i, lres[i]); + goto error; + } + } + + ((dbt_con_p)_h->tail)->affected++; + + } + _drp = _drp->next; + } + + if(((dbt_con_p)_h->tail)->affected == 0) { + _drp = dbt_row_new(_tbc->nrcols); + if(!_drp) + { + LM_ERR("no shm memory for a new row!!\n"); + goto error; + } + + for(i=0; i<_n; i++) + { + j = lres[i]; + if(dbt_is_neq_type(_tbc->colv[j]->type, _v[i].type)) + { + LM_ERR("incompatible types v[%d] - c[%d]!\n", i, j); + goto error; + } + if(_v[i].type == DB1_STRING && !_v[i].nul) + _v[i].val.str_val.len = strlen(_v[i].val.string_val); + if(dbt_row_set_val(_drp, &(_v[i]), _tbc->colv[j]->type, j)) + { + LM_ERR("cannot set v[%d] in c[%d]!\n", i, j); + goto error; + } + } + + if(dbt_table_add_row(_tbc, _drp)) + { + LM_ERR("cannot insert the new row!!\n"); + goto error; + } + + ((dbt_con_p)_h->tail)->affected = 1; + + } + + if( ((dbt_con_p)_h->tail)->affected ) + dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1); + + /* dbt_print_table(_tbc, NULL); */ + + /* unlock database */ + dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + + if(lkey) + pkg_free(lkey); + if(lres) + pkg_free(lres); + + return 0; + +error: + + if(lkey) + pkg_free(lkey); + if(lres) + pkg_free(lres); + if(_drp) // free row + dbt_row_free(_tbc, _drp); + + /* unlock database */ + dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + + LM_ERR("failed to update the table!\n"); + + return -1; +} + + diff --git a/modules/db_text/dbtext.c b/modules/db_text/dbtext.c index 4f1d4a6..f601398 100644 --- a/modules/db_text/dbtext.c +++ b/modules/db_text/dbtext.c @@ -125,9 +125,10 @@ int dbt_bind_api(db_func_t *dbb) dbb->insert = (db_insert_f)dbt_insert; dbb->delete = (db_delete_f)dbt_delete; dbb->update = (db_update_f)dbt_update; + dbb->replace = (db_replace_f)dbt_replace; dbb->affected_rows = (db_affected_rows_f) dbt_affected_rows; dbb->raw_query = (db_raw_query_f) dbt_raw_query; - dbb->cap = DB_CAP_ALL | DB_CAP_AFFECTED_ROWS | DB_CAP_RAW_QUERY; + dbb->cap = DB_CAP_ALL | DB_CAP_AFFECTED_ROWS | DB_CAP_RAW_QUERY | DB_CAP_REPLACE; return 0; } diff --git a/modules/db_text/dbtext.h b/modules/db_text/dbtext.h index 92e6236..5cbacae 100644 --- a/modules/db_text/dbtext.h +++ b/modules/db_text/dbtext.h @@ -82,6 +82,12 @@ int dbt_update(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, db_key_t* _uk, db_val_t* _uv, int _n, int _un); /* + * replace a row in table + */ +int dbt_replace(db1_con_t* _h, db_key_t* _k, db_val_t* _v, + int _n, int _nk, int _m); + +/* * Affected rows */ int dbt_affected_rows(db1_con_t* _h);

8 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016