sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
303 discussions

git:master:975a61c8: topos: safety handling of onsend data

by Daniel-Constantin Mierla

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; }

3 years, 8 months

git:master:72cc3d46: topos: uniform processing for requests during early dialog

by Daniel-Constantin Mierla

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;

3 years, 8 months

git:master:32800023: lost: Coverity Scan fixes

by Wolfgang Kampichler

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…

3 years, 8 months

git:master:fb777b0e: topos: reset context on msg received callback

by Daniel-Constantin Mierla

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,

3 years, 8 months

git:master:5d661eaa: topos: use context to load stored branch attributes only for requests

by Daniel-Constantin Mierla

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;

3 years, 8 months

git:master:55095abd: pkg/kamailio/deb: version set 5.6.0~dev0

by Victor Seva

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…

3 years, 8 months

Branch 5.5 has been created

by Daniel-Constantin Mierla

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/

3 years, 8 months

[CRON] Failed: dbank888/kamailio#133 (master - 491e19e)

by Travis CI

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.

3 years, 8 months

Development is open for future release of v5.6.x series

by Daniel-Constantin Mierla

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/

3 years, 8 months

git:5.5:677bf448: Makefile.defs: version set to 5.5.0-rc0

by Daniel-Constantin Mierla

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)

3 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021