sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
380 discussions

[kamailio/kamailio] tm: TMCB_REQUEST_FWDED callbacks are always executed as ROUTE_REQUEST (#2141)

by Victor Seva

### Description <Sipwise Hat on> We have a module that has tm callbacks of type TMCB_REQUEST_FWDED and it calls uac.replace_from API. I noticed that this call was failing in a forking scenario: First branch: ``` Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[0]} tm [t_hooks.c:258]: run_trans_callbacks_internal(): DBG: trans=0x7f89149cf660, callback type 16, id 0 entered Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[0]} pv_headers [pv_headers.c:413]: pv_apply_headers(): xavp->name:headers.0 br_xname:headers.0 keys_count: 21 Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[0]} pv_headers [pv_headers.c:445]: pv_apply_headers(): replace_from[From]: sip:4311002@spce.test Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[0]} uac [uac.c:489]: replace_from_api(): dsp=(nil) (len=0) , uri=0x7ffde172f250 (len=21) Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[0]} uac [replace.c:361]: replace_uri(): uri to replace [sip:testuser1002@spce.test] Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[0]} uac [replace.c:362]: replace_uri(): replacement uri is [sip:4311002@spce.test] Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[0]} uac [replace.c:506]: replace_uri(): encode is=<aVBYbwMxODMSLiN6KQM7LQplW2h4fiwKMBM-> len=36 Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[0]} pv_headers [pv_headers.c:464]: pv_apply_headers(): skip unchanged To header ``` Second branch: ``` Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[1]} tm [t_hooks.c:258]: run_trans_callbacks_internal(): DBG: trans=0x7f89149cf660, callback type 16, id 0 entered Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[1]} pv_headers [pv_headers.c:413]: pv_apply_headers(): xavp->name:headers.1 br_xname:headers.1 keys_count: 21 Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[1]} pv_headers [pv_headers.c:445]: pv_apply_headers(): replace_from[From]: sip:4311002@spce.test Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[1]} uac [uac.c:489]: replace_from_api(): dsp=(nil) (len=0) , uri=0x7ffde172f250 (len=21) Nov 20 16:24:59 spce proxy[28430]: ERROR: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[1]} uac [replace.c:267]: replace_uri(): called uac_replace_from() multiple times on the message Nov 20 16:24:59 spce proxy[28430]: DEBUG: {1 NGCP%invite_q_forking%///1-28692(a)127.126.0.1[1]} pv_headers [pv_headers.c:464]: pv_apply_headers(): skip unchanged To header ``` ### Possible solution allow TMCB_REQUEST_FWDED cb to be executed as BRANCH_ROUTE -- 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/2141

4 years, 7 months

[kamailio/kamailio] tm: execute TMCB_REQUEST_FWDED cb as BRANCH_ROUTE when necessary (#2142)

by Victor Seva

#### 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) - [X] 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 - [X] Related to issue #2141 #### Description Execute TMCB_REQUEST_FWDED cb as BRANCH_ROUTE there's branch_route actions You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2142 -- Commit Summary -- * tm: execute TMCB_REQUEST_FWDED cb as BRANCH_ROUTE when necessary -- File Changes -- M src/modules/tm/t_fwd.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2142.patch https://github.com/kamailio/kamailio/pull/2142.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/2142

4 years, 7 months

git:master:bc40eaa4: tm: execute TMCB_REQUEST_FWDED cb as BRANCH_ROUTE when necessary

by Victor Seva

Module: kamailio Branch: master Commit: bc40eaa4fe446bffd9f41d5d6b21becd7b7fdc87 URL: https://github.com/kamailio/kamailio/commit/bc40eaa4fe446bffd9f41d5d6b21bec… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-21T10:01:14+01:00 tm: execute TMCB_REQUEST_FWDED cb as BRANCH_ROUTE when necessary --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/bc40eaa4fe446bffd9f41d5d6b21bec… Patch: https://github.com/kamailio/kamailio/commit/bc40eaa4fe446bffd9f41d5d6b21bec… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 33a50d7799..81a0f20841 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -374,15 +374,19 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, goto error03; } } + /* run the specific callbacks for this transaction */ + if (unlikely(has_tran_tmcbs(t, TMCB_REQUEST_FWDED))) + run_trans_callbacks( TMCB_REQUEST_FWDED , t, i_req, 0, + -i_req->REQ_METHOD); + tm_ctx_set_branch_index(T_BR_UNDEFINED); set_route_type(backup_route_type); + } else { + /* run the specific callbacks for this transaction */ + if (unlikely(has_tran_tmcbs(t, TMCB_REQUEST_FWDED))) + run_trans_callbacks( TMCB_REQUEST_FWDED , t, i_req, 0, + -i_req->REQ_METHOD); } - - /* run the specific callbacks for this transaction */ - if (unlikely(has_tran_tmcbs(t, TMCB_REQUEST_FWDED))) - run_trans_callbacks( TMCB_REQUEST_FWDED , t, i_req, 0, - -i_req->REQ_METHOD); - if (likely( !(flags & UAC_DNS_FAILOVER_F) && i_req->dst_uri.s && i_req->dst_uri.len)){ /* no dns failover and non-empty dst_uri => use it as dst

4 years, 7 months

git:master:6d036dcc: kazoo: add new functions & params

by lazedo

Module: kamailio Branch: master Commit: 6d036dcca36ace03c84a2ee663b44b17d44cd151 URL: https://github.com/kamailio/kamailio/commit/6d036dcca36ace03c84a2ee663b44b1… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2019-11-07T22:27:56Z kazoo: add new functions & params --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h Modified: src/modules/kazoo/kz_fixup.c --- Diff: https://github.com/kamailio/kamailio/commit/6d036dcca36ace03c84a2ee663b44b1… Patch: https://github.com/kamailio/kamailio/commit/6d036dcca36ace03c84a2ee663b44b1…

4 years, 7 months

[kamailio/kamailio] db_redis: allow deletion of all rows (#2140)

by rdboisvert

#### 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) - [X] 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 #### Description  Previous version did not allow deletion of all rows in the table although this is allowed as described in section [9.2.9](http://www.asipto.com/pub/kamailio-devel-guide/#c09f_delete) of the Kamailio SIP Server v3.2.0 Development Guide. Former code always assumed filters would be involved so this change skips the filter matching if no filter is applied. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2140 -- Commit Summary -- * db_redis: allow deletion of all rows -- File Changes -- M src/modules/db_redis/redis_dbase.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2140.patch https://github.com/kamailio/kamailio/pull/2140.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/2140

4 years, 7 months

git:5.3:159e32c2: db_redis: allow deletion of all rows

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 159e32c2c2cc3f2c5c3c226be3406bd91ca9a052 URL: https://github.com/kamailio/kamailio/commit/159e32c2c2cc3f2c5c3c226be3406bd… Author: rdboisvert <rdbprog(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-20T20:21:10+01:00 db_redis: allow deletion of all rows (cherry picked from commit bf2ecd4dec55d5009e0904392d083e17af91977d) --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/159e32c2c2cc3f2c5c3c226be3406bd… Patch: https://github.com/kamailio/kamailio/commit/159e32c2c2cc3f2c5c3c226be3406bd… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c4cd696ead..97fd19ee01 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1325,6 +1325,12 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con if (tmp) db_redis_key_free(&tmp); + // skip if delete all rows + if (!*manual_keys_count) { + db_redis_key_free (&query_v); + goto skipkeys; + } + if (db_redis_key_prepend_string(&query_v, "HMGET", 5) != 0) { LM_ERR("Failed to set hmget command to pre-delete query\n"); goto error; @@ -1416,6 +1422,7 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con db_vals = NULL; db_redis_free_reply(&reply); + skipkeys: if (db_redis_key_add_string(&query_v, "DEL", 3) != 0) { LM_ERR("Failed to add del command to delete query\n"); goto error;

4 years, 7 months

git:5.2:cd955a22: db_redis: allow deletion of all rows

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: cd955a22ddceab2356a8bf6ca37b57704baec097 URL: https://github.com/kamailio/kamailio/commit/cd955a22ddceab2356a8bf6ca37b577… Author: rdboisvert <rdbprog(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-20T20:20:49+01:00 db_redis: allow deletion of all rows (cherry picked from commit bf2ecd4dec55d5009e0904392d083e17af91977d) --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/cd955a22ddceab2356a8bf6ca37b577… Patch: https://github.com/kamailio/kamailio/commit/cd955a22ddceab2356a8bf6ca37b577… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c4cd696ead..97fd19ee01 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1325,6 +1325,12 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con if (tmp) db_redis_key_free(&tmp); + // skip if delete all rows + if (!*manual_keys_count) { + db_redis_key_free (&query_v); + goto skipkeys; + } + if (db_redis_key_prepend_string(&query_v, "HMGET", 5) != 0) { LM_ERR("Failed to set hmget command to pre-delete query\n"); goto error; @@ -1416,6 +1422,7 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con db_vals = NULL; db_redis_free_reply(&reply); + skipkeys: if (db_redis_key_add_string(&query_v, "DEL", 3) != 0) { LM_ERR("Failed to add del command to delete query\n"); goto error;

4 years, 7 months

git:master:bf2ecd4d: db_redis: allow deletion of all rows

by Henning Westerholt

Module: kamailio Branch: master Commit: bf2ecd4dec55d5009e0904392d083e17af91977d URL: https://github.com/kamailio/kamailio/commit/bf2ecd4dec55d5009e0904392d083e1… Author: rdboisvert <rdbprog(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-20T20:20:10+01:00 db_redis: allow deletion of all rows --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/bf2ecd4dec55d5009e0904392d083e1… Patch: https://github.com/kamailio/kamailio/commit/bf2ecd4dec55d5009e0904392d083e1… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c4cd696ead..97fd19ee01 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1325,6 +1325,12 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con if (tmp) db_redis_key_free(&tmp); + // skip if delete all rows + if (!*manual_keys_count) { + db_redis_key_free (&query_v); + goto skipkeys; + } + if (db_redis_key_prepend_string(&query_v, "HMGET", 5) != 0) { LM_ERR("Failed to set hmget command to pre-delete query\n"); goto error; @@ -1416,6 +1422,7 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con db_vals = NULL; db_redis_free_reply(&reply); + skipkeys: if (db_redis_key_add_string(&query_v, "DEL", 3) != 0) { LM_ERR("Failed to add del command to delete query\n"); goto error;

4 years, 7 months

git:master:a8cc28b6: ims_isc: null terminate dst_uri field

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a8cc28b6e0236b21569625baffa865ff4ce0a153 URL: https://github.com/kamailio/kamailio/commit/a8cc28b6e0236b21569625baffa865f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-20T19:31:19+01:00 ims_isc: null terminate dst_uri field --- Modified: src/modules/ims_isc/isc.c --- Diff: https://github.com/kamailio/kamailio/commit/a8cc28b6e0236b21569625baffa865f… Patch: https://github.com/kamailio/kamailio/commit/a8cc28b6e0236b21569625baffa865f… --- diff --git a/src/modules/ims_isc/isc.c b/src/modules/ims_isc/isc.c index a095e054e7..a7a142ba94 100644 --- a/src/modules/ims_isc/isc.c +++ b/src/modules/ims_isc/isc.c @@ -66,13 +66,14 @@ int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark, int firstflag /* change destination so it forwards to the app server */ if (msg->dst_uri.s) pkg_free(msg->dst_uri.s); - msg->dst_uri.s = pkg_malloc(m->server_name.len); + msg->dst_uri.s = pkg_malloc(m->server_name.len + 1); if (!msg->dst_uri.s) { LM_ERR("error allocating %d bytes\n", m->server_name.len); return ISC_RETURN_ERROR; } msg->dst_uri.len = m->server_name.len; memcpy(msg->dst_uri.s, m->server_name.s, m->server_name.len); + msg->dst_uri.s[msg->dst_uri.len] = '\0'; /* append branch if last trigger failed */ if (is_route_type(FAILURE_ROUTE) && !firstflag)

4 years, 7 months

git:master:a8be2459: ims_ipsec_pcscf: null terminate dst_uri fields

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a8be2459fc4013060944bf79e7c66b3613e8d04c URL: https://github.com/kamailio/kamailio/commit/a8be2459fc4013060944bf79e7c66b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-20T19:30:44+01:00 ims_ipsec_pcscf: null terminate dst_uri fields --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/a8be2459fc4013060944bf79e7c66b3… Patch: https://github.com/kamailio/kamailio/commit/a8be2459fc4013060944bf79e7c66b3… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 11673582ad..b72d57a0ad 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -753,13 +753,14 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, ci.via_host.s, dst_port); - if((m->dst_uri.s = pkg_malloc(buf_len)) == NULL) { + if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { LM_ERR("Error allocating memory for dst_uri\n"); goto cleanup; } memcpy(m->dst_uri.s, buf, buf_len); m->dst_uri.len = buf_len; + m->dst_uri.s[m->dst_uri.len] = '\0'; // Set send socket struct socket_info * client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto);

4 years, 7 months

← Newer
1
...
22
23
24
25
26
27
28
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019