sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
389 discussions

git:master:e59c4415: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e59c4415707f0995a0d5315b5601ae518b4f1ed5 URL: https://github.com/kamailio/kamailio/commit/e59c4415707f0995a0d5315b5601ae5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-22T10:17:01+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/e59c4415707f0995a0d5315b5601ae5… Patch: https://github.com/kamailio/kamailio/commit/e59c4415707f0995a0d5315b5601ae5… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index 81c0cb4cb99..f94669509f1 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -58,7 +58,7 @@ Tsvetomir Dimitrov 4.1. ipsec_create(domain) 4.2. ipsec_forward(domain, flags) - 4.3. ipsec_destroy(domain) + 4.3. ipsec_destroy(domain [, aor]) List of Examples @@ -103,7 +103,7 @@ Chapter 1. Admin Guide 4.1. ipsec_create(domain) 4.2. ipsec_forward(domain, flags) - 4.3. ipsec_destroy(domain) + 4.3. ipsec_destroy(domain [, aor]) 1. Overview @@ -270,7 +270,7 @@ modparam("ims_ipsec_pcscf", "ipsec_preferred_ealg", "aes-cbc") 4.1. ipsec_create(domain) 4.2. ipsec_forward(domain, flags) - 4.3. ipsec_destroy(domain) + 4.3. ipsec_destroy(domain [, aor]) 4.1. ipsec_create(domain) @@ -325,13 +325,15 @@ ipsec_forward("location"); ipsec_forward("location", "1"); ... -4.3. ipsec_destroy(domain) +4.3. ipsec_destroy(domain [, aor]) The function destroys IPSec tunnel, created with ipsec_create. Meaning of the parameters is as follows: * domain - Logical domain within the registrar. If a database is used then this must be name of the table which stores the contacts. + aor - SIP URI to match the record. If not provided, then R-URI is + used. Example 1.13. ipsec_destroy ...

1 year

git:master:57ed2639: ims_ipsec_pcscf: do not change msg r-uri with ipsec_destroy() param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 57ed2639259f7116795f6214ca505cc86bb7ccb5 URL: https://github.com/kamailio/kamailio/commit/57ed2639259f7116795f6214ca505cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T10:09:16+01:00 ims_ipsec_pcscf: do not change msg r-uri with ipsec_destroy() param - only changing r-uri shortcut inside sip msg field can have side effects, avoid it by providing the parameter to fill_contact() - use core fixup function for handling config parameter for aor --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/57ed2639259f7116795f6214ca505cc… Patch: https://github.com/kamailio/kamailio/commit/57ed2639259f7116795f6214ca505cc… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index aa905b09a9b..69d1fccc502 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -162,7 +162,7 @@ static str get_www_auth_param(const char *param_name, str www_auth) } static int fill_contact( - pcontact_info_t *ci, sip_msg_t *m, tm_cell_t *t, int sflags) + pcontact_info_t *ci, sip_msg_t *m, tm_cell_t *t, str *ruri, int sflags) { contact_body_t *cb = NULL; struct via_body *vb = NULL; @@ -183,8 +183,13 @@ static int fill_contact( memset(&uri, 0, sizeof(struct sip_uri)); - if((sflags & IPSEC_DSTADDR_SEARCH) && m->dst_uri.s != NULL - && m->dst_uri.len > 0) { + if(ruri != NULL && ruri->len > 0) { + suri.s = ruri->s; + suri.len = ruri->len; + LM_DBG("using param r-uri for contact filling: %.*s\n", suri.len, + suri.s); + } else if((sflags & IPSEC_DSTADDR_SEARCH) && m->dst_uri.s != NULL + && m->dst_uri.len > 0) { suri = m->dst_uri; LM_DBG("using dst uri for contact filling: %.*s\n", suri.len, suri.s); @@ -702,7 +707,7 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) t = tmb.t_gett(); } // Find the contact - if(fill_contact(&ci, m, t, _cflags) != 0) { + if(fill_contact(&ci, m, t, NULL, _cflags) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -860,7 +865,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // // Find the contact // - if(fill_contact(&ci, m, t, _cflags) != 0) { + if(fill_contact(&ci, m, t, NULL, _cflags) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -1052,14 +1057,8 @@ int ipsec_destroy(struct sip_msg *m, udomain_t *d, str *uri) t = tmb.t_gett(); } - // Insert URI in SIP message - if(uri != NULL) { - m->first_line.u.request.uri.s = uri->s; - m->first_line.u.request.uri.len = uri->len; - } - // Find the contact - if(fill_contact(&ci, m, t, 0) != 0) { + if(fill_contact(&ci, m, t, uri, 0) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index 3709a78c610..1e25650e1bc 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -23,6 +23,7 @@ */ #include "../../core/sr_module.h" +#include "../../core/mod_fix.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" @@ -459,24 +460,7 @@ static int unregister_fixup(void **param, int param_no) if(param_no == 1) { return domain_fixup(param, param_no); } else { - pv_elem_t *model = NULL; - str s; - - /* convert to str */ - s.s = (char *)*param; - s.len = strlen(s.s); - - model = NULL; - if(s.len == 0) { - LM_ERR("no param!\n"); - return E_CFG; - } - if(pv_parse_format(&s, &model) < 0 || model == NULL) { - LM_ERR("wrong format [%s]!\n", s.s); - return E_CFG; - } - *param = (void *)model; - return 0; + return fixup_spve_all(param, param_no); } return E_CFG; } @@ -503,13 +487,11 @@ static int w_forward(struct sip_msg *_m, char *_d, char *_cflags) static int w_destroy(struct sip_msg *_m, char *_d, char *_aor) { - pv_elem_t *model; str aor; if(_aor) { - model = (pv_elem_t *)_aor; - if(pv_printf_s(_m, model, &aor) < 0) { - LM_ERR("error - cannot print the format\n"); + if(fixup_get_svalue(_m, (gparam_t *)_aor, &aor) < 0) { + LM_ERR("failed to get aor parameter\n"); return -1; } LM_DBG("URI: %.*s\n", aor.len, aor.s);

1 year

git:master:ef3f50db: ims_ipsec_pcscf: docs updated for ipsec_destroy()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ef3f50db619490509f127eba87b75190a98a1b3e URL: https://github.com/kamailio/kamailio/commit/ef3f50db619490509f127eba87b7519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T10:09:16+01:00 ims_ipsec_pcscf: docs updated for ipsec_destroy() --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef3f50db619490509f127eba87b7519… Patch: https://github.com/kamailio/kamailio/commit/ef3f50db619490509f127eba87b7519… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index 982df9bbb14..d50c66ed45a 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -345,7 +345,7 @@ ipsec_forward("location", "1"); </section> <section> - <title><function moreinfo="none">ipsec_destroy(domain)</function></title> + <title><function moreinfo="none">ipsec_destroy(domain [, aor])</function></title> <para>The function destroys IPSec tunnel, created with ipsec_create.</para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -355,6 +355,10 @@ ipsec_forward("location", "1"); If a database is used then this must be name of the table which stores the contacts. </para> + <para> + <emphasis>aor</emphasis> - SIP URI to match the record. If not + provided, then R-URI is used. + </para> </listitem> </itemizedlist> <example>

1 year

git:master:e3f6c3c8: ims_ipsec_pcscf: add optional AoR argument to ipsec_destroy()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e3f6c3c8d23b379779369005f7a4b56ba8e0a588 URL: https://github.com/kamailio/kamailio/commit/e3f6c3c8d23b379779369005f7a4b56… Author: bishoja <james.bishop(a)ec.europa.eu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T10:09:16+01:00 ims_ipsec_pcscf: add optional AoR argument to ipsec_destroy() --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/cmd.h Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e3f6c3c8d23b379779369005f7a4b56… Patch: https://github.com/kamailio/kamailio/commit/e3f6c3c8d23b379779369005f7a4b56…

1 year

git:master:ba3eca2b: modules: readme files regenerated - ims_charging ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: ba3eca2b41091e169a279be30827495d8269a1a0 URL: https://github.com/kamailio/kamailio/commit/ba3eca2b41091e169a279be30827495… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-22T09:47:01+01:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/ba3eca2b41091e169a279be30827495… Patch: https://github.com/kamailio/kamailio/commit/ba3eca2b41091e169a279be30827495… --- diff --git a/src/modules/ims_charging/README b/src/modules/ims_charging/README index a3b33a21eae..8e61583c0c4 100644 --- a/src/modules/ims_charging/README +++ b/src/modules/ims_charging/README @@ -66,6 +66,7 @@ Carlos Ruiz Diaz 4.26. app_provided_party_avp (avp string) 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) + 4.29. strip_plus_from_e164 (int) 5. Functions @@ -123,8 +124,9 @@ Carlos Ruiz Diaz 1.26. app_provided_party_avpparameter usage 1.27. vendor_specific_chargeinfoparameter usage 1.28. vendor_specific_idparameter usage - 1.29. Ro_CCR - 1.30. Ro_set_session_id_avp + 1.29. strip_plus_from_e164parameter usage + 1.30. Ro_CCR + 1.31. Ro_set_session_id_avp Chapter 1. Admin Guide @@ -172,6 +174,7 @@ Chapter 1. Admin Guide 4.26. app_provided_party_avp (avp string) 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) + 4.29. strip_plus_from_e164 (int) 5. Functions @@ -374,6 +377,7 @@ Chapter 1. Admin Guide 4.26. app_provided_party_avp (avp string) 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) + 4.29. strip_plus_from_e164 (int) 4.1. hash_size(int) @@ -755,6 +759,19 @@ modparam("ims_charging", "vendor_specific_chargeinfo", 1) modparam("ims_charging", "vendor_specific_id", 10) ... +4.29. strip_plus_from_e164 (int) + + Strip + from subscription id when E.164 format is used. This is + according to spec, but this parameter is to keep existing behavior as + the default. + + Default value is 0. + + Example 1.29. strip_plus_from_e164parameter usage +... +modparam("ims_charging", "strip_plus_from_e164", 1) +... + 5. Functions 5.1. Ro_CCR(route_name, direction, reservation_units, @@ -782,7 +799,7 @@ outgoing_trunk_id) This method is executed asynchronously. See example on how to retrieve return value. - Example 1.29. Ro_CCR + Example 1.30. Ro_CCR ... xlog("L_DBG","Sending initial CCR Request for call\n"); Ro_CCR("RO_ASYNC_TERM_REPLY", "term", 30, "1", "1"); @@ -818,7 +835,7 @@ n"); This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE. - Example 1.30. Ro_set_session_id_avp + Example 1.31. Ro_set_session_id_avp ... Ro_set_session_id_avp(); xlog("L_DBG","Ro session AVP has been set: $avp(ro_session_id)\n");

1 year

[kamailio/kamailio] cdp: Avoid deadlock for callback on diameter timeout (PR #3643)

by Morten Tryfoss

Callback function might do an operation which creates a new transaction, which will result in a deadlock.   #### 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 #3641 #### Description Problem in detail described in ticket. Summary is that the lock used to iterate expired transactions is also needed when creating a new transaction. If the callback function (directly or indirectly) do something that creates a new transaction, it will result in a deadlock. In my case, this was the ims_charging module where a start charging request times out. The callback does t_continue() where the routing logic then rejects the call. This will create a stop request to the charging server, and it will block. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3643 -- Commit Summary -- * cdp: Avoid deadlock for callback on diameter timeout -- File Changes -- M src/modules/cdp/transaction.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3643.patch https://github.com/kamailio/kamailio/pull/3643.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3643 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3643(a)github.com>

1 year

[kamailio/kamailio] Deadlock in ims_charging / cdp modules on connection issues (Issue #3641)

by Morten Tryfoss

### Description I've been simulating calls while there's (faked) issues against the diameter server using TCP. Ro_CCR() uses t_suspend() to suspend the SIP transaction while waiting for a response from the charging server. A cdp transaction is also created with a callback to resume_on_initial_ccr() in the ims charging module. When a response to a charging request is received, this is handled in cdp/api_process.c where cdp_take_trans() find the given transaction and returns it without a lock held. The callback is then executed, and everything is fine. The problem occurs when a CCR times out, and the callback is done by the cdp_trans_timer() function. This hold a lock for the entire transaction list while executing callbacks for every timed out entry. In my case, the charging module does t_continue and the execution of that routing block is started again. Here we reply a cause indicating it was an issue with the charging server. This will trigger a new callback from the ims_dialog module which again will try to start a new cdp transaction (CCR Stop) - still while the cdp_trans_timer function holds a lock. Since the cdp timers now are blocked, no new connection attempts to the failed diameter server is done either. ### Troubleshooting #### Reproduction  ``` Ro_CCR("RO_CONTINUE_DISPATCHER", "orig", 30, "", "") this times out, and will do continue in the routing block specified (based on the cdp transaction timeout timer) route[RO_CONTINUE_DISPATCHER] { send_reply("500", "Internal error"); exit; } ``` ### Debugging Data  cdp_add_trans() on line 2 is blocked while waiting for lock held by cdp_trans_timer() on line 26 to be freed. The line numbers are a bit off because of some debugging. ``` #0 0x00007f6d9a3e0e29 in syscall () from /lib64/libc.so.6 #1 0x00007f6d979622f6 in futex_get (lock=0x7f6d706622a0) at ../../core/mem/../futexlock.h:121 #2 0x00007f6d979632cd in cdp_add_trans (msg=0x7f6d70921280, cb=0x7f6d9084caf5 <resume_on_termination_ccr>, ptr=0x0, timeout=5, auto_drop=1) at transaction.c:126 #3 0x00007f6d97980740 in AAASendMessage (message=0x7f6d70921280, callback_f=0x7f6d9084caf5 <resume_on_termination_ccr>, callback_param=0x0) at diameter_comm.c:158 #4 0x00007f6d9084c71b in send_ccr_stop_with_param (ro_session=0x7f6d70921dc0, code=0, reason=0x7ffe9b6cd400) at ims_ro.c:1183 #5 0x00007f6d90829f6d in dlg_terminated (dlg=0x7f6d7091f5d0, type=4, termcode=0, reason=0x7f6d9086f998 "call failed", _params=0x7f6d90d20280 <params>) at dialog.c:249 #6 0x00007f6d908216cd in dlg_callback_received (dlg=0x7f6d7091f5d0, type=4, _params=0x7f6d90d20280 <params>) at dialog.c:29 #7 0x00007f6d90aed1b9 in run_dlg_callbacks (type=4, dlg=0x7f6d7091f5d0, req=0x7f6d7091fb68, rpl=0xffffffffffffffff, dir=2, dlg_data=0x0) at dlg_cb.c:271 #8 0x00007f6d90abced4 in dlg_onreply (t=0x7f6d70931e10, type=1048576, param=0x7ffe9b6cda80) at dlg_handlers.c:1363 #9 0x00007f6d94252f2c in run_trans_callbacks_internal (cb_lst=0x7f6d70931eb8, type=1048576, trans=0x7f6d70931e10, params=0x7ffe9b6cda80) at t_hooks.c:236 #10 0x00007f6d942530e4 in run_trans_callbacks_with_buf (type=1048576, rbuf=0x7f6d70931f10, req=0x7f6d7091fb68, repl=0xffffffffffffffff, flags=0) at t_hooks.c:272 #11 0x00007f6d941d2860 in _reply_light (trans=0x7f6d70931e10, buf=0x7f6d97d10768 "SIP/2.0 480 Temporarily Unavailable\r\nVia: SIP/2.0/UDP 192.168.10.15:5060;branch=z9hG4bK427d31b9\r\nFrom: \"sipp\" <sip:+4749484948@192.168.10.15;user=phone>;tag=as22aa85b4\r\nTo: <sip:+4749494848@192.168.10.20"..., len=386, code=480, to_tag=0x7f6d944bb5e0 <tm_tags> "b239b52f382f2203913409401a079c72-9b859c73", to_tag_len=41, lock=0, bm=0x7ffe9b6ce5d0) at t_reply.c:520 #12 0x00007f6d941d3e8e in _reply (trans=0x7f6d70931e10, p_msg=0x7f6d70946878, code=480, reason=0x7ffe9b6ce750, lock=0) at t_reply.c:689 #13 0x00007f6d941dfdcf in t_reply_str_unsafe (t=0x7f6d70931e10, p_msg=0x7f6d70946878, code=480, reason=0x7ffe9b6ce750) at t_reply.c:1753 #14 0x00007f6d941fd400 in ki_t_reply (msg=0x7f6d70946878, code=480, reason=0x7ffe9b6ce750) at tm.c:1538 #15 0x00007f6d941fdcee in w_t_reply_wrp (msg=0x7f6d70946878, code=480, txt=0x7f6d97d106e8 "Temporarily Unavailable") at tm.c:1598 #16 0x00007f6d93d24c0e in send_reply (msg=0x7f6d70946878, code=480, reason=0x7ffe9b6ce880) at sl.c:287 #17 0x00007f6d93d25728 in w_send_reply (msg=0x7f6d70946878, p1=0x7f6d97cee2e8 "x)\320\227m\177", p2=0x7f6d97cee388 "\350)\320\227m\177") at sl.c:329 #18 0x0000000000466fb3 in do_action (h=0x7ffe9b6cf9b0, a=0x7f6d97d025d8, msg=0x7f6d70946878) at core/action.c:1131 #19 0x0000000000474188 in run_actions (h=0x7ffe9b6cf9b0, a=0x7f6d97d02210, msg=0x7f6d70946878) at core/action.c:1618 #20 0x000000000047028d in do_action (h=0x7ffe9b6cf9b0, a=0x7f6d97d02f00, msg=0x7f6d70946878) at core/action.c:1241 #21 0x0000000000474188 in run_actions (h=0x7ffe9b6cf9b0, a=0x7f6d97cfdb68, msg=0x7f6d70946878) at core/action.c:1618 #22 0x00000000004748cc in run_top_route (a=0x7f6d97cfdb68, msg=0x7f6d70946878, c=0x0) at core/action.c:1701 #23 0x00007f6d9425802a in t_continue_helper (hash_index=39149, label=1245761144, rtact=0x7f6d97cfdb68, cbname=0x0, cbparam=0x0, skip_timer=1) at t_suspend.c:307 #24 0x00007f6d9425c6d8 in t_continue (hash_index=39149, label=1245761144, route=0x7f6d97cfdb68) at t_suspend.c:603 #25 0x00007f6d9085b372 in resume_on_initial_ccr (is_timeout=1, param=0x7f6d70921cc8, cca=0x0, elapsed_msecs=1) at ims_ro.c:1786 #26 0x00007f6d979646d1 in cdp_trans_timer (now=1699966590, ptr=0x0) at transaction.c:223 #27 0x00007f6d9798e3b0 in timer_loop () at timer.c:117 #28 0x00007f6d9798f639 in timer_process (returns=0) at timer.c:217 #29 0x00007f6d97942cf8 in diameter_peer_start (blocking=0) at diameter_peer.c:350 #30 0x00007f6d97932bb2 in cdp_child_init (rank=0) at cdp_mod.c:272 ``` #### Log Messages  ``` ``` #### SIP Traffic  ``` ``` ### Possible Solutions I'm considering changing cdp_trans_timer() to iterate through the list, remove expired items while keeping them in a new list so all callbacks can be executed without the lock held. Could also be fixed within the ims_charging module. For example by not sending a CCR-T when there's no answer to the CCR-I, but I feel that's more of a band aid rather than a real fix. Any feedback or suggestions would be nice. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` master ``` * **Operating System**:  ``` centos 7.8 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3641 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3641(a)github.com>

1 year

git:master:48f0e7fc: cdp: Avoid deadlock for callback on diameter timeout

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 48f0e7fc9bd95b509e8fb619d8aafb59c125d2c8 URL: https://github.com/kamailio/kamailio/commit/48f0e7fc9bd95b509e8fb619d8aafb5… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T09:37:08+01:00 cdp: Avoid deadlock for callback on diameter timeout Callback function might do an operation which creates a new transaction, which will result in a deadlock. Fixes #3641 --- Modified: src/modules/cdp/transaction.c --- Diff: https://github.com/kamailio/kamailio/commit/48f0e7fc9bd95b509e8fb619d8aafb5… Patch: https://github.com/kamailio/kamailio/commit/48f0e7fc9bd95b509e8fb619d8aafb5… --- diff --git a/src/modules/cdp/transaction.c b/src/modules/cdp/transaction.c index 5680e5b59c6..bba7e27fcc8 100644 --- a/src/modules/cdp/transaction.c +++ b/src/modules/cdp/transaction.c @@ -206,6 +206,15 @@ void cdp_free_trans(cdp_trans_t *x) int cdp_trans_timer(time_t now, void *ptr) { cdp_trans_t *x, *n; + cdp_trans_list_t *cb_queue = 0; + cb_queue = pkg_malloc(sizeof(cdp_trans_list_t)); + if(!cb_queue) { + LOG_NO_MEM("pkg", sizeof(cdp_trans_list_t)); + return 0; + } + cb_queue->head = 0; + cb_queue->tail = 0; + lock_get(trans_list->lock); x = trans_list->head; while(x) { @@ -215,9 +224,6 @@ int cdp_trans_timer(time_t now, void *ptr) .timeout); //Transaction has timed out waiting for response x->ans = 0; - if(x->cb) { - (x->cb)(1, *(x->ptr), 0, (now - x->expires)); - } n = x->next; if(x->prev) @@ -228,7 +234,17 @@ int cdp_trans_timer(time_t now, void *ptr) x->next->prev = x->prev; else trans_list->tail = x->prev; - if(x->auto_drop) + + if(x->cb) { + /* queue cb to be done after list unlock */ + x->next = 0; + x->prev = cb_queue->tail; + if(cb_queue->tail) + cb_queue->tail->next = x; + cb_queue->tail = x; + if(!cb_queue->head) + cb_queue->head = x; + } else if(x->auto_drop) /* if no callback, auto drop here */ cdp_free_trans(x); x = n; @@ -236,6 +252,17 @@ int cdp_trans_timer(time_t now, void *ptr) x = x->next; } lock_release(trans_list->lock); + + /* do all queued callbacks */ + x = cb_queue->head; + while(x) { + (x->cb)(1, *(x->ptr), 0, (now - x->expires)); + if(x->auto_drop) + cdp_free_trans(x); + x = x->next; + } + pkg_free(cb_queue); + return 1; }

1 year

git:master:e17b554b: ims_charging: Various changes to make module compatible to other charging servers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e17b554ba918dc33c60f41c2cee50ad2578fbbd3 URL: https://github.com/kamailio/kamailio/commit/e17b554ba918dc33c60f41c2cee50ad… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T09:36:44+01:00 ims_charging: Various changes to make module compatible to other charging servers - Use origin-host of CCR response as destination-host of subsequent CCR requests, to make sure those requests are routed to the same charging server (when using relay). - use str_dup and str_free from ims_getters instead of locally defined. - Honour AVP_Time_Quota_Threshold in CCR response, as an alternative to static configured modparam "timer_buffer". - Add new modparam "strip_plus_from_e164" to enable sending subscription id with correct format according to specified type in the AVP. - Moved subscription id formatting into a common function. - Handle CCR response without AVP_Validity_Time set correctly. Was interpreted as immediate expire. - Handle IMS_RAR (Re-auth) request from charging server. Triggers an immediate interim update if the session is alive. - Handle IMS_ASR (Abort) request from charging server. Triggers an immediate termination of the session/call. - Fixed issue with signed/unsigned int related to check for Expires header. cscf_get_expires_hdr() returns signed (-1 for not found), while that value was added to the outgoing diameter request unsigned. That again resulted in an Expires AVP with a really large value, and was rejected by the charging server. --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/Ro_data.h Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/config.h Modified: src/modules/ims_charging/dialog.c Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ims_ro.h Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_db_handler.h Modified: src/modules/ims_charging/ro_session_hash.c Modified: src/modules/ims_charging/ro_session_hash.h Modified: src/modules/ims_charging/ro_timer.c Modified: utils/kamctl/mysql/ims_charging-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/e17b554ba918dc33c60f41c2cee50ad… Patch: https://github.com/kamailio/kamailio/commit/e17b554ba918dc33c60f41c2cee50ad…

1 year

git:master:6cd9f310: cdp: Add support for re-auth on ro sessions initiated from charging server

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6cd9f310a0af9bf6024696d436b6b96491808832 URL: https://github.com/kamailio/kamailio/commit/6cd9f310a0af9bf6024696d436b6b96… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T09:36:44+01:00 cdp: Add support for re-auth on ro sessions initiated from charging server - handle missing valid_for in CCA correctly, for chargings server not using it - add AVP_Time_Quota_Threshold AVP, to support server controlled CCR-U threshold --- Modified: src/modules/cdp/acctstatemachine.c Modified: src/modules/cdp/diameter_code_avp.h Modified: src/modules/cdp/peerstatemachine.c Modified: src/modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/6cd9f310a0af9bf6024696d436b6b96… Patch: https://github.com/kamailio/kamailio/commit/6cd9f310a0af9bf6024696d436b6b96… --- diff --git a/src/modules/cdp/acctstatemachine.c b/src/modules/cdp/acctstatemachine.c index 398526d86d7..aad4ca1cc04 100644 --- a/src/modules/cdp/acctstatemachine.c +++ b/src/modules/cdp/acctstatemachine.c @@ -176,6 +176,8 @@ int cc_acc_client_stateful_sm_process( //nothing we can do here, we have sent callback, client needs to send CCR Update LM_DBG("Reservation close to expiring\n"); break; + case ACC_CC_EV_SESSION_MODIFIED: + break; default: LM_ERR("Received unknown event [%d] in state [%d]\n", event, x->state); diff --git a/src/modules/cdp/diameter_code_avp.h b/src/modules/cdp/diameter_code_avp.h index 32987538dee..262ab62c012 100644 --- a/src/modules/cdp/diameter_code_avp.h +++ b/src/modules/cdp/diameter_code_avp.h @@ -266,6 +266,8 @@ typedef enum AVP_Service_Selection = 493, //RFC5778 AVP_Call_Id = 494, + AVP_Time_Quota_Threshold = 868, // 3GPP TS 32.299 + } AAA_AVPCodeNr; enum diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 24d5aed959e..74d119b70f2 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -1350,11 +1350,9 @@ void Rcv_Process(peer *p, AAAMessage *msg) switch(session->type) { case ACCT_CC_CLIENT: if(is_req(msg)) { - LM_WARN("unhandled receive request on Credit Control Acct " - "session\n"); - AAASessionsUnlock( - session->hash); //must be called because we don't call state machine here - session = 0; //we don't call SM here so we must not set to 0 + cc_acc_client_stateful_sm_process( + session, ACC_CC_EV_SESSION_MODIFIED, msg); + session = 0; } else { cc_acc_client_stateful_sm_process( session, ACC_CC_EV_RECV_ANS, msg); diff --git a/src/modules/cdp/session.c b/src/modules/cdp/session.c index e6e23fcbcf6..cd169f103ab 100644 --- a/src/modules/cdp/session.c +++ b/src/modules/cdp/session.c @@ -491,7 +491,7 @@ int cdp_sessions_timer(time_t now, void *ptr) 15; //15 seconds - TODO: add as config parameter //we should check for reservation expiring if the state is open if(x->u.cc_acc.state == ACC_CC_ST_OPEN) { - if(last_res_timestamp) { + if(last_res_timestamp && res_valid_for) { //we have obv already started reservations if((last_res_timestamp + res_valid_for) < (time(0) + last_reservation

1 year

← Newer
1
...
18
19
20
21
22
23
24
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023