- sr-dev - kamailio.org

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

[CRON] Failed: dbank888/kamailio#133 (master - 491e19e)
by Travis CI 22 Apr '21

22 Apr '21

Build Update for dbank888/kamailio ------------------------------------- Build: #133 Status: Failed Duration: 5 mins and 15 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/768045521?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Development is open for future release of v5.6.x series
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Hello, the branch 5.5 was created, therefore the master branch is open for adding new features, to be part of future release series v5.6.x (or whatever version is decided for next series). Any bug fix committed to master that applies to 5.5.x or older stable branches should be backported as usual with "git cherry-pick -x ..." to appropriate branches like 5.5 or 5.4. Expect that v5.5.0 will be released in a few weeks from now. Based on the workflow used during the past years, the next future release v5.6.0 should be out after another 6-10 months of development, plus 1-2 months of testing, so sometime by end of 2021 or in the first part of 2022. 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

git:5.5:677bf448: Makefile.defs: version set to 5.5.0-rc0
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: 5.5 Commit: 677bf4480a14ea1c93eb92000cad19299d2d098e URL: https://github.com/kamailio/kamailio/commit/677bf4480a14ea1c93eb92000cad192… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:54:33+02:00 Makefile.defs: version set to 5.5.0-rc0 - branch 5.5 was created to host 5.5.x series - vesion type set to release candidate mode --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/677bf4480a14ea1c93eb92000cad192… Patch: https://github.com/kamailio/kamailio/commit/677bf4480a14ea1c93eb92000cad192… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 2247a05385..a7791acb28 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:0c1211b0: Makefile.defs: version set to 5.6.0-dev0
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 0c1211b02b48bf7776bd490454d0ad9ae785032e URL: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:51:26+02:00 Makefile.defs: version set to 5.6.0-dev0 - master branch is open for new features to be part of future release series 5.6.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… Patch: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 2247a05385..027c985798 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 5 +PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:a8217183: Makefile.defs: version set to 5.5.0-pre1
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: a82171835767f65aa7365d303e53c097bf59e21a URL: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:48:20+02:00 Makefile.defs: version set to 5.5.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… Patch: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 1d8e131e12..2247a05385 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:54fe6aa0: topos_redis: set attributes always for provisional replies
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 54fe6aa05a266bfbf0cffedde89134ba534c8d1b URL: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:46:29+02:00 topos_redis: set attributes always for provisional replies --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… Patch: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 93f02da0fd..5f0fda701e 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1171,15 +1171,14 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &tt_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &tt_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &tt_key_b_contact, argv, argvlen); } if((mode & TPS_DBU_RPLATTRS) && msg->first_line.type==SIP_REPLY) { - if(sd->b_tag.len<=0 - && msg->first_line.u.reply.statuscode>=180 + if(msg->first_line.u.reply.statuscode>=180 && msg->first_line.u.reply.statuscode<200) { TPS_REDIS_SET_ARGS(&md->b_rr, argc, &tt_key_y_rr, argv, argvlen);

1 0

git:master:86b05ed4: ims_charging: fixed compiler warnings for kemi exports
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 86b05ed47d2ec44535b3615dbebac59e4c2c99ca URL: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T09:29:26+02:00 ims_charging: fixed compiler warnings for kemi exports --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… Patch: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index a8883dc548..a01a08b566 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -409,7 +409,7 @@ static int ki_ro_ccr_stop(sip_msg_t *msg, str* p_direction, int p_code, str* p_r struct ro_session* ro_session; struct ro_session_entry *ro_session_entry; unsigned int h_entry; - str s_code, s_reason; + str s_reason; unsigned int code; int dir = 0; /*any side*/ char *c_direction; @@ -527,7 +527,7 @@ static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int re return RO_RETURN_ERROR; } - dir = get_direction_as_int(&s_direction); + dir = get_direction_as_int(s_direction); if (dir == RO_ORIG_DIRECTION) { //get caller IMPU from asserted identity @@ -610,7 +610,7 @@ static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int re goto done; } - ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, &s_incoming_trunk_id, &s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel); + ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, s_incoming_trunk_id, s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel); if(ret < 0){ LM_ERR("Failed to send CCR\n"); @@ -669,6 +669,7 @@ static int ki_ro_set_session_id_avp(sip_msg_t *msg) { res = create_response_avp_string("ro_session_id", &ro_session->ro_session_id); dlgb.release_dlg(dlg); unref_ro_session(ro_session, 1, 1); + return res; } static int ro_fixup_stop(void **param, int param_no) { @@ -702,4 +703,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(ims_charging_kemi_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:06e265b3: ims_diameter_server: removed goto label used in single place
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 06e265b38a857789b64ca1370db039eeca5a0e50 URL: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T09:36:31+02:00 ims_diameter_server: removed goto label used in single place --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… Patch: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index 2270a62560..3ee51601ec 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -286,7 +286,10 @@ int ki_diameter_request(struct sip_msg * msg, str* s_peer, int i_appid, int i_co session = 0; } - if (!req) goto error1; + if (!req) { + LM_ERR("Error occurred trying to send request\n"); + return -1; + } if (!addAVPsfromJSON(req, s_message)) { LM_ERR("Failed to parse JSON Request\n"); @@ -325,12 +328,6 @@ int ki_diameter_request(struct sip_msg * msg, str* s_peer, int i_appid, int i_co } } } -error1: - //Only free UAR IFF it has not been passed to CDP - if (req) cdpb.AAAFreeMessage(&req); - LM_ERR("Error occurred trying to send request\n"); - return -1; - } int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* commandcode, char* message, int async) {

1 0

git:master:94068d2e: dmq: skip removing local node via rpc command
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 94068d2e40eb867a5d6da44868d5edb52949f817 URL: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T08:36:11+02:00 dmq: skip removing local node via rpc command --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Patch: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 631dce11d5..4300f80b54 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -328,9 +328,12 @@ void pkg_free_node(dmq_node_t *node) } /** - * @brief delete dmq node + * @brief delete dmq node with filter rules + * - list - the list of nodes + * - node - the structure with characteristics of the node to be deleted + * - filter - if 0: delete node always; if 1: delete node if not local */ -int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +int dmq_node_del_filter(dmq_node_list_t *list, dmq_node_t *node, int filter) { dmq_node_t *cur, **prev; lock_get(&list->lock); @@ -338,8 +341,10 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) prev = &list->nodes; while(cur) { if(cmp_dmq_node(cur, node)) { - *prev = cur->next; - destroy_dmq_node(cur, 1); + if(filter==0 || cur->local==0) { + *prev = cur->next; + destroy_dmq_node(cur, 1); + } lock_release(&list->lock); return 1; } @@ -350,6 +355,14 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node + */ +int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +{ + return dmq_node_del_filter(list, node, 0); +} + /** * @brief delete dmq node by uri */ @@ -363,7 +376,7 @@ int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) return -1; } - return del_dmq_node(list, &dnode); + return dmq_node_del_filter(list, &dnode, 1); } /**

1 0

git:master:0fa5455d: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 0fa5455d9bc1d603c142cd9a767df5b248eba64a URL: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T19:31:12+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Patch: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 78196f8ce1..1e7d6ff375 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -56,6 +56,7 @@ Charles Chance 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 2. Developer Guide @@ -87,6 +88,7 @@ Charles Chance 1.14. dmq_t_replicate usage 1.15. dmq_is_from_node usage 1.16. dmq.list_nodes usage + 1.17. dmq.remove usage 2.1. dmq_api_t structure 2.2. register_dmq_peer usage 2.3. bcast_message usage @@ -125,6 +127,7 @@ Chapter 1. Admin Guide 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 1. Overview @@ -464,6 +467,7 @@ ext/plain"); 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 5.1. dmq.list_nodes @@ -474,6 +478,18 @@ ext/plain"); kamcmd dmq.list_nodes ... +5.2. dmq.remove + + Remove a DMQ node by address. + + Parameters: + * address - the SIP address of the DMQ node to remove. + + Example 1.17. dmq.remove usage +... +kamctl rpc dmq.remove sip:1.2.3.4:5060 +... + Chapter 2. Developer Guide Table of Contents

1 0

Branching 5.5 on git repo for 5.5.x releases
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Hello, since freezing the development for 5.5 series, I did quite a lot of code analyzing with a bunch of tools as well as run various tests, no major issue being in my list at this moment, therefore I think we can plan branching 5.5 on git repo in the near future. If there is no other suggestion or argument against it, I propose to create the branch 5.5 on Thursday next week (April 22, 2021). After that, master branch will be open for new features (to become part of 5.6 or what ever version will be decided to be next), testing will continue for branch 5.5 for another 1-2 weeks, then we will release 5.5.0 as first stable version in the 5.5.x series. 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 1

git:master:955152db: dmq: added dmq.remove rpc command
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 955152dbe5d1f05bf24d6ba23b091fe91a202cc3 URL: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:09:21+02:00 dmq: added dmq.remove rpc command - make it possible to remove a node that still is reachable by old address without having to shut dowm all nodes --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h --- Diff: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Patch: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index fea60e0cc4..1db7cdd1f4 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -430,8 +430,29 @@ static void dmq_rpc_list_nodes(rpc_t *rpc, void *c) static const char *dmq_rpc_list_nodes_doc[2] = {"Print all nodes", 0}; +void rpc_dmq_remove(rpc_t* rpc, void* ctx) +{ + str taddr = STR_NULL; + + if (rpc->scan(ctx, ".S", &taddr) < 1) { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(dmq_node_del_by_uri(dmq_node_list, &taddr)<0) { + rpc->fault(ctx, 500, "Failure"); + return; + } +} + +static const char* rpc_dmq_remove_doc[3] = { + "Remove a DMQ node", + "address - the DMQ node address", + 0 +}; + static rpc_export_t rpc_methods[] = { {"dmq.list_nodes", dmq_rpc_list_nodes, dmq_rpc_list_nodes_doc, RET_ARRAY}, + {"dmq.remove", rpc_dmq_remove, rpc_dmq_remove_doc, 0}, {0, 0, 0, 0} }; diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 7e6ef93bdf..631dce11d5 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -350,6 +350,22 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node by uri + */ +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) +{ + dmq_node_t dnode; + + memset(&dnode, 0, sizeof(dmq_node_t)); + if(parse_uri(suri->s, suri->len, &dnode.uri) < 0) { + LM_ERR("error parsing uri [%.*s]\n", suri->len, suri->s); + return -1; + } + + return del_dmq_node(list, &dnode); +} + /** * @brief add dmq node */ diff --git a/src/modules/dmq/dmqnode.h b/src/modules/dmq/dmqnode.h index 45cac604a4..22c5c6fb1d 100644 --- a/src/modules/dmq/dmqnode.h +++ b/src/modules/dmq/dmqnode.h @@ -69,6 +69,7 @@ dmq_node_t *find_dmq_node(dmq_node_list_t *list, dmq_node_t *node); dmq_node_t *find_dmq_node_uri(dmq_node_list_t *list, str *uri); dmq_node_t *find_dmq_node_uri2(str *uri); int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node); +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri); int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode); int update_dmq_node_status(dmq_node_list_t *list, dmq_node_t *node, int status); dmq_node_t *shm_dup_node(dmq_node_t *node);

1 0

git:master:adf8919f: dmq: docs for rpc dmq.remove command
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: adf8919f52841800f0cd4528c33679c7ef80f2c5 URL: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:16:21+02:00 dmq: docs for rpc dmq.remove command --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Patch: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 0e749e901e..ebc6f44e1a 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -518,6 +518,30 @@ modparam("dmq", "ping_interval", 90) <programlisting format="linespecific"> ... &kamcmd; dmq.list_nodes +... + </programlisting> + </example> + </section> + <section id="dmq.r.list_nodes"> + <title>dmq.remove</title> + <para> + Remove a DMQ node by address. + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>address</emphasis> - the SIP address + of the DMQ node to remove. + </para> + </listitem> + </itemizedlist> + + <example> + <title>dmq.remove usage</title> + <programlisting format="linespecific"> +... +&kamctl; rpc dmq.remove sip:1.2.3.4:5060 ... </programlisting> </example>

1 0

Crashes because of mixed shm and pkg in kamailio
by Rick Barenthin 21 Apr '21

21 Apr '21

Hi everyone, We have seen some crashes in kamailio version 5.3 which happens in some modules who are getting the request for a reply from the transaction by the tm module export and try to parse extra header in this request by the parser functions. This seems to create a mix of shm with pkg which lead to a crash in retransmission. My question is, is there a way to make sure that there is no mix of shm and pkg or is the parsing on the message from the transaction not a planned way of usage? Best regards Rick

3 2

git:master:1b956d74: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 1b956d74b25c9f80f01a6aa0bc7a6ff8f3d0f712 URL: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T11:31:26+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Patch: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev