- sr-dev - kamailio.org

git:master:7d24a7af: jwt: more details about claims parameter format
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: master Commit: 7d24a7afe02bf1f7c8ddddfcfc9f1c287296c996 URL: https://github.com/kamailio/kamailio/commit/7d24a7afe02bf1f7c8ddddfcfc9f1c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T08:00:32+02:00 jwt: more details about claims parameter format --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d24a7afe02bf1f7c8ddddfcfc9f1c2… Patch: https://github.com/kamailio/kamailio/commit/7d24a7afe02bf1f7c8ddddfcfc9f1c2… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index dba928b523..36d3d0d0f7 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -109,6 +109,10 @@ modparam("jwt", "key_mode", 1) <para> claims - the list of claims to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters format). + The string values can be enclosed in single or double quotes. If a + value is not eclosed in between quotes, it is added as numeric + value if it is successfully converted to a long value, otherwise is + added as string value. </para> </listitem> </itemizedlist> @@ -120,7 +124,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); ... </programlisting> </example> @@ -151,7 +155,8 @@ modparam("jwt", "key_mode", 1) <listitem> <para> claims - the list of claims to be checked they are in the JWT, in the format - "name1=value1;name2=value2;..." (same as the SIP parameters format). + "name1=value1;name2=value2;..." (same as the SIP parameters format, + see also the description of claims parameter for jwt_generate()). </para> </listitem> <listitem> @@ -168,7 +173,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... if(!jwt_verify("/path/to/pubkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci", + "caller='$fU';callee='$tU';callid='$ci';index=100", "$var(jwt)") { xwarn("failed to verify jwt\n"); } @@ -206,7 +211,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); xinfo("jwt is: $jwt(val)"); ... </programlisting>

1 0

git:master:201c219a: lost: error response fix in lost_function(), lost_held_dereference() and lost_held_function()
by Wolfgang Kampichler 02 May '21

02 May '21

Module: kamailio Branch: master Commit: 201c219a5496924e701cc2b17fb0a439ee530813 URL: https://github.com/kamailio/kamailio/commit/201c219a5496924e701cc2b17fb0a43… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-02T17:28:44+02:00 lost: error response fix in lost_function(), lost_held_dereference() and lost_held_function() - error variable was set to 0 (clean up) before return. Lost functions now returns 500 in case of LOST/HELD server error, or 400 in case of internal error, otherwise 2xx. --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h --- Diff: https://github.com/kamailio/kamailio/commit/201c219a5496924e701cc2b17fb0a43… Patch: https://github.com/kamailio/kamailio/commit/201c219a5496924e701cc2b17fb0a43…

1 0

git:master:824920d5: topos_redis: use initial transaction method for early dialog branch loading
by Daniel-Constantin Mierla 01 May '21

01 May '21

Module: kamailio Branch: master Commit: 824920d5b159d80ce3c241313bf647b5dbbf6661 URL: https://github.com/kamailio/kamailio/commit/824920d5b159d80ce3c241313bf647b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-01T14:38:36+02:00 topos_redis: use initial transaction method for early dialog branch loading --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/824920d5b159d80ce3c241313bf647b… Patch: https://github.com/kamailio/kamailio/commit/824920d5b159d80ce3c241313bf647b… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index d63543dc38..c2d43b4c33 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -588,6 +588,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat str skey = STR_NULL; str sval = STR_NULL; str xuuid = str_init(""); + str smethod = str_init("INVITE"); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -622,12 +623,17 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat xuuid.len = sd->b_uuid.len - 1; } + if(md->s_method_id & (METHOD_SUBSCRIBE|METHOD_NOTIFY)) { + smethod.s = "SUBSCRIBE"; + smethod.len =9; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, - md->s_method.len, md->s_method.s, + smethod.len, smethod.s, md->a_callid.len, md->a_callid.s, md->b_tag.len, md->b_tag.s, xuuid.len, xuuid.s); @@ -1161,15 +1167,11 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, return -1; } - if(md->s_method.len==6 && strncmp(md->s_method.s, "INVITE", 6)==0) { - if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert INVITE extra branch data\n"); - return -1; - } - } - if(md->s_method.len==9 && strncmp(md->s_method.s, "SUBSCRIBE", 9)==0) { + if(md->s_method_id==METHOD_INVITE + || md->s_method_id==METHOD_SUBSCRIBE) { if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert SUBSCRIBE extra branch data\n"); + LM_ERR("failed to insert %.*s extra initial branch data\n", + md->s_method.len, md->s_method.s); return -1; } }

1 0

git:master:7b3a33d8: topos_redis: use also stored record to get uuid for branch replies
by Daniel-Constantin Mierla 01 May '21

01 May '21

Module: kamailio Branch: master Commit: 7b3a33d88ae3e3bbef88294720aa21ba34118b8e URL: https://github.com/kamailio/kamailio/commit/7b3a33d88ae3e3bbef88294720aa21b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-01T13:28:32+02:00 topos_redis: use also stored record to get uuid for branch replies --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/7b3a33d88ae3e3bbef88294720aa21b… Patch: https://github.com/kamailio/kamailio/commit/7b3a33d88ae3e3bbef88294720aa21b…

1 0

git:master:b798fda3: pkg: small spelling fix in comments
by Henning Westerholt 01 May '21

01 May '21

Module: kamailio Branch: master Commit: b798fda339b74e9595d2a5d44af9835ec196ca3e URL: https://github.com/kamailio/kamailio/commit/b798fda339b74e9595d2a5d44af9835… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-05-01T08:17:28Z pkg: small spelling fix in comments --- Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/wheezy --- Diff: https://github.com/kamailio/kamailio/commit/b798fda339b74e9595d2a5d44af9835… Patch: https://github.com/kamailio/kamailio/commit/b798fda339b74e9595d2a5d44af9835… --- diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 8b060e0956..27dc6c6122 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -91,7 +91,7 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ ${DIST}/control -# this removes python3 from Package: kamalio +# this removes python3 from Package: kamailio sed -i -e '/python3/d' ${DIST}/control # add that again sed -i '/lsb-base,/a \ python3,' ${DIST}/control diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index 95180221f0..d08477b0ad 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -91,7 +91,7 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ ${DIST}/control -# this removes python3 from Package: kamalio +# this removes python3 from Package: kamailio sed -i -e '/python3/d' ${DIST}/control # add that again sed -i '/lsb-base,/a \ python3,' ${DIST}/control

1 0

topos_redis enhancement
by Juha Heinanen 01 May '21

01 May '21

Daniel, I studied a bit topos_redis source and noticed that it lacks x_context td and tt keys. Is there something else missing in order to make spirals work also when redis backend is in use? -- Juha

2 4

git:master:5707f9ef: topos_redis: use uuid for initial transaction indexing
by Daniel-Constantin Mierla 01 May '21

01 May '21

Module: kamailio Branch: master Commit: 5707f9ef7f6a0d9b9bcd00ff85168b977591a30a URL: https://github.com/kamailio/kamailio/commit/5707f9ef7f6a0d9b9bcd00ff85168b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-01T08:07:08+02:00 topos_redis: use uuid for initial transaction indexing --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5707f9ef7f6a0d9b9bcd00ff85168b9… Patch: https://github.com/kamailio/kamailio/commit/5707f9ef7f6a0d9b9bcd00ff85168b9… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 5f0fda701e..78013993fe 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -314,6 +314,7 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) redisc_server_t *rsrv = NULL; redisReply *rrpl = NULL; unsigned long lval = 0; + str xuuid = str_init(""); if(td->x_vbranch1.len<=0) { LM_INFO("no via branch for this message\n"); @@ -331,13 +332,22 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(td->a_uuid.len>1) { + xuuid.s = td->a_uuid.s + 1; + xuuid.len = td->a_uuid.len - 1; + } else if(td->b_uuid.len>1) { + xuuid.s = td->b_uuid.s + 1; + xuuid.len = td->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE-128, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, td->s_method.len, td->s_method.s, td->a_callid.len, td->a_callid.s, - td->b_tag.len, td->b_tag.s); + td->b_tag.len, td->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE-128) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1; @@ -571,6 +581,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat redisReply *rrpl = NULL; str skey = STR_NULL; str sval = STR_NULL; + str xuuid = str_init(""); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -591,14 +602,23 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(md->a_uuid.len>1) { + xuuid.s = md->a_uuid.s + 1; + xuuid.len = md->a_uuid.len - 1; + } else if(md->b_uuid.len>1) { + xuuid.s = md->b_uuid.s + 1; + xuuid.len = md->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, md->s_method.len, md->s_method.s, md->a_callid.len, md->a_callid.s, - md->b_tag.len, md->b_tag.s); + md->b_tag.len, md->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1;

1 0

Development for v5.5.x is frozen
by Daniel-Constantin Mierla 30 Apr '21

30 Apr '21

Hello, the formal notification that the development for the next major version 5.5.0 is now frozen. The focus has to be on testing the master branch. Also, the master branch should not get commits with new features till the branch 5.5 is created, expected to happen in 2-4 weeks, a matter of how testing goes on. Meanwhile, the commits with new features in the C code can be pushed to personal branches, new pull requests can still be done, but they will be merged after branching 5.5. Can still be done commits with documentation improvements, enhancements to related tools (e.g., kamctl, kamcmd), merging exiting pull requests at this moment, exporting missing KEMI functions and completing the functionality of the new modules added in 5.5. Once the branch 5.5 is created, new features can be pushed again to master branch as usual. From that moment, the v5.5.0 should be out very soon, time used for further testing but also preparing the release of packages. If someone is not sure if a commit brings a new feature, just make a pull request and it can be discussed there on github portal or via sr-dev mailing list. A summary of what is new in upcoming 5.5 is going to be built at: * https://www.kamailio.org/wiki/features/new-in-5.5.x Upgrade guidelines will be collected at: * https://www.kamailio.org/wiki/install/upgrade/5.4.x-to-5.5.0 Everyone is more than welcome to contribute to the above wiki pages, especially to the upgrade guidelines, to help everyone else during the migration process from v5.4.x to 5.4.x. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 4

[kamailio/kamailio] CORE_TLS option in 5.4 (#2720)
by Boris Korzun 30 Apr '21

30 Apr '21

### Description There's a `CORE_TLS` option in _Makefile.defs_. But Kamailio isn't build with the option. https://github.com/kamailio/kamailio/blob/cf105d5af78963759825f5eaf9feb767c… There is no `core/tls/tls_init.h` for include. ### Additional Information Kamailio 5.4.5 * **Operating System**: FreeBSD 12.2 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2720

2 2

git:5.5:19093d83: lost: Coverity Scan fixes
by Wolfgang Kampichler 30 Apr '21

30 Apr '21

Module: kamailio Branch: 5.5 Commit: 19093d837b94cabb6e1413fa0ff1786bfc06549f URL: https://github.com/kamailio/kamailio/commit/19093d837b94cabb6e1413fa0ff1786… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-30T12:26:27+02:00 lost: Coverity Scan fixes (cherry picked from commit 328000233928fa08095889fdca7d66acba5e5825) --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/19093d837b94cabb6e1413fa0ff1786… Patch: https://github.com/kamailio/kamailio/commit/19093d837b94cabb6e1413fa0ff1786…

1 0

git:5.5:f97b189d: lost: fixed possible resource leak inside lost_get_response_issues()
by Wolfgang Kampichler 30 Apr '21

30 Apr '21

Module: kamailio Branch: 5.5 Commit: f97b189d238bd63f80a4525c56501cd394b7d2f3 URL: https://github.com/kamailio/kamailio/commit/f97b189d238bd63f80a4525c56501cd… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-30T12:26:53+02:00 lost: fixed possible resource leak inside lost_get_response_issues() (cherry picked from commit a1bbe035f1a1acc11f86d27fdc0adef1b1a3d010) --- Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/f97b189d238bd63f80a4525c56501cd… Patch: https://github.com/kamailio/kamailio/commit/f97b189d238bd63f80a4525c56501cd… --- diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index b3389448b8..6eb13e8260 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -573,39 +573,53 @@ p_lost_issue_t lost_get_response_issues(xmlNodePtr node) cur = node->children; while(cur) { if(cur->type == XML_ELEMENT_NODE) { - /* get a new response type element */ + /* get a new response type object */ issue = lost_new_response_type(); if(issue == NULL) { /* didn't get it ... return */ break; } - /* parse properties */ - issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + /* get issue type */ tmp.s = (char *)cur->name; tmp.len = strlen((char *)cur->name); + /* copy issue type to object */ + len = 0; if(tmp.len > 0 && tmp.s != NULL) { issue->type = lost_copy_string(tmp, &len); } - if(len > 0) { + if(len == 0) { + /* issue type not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parse source property */ + len = 0; + issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + if(len == 0) { + /* source property not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } - LM_DBG("###\t[%s]\n", issue->type); + LM_DBG("###\t[%s]\n", issue->type); - if(issue->info != NULL) { - issue->info->text = lost_get_property(cur, PROP_MSG, &len); - issue->info->lang = lost_get_property(cur, PROP_LANG, &len); - } - /* get a new list element */ - new = lost_new_response_issues(); - if(new == NULL) { - /* didn't get it, delete response type element ... return */ - lost_delete_response_type(&issue); /* clean up */ - break; - } - /* append to list */ - new->issue = issue; - new->next = list; - list = new; + /* type and source property found ... parse text and copy */ + if(issue->info != NULL) { + issue->info->text = lost_get_property(cur, PROP_MSG, &len); + issue->info->lang = lost_get_property(cur, PROP_LANG, &len); } + /* get a new list element */ + new = lost_new_response_issues(); + if(new == NULL) { + /* didn't get it, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parsing done, append object to list */ + new->issue = issue; + new->next = list; + list = new; + /* get next element */ cur = cur->next; }

1 0

git:master:41b5e947: tls: declare variable based on SSL_CTX_set_ecdh_auto
by Daniel-Constantin Mierla 30 Apr '21

30 Apr '21

Module: kamailio Branch: master Commit: 41b5e9473d79409712d46fdbb5a0b943ab880aa7 URL: https://github.com/kamailio/kamailio/commit/41b5e9473d79409712d46fdbb5a0b94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-30T08:53:47+02:00 tls: declare variable based on SSL_CTX_set_ecdh_auto - fix unused variable warning introduced in previous commit --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/41b5e9473d79409712d46fdbb5a0b94… Patch: https://github.com/kamailio/kamailio/commit/41b5e9473d79409712d46fdbb5a0b94… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index c2231b0db0..b5160ec833 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -65,7 +65,9 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); #if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) static void setup_ecdh(SSL_CTX *ctx) { +#if !defined(SSL_CTX_set_ecdh_auto) EC_KEY *ecdh; +#endif #if OPENSSL_VERSION_NUMBER < 0x010100000L if (SSLeay() < 0x1000005fL) {

1 0

git:master:0a2450e6: rtpengine: extract call-id/from-tag/to-tag only from sip messages
by Daniel-Constantin Mierla 30 Apr '21

30 Apr '21

Module: kamailio Branch: master Commit: 0a2450e62d77020243530e18d93c9aa8181a5701 URL: https://github.com/kamailio/kamailio/commit/0a2450e62d77020243530e18d93c9aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-30T08:31:34+02:00 rtpengine: extract call-id/from-tag/to-tag only from sip messages - they can be provided via flags in function parameters - fix using functions in non-sip routing blocks (e.g., xhttp processing) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/0a2450e62d77020243530e18d93c9aa… Patch: https://github.com/kamailio/kamailio/commit/0a2450e62d77020243530e18d93c9aa… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index a60de52a35..6f91c222b2 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2477,17 +2477,19 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ memset(&ng_flags, 0, sizeof(ng_flags)); - if (get_callid(msg, &ng_flags.call_id) == -1 || ng_flags.call_id.len == 0) { - LM_ERR("can't get Call-Id field\n"); - return NULL; - } - if (get_to_tag(msg, &ng_flags.to_tag) == -1) { - LM_ERR("can't get To tag\n"); - return NULL; - } - if (get_from_tag(msg, &ng_flags.from_tag) == -1 || ng_flags.from_tag.len == 0) { - LM_ERR("can't get From tag\n"); - return NULL; + if(IS_SIP(msg) || IS_SIP_REPLY(msg)) { + if (get_callid(msg, &ng_flags.call_id) == -1 || ng_flags.call_id.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return NULL; + } + if (get_to_tag(msg, &ng_flags.to_tag) == -1) { + LM_ERR("can't get To tag\n"); + return NULL; + } + if (get_from_tag(msg, &ng_flags.from_tag) == -1 || ng_flags.from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return NULL; + } } if (bencode_buffer_init(bencbuf)) { LM_ERR("could not initialize bencode_buffer_t\n"); @@ -2535,6 +2537,18 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ if (parse_flags(&ng_flags, msg, &op, flags_str)) goto error; + if(!IS_SIP(msg) && !IS_SIP_REPLY(msg)) { + /* check required values */ + if (ng_flags.call_id.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return NULL; + } + if (ng_flags.from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return NULL; + } + } + /* trickle ice sdp fragment? */ if (cont_type == 3) bencode_list_add_string(ng_flags.flags, "fragment");

1 0

git:master:4695b48b: msrp: destroy str array on error
by Daniel-Constantin Mierla 30 Apr '21

30 Apr '21

Module: kamailio Branch: master Commit: 4695b48b23e22135049f67a6ef362e933a0cf337 URL: https://github.com/kamailio/kamailio/commit/4695b48b23e22135049f67a6ef362e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-30T08:03:10+02:00 msrp: destroy str array on error - some code reformatting --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/4695b48b23e22135049f67a6ef362e9… Patch: https://github.com/kamailio/kamailio/commit/4695b48b23e22135049f67a6ef362e9… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index 7defaf9353..c701d6a6ca 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -610,7 +610,7 @@ msrp_hdr_t *msrp_get_hdr_by_id(msrp_frame_t *mf, int hdrid) /** * */ -int msrp_explode_str(str **arr, str *in, str *del) +int msrp_explode_str(str_array_t *arr, str *in, str *del) { str *larr; int i; @@ -633,20 +633,20 @@ int msrp_explode_str(str **arr, str *in, str *del) } n++; - larr = pkg_malloc(n * sizeof(str)); + larr = pkg_mallocxz(n * sizeof(str)); if(larr==NULL) { LM_ERR("no more pkg\n"); return -1; } - memset(larr, 0, n * sizeof(str)); k = 0; if(n==1) { larr[k].s = in->s; larr[k].len = in->len; - *arr = larr; + arr->list = larr; + arr->size = n; return n; } @@ -657,19 +657,23 @@ int msrp_explode_str(str **arr, str *in, str *del) { if(in->s[i]==del->s[j]) { - if(k<n) + if(k<n) { larr[k].len = in->s + i - larr[k].s; + } k++; - if(k<n) + if(k<n) { larr[k].s = in->s + i + 1; + } break; } } } - if(k<n) + if(k<n) { larr[k].len = in->s + i - larr[k].s; + } - *arr = larr; + arr->list = larr; + arr->size = n; return n; } @@ -677,7 +681,7 @@ int msrp_explode_str(str **arr, str *in, str *del) /** * */ -int msrp_explode_strz(str **arr, str *in, char *del) +int msrp_explode_strz(str_array_t *arr, str *in, char *del) { str s; @@ -693,7 +697,7 @@ void msrp_str_array_destroy(void *data) return; arr = (str_array_t*)data; if(arr->list!=NULL) - pkg_free(arr->list); + pkg_free(arr->list); pkg_free(arr); } @@ -705,20 +709,19 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) str_array_t *arr; str s; - arr = pkg_malloc(sizeof(str_array_t)); + arr = pkg_mallocxz(sizeof(str_array_t)); if(arr==NULL) { LM_ERR("no more pkg\n"); return -1; } - memset(arr, 0, sizeof(str_array_t)); s = hdr->body; trim(&s); - arr->size = msrp_explode_strz(&arr->list, &s, " "); - if(arr->size<0) + if(msrp_explode_strz(arr, &s, " ")<0) { LM_ERR("failed to explode\n"); + msrp_str_array_destroy(arr); return -1; } hdr->parsed.flags |= MSRP_DATA_SET;

1 0

[kamailio/kamailio] Random crashes on tls_server.c:tls_h_tcpconn_clean_f() (#2638)
by Boris Korzun 29 Apr '21

29 Apr '21

### Description We've random crashes (approx one occurrence per day) on tls_h_tcpconn_clean_f(). ### Troubleshooting #### Reproduction The crash appears **sometimes** on closing TLS session (it doesn't have to be gracefully) initiated by remote edge. #### Debugging Data ``` (lldb) target create "/usr/local/sbin/kamailio" --core "/var/coredump/986/kamailio.51059.core" Core file '/var/coredump/986/kamailio.51059.core' (x86_64) was loaded. (lldb) bt * thread #1, name = 'kamailio', stop reason = signal SIGSEGV * frame #0: 0x0000000800a13cd4 libc.so.7`__je_large_dalloc(tsdn=0x0000000800d1a090, extent=0x0000000000000000) at jemalloc_large.c:346 frame #1: 0x0000000800a3acb7 libc.so.7`__free [inlined] rtree_leaf_elm_lookup(tsdn=0x0000000800d1a090, rtree=<unavailable>, rtree_ctx=<unavailable>, key=<unavailable>, dependent=true, init_missing=false) at rtree.h:337:6 frame #2: 0x0000000800a3acb2 libc.so.7`__free [inlined] rtree_read(tsdn=0x0000000800d1a090, rtree=<unavailable>, rtree_ctx=<unavailable>, key=<unavailable>, dependent=true) at rtree.h:406 frame #3: 0x0000000800a3acb2 libc.so.7`__free [inlined] rtree_extent_read(tsdn=0x0000000800d1a090, rtree=<unavailable>, rtree_ctx=<unavailable>, key=<unavailable>, dependent=true) at rtree.h:418 frame #4: 0x0000000800a3acb2 libc.so.7`__free [inlined] iealloc(tsdn=0x0000000800d1a090, ptr=0x00000008235782f0) at jemalloc_internal_inlines_b.h:82 frame #5: 0x0000000800a3acb2 libc.so.7`__free [inlined] arena_dalloc(tsdn=0x0000000800d1a090, ptr=0x00000008235782f0, tcache=0x0000000800cf4c80, alloc_ctx=<unavailable>, slow_path=false) at arena_inlines_b.h:236 frame #6: 0x0000000800a3ac91 libc.so.7`__free [inlined] idalloctm(tsdn=0x0000000800d1a090, ptr=0x00000008235782f0, tcache=0x0000000800cf4c80, alloc_ctx=<unavailable>, is_internal=false, slow_path=false) at jemalloc_internal_inlines_c.h:118 frame #7: 0x0000000800a3ac91 libc.so.7`__free [inlined] ifree(tsd=<unavailable>, ptr=0x00000008235782f0, tcache=0x0000000800cf4c80, slow_path=false) at jemalloc_jemalloc.c:2226 frame #8: 0x0000000800a3ac91 libc.so.7`__free(ptr=<unavailable>) at jemalloc_jemalloc.c:2382 frame #9: 0x0000000800d9ed0b libthr.so.3`_thr_rwlock_destroy(rwlock=<unavailable>) at thr_rwlock.c:136:3 frame #10: 0x00000008027feba3 libcrypto.so.111`CRYPTO_THREAD_lock_free(lock=0x0000000802e87e20) at threads_pthread.c:107:5 frame #11: 0x00000008027ec676 libcrypto.so.111`BIO_free(a=0x0000000802e88920) at bio_lib.c:136:5 frame #12: 0x00000008027ed572 libcrypto.so.111`BIO_free_all(bio=0x0000000000000000) at bio_lib.c:691:9 frame #13: 0x0000000802540d0b libssl.so.111`SSL_free(s=0x0000000802e799a8) at ssl_lib.c:1160:5 frame #14: 0x0000000802482fdd tls.so`tls_h_tcpconn_clean_f(c=0x0000000802e93270) at tls_server.c:655:3 frame #15: 0x0000000000618bd8 kamailio`_tcpconn_free(c=0x0000000802e93270) at tcp_main.c:1528:58 frame #16: 0x0000000000659534 kamailio`tcpconn_put_destroy(tcpconn=0x0000000802e93270) at tcp_main.c:3269:3 frame #17: 0x0000000000668966 kamailio`handle_tcp_child(tcp_c=0x00000008014dcf68, fd_i=-1) at tcp_main.c:3706:5 frame #18: 0x000000000065b7e9 kamailio`handle_io(fm=0x00000008014e6110, ev=1, idx=-1) at tcp_main.c:4523:8 frame #19: 0x0000000000644502 kamailio`io_wait_loop_kqueue(h=0x00000000008dbf50, t=5, repeat=0) at io_wait.h:1187:9 frame #20: 0x000000000063cb62 kamailio`tcp_main_loop at tcp_main.c:4824:5 frame #21: 0x00000000002e973a kamailio`main_loop at main.c:1779:5 frame #22: 0x00000000002f7650 kamailio`main(argc=7, argv=0x00007fffffffec68) at main.c:2856:6 frame #23: 0x00000000002d1af0 kamailio`_start(ap=<unavailable>, cleanup=<unavailable>) at crt1.c:76:7 ``` All backtraces are differ from other on frames downed SSL_free() (frame #13 on the backtrace). #### Log Messages ``` 17:40:34.305319 51059 - - DEBUG: <core> [core/io_wait.h:600]: io_watch_del(): DBG: io_watch_del (0x8dbf50, 55, -1, 0x0) fd_no=46 called 17:40:34.30536351059 - - DEBUG: <core> [core/tcp_main.c:4457]: handle_tcpconn_ev(): sending to child, events 11 17:40:34.305382 51059 - - DEBUG: <core> [core/tcp_main.c:4130]: send2child(): selected tcp worker idx:5 proc:30 pid:51056 for activity on [tls:91.217.xx.yy:5070], 0x802e93270 17:40:34.305430 51059 - - DEBUG: <core> [core/io_wait.h:600]: io_watch_del(): DBG: io_watch_del (0x8dbf50, 56, -1, 0x0) fd_no=45 called 17:40:34.305446 51059 - - DEBUG: <core> [core/tcp_main.c:4457]: handle_tcpconn_ev(): sending to child, events 11 17:40:34.305461 51059 - - DEBUG: <core> [core/tcp_main.c:4130]: send2child(): selected tcp worker idx:6 proc:31 pid:51057 for activity on [tls:91.217.xx.yy:5070], 0x802ea7430 17:40:34.305678 51059 - - DEBUG: <core> [core/tcp_main.c:3560]: handle_tcp_child(): reader response= 802e93270, -1 from 5 17:40:34.305700 51059 - - DEBUG: tls [tls_server.c:683]: tls_h_tcpconn_close_f(): Closing SSL connection 0x802e9b3a8 17:40:35.024013 51026 - - ALERT: <core> [main.c:777]: handle_sigs(): child process 51059 exited by a signal 11 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.4.3 (x86_64/freebsd) e19ae3 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: e19ae3 compiled on 14:45:07 Feb 11 2021 with cc FreeBSD clang version 10.0.1 (git@github.com:llvm/llvm-project.git llvmorg-10.0.1-0-gef32c611aa2) ``` * **Operating System**: ``` FreeBSD 12.2-STABLE r369029 OpenSSL 1.1.1i-freebsd 8 Dec 2020 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2638

5 11

git: new commits in branch 5.5
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

- URL: https://github.com/kamailio/kamailio/commit/5513825a246cff4e5144ed2e83bd010… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:57:07+02:00 topos: use context to load stored branch attributes only for requests (cherry picked from commit 5d661eaa92461f3b43c433ec32653c4f89bb818e) - URL: https://github.com/kamailio/kamailio/commit/0326fec293da66797fa13ae0a07e3e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:57:34+02:00 topos: reset context on msg received callback (cherry picked from commit fb777b0e9bf2f87ea8cb1b0134fbfcc625121ad4) - URL: https://github.com/kamailio/kamailio/commit/314436b2110396a5cb069ea093f8d82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:57:49+02:00 topos: uniform processing for requests during early dialog - requests that are handled during 1xx state, like PRACK, UPDATE, BYE (cherry picked from commit 72cc3d46c39791d50927508114bdd1faa4a83f4c) - URL: https://github.com/kamailio/kamailio/commit/b371e7f9be73368d2bb5b9a6deeeb17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:06+02:00 topos: safety handling of onsend data (cherry picked from commit 975a61c89b2440fba737758cce3ab08000811b02) - URL: https://github.com/kamailio/kamailio/commit/fc90e4c06c5df8c8a9d5cd615923c09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:15+02:00 core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments (cherry picked from commit 764d5be0c44036bb4b86f841588fb0df3b4bb834) - URL: https://github.com/kamailio/kamailio/commit/1e235b0b5981c309e663cee2ef6f452… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:34+02:00 topos: simplified tps_dlg_message_update() (cherry picked from commit 7e5c4c30d2f0bbed2b566d46e5141b6abba315e7) - URL: https://github.com/kamailio/kamailio/commit/d3575aa72d779e11fd8cfebc7060647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:49+02:00 topos: load associated early dialog transaction using also uuid (cherry picked from commit 94e8988769662a5ae68e30847eef133d50ec5431) - URL: https://github.com/kamailio/kamailio/commit/f201ea9f86561e9d07fa7ac07b356f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:02+02:00 topos: check if event field exists for NOTIFY (cherry picked from commit 317ddc9efa2f11f0fe3787e9ab462550724954ed) - URL: https://github.com/kamailio/kamailio/commit/d5e4e026cf6efc19f155f3adddb1429… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:13+02:00 topos: restore checks on uri and sip_params for tps_dlg_message_update() - use define for expected min len safety checks (cherry picked from commit 1d6736d16ab3a83b77d6c7be3f9689c7fbfccf28) - URL: https://github.com/kamailio/kamailio/commit/22e201fa57f7e2be7a9718b97b550a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:26+02:00 topos: increase the number of db keys for query when using uuid for branch - debug message to print a/b uuid (cherry picked from commit fb5ab20123a07afdfaf96197db25d76f8dda0683) - URL: https://github.com/kamailio/kamailio/commit/8c75a148451b9e2d1c60e67e9b3dfaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:40+02:00 topos: explicitely set the db match operator and value type for uuid (cherry picked from commit e279f2f464ab05e1a2821d6e2d9e673fe145fbf2) - URL: https://github.com/kamailio/kamailio/commit/bf57721508c810334c966bab79f2ac3… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-04-29T15:00:37+02:00 mohqueue: fixed compiler warning about array initialization (cherry picked from commit c7781edcb37a35193ccdb9414183919aaa614d3a) - URL: https://github.com/kamailio/kamailio/commit/9dc8f5170a22e4318e1b1ac3f3f0dba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:00:46+02:00 ims_ipsec_pcscf: initialize variable to fix warnings (cherry picked from commit afff18592998cb14561cf4fd95acd1b4866fd994) - URL: https://github.com/kamailio/kamailio/commit/884dc8babeb285d2c36239d2941dcb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:00:55+02:00 textops: check for msg headers field in case is used for non-sip traffic (cherry picked from commit 48200f3e9ca9f5e5a05de440eefc23f7265b5268) - URL: https://github.com/kamailio/kamailio/commit/3b2f5081df6450aac425c344e11ce4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:01:05+02:00 core: kemi - parse headers before insert operation (cherry picked from commit 7bf0081102a5755c3282e7f01a0f45e160fdda0f) - URL: https://github.com/kamailio/kamailio/commit/e55ecc6412997b55569f3b626a681ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:01:16+02:00 msrp: check return code for str explode (cherry picked from commit addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e) - URL: https://github.com/kamailio/kamailio/commit/1c7a8459f1a5b0f4d96f3908a301b59… Author: SPChan <shihping.chan(a)gmail.com> Date: 2021-04-29T15:01:25+02:00 [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. (cherry picked from commit 27904530d1f8efd26e2b96fa5f18a3aad887919b) - URL: https://github.com/kamailio/kamailio/commit/126be686df87f1f89edbdf4e5691636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:06:45+02:00 dispatcher: safety to avoid division by 0 for latency operations (cherry picked from commit cf105d5af78963759825f5eaf9feb767c047a49c) - URL: https://github.com/kamailio/kamailio/commit/e7d46be2813531b88782004dd6ddbca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:15:32+02:00 Makefile.defs: version set to 5.5.0-rc1

1 0

git:5.4:9e7c22a2: dispatcher: safety to avoid division by 0 for latency operations
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: 5.4 Commit: 9e7c22a21d57230180fd7c135128a30f47ea427d URL: https://github.com/kamailio/kamailio/commit/9e7c22a21d57230180fd7c135128a30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:50:12+02:00 dispatcher: safety to avoid division by 0 for latency operations - manual backporting of cf105d5af78963759825f5eaf9feb767c047a49c --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/9e7c22a21d57230180fd7c135128a30… Patch: https://github.com/kamailio/kamailio/commit/9e7c22a21d57230180fd7c135128a30… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index aee5eb8ea6..8fd28c546c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2573,12 +2573,14 @@ int ds_mark_dst(struct sip_msg *msg, int state) return (ret == 0) ? 1 : -1; } +#define _VOR1(v) ((v)?(v):1) + static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ if (latency_stats->count < 2097152) { latency_stats->count++; } else { /* We adjust the sum of squares used by the oneline algorithm proportionally */ - latency_stats->m2 -= latency_stats->m2/latency_stats->count; + latency_stats->m2 -= latency_stats->m2/_VOR1(latency_stats->count); } if (latency_stats->count == 1) { latency_stats->stdev = 0.0f; @@ -2601,10 +2603,10 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l float delta; float delta2; delta = latency - latency_stats->average; - latency_stats->average += delta/latency_stats->count; + latency_stats->average += delta/_VOR1(latency_stats->count); delta2 = latency - latency_stats->average; latency_stats->m2 += ((double)delta)*delta2; - latency_stats->stdev = sqrt(latency_stats->m2 / (latency_stats->count-1)); + latency_stats->stdev = sqrt(latency_stats->m2 / _VOR1(latency_stats->count-1)); } /* exponentialy weighted moving average */ if (latency_stats->count < 10) { @@ -2697,7 +2699,7 @@ int ds_update_latency(int group, str *address, int code) ds_latency_stats_t *latency_stats = &ds_dest->latency_stats; congestion_ms = latency_stats->estimate - latency_stats->average; /* We multiply by 2^4 to keep enough precision */ - active_weight = (total_congestion_ms << 4) / congestion_ms; + active_weight = (total_congestion_ms << 4) / _VOR1(congestion_ms); if (ds_dest->attrs.rweight != active_weight) { apply_rweights = 1; ds_dest->attrs.rweight = active_weight;

1 0

git:master:cf105d5a: dispatcher: safety to avoid division by 0 for latency operations
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: cf105d5af78963759825f5eaf9feb767c047a49c URL: https://github.com/kamailio/kamailio/commit/cf105d5af78963759825f5eaf9feb76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:47:36+02:00 dispatcher: safety to avoid division by 0 for latency operations --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cf105d5af78963759825f5eaf9feb76… Patch: https://github.com/kamailio/kamailio/commit/cf105d5af78963759825f5eaf9feb76… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 80944e4b05..78ece3fffe 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2733,7 +2733,8 @@ int ds_mark_dst(struct sip_msg *msg, int state) return (ret == 0) ? 1 : -1; } -void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int count) { +void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int count) +{ latency_stats->stdev = 0.0f; latency_stats->m2 = 0.0f; latency_stats->max = latency; @@ -2743,14 +2744,17 @@ void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int coun latency_stats->count = count; } -static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { +#define _VOR1(v) ((v)?(v):1) + +static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) +{ int training_count = 10000; /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ if (latency_stats->count < 2097152) { latency_stats->count++; } else { /* We adjust the sum of squares used by the oneline algorithm proportionally */ - latency_stats->m2 -= latency_stats->m2/latency_stats->count; + latency_stats->m2 -= latency_stats->m2/_VOR1(latency_stats->count); } if (latency_stats->count == 1) @@ -2771,10 +2775,10 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l float delta; float delta2; delta = latency - latency_stats->average; - latency_stats->average += delta/latency_stats->count; + latency_stats->average += delta/_VOR1(latency_stats->count); delta2 = latency - latency_stats->average; latency_stats->m2 += ((double)delta)*delta2; - latency_stats->stdev = sqrt(latency_stats->m2 / (latency_stats->count-1)); + latency_stats->stdev = sqrt(latency_stats->m2 / _VOR1(latency_stats->count-1)); } /* exponentialy weighted moving average */ if (latency_stats->count < 10) { @@ -2793,7 +2797,8 @@ typedef struct congestion_control_state { int apply_rweights; } congestion_control_state_t; -int ds_update_weighted_congestion_control(congestion_control_state_t *cc, int weight, ds_latency_stats_t *latency_stats) +int ds_update_weighted_congestion_control(congestion_control_state_t *cc, + int weight, ds_latency_stats_t *latency_stats) { int active_weight = 0; int congestion_ms = latency_stats->estimate - latency_stats->average; @@ -2894,7 +2899,7 @@ int ds_update_latency(int group, str *address, int code) ds_latency_stats_t *latency_stats = &ds_dest->latency_stats; congestion_ms = latency_stats->estimate - latency_stats->average; /* We multiply by 2^4 to keep enough precision */ - active_weight = (cc.total_congestion_ms << 4) / congestion_ms; + active_weight = (cc.total_congestion_ms << 4) / _VOR1(congestion_ms); if (ds_dest->attrs.rweight != active_weight) { cc.apply_rweights = 1; ds_dest->attrs.rweight = active_weight;

1 0

git:master:d139cf26: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: d139cf261147c96451454b27a4a3dbaa0a226636 URL: https://github.com/kamailio/kamailio/commit/d139cf261147c96451454b27a4a3dba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-29T11:31:19+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/d139cf261147c96451454b27a4a3dba… Patch: https://github.com/kamailio/kamailio/commit/d139cf261147c96451454b27a4a3dba… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index a699336f53..d7da3a8bf7 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -31,7 +31,8 @@ Daniel-Constantin Mierla 3.4. rotate (int) 3.5. folder (str) 3.6. fprefix (str) - 3.7. event_callback (str) + 3.7. fage (int) + 3.8. event_callback (str) 4. Functions @@ -55,9 +56,10 @@ Daniel-Constantin Mierla 1.4. Set rotate parameter 1.5. Set folder parameter 1.6. Set fprefix parameter - 1.7. Set event_callback parameter - 1.8. sipdump_send usage - 1.9. sipdump.enable usage + 1.7. Set fage parameter + 1.8. Set event_callback parameter + 1.9. sipdump_send usage + 1.10. sipdump.enable usage Chapter 1. Admin Guide @@ -77,7 +79,8 @@ Chapter 1. Admin Guide 3.4. rotate (int) 3.5. folder (str) 3.6. fprefix (str) - 3.7. event_callback (str) + 3.7. fage (int) + 3.8. event_callback (str) 4. Functions @@ -138,7 +141,8 @@ Chapter 1. Admin Guide 3.4. rotate (int) 3.5. folder (str) 3.6. fprefix (str) - 3.7. event_callback (str) + 3.7. fage (int) + 3.8. event_callback (str) 3.1. enable (int) @@ -215,13 +219,26 @@ modparam("sipdump", "folder", "/run/kamailio") modparam("sipdump", "fprefix", "ksipdump-") ... -3.7. event_callback (str) +3.7. fage (int) + + Age of created files (in seconds) to be removed if they become older. + Cleanup is done on a timer routine running every 600 seconds. + + Default value is 0 (no cleanup of created files). + + Example 1.7. Set fage parameter +... +# cleanup files older than two days +modparam("sipdump", "fage", 172800) +... + +3.8. event_callback (str) Name of the KEMI function to be executed instead of the event route. Default value is not set. - Example 1.7. Set event_callback parameter + Example 1.8. Set event_callback parameter ... modparam("sipdump", "event_callback", "ksr_sipdump_event") ... @@ -246,7 +263,7 @@ end This function can be used from ANY_ROUTE. - Example 1.8. sipdump_send usage + Example 1.9. sipdump_send usage ... sipdump_send("cfg"); ... @@ -264,7 +281,7 @@ sipdump_send("cfg"); This function can be used from ANY_ROUTE. - Example 1.9. sipdump.enable usage + Example 1.10. sipdump.enable usage ... kamcmd sipdump.enable kamcmd sipdump.enable 1

1 0

git:master:945b6455: sipdump: new param fage - set file age for clean up
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: 945b6455ed8ce9e3de528588cb45aa70728d4430 URL: https://github.com/kamailio/kamailio/commit/945b6455ed8ce9e3de528588cb45aa7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T11:17:10+02:00 sipdump: new param fage - set file age for clean up - older files than fage created by sipdump are deleted on a timer routine running every 600 seconds - default value is 0 (no cleanup) - value is in seconds --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/945b6455ed8ce9e3de528588cb45aa7… Patch: https://github.com/kamailio/kamailio/commit/945b6455ed8ce9e3de528588cb45aa7… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 54b5c47484..9b733dad66 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -26,6 +26,10 @@ #include <string.h> #include <time.h> #include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <dirent.h> +#include <errno.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" @@ -49,9 +53,12 @@ static str sipdump_folder = str_init("/tmp"); static str sipdump_fprefix = str_init("kamailio-sipdump-"); int sipdump_mode = SIPDUMP_MODE_WTEXT; static str sipdump_event_callback = STR_NULL; +static int sipdump_fage = 0; static int sipdump_event_route_idx = -1; +static void sipdump_storage_clean(unsigned int ticks, void* param); + static int mod_init(void); static int child_init(int); static void mod_destroy(void); @@ -78,6 +85,7 @@ static param_export_t params[]={ {"rotate", PARAM_INT, &sipdump_rotate}, {"folder", PARAM_STR, &sipdump_folder}, {"fprefix", PARAM_STR, &sipdump_fprefix}, + {"fage", PARAM_INT, &sipdump_fage}, {"mode", PARAM_INT, &sipdump_mode}, {"event_callback", PARAM_STR, &sipdump_event_callback}, @@ -148,6 +156,12 @@ static int mod_init(void) register_basic_timers(1); } + if(sipdump_fage>0) { + if(sr_wtimer_add(sipdump_storage_clean, NULL, 600)<0) { + return -1; + } + } + sr_event_register_cb(SREV_NET_DATA_IN, sipdump_msg_received); sr_event_register_cb(SREV_NET_DATA_OUT, sipdump_msg_sent); @@ -430,6 +444,79 @@ int sipdump_msg_sent(sr_event_param_t *evp) return 0; } +/** + * + */ +static void sipdump_storage_clean(unsigned int ticks, void* param) +{ + DIR *dlist = NULL; + struct stat fstatbuf; + struct dirent *dentry = NULL; + str fname = STR_NULL; + char *cwd = NULL; + time_t tnow; + int fcount = 0; + + if(sipdump_folder.s==NULL || sipdump_folder.len<=0 + || sipdump_fprefix.s==NULL || sipdump_fprefix.len<=0) { + return; + } + cwd = getcwd(NULL, 0); + if(cwd==NULL) { + LM_ERR("getcwd failed\n"); + return; + } + if ((chdir(sipdump_folder.s)==-1)) { + LM_ERR("chdir to [%s] failed\n", sipdump_folder.s); + free(cwd); + return; + } + + dlist = opendir(sipdump_folder.s); + if (dlist==NULL) { + LM_ERR("unable to read directory [%s]\n", sipdump_folder.s); + goto done; + } + + tnow = time(NULL); + while ((dentry = readdir(dlist))) { + fname.s = dentry->d_name; + fname.len = strlen(fname.s); + + /* ignore '.' and '..' */ + if(fname.len==1 && strcmp(fname.s, ".")==0) { continue; } + if(fname.len==2 && strcmp(fname.s, "..")==0) { continue; } + + if(fname.len<=sipdump_fprefix.len + || strncmp(fname.s, sipdump_fprefix.s, sipdump_fprefix.len)!=0) { + continue; + } + if(lstat(fname.s, &fstatbuf) == -1) { + LM_ERR("stat failed on [%s]\n", fname.s); + continue; + } + if (S_ISREG(fstatbuf.st_mode)) { + /* check last modification time */ + if ((tnow - sipdump_fage) > fstatbuf.st_mtime) { + LM_DBG("deleting [%s]\n", fname.s); + unlink (fname.s); + fcount++; + } + } + } + closedir(dlist); + if(fcount>0) { + LM_DBG("deleted %d files\n", fcount); + } + +done: + if((chdir(cwd)==-1)) { + LM_ERR("chdir to [%s] failed\n", cwd); + goto done; + } + free(cwd); +} + /** * */

1 0

git:master:cf067586: sipdump: docs for fage parameter
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: cf067586bf5c147aa955d3ba7d3a875a2e376329 URL: https://github.com/kamailio/kamailio/commit/cf067586bf5c147aa955d3ba7d3a875… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T11:23:39+02:00 sipdump: docs for fage parameter --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf067586bf5c147aa955d3ba7d3a875… Patch: https://github.com/kamailio/kamailio/commit/cf067586bf5c147aa955d3ba7d3a875… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 7e642f6010..301b667d80 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -195,6 +195,27 @@ modparam("sipdump", "folder", "/run/kamailio") ... modparam("sipdump", "fprefix", "ksipdump-") ... +</programlisting> + </example> + </section> + <section id="sipdump.p.fage"> + <title><varname>fage</varname> (int)</title> + <para> + Age of created files (in seconds) to be removed if they become older. + Cleanup is done on a timer routine running every 600 seconds. + </para> + <para> + <emphasis> + Default value is 0 (no cleanup of created files). + </emphasis> + </para> + <example> + <title>Set <varname>fage</varname> parameter</title> + <programlisting format="linespecific"> +... +# cleanup files older than two days +modparam("sipdump", "fage", 172800) +... </programlisting> </example> </section>

1 0

Default config and options for Kamailio 5.5.0
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Hello, I opened a tracker issue to discuss about default kamailio.cfg to be shipped with upcoming new major version 5.5.0: * https://github.com/kamailio/kamailio/issues/2719 Add your comments on the tracker, to have everyting in a single place -- this message is to notify about on mailing list, not intended to discuss here. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

[kamailio/kamailio] TLS Client Verification OpenSSL 1.1.1(P-256) to OpenSSL 1.0.2 (P-521) is failing (#2716)
by space88man 29 Apr '21

29 Apr '21

### Description I am connecting two kamailio (5.4.5) using TLS with client cert verification. When one side is OpenSSL 1.1.1 (CentOS 8) + P-256 cert and the other side is OpenSSL 1.0.2 (CentOS 7) + P-521 cert *and* `cipher_list` is set(e.g., `DEFAULT`), the ClientHello fails because the only supported curve sent is P-256 (server has P-521). ### Troubleshooting 1. If `cipher_list` is *not* set at all in `[client:defaut]`l, then the ClientHello sends 4 supported EC groups and the handshake succeeds. 2 . If `cipher_list` is set in `[client:defaut]` (e.g. `DEFAULT` or `ANY`) then the ClientHello sends only 1 supported EC group P-256 (I guess because the client is using a P-256 cert), then the handshake will fail. #### Reproduction 1. Connect two kamailos one on CentOS 8 sending SIP to one on CentOS 7, enable TLS, with client cert verification. Put a P-256 cert on CentOS 8 and a P-521 cert on CentOS 7. #### Debugging Data 1. `cipher_list` is not set: TLS ClientHello Supported Groups is 4 groups: secp256r1 secp521r1 secp384r1 secp256k1 2. `cipher_list` is set to `DEFAULT`: TLS ClientHello Supported Groups is 1 group: secp256r1. #### Log Messages ``` ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS accept:error:1408A0C1:SSL routines:ssl3_get_client_hello:no shared cipher ``` #### SIP Traffic NA - couldn't complete TLS handshake so no SIP was transferred. ### Possible Solutions 1. Don't set cipher_list at all; the moment you set cipher_list to anything(`ANY`, `DEFAULT` etc), the ClientHello will narrow the supported groups to P-256 and the server will reject. I have a thought: does `setup_ecdh()` in `tls_domain.c` behave differently on OpenSSL 1.1.1? Maybe it is forcing the handshake to send only the curve of the client. ### Additional Information 1. kamailio version is 5.4.5 2. Must be OpenSSL 1.1.1 to OpenSSL 1.0.2. BTW in the reverse direction P-521 CentOS 7 to P-256 CentOS 8 doesn't encounter this issue. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2716

2 4

[kamailio/kamailio] [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ (#2717)
by space88man 29 Apr '21

29 Apr '21

Address GH #2716. Also see https://bugs.python.org/issue29697.   #### Pre-Submission Checklist    - [X ] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X ] Tested changes locally - [ ] Related to issue #2716 #### Description For OpenSSL 1.1.x initialization of EC SSL contexts has changed — we should be using the < 1.0.2 technique on OpenSSL 1.1+. This addresses a corner case where TLS server with P-256 cert would not handshake with a TLS client presenting a P-521 cert. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2717 -- Commit Summary -- * [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ -- File Changes -- M src/modules/tls/tls_domain.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2717.patch https://github.com/kamailio/kamailio/pull/2717.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2717

2 2

git:master:27904530: [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: 27904530d1f8efd26e2b96fa5f18a3aad887919b URL: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T08:32:13+02:00 [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… Patch: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index ab45fa7136..c2231b0db0 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -57,8 +57,12 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); * ECDHE is enabled only on OpenSSL 1.0.0e and later. * See http://www.openssl.org/news/secadv_20110906.txt * for details. + * Also, copied from _ssl.c of Python for correct initialization. + * Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use + * prime256v1 by default. This is Apache mod_ssl's initialization + * policy, so we should be safe. OpenSSL 1.1 has it enabled by default. */ -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; @@ -69,11 +73,15 @@ static void setup_ecdh(SSL_CTX *ctx) } #endif +#if defined(SSL_CTX_set_ecdh_auto) + SSL_CTX_set_ecdh_auto(ctx, 1); +#else ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); SSL_CTX_set_tmp_ecdh(ctx, ecdh); EC_KEY_free(ecdh); +#endif } #endif @@ -691,7 +699,7 @@ static int set_cipher_list(tls_domain_t* d) tls_domain_str(d), cipher_list); return -1; } -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) setup_ecdh(d->ctx[i]); #endif #ifndef OPENSSL_NO_DH

1 0

git:master:addb6a88: msrp: check return code for str explode
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e URL: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T08:25:49+02:00 msrp: check return code for str explode --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… Patch: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index 4e5e67e130..7defaf9353 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -716,6 +716,11 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) s = hdr->body; trim(&s); arr->size = msrp_explode_strz(&arr->list, &s, " "); + if(arr->size<0) + { + LM_ERR("failed to explode\n"); + return -1; + } hdr->parsed.flags |= MSRP_DATA_SET; hdr->parsed.free_fn = msrp_str_array_destroy; hdr->parsed.data = arr;

1 0

git:master:a1bbe035: lost: fixed possible resource leak inside lost_get_response_issues()
by Wolfgang Kampichler 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: a1bbe035f1a1acc11f86d27fdc0adef1b1a3d010 URL: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-28T17:22:58+02:00 lost: fixed possible resource leak inside lost_get_response_issues() --- Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… Patch: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… --- diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index b3389448b8..6eb13e8260 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -573,39 +573,53 @@ p_lost_issue_t lost_get_response_issues(xmlNodePtr node) cur = node->children; while(cur) { if(cur->type == XML_ELEMENT_NODE) { - /* get a new response type element */ + /* get a new response type object */ issue = lost_new_response_type(); if(issue == NULL) { /* didn't get it ... return */ break; } - /* parse properties */ - issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + /* get issue type */ tmp.s = (char *)cur->name; tmp.len = strlen((char *)cur->name); + /* copy issue type to object */ + len = 0; if(tmp.len > 0 && tmp.s != NULL) { issue->type = lost_copy_string(tmp, &len); } - if(len > 0) { + if(len == 0) { + /* issue type not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parse source property */ + len = 0; + issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + if(len == 0) { + /* source property not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } - LM_DBG("###\t[%s]\n", issue->type); + LM_DBG("###\t[%s]\n", issue->type); - if(issue->info != NULL) { - issue->info->text = lost_get_property(cur, PROP_MSG, &len); - issue->info->lang = lost_get_property(cur, PROP_LANG, &len); - } - /* get a new list element */ - new = lost_new_response_issues(); - if(new == NULL) { - /* didn't get it, delete response type element ... return */ - lost_delete_response_type(&issue); /* clean up */ - break; - } - /* append to list */ - new->issue = issue; - new->next = list; - list = new; + /* type and source property found ... parse text and copy */ + if(issue->info != NULL) { + issue->info->text = lost_get_property(cur, PROP_MSG, &len); + issue->info->lang = lost_get_property(cur, PROP_LANG, &len); } + /* get a new list element */ + new = lost_new_response_issues(); + if(new == NULL) { + /* didn't get it, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parsing done, append object to list */ + new->issue = issue; + new->next = list; + list = new; + /* get next element */ cur = cur->next; }

1 0

git:master:48200f3e: textops: check for msg headers field in case is used for non-sip traffic
by Daniel-Constantin Mierla 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: 48200f3e9ca9f5e5a05de440eefc23f7265b5268 URL: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T15:57:05+02:00 textops: check for msg headers field in case is used for non-sip traffic --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… Patch: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 3d90e97a90..2998906051 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3401,7 +3401,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, int len; str s0; - if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { LM_ERR("error while parsing message\n"); return -1; }

1 0

git:master:7bf00811: core: kemi - parse headers before insert operation
by Daniel-Constantin Mierla 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: 7bf0081102a5755c3282e7f01a0f45e160fdda0f URL: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T16:06:50+02:00 core: kemi - parse headers before insert operation --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… Patch: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index ba0b435dce..0932339996 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2143,6 +2143,11 @@ static int sr_kemi_hdr_insert(sip_msg_t *msg, str *txt) if(txt==NULL || txt->s==NULL || msg==NULL) return -1; + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { + LM_ERR("error while parsing message\n"); + return -1; + } + LM_DBG("insert hf: %.*s\n", txt->len, txt->s); hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { @@ -2188,7 +2193,7 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) return -1; } - if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { LM_ERR("error while parsing message\n"); return -1; }

1 0

git:master:afff1859: ims_ipsec_pcscf: initialize variable to fix warnings
by Daniel-Constantin Mierla 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: afff18592998cb14561cf4fd95acd1b4866fd994 URL: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T13:28:05+02:00 ims_ipsec_pcscf: initialize variable to fix warnings --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… Patch: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 10841c74b2..45e82ddf3e 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -681,8 +681,8 @@ static int delete_unused_sa_cb(const struct nlmsghdr *nlh, void *data) void *cp; str received_host; ip_addr_t received_host_addr; - ipsec_t ipsec; - + ipsec_t ipsec = {0}; + cp = ((struct del_tunnels*)data)->contacts; while (1) { memcpy(&(received_host.len), cp, sizeof(received_host.len)); @@ -1080,4 +1080,4 @@ int delete_unused_tunnels() free(buf); return 0; -} \ No newline at end of file +}

1 0

[kamailio/kamailio] build warnings (#2710)
by sergey-safarov 27 Apr '21

27 Apr '21

**missing braces around initializer** *mohq_funcs.c:2163* ``` LD (gcc) [M matrix.so] matrix.so CC (gcc) [M mohqueue.so] mohq_locks.o CC (gcc) [M mohqueue.so] mohq_funcs.o mohq_funcs.c: In function 'send_rtp_answer': mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { } CC (gcc) [M mohqueue.so] mohq_db.o CC (gcc) [M mohqueue.so] mohqueue_mod.o make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M mohqueue.so] mohqueue.so CC (gcc) [M msilo.so] msfuncs.o CC (gcc) [M msilo.so] msilo.o ``` **"_POSIX_C_SOURCE" redefined** ``` CC (gcc) [M app_python.so] python_iface.o CC (gcc) [M app_python.so] apy_kemi_export.o In file included from /usr/include/python2.7/pyconfig.h:6, from /usr/include/python2.7/Python.h:8, from apy_kemi_export.c:30: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined 1232 | #define _POSIX_C_SOURCE 200112L | In file included from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:27, from apy_kemi_export.c:26: /usr/include/features.h:265: note: this is the location of the previous definition 265 | # define _POSIX_C_SOURCE 200809L | CC (gcc) [M app_python.so] mod_Core.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/pyconfig.h:6, from /usr/include/python2.7/Python.h:8, from apy_kemi.c:25: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined 1232 | #define _POSIX_C_SOURCE 200112L | In file included from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:27, from apy_kemi.c:21: /usr/include/features.h:265: note: this is the location of the previous definition 265 | # define _POSIX_C_SOURCE 200809L | CC (gcc) [M app_python.so] python_msgobj.o CC (gcc) [M app_python.so] mod_Router.o CC (gcc) [M app_python.so] app_python_mod. ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2710

3 14

git:master:c7781edc: mohqueue: fixed compiler warning about array initialization
by Sergey Safarov 27 Apr '21

27 Apr '21

Module: kamailio Branch: master Commit: c7781edcb37a35193ccdb9414183919aaa614d3a URL: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-04-27T13:00:35+03:00 mohqueue: fixed compiler warning about array initialization --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… Patch: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index dd9f105bfc..1f72c58c5a 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -2160,7 +2160,9 @@ int nsession; sdp_session_cell_t *psession; char pflagbuf [5]; strcpy (pflagbuf, "z20"); -fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; +fparam_t pzflag [1] = { + {"", FPARAM_STRING, {pflagbuf}, 0} +}; for (nsession = 0; (psession = get_sdp_session (pmsg, nsession)); nsession++) { int nstream;

1 0

git:5.5:6b9ecb08: dispatcher: docs - set xmlns for include tags
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: 5.5 Commit: 6b9ecb0856a881144546fea6d3cbd8a3dc668b81 URL: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T10:00:41+02:00 dispatcher: docs - set xmlns for include tags (cherry picked from commit 3f25ef01c5cc3adb02dd1bfecdfd4c3ce80cef47) --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… Patch: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index 3888e5f281..af040e737d 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -6,12 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]> -<book xmlns:xi="http://www.w3.org/2001/XInclude"> +<book> <bookinfo> <title>DISPATCHER Module</title> <productname class="trade">&kamailioname;</productname> @@ -97,7 +94,7 @@ </bookinfo> <toc/> - <xi:include href="dispatcher_admin.xml"/> - <xi:include href="dispatcher_faq.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_admin.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_faq.xml"/> </book> diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 45f93a3121..0ac1a430e6 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ - +  <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>  -<chapter xmlns:xi="http://www.w3.org/2001/XInclude"> +<chapter> <title>&adminguide;</title> @@ -2215,7 +2212,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>dispatcher list file</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.list" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.list" parse="text"/> ... </programlisting> </example> @@ -2231,7 +2228,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>&kamailio; config script - sample dispatcher usage</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.cfg" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.cfg" parse="text"/> ... </programlisting> </example>

1 0

git:5.5:f3cf66fa: dmq: docs - fix section id for dmq.remove rpc command
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: 5.5 Commit: f3cf66fafaba73b245b5e8179c290da936f6418e URL: https://github.com/kamailio/kamailio/commit/f3cf66fafaba73b245b5e8179c290da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T10:00:28+02:00 dmq: docs - fix section id for dmq.remove rpc command (cherry picked from commit 2c473f7c2eccf4ef79f23f9cecd122e861395a00) --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f3cf66fafaba73b245b5e8179c290da… Patch: https://github.com/kamailio/kamailio/commit/f3cf66fafaba73b245b5e8179c290da… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index ebc6f44e1a..661fd4b847 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -522,7 +522,7 @@ modparam("dmq", "ping_interval", 90) </programlisting> </example> </section> - <section id="dmq.r.list_nodes"> + <section id="dmq.r.remove"> <title>dmq.remove</title> <para> Remove a DMQ node by address.

1 0

git:master:3f25ef01: dispatcher: docs - set xmlns for include tags
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: master Commit: 3f25ef01c5cc3adb02dd1bfecdfd4c3ce80cef47 URL: https://github.com/kamailio/kamailio/commit/3f25ef01c5cc3adb02dd1bfecdfd4c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T09:59:29+02:00 dispatcher: docs - set xmlns for include tags --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f25ef01c5cc3adb02dd1bfecdfd4c3… Patch: https://github.com/kamailio/kamailio/commit/3f25ef01c5cc3adb02dd1bfecdfd4c3… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index 3888e5f281..af040e737d 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -6,12 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]> -<book xmlns:xi="http://www.w3.org/2001/XInclude"> +<book> <bookinfo> <title>DISPATCHER Module</title> <productname class="trade">&kamailioname;</productname> @@ -97,7 +94,7 @@ </bookinfo> <toc/> - <xi:include href="dispatcher_admin.xml"/> - <xi:include href="dispatcher_faq.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_admin.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_faq.xml"/> </book> diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 45f93a3121..0ac1a430e6 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ - +  <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>  -<chapter xmlns:xi="http://www.w3.org/2001/XInclude"> +<chapter> <title>&adminguide;</title> @@ -2215,7 +2212,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>dispatcher list file</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.list" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.list" parse="text"/> ... </programlisting> </example> @@ -2231,7 +2228,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>&kamailio; config script - sample dispatcher usage</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.cfg" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.cfg" parse="text"/> ... </programlisting> </example>

1 0

git:master:2c473f7c: dmq: docs - fix section id for dmq.remove rpc command
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: master Commit: 2c473f7c2eccf4ef79f23f9cecd122e861395a00 URL: https://github.com/kamailio/kamailio/commit/2c473f7c2eccf4ef79f23f9cecd122e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T09:51:30+02:00 dmq: docs - fix section id for dmq.remove rpc command --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2c473f7c2eccf4ef79f23f9cecd122e… Patch: https://github.com/kamailio/kamailio/commit/2c473f7c2eccf4ef79f23f9cecd122e… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index ebc6f44e1a..661fd4b847 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -522,7 +522,7 @@ modparam("dmq", "ping_interval", 90) </programlisting> </example> </section> - <section id="dmq.r.list_nodes"> + <section id="dmq.r.remove"> <title>dmq.remove</title> <para> Remove a DMQ node by address.

1 0

git:master:764d5be0: core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 764d5be0c44036bb4b86f841588fb0df3b4bb834 URL: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T11:22:20+02:00 core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… Patch: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 94f972eae9..fb786ba635 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -509,7 +509,7 @@ void qm_free(void* qmp, void* p) #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f, file, line); - if (f->u.is_free){ + if (unlikely(f->u.is_free)){ if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { LM_CRIT("BUG: freeing already freed pointer (%p)," " called from %s: %s(%d), first free %s: %s(%ld) - aborting\n", @@ -524,12 +524,13 @@ void qm_free(void* qmp, void* p) } MDBG("freeing frag. %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line); -#endif +#else if (unlikely(f->u.is_free)){ LM_INFO("freeing a free fragment (%p/%p) - ignore\n", f, p); return; } +#endif size=f->size; qm->used-=size;

2 2

git:master:e279f2f4: topos: explicitely set the db match operator and value type for uuid
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: e279f2f464ab05e1a2821d6e2d9e673fe145fbf2 URL: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T14:58:39+02:00 topos: explicitely set the db match operator and value type for uuid --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… Patch: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 2d611402c8..6e88b35af3 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1148,20 +1148,32 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if(md->a_uuid.len>0) { if(md->a_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); nr_keys++; } else if(md->a_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); nr_keys++; } } else if(md->b_uuid.len>0) { if(md->b_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); nr_keys++; } else if(md->b_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); nr_keys++; }

1 0

git:master:fb5ab201: topos: increase the number of db keys for query when using uuid for branch
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: fb5ab20123a07afdfaf96197db25d76f8dda0683 URL: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T14:51:55+02:00 topos: increase the number of db keys for query when using uuid for branch - debug message to print a/b uuid --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… Patch: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 852a19aaa2..854d2cdbc6 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -826,6 +826,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) } lkey = msg->callid->body; + LM_DBG("callid [%.*s] - a_uuid [%.*s] - b_uuid [%.*s]\n", lkey.len, lkey.s, + mtsd.a_uuid.len, ((mtsd.a_uuid.len>0)?mtsd.a_uuid.s:""), + mtsd.b_uuid.len, ((mtsd.b_uuid.len>0)?mtsd.b_uuid.s:"")); tps_storage_lock_get(&lkey); diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index caff16c5ee..2d611402c8 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1149,17 +1149,21 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if(md->a_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + nr_keys++; } else if(md->a_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + nr_keys++; } } else if(md->b_uuid.len>0) { if(md->b_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + nr_keys++; } else if(md->b_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + nr_keys++; } } }

1 0

git:master:1d6736d1: topos: restore checks on uri and sip_params for tps_dlg_message_update()
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 1d6736d16ab3a83b77d6c7be3f9689c7fbfccf28 URL: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:49:42+02:00 topos: restore checks on uri and sip_params for tps_dlg_message_update() - use define for expected min len safety checks --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… Patch: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index cbf8b3c9f3..852a19aaa2 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -309,17 +309,18 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) str tuuid = STR_NULL; int ret; +#define TPS_TUUID_MIN_LEN 10 + if(parse_sip_msg_uri(msg)<0) { LM_ERR("failed to parse r-uri\n"); return -1; } - if(msg->parsed_uri.sip_params.len<10) { - LM_DBG("not an expected %s format\n", (ctmode==0)?"user":"param"); - return 1; - } - if (ctmode == 1 || ctmode == 2) { + if(msg->parsed_uri.sip_params.len<TPS_TUUID_MIN_LEN) { + LM_DBG("not an expected param format\n"); + return 1; + } /* find the r-uri parameter */ ret = tps_get_param_value(&msg->parsed_uri.params, &_tps_cparam_name, &tuuid); @@ -332,6 +333,10 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return 1; } } else { + if(msg->parsed_uri.user.len<TPS_TUUID_MIN_LEN) { + LM_DBG("not an expected user format\n"); + return 1; + } tuuid = msg->parsed_uri.user; }

1 0

git:master:317ddc9e: topos: check if event field exists for NOTIFY
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 317ddc9efa2f11f0fe3787e9ab462550724954ed URL: https://github.com/kamailio/kamailio/commit/317ddc9efa2f11f0fe3787e9ab46255… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:43:21+02:00 topos: check if event field exists for NOTIFY --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/317ddc9efa2f11f0fe3787e9ab46255… Patch: https://github.com/kamailio/kamailio/commit/317ddc9efa2f11f0fe3787e9ab46255… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 21cb59c517..caff16c5ee 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1110,7 +1110,7 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if((get_cseq(msg)->method_id == METHOD_SUBSCRIBE) || ((get_cseq(msg)->method_id == METHOD_NOTIFY) - && (msg->event->len > 0))) { + && (msg->event && msg->event->len > 0))) { bInviteDlg = 0; }

1 0

git:master:94e89887: topos: load associated early dialog transaction using also uuid
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 94e8988769662a5ae68e30847eef133d50ec5431 URL: https://github.com/kamailio/kamailio/commit/94e8988769662a5ae68e30847eef133… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:02:11+02:00 topos: load associated early dialog transaction using also uuid --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/94e8988769662a5ae68e30847eef133… Patch: https://github.com/kamailio/kamailio/commit/94e8988769662a5ae68e30847eef133… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 25275ab272..21cb59c517 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1144,6 +1144,24 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = bInviteDlg ? sinv : ssub; nr_keys++; + + if(md->a_uuid.len>0) { + if(md->a_uuid.s[0]=='a') { + db_keys[nr_keys]=&tt_col_a_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + } else if(md->a_uuid.s[0]=='b') { + db_keys[nr_keys]=&tt_col_b_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + } + } else if(md->b_uuid.len>0) { + if(md->b_uuid.s[0]=='a') { + db_keys[nr_keys]=&tt_col_a_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + } else if(md->b_uuid.s[0]=='b') { + db_keys[nr_keys]=&tt_col_b_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + } + } } if(msg->first_line.type==SIP_REQUEST && md->x_context.len>0) {

1 0

git:master:7e5c4c30: topos: simplified tps_dlg_message_update()
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 7e5c4c30d2f0bbed2b566d46e5141b6abba315e7 URL: https://github.com/kamailio/kamailio/commit/7e5c4c30d2f0bbed2b566d46e5141b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T12:48:37+02:00 topos: simplified tps_dlg_message_update() --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/7e5c4c30d2f0bbed2b566d46e5141b6… Patch: https://github.com/kamailio/kamailio/commit/7e5c4c30d2f0bbed2b566d46e5141b6… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index bf5815fa76..cbf8b3c9f3 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -306,7 +306,7 @@ int tps_dlg_detect_direction(sip_msg_t *msg, tps_data_t *ptsd, */ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) { - str tmp; + str tuuid = STR_NULL; int ret; if(parse_sip_msg_uri(msg)<0) { @@ -314,14 +314,15 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return -1; } + if(msg->parsed_uri.sip_params.len<10) { + LM_DBG("not an expected %s format\n", (ctmode==0)?"user":"param"); + return 1; + } + if (ctmode == 1 || ctmode == 2) { - if(msg->parsed_uri.sip_params.len<10) { - LM_DBG("not an expected param format\n"); - return 1; - } - // find parameter, there might be others + /* find the r-uri parameter */ ret = tps_get_param_value(&msg->parsed_uri.params, - &_tps_cparam_name, &tmp); + &_tps_cparam_name, &tuuid); if (ret < 0) { LM_ERR("failed to parse param\n"); return -1; @@ -330,31 +331,20 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) LM_DBG("prefix para not found\n"); return 1; } - if(memcmp(tmp.s, "atpsh-", 6)==0) { - ptsd->a_uuid = tmp; - return 0; - } - if(memcmp(tmp.s, "btpsh-", 6)==0) { - ptsd->a_uuid = tmp; - ptsd->b_uuid = tmp; - return 0; - } - } else { - if(msg->parsed_uri.user.len<10) { - LM_DBG("not an expected user format\n"); - return 1; - } - if(memcmp(msg->parsed_uri.user.s, "atpsh-", 6)==0) { - ptsd->a_uuid = msg->parsed_uri.user; - return 0; - } - if(memcmp(msg->parsed_uri.user.s, "btpsh-", 6)==0) { - ptsd->a_uuid = msg->parsed_uri.user; - ptsd->b_uuid = msg->parsed_uri.user; - return 0; - } + tuuid = msg->parsed_uri.user; + } + + if(memcmp(tuuid.s, "atpsh-", 6)==0) { + ptsd->a_uuid = tuuid; + return 0; + } + if(memcmp(tuuid.s, "btpsh-", 6)==0) { + ptsd->a_uuid = tuuid; + ptsd->b_uuid = tuuid; + return 0; } + LM_DBG("not an expected prefix\n"); return 1; @@ -840,7 +830,6 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(((get_cseq(msg)->method_id) & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ - memset(&stsd, 0, sizeof(tps_data_t)); if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { /* detect direction - via from-tag */ if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { @@ -850,6 +839,8 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_storage_link_msg(msg, &mtsd, direction) < 0) { goto error; } + mtsd.direction = direction; + memset(&stsd, 0, sizeof(tps_data_t)); if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { goto error; } @@ -859,9 +850,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error; } + mtsd.direction = direction; } - mtsd.direction = direction; tps_storage_lock_release(&lkey);

1 0

git:master:975a61c8: topos: safety handling of onsend data
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 975a61c89b2440fba737758cce3ab08000811b02 URL: https://github.com/kamailio/kamailio/commit/975a61c89b2440fba737758cce3ab08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T10:14:58+02:00 topos: safety handling of onsend data --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/975a61c89b2440fba737758cce3ab08… Patch: https://github.com/kamailio/kamailio/commit/975a61c89b2440fba737758cce3ab08… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 24cb77c208..ba58920a6c 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -602,12 +602,15 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, struct run_act_ctx ctx; int rtb; sr_kemi_eng_t *keng = NULL; - struct onsend_info onsnd_info = {0}; + onsend_info_t onsnd_info = {0}; + onsend_info_t *p_onsend_bak; if(!(_tps_eventrt_mode & evtype)) { return 0; } + p_onsend_bak = p_onsend; + if(evidx<0) { if(_tps_eventrt_callback.s!=NULL || _tps_eventrt_callback.len>0) { keng = sr_kemi_eng_get(); @@ -627,8 +630,10 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, evidx); fmsg = faked_msg_next(); - onsnd_info.to = &evp->dst->to; - onsnd_info.send_sock = evp->dst->send_sock; + if(evp->dst) { + onsnd_info.to = &evp->dst->to; + onsnd_info.send_sock = evp->dst->send_sock; + } if(msg!=NULL) { onsnd_info.buf = msg->buf; onsnd_info.len = msg->len; @@ -650,7 +655,7 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE, &_tps_eventrt_callback, evname)<0) { LM_ERR("error running event route kemi callback\n"); - p_onsend=NULL; + p_onsend=p_onsend_bak; return -1; } } @@ -658,12 +663,12 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, set_route_type(rtb); if(ctx.run_flags&DROP_R_F) { LM_DBG("exit due to 'drop' in event route\n"); - p_onsend=NULL; + p_onsend=p_onsend_bak; return 1; } done: - p_onsend=NULL; + p_onsend=p_onsend_bak; return 0; }

1 0

git:master:72cc3d46: topos: uniform processing for requests during early dialog
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 72cc3d46c39791d50927508114bdd1faa4a83f4c URL: https://github.com/kamailio/kamailio/commit/72cc3d46c39791d50927508114bdd1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T10:14:58+02:00 topos: uniform processing for requests during early dialog - requests that are handled during 1xx state, like PRACK, UPDATE, BYE --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/72cc3d46c39791d50927508114bdd1f… Patch: https://github.com/kamailio/kamailio/commit/72cc3d46c39791d50927508114bdd1f… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 2389026d14..bf5815fa76 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -834,35 +834,31 @@ int tps_request_received(sip_msg_t *msg, int dialog) tps_storage_lock_get(&lkey); - if((get_cseq(msg)->method_id)&(METHOD_PRACK)) { - if(tps_storage_link_msg(msg, &mtsd, TPS_DIR_DOWNSTREAM)<0) { + if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { + goto error; + } + if(((get_cseq(msg)->method_id) & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) + && stsd.b_contact.len <= 0) { + /* no B-side contact, look for INVITE transaction record */ + memset(&stsd, 0, sizeof(tps_data_t)); + if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { + /* detect direction - via from-tag */ + if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { + goto error; + } + } + if(tps_storage_link_msg(msg, &mtsd, direction) < 0) { goto error; } - if(tps_storage_load_branch(msg, &mtsd, &stsd, 1)<0) { + if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { goto error; } use_branch = 1; } else { - if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { + /* detect direction - via from-tag */ + if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error; } - if(((get_cseq(msg)->method_id) & (METHOD_BYE)) - && stsd.b_contact.len <= 0) { - /* BYE but not B-side contact, look for INVITE transaction record */ - memset(&stsd, 0, sizeof(tps_data_t)); - if(tps_storage_link_msg(msg, &mtsd, TPS_DIR_DOWNSTREAM) < 0) { - goto error; - } - if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { - goto error; - } - use_branch = 1; - } else { - /* detect direction - via from-tag */ - if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { - goto error; - } - } } mtsd.direction = direction;

1 0

git:master:32800023: lost: Coverity Scan fixes
by Wolfgang Kampichler 25 Apr '21

25 Apr '21

Module: kamailio Branch: master Commit: 328000233928fa08095889fdca7d66acba5e5825 URL: https://github.com/kamailio/kamailio/commit/328000233928fa08095889fdca7d66a… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-25T22:44:01+02:00 lost: Coverity Scan fixes --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/328000233928fa08095889fdca7d66a… Patch: https://github.com/kamailio/kamailio/commit/328000233928fa08095889fdca7d66a…

1 0

git:master:5d661eaa: topos: use context to load stored branch attributes only for requests
by Daniel-Constantin Mierla 23 Apr '21

23 Apr '21

Module: kamailio Branch: master Commit: 5d661eaa92461f3b43c433ec32653c4f89bb818e URL: https://github.com/kamailio/kamailio/commit/5d661eaa92461f3b43c433ec32653c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-23T12:36:20+02:00 topos: use context to load stored branch attributes only for requests --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5d661eaa92461f3b43c433ec32653c4… Patch: https://github.com/kamailio/kamailio/commit/5d661eaa92461f3b43c433ec32653c4… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 408d84d8cc..25275ab272 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1146,7 +1146,7 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, nr_keys++; } - if(md->x_context.len>0) { + if(msg->first_line.type==SIP_REQUEST && md->x_context.len>0) { db_keys[nr_keys]=&tt_col_x_context; db_ops[nr_keys]=OP_EQ; db_vals[nr_keys].type = DB1_STR;

1 0

git:master:fb777b0e: topos: reset context on msg received callback
by Daniel-Constantin Mierla 23 Apr '21

23 Apr '21

Module: kamailio Branch: master Commit: fb777b0e9bf2f87ea8cb1b0134fbfcc625121ad4 URL: https://github.com/kamailio/kamailio/commit/fb777b0e9bf2f87ea8cb1b0134fbfcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-23T12:36:20+02:00 topos: reset context on msg received callback --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fb777b0e9bf2f87ea8cb1b0134fbfcc… Patch: https://github.com/kamailio/kamailio/commit/fb777b0e9bf2f87ea8cb1b0134fbfcc… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 4975af9493..24cb77c208 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -432,6 +432,8 @@ int tps_msg_received(sr_event_param_t *evp) int dialog; int ret; + ki_tps_set_context(NULL, NULL); + obuf = (str*)evp->data; if(tps_execute_event_route(NULL, evp, TPS_EVENTRT_INCOMING,

1 0

git:master:55095abd: pkg/kamailio/deb: version set 5.6.0~dev0
by Victor Seva 23 Apr '21

23 Apr '21

Module: kamailio Branch: master Commit: 55095abdb65ddf1d332d294c1acefc61935f240e URL: https://github.com/kamailio/kamailio/commit/55095abdb65ddf1d332d294c1acefc6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-23T11:28:44+02:00 pkg/kamailio/deb: version set 5.6.0~dev0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/55095abdb65ddf1d332d294c1acefc6… Patch: https://github.com/kamailio/kamailio/commit/55095abdb65ddf1d332d294c1acefc6…

1 0

Branch 5.5 has been created
by Daniel-Constantin Mierla 23 Apr '21

23 Apr '21

Hello, the branch 5.5 has been created, to be used for releasing v5.5.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.5 cd kamailio-5.5 git checkout -b 5.5 origin/5.5 Pushing commits in this branch: git push origin 5.5:5.5 Note that 5.5 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.5 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 5.5 will be out, respectively Kamailio v5.5.0. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev