sr-dev January 2021

sr-dev@lists.kamailio.org

17 participants
184 discussions

git:master:90dfc421: tm: new parameter reply_relay_mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 90dfc421dab438a8ef62cc8f68b2c1f7fb50b0dc URL: https://github.com/kamailio/kamailio/commit/90dfc421dab438a8ef62cc8f68b2c1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-25T12:34:33+01:00 tm: new parameter reply_relay_mode - control the behaviour introduced by 18410da0 - if set to 0, the behaviour is like before the commit referenced above, tm is attemptime to send suspended 200ok after another final response that was forwarded while 200ok was suspended - default is 1 (behave as the patch changed the forwarding policy, not to overwrite the response buffer) --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/90dfc421dab438a8ef62cc8f68b2c1f… Patch: https://github.com/kamailio/kamailio/commit/90dfc421dab438a8ef62cc8f68b2c1f… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index dcf4537f08..c8dd0c91ce 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -109,6 +109,10 @@ extern int tm_remap_503_500; /* send path and flags in 3xx class reply */ int tm_rich_redirect = 0; +/* control if reply should be relayed + * when transaction reply status is RPS_PUSHED_AFTER_COMPLETION */ +extern int tm_reply_relay_mode; + /* how to deal with winning branch reply selection in failure_route * can be overwritten per transaction with t_drop_replies(...) * Values: @@ -2042,7 +2046,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, goto error02; } - if (reply_status != RPS_PUSHED_AFTER_COMPLETION) { + if (tm_reply_relay_mode == 0 + || reply_status != RPS_PUSHED_AFTER_COMPLETION) { /* attempt to copy the message to UAS's shmem: * - copy to-tag for ACK matching as well * - allocate little a bit more for provisional as @@ -2102,7 +2107,9 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, } if (likely(uas_rb->dst.send_sock)) { if (onsend_route_enabled(SIP_REPLY) && p_msg - && (p_msg != FAKED_REPLY) && (reply_status != RPS_PUSHED_AFTER_COMPLETION)) { + && (p_msg != FAKED_REPLY) + && (tm_reply_relay_mode == 0 + || reply_status != RPS_PUSHED_AFTER_COMPLETION)) { if (run_onsend(p_msg, &uas_rb->dst, buf, res_len)==0){ su2ip_addr(&ip, &(uas_rb->dst.to)); LM_ERR("reply to %s:%d(%d) dropped" @@ -2118,7 +2125,9 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (SEND_PR_BUFFER( uas_rb, buf, res_len ) >= 0){ LM_DBG("reply buffer sent out\n"); if (unlikely(!totag_retr - && has_tran_tmcbs(t, TMCB_RESPONSE_OUT) && (reply_status != RPS_PUSHED_AFTER_COMPLETION))){ + && has_tran_tmcbs(t, TMCB_RESPONSE_OUT) + && (tm_reply_relay_mode == 0 + || reply_status != RPS_PUSHED_AFTER_COMPLETION))){ LOCK_REPLIES( t ); if(relayed_code==uas_rb->rbtype) { run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, @@ -2130,7 +2139,9 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, } UNLOCK_REPLIES( t ); } - if (unlikely(has_tran_tmcbs(t, TMCB_RESPONSE_SENT) && (reply_status != RPS_PUSHED_AFTER_COMPLETION))){ + if (unlikely(has_tran_tmcbs(t, TMCB_RESPONSE_SENT) + && (tm_reply_relay_mode == 0 + || reply_status != RPS_PUSHED_AFTER_COMPLETION))){ INIT_TMCB_ONSEND_PARAMS(onsend_params, t->uas.request, relayed_msg, uas_rb, &uas_rb->dst, buf, res_len, diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 7a423ae5b8..2393ce67a9 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -222,6 +222,10 @@ str on_sl_reply_name = {NULL, 0}; int tm_remap_503_500 = 1; str _tm_event_callback_lres_sent = {NULL, 0}; +/* control if reply should be relayed + * when transaction reply status is RPS_PUSHED_AFTER_COMPLETION */ +int tm_reply_relay_mode = 1; + unsigned long tm_exec_time_check = 0; /* microseconds */ int tm_exec_time_check_param = 5000; /* milliseconds */ @@ -480,6 +484,7 @@ static param_export_t params[]={ {"rich_redirect" , PARAM_INT, &tm_rich_redirect }, {"event_callback_lres_sent", PARAM_STR, &_tm_event_callback_lres_sent }, {"exec_time_check" , PARAM_INT, &tm_exec_time_check_param }, + {"reply_relay_mode", PARAM_INT, &tm_reply_relay_mode }, {0,0,0} };

3 years, 3 months

[kamailio/kamailio] tm: 200 OK not processed correctly by Proxy after final non-2xx (#2590)

by annema-Kontron

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x ] Tested changes locally -- tested at 5.1.6 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Problem: Forwarding of 200 OK while sent 488 waits for ACK, destroys the UAS send buffer Scenario: During suspension of 200 OK by ims_qos module function Rx_AAR() at terminating PCSCF, The PCRF sends an AA Answer with result code DIAMETER_TOO_BUSY (3004), which triggers the PCSCF to send a 488 ‘Sorry no QoS available’ to the originating side (ims_dialog module function dlg_terminate()). Afterwards neither the 200 OK nor the ACK(488) is processed correctly by the PCSCF. Solution: The UAS send buffer should not be overwritten during processing of 200 OK, because non-2xx is needed to associate the ACK message in a correct way. 200 OK must be forwarded statelessly. Side-Effect (potentially breaks existing function): Some callbacks cannot be called for the 200 OK, to avoid messing the stored 488. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2590 -- Commit Summary -- * tm: 200 OK not processed correctly by Proxy after final non-2xx -- File Changes -- M src/modules/tm/t_reply.c (72) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2590.patch https://github.com/kamailio/kamailio/pull/2590.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/2590

3 years, 3 months

git:master:18410da0: tm: 200 OK not processed correctly by Proxy after final non-2xx

by Theo

Module: kamailio Branch: master Commit: 18410da04c7f7bbc9628820427fedb92cf893526 URL: https://github.com/kamailio/kamailio/commit/18410da04c7f7bbc9628820427fedb9… Author: Theo <theodor.scherney(a)kapsch.net> Committer: Theo <theodor.scherney(a)kapsch.net> Date: 2020-12-17T14:32:39+01:00 tm: 200 OK not processed correctly by Proxy after final non-2xx Description: Problem: Forwarding of 200 OK while sent 488 waits for ACK, destroys the UAS send buffer Scenario: During suspension of 200 OK by ims_qos module function Rx_AAR() at terminating PCSCF, The PCRF sends an AA Answer with result code DIAMETER_TOO_BUSY (3004), which triggers the PCSCF to send a 488 âSorry no QoS availableâ to the originating side (ims_dialog module function dlg_terminate()). Afterwards neither the 200 OK nor the ACK(488) is processed correctly by the PCSCF. Solution: The UAS send buffer should not be overwritten during processing of 200 OK, because non-2xx is needed to associate the ACK message in a correct way. 200 OK must be forwarded statelessly. Side-Effect (potentially breaks existing function): Some callbacks cannot be called for the 200 OK, to avoid messing the stored 488. --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/18410da04c7f7bbc9628820427fedb9… Patch: https://github.com/kamailio/kamailio/commit/18410da04c7f7bbc9628820427fedb9…

3 years, 3 months

git:master:cb82ac71: Merge pull request #2590 from annema-Kontron/fix_kontron_late_200OK

by GitHub

Module: kamailio Branch: master Commit: cb82ac71482abdf6e58e76b54da8acf717890392 URL: https://github.com/kamailio/kamailio/commit/cb82ac71482abdf6e58e76b54da8acf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-01-25T11:17:15+01:00 Merge pull request #2590 from annema-Kontron/fix_kontron_late_200OK tm: 200 OK not processed correctly by Proxy after final non-2xx --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/cb82ac71482abdf6e58e76b54da8acf… Patch: https://github.com/kamailio/kamailio/commit/cb82ac71482abdf6e58e76b54da8acf…

3 years, 3 months

Errored: kamailio/kamailio#9820 (master - c9c30cf)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #9820 Status: Errored Duration: 7 mins and 32 secs Commit: c9c30cf (master) Author: Daniel-Constantin Mierla Message: Merge pull request #2605 from nchaigne/master-202101-rm-by-index core: fix to xavp_rm_internal (#2604) View the changeset: https://github.com/kamailio/kamailio/compare/4a4f0475716c...c9c30cf84fd3 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/756064944?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. 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, 3 months

[kamailio/kamailio] [kamailio 5.4.3] xavp_rm_by_index removes (N+1) first indexes instead of index N (#2604)

by Nicolas C

As previously discussed on the mailing list, this is a bug. I have a fix that works, so I'll provide a pull request. ### Description I’m trying to use function xavp_rm_by_index to remove a specific index from a given xavp. I’m observing an unexpected behaviour, I think it might be a bug. Instead of just removing the index, the function removes the index and all others before it. E.g : if called with « idx = 1 », it removes indexes 0 and 1. Reading the code of xavp_rm_internal (which is called by xavp_rm_by_index), I don’t think it behaves at it should : ``` /* Remove xavps * idx: <0 remove all xavps with the same name * >=0 remove only the specified index xavp * Returns number of xavps that were deleted */ ``` For example when I do this : ``` LM_ERR("COUNT BEFORE: %d\n", xavp_count(rname, NULL)); int rm_count = xavp_rm_by_index(rname, 1, NULL); // TEST LM_ERR("REMOVED: %d\n", rm_count); LM_ERR("COUNT AFTER: %d\n", xavp_count(rname, NULL)); ``` « rm_count » returned is 1 (which is expected). However, « count after » is decremented by 2. And when I look at the contents of my xavp, I notice that the first two elements have been removed. Likewise if xavp_rm_by_index is invoked with idx = 2 => the first 3 elements are removed. ### Troubleshooting #### Reproduction Here is some code that shows the issue : 1) a test cmd_function in a module defined as follows : ``` static int was_test(struct sip_msg *msg, char *param1, char *param2); static cmd_export_t cmds[] = { {"was_test", (cmd_function)was_test, 2, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; /** * For testing purposes. */ static int was_test(struct sip_msg *msg, char *param1, char *param2) { LM_WARN("Called with param1: [%s], param2: [%s]\n", param1, param2); str my_str; my_str.s = param1; my_str.len = strlen(param1); int idx = atoi(param2); str *rname = &my_str; LM_ERR("COUNT BEFORE: %d\n", xavp_count(rname, NULL)); int rm_count = xavp_rm_by_index(rname, idx, NULL); LM_ERR("REMOVED: %d\n", rm_count); LM_ERR("COUNT AFTER: %d\n", xavp_count(rname, NULL)); return 1; } ``` 2) Kamailio script : ``` request_route { # push 4 rows to xavp "test": $xavp(test=>a) = "3.a"; $xavp(test[0]=>b) = "3.b"; $xavp(test=>a) = "2.a"; $xavp(test[0]=>b) = "2.b"; $xavp(test=>a) = "1.a"; $xavp(test[0]=>b) = "1.b"; $xavp(test=>a) = "0.a"; $xavp(test[0]=>b) = "0.b"; # then try to call xavp_rm_by_index with a non-zero idx xlog("L_INFO", "BEFORE\n"); xlog("L_INFO", "test[*]: [$(was_xavp_serialize(test)[*])]\n"); pv_xavp_print(); was_test("test", "1"); // expecting only row 1 to be removed (1.a / 1.b) xlog("L_INFO", "AFTER\n"); xlog("L_INFO", "test[*]: [$(was_xavp_serialize(test)[*])]\n"); pv_xavp_print(); } ``` #### Log Messages ``` 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <script>: BEFORE 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <script>: test[*]: [(0):b=0.b;a=0.a, (1):b=1.b;a=1.a, (2):b=2.b;a=2.a, (3):b=3.b;a=3.a] 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff798 ((nil)) (level=0) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff798) XAVP name: test 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 2063405720 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 6 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:629]: xavx_print_list_content(): XAVP value: <xavp:0x7f7193dff840> 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff840 (0x7f7193dff7b8) (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff840) XAVP name: b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 110 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 0.b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff840) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff6f0) XAVP name: a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 109 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 0.a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff6f0) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff840 (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff798) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff5a0) XAVP name: test 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 2063405720 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 6 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:629]: xavx_print_list_content(): XAVP value: <xavp:0x7f7193dff648> 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff648 (0x7f7193dff5c0) (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff648) XAVP name: b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 110 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 1.b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff648) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff4f8) XAVP name: a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 109 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 1.a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff4f8) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff648 (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff5a0) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff3a8) XAVP name: test 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 2063405720 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 6 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:629]: xavx_print_list_content(): XAVP value: <xavp:0x7f7193dff450> 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff450 (0x7f7193dff3c8) (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff450) XAVP name: b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 110 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 2.b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff450) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff300) XAVP name: a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 109 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 2.a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff300) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff450 (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff3a8) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff1b0) XAVP name: test 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 2063405720 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 6 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:629]: xavx_print_list_content(): XAVP value: <xavp:0x7f7193dff258> 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff258 (0x7f7193dff1d0) (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff258) XAVP name: b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 110 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 3.b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff258) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff108) XAVP name: a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 109 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 3.a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff108) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff258 (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff1b0) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff798 (level=0) 2(16546) WARNING: {1 INVITE 1-22211(a)10.31.22.1} was_utils [was_utils.c:169]: was_test(): Called with param1: [test], param2: [1] 2(16546) ERROR: {1 INVITE 1-22211(a)10.31.22.1} was_utils [was_utils.c:178]: was_test(): COUNT BEFORE: 4 2(16546) ERROR: {1 INVITE 1-22211(a)10.31.22.1} was_utils [was_utils.c:180]: was_test(): REMOVED: 1 2(16546) ERROR: {1 INVITE 1-22211(a)10.31.22.1} was_utils [was_utils.c:181]: was_test(): COUNT AFTER: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <script>: AFTER 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <script>: test[*]: [(0):b=2.b;a=2.a, (1):b=3.b;a=3.a] 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff3a8 ((nil)) (level=0) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff3a8) XAVP name: test 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 2063405720 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 6 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:629]: xavx_print_list_content(): XAVP value: <xavp:0x7f7193dff450> 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff450 (0x7f7193dff3c8) (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff450) XAVP name: b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 110 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 2.b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff450) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff300) XAVP name: a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 109 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 2.a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff300) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff450 (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff3a8) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff1b0) XAVP name: test 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 2063405720 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 6 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:629]: xavx_print_list_content(): XAVP value: <xavp:0x7f7193dff258> 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff258 (0x7f7193dff1d0) (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff258) XAVP name: b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 110 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 3.b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff258) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff108) XAVP name: a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 109 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 3.a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff108) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff258 (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff1b0) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff3a8 (level=0) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff3a8 ((nil)) (level=0) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff3a8) XAVP name: test 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 2063405720 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 6 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:629]: xavx_print_list_content(): XAVP value: <xavp:0x7f7193dff450> 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff450 (0x7f7193dff3c8) (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff450) XAVP name: b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 110 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 2.b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff450) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff300) XAVP name: a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 109 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 2.a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff300) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff450 (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff3a8) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff1b0) XAVP name: test 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 2063405720 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 6 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:629]: xavx_print_list_content(): XAVP value: <xavp:0x7f7193dff258> 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:601]: xavx_print_list_content(): +++++ start XAVP list: 0x7f7193dff258 (0x7f7193dff1d0) (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff258) XAVP name: b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 110 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 3.b 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff258) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:605]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff108) XAVP name: a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:606]: xavx_print_list_content(): XAVP id: 109 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:607]: xavx_print_list_content(): XAVP value type: 2 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:616]: xavx_print_list_content(): XAVP value (str): 3.a 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:1 - 0x7f7193dff108) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff258 (level=1) 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:642]: xavx_print_list_content(): *** (l:0 - 0x7f7193dff1b0) end 2(16546) INFO: {1 INVITE 1-22211(a)10.31.22.1} <core> [core/xavp.c:645]: xavx_print_list_content(): ----- end XAVP list: 0x7f7193dff3a8 (level=0) ``` ### Possible Solutions Will provide a pull request. -- 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/2604

3 years, 3 months

[kamailio/kamailio] core: fix to xavp_rm_internal (#2604) (#2605)

by Nicolas C

This fixes the following issue: https://github.com/kamailio/kamailio/issues/2604 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2605 -- Commit Summary -- * core: fix to xavp_rm_internal (#2604) -- File Changes -- M src/core/xavp.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2605.patch https://github.com/kamailio/kamailio/pull/2605.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/2605

3 years, 3 months

git:master:12414972: core: fix to xavp_rm_internal (#2604)

by Nicolas C

Module: kamailio Branch: master Commit: 12414972ad0c28ac50ece3c14f98134c3f06c522 URL: https://github.com/kamailio/kamailio/commit/12414972ad0c28ac50ece3c14f98134… Author: Nicolas C <nchaigne(a)capgemini.fr> Committer: Nicolas C <nchaigne(a)capgemini.fr> Date: 2021-01-22T16:04:40+01:00 core: fix to xavp_rm_internal (#2604) This fixes the following issue: https://github.com/kamailio/kamailio/issues/2604 Description of the issue: When called to remove a specific index from a given xavp, function xavp_rm_by_index removes the index (as expected) but also all others before it. E.g : If called with idx = 1, it removes indexes 0 and 1. Likewise if invoked with idx = 2 => the first 3 elements are removed. This bug is located in function xavp_rm_internal. An assignment was missing when looping over the xavp list. Same for xavi_rm_internal. --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/12414972ad0c28ac50ece3c14f98134… Patch: https://github.com/kamailio/kamailio/commit/12414972ad0c28ac50ece3c14f98134… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index de6da0c858..26e89a8df3 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -454,6 +454,8 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) if(idx>=0) return 1; count++; + } else { + prv = foo; } n++; } else { @@ -1914,6 +1916,8 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) if(idx>=0) return 1; count++; + } else { + prv = foo; } n++; } else {

3 years, 3 months

git:master:c9c30cf8: Merge pull request #2605 from nchaigne/master-202101-rm-by-index

by GitHub

Module: kamailio Branch: master Commit: c9c30cf84fd352eb5b37b4cf5c712dc4f384563c URL: https://github.com/kamailio/kamailio/commit/c9c30cf84fd352eb5b37b4cf5c712dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-01-25T10:40:13+01:00 Merge pull request #2605 from nchaigne/master-202101-rm-by-index core: fix to xavp_rm_internal (#2604) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/c9c30cf84fd352eb5b37b4cf5c712dc… Patch: https://github.com/kamailio/kamailio/commit/c9c30cf84fd352eb5b37b4cf5c712dc… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index de6da0c858..26e89a8df3 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -454,6 +454,8 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) if(idx>=0) return 1; count++; + } else { + prv = foo; } n++; } else { @@ -1914,6 +1916,8 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) if(idx>=0) return 1; count++; + } else { + prv = foo; } n++; } else {

3 years, 3 months

git:master:4a4f0475: kamctl: removed condition on CTLENGINETYPE

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4a4f0475716cbf824b2ab9684457e21f6732aa74 URL: https://github.com/kamailio/kamailio/commit/4a4f0475716cbf824b2ab9684457e21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-21T14:06:38+01:00 kamctl: removed condition on CTLENGINETYPE - done again inside ctl_cmd_run --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/4a4f0475716cbf824b2ab9684457e21… Patch: https://github.com/kamailio/kamailio/commit/4a4f0475716cbf824b2ab9684457e21… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 338b4a8585..b28dfb642e 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -955,12 +955,7 @@ cisco_restart() { myhost=`get_my_host` CMDPARAMS="= tm.t_uac_start NOTIFY \"$1\" \".\" \".\" \"From:sip:daemon@$myhost=CRLF=To:<$1>=CRLF=Event:check-sync=CRLF=Contact:sip:daemon@$myhost=CRLF=\"" - if [ $CTLENGINETYPE -eq 1 ] ; then - ctl_cmd_run $CMDPARAMS - else - RET=`ctl_cmd_run $CMDPARAMS | head -1` - print_status $RET - fi + ctl_cmd_run $CMDPARAMS } # @@ -2037,12 +2032,7 @@ options_ping() { myhost=`get_my_host` require_ctlengine CMDPARAMS="= tm.t_uac_wait_block OPTIONS \"$1\" \".\" \".\" \"From:sip:daemon@$myhost=CRLF=To:<$1>=CRLF=Contact:sip:daemon@$myhost=CRLF=\"" - if [ $CTLENGINETYPE -eq 1 ] ; then - ctl_cmd_run $CMDPARAMS - else - RET=`ctl_cmd_run $CMDPARAMS | head -1` - print_status $RET - fi + ctl_cmd_run $CMDPARAMS } #

3 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2021