sr-dev July 2024

sr-dev@lists.kamailio.org

16 participants
215 discussions

git:master:39be7eb5: src: added ims_qos_npn to Makefile.groups
by Dragos Vingarzan 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 39be7eb53773a1e3776d185f47d13a41e95408c3 URL: https://github.com/kamailio/kamailio/commit/39be7eb53773a1e3776d185f47d13a4… Author: Dragos Vingarzan <dragos(a)neatpath.net> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-18T09:02:17+02:00 src: added ims_qos_npn to Makefile.groups --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/39be7eb53773a1e3776d185f47d13a4… Patch: https://github.com/kamailio/kamailio/commit/39be7eb53773a1e3776d185f47d13a4… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 909abc7541b..b40781bf5cd 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -167,7 +167,7 @@ mod_list_redis=db_redis ndb_redis topos_redis mod_list_mono=app_mono # - modules related to IMS extensions -mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos \ +mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos ims_qos_npn \ ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ ims_usrloc_scscf ims_charging ims_ocs ims_diameter_server \ ims_ipsec_pcscf

1 0

git:master:5ee7d35c: ims_qos_npn: imported modified module
by Dragos Vingarzan 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 5ee7d35cfd9839230efbb163bac81ecbd461d6b5 URL: https://github.com/kamailio/kamailio/commit/5ee7d35cfd9839230efbb163bac81ec… Author: Dragos Vingarzan <dragos(a)neatpath.net> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-18T09:02:17+02:00 ims_qos_npn: imported modified module --- Added: src/modules/ims_qos_npn/Makefile Added: src/modules/ims_qos_npn/README Added: src/modules/ims_qos_npn/cdpeventprocessor.c Added: src/modules/ims_qos_npn/cdpeventprocessor.h Added: src/modules/ims_qos_npn/doc/Makefile Added: src/modules/ims_qos_npn/doc/ims_qos.xml Added: src/modules/ims_qos_npn/doc/ims_qos_admin.xml Added: src/modules/ims_qos_npn/ims_qos_mod.c Added: src/modules/ims_qos_npn/ims_qos_mod.h Added: src/modules/ims_qos_npn/ims_qos_stats.c Added: src/modules/ims_qos_npn/ims_qos_stats.h Added: src/modules/ims_qos_npn/rx_aar.c Added: src/modules/ims_qos_npn/rx_aar.h Added: src/modules/ims_qos_npn/rx_asr.c Added: src/modules/ims_qos_npn/rx_asr.h Added: src/modules/ims_qos_npn/rx_authdata.c Added: src/modules/ims_qos_npn/rx_authdata.h Added: src/modules/ims_qos_npn/rx_avp.c Added: src/modules/ims_qos_npn/rx_avp.h Added: src/modules/ims_qos_npn/rx_rar.c Added: src/modules/ims_qos_npn/rx_rar.h Added: src/modules/ims_qos_npn/rx_str.c Added: src/modules/ims_qos_npn/rx_str.h Added: src/modules/ims_qos_npn/sem.h Added: src/modules/ims_qos_npn/stats.c Added: src/modules/ims_qos_npn/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/5ee7d35cfd9839230efbb163bac81ec… Patch: https://github.com/kamailio/kamailio/commit/5ee7d35cfd9839230efbb163bac81ec…

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 17 Jul '24

17 Jul '24

- URL: https://github.com/kamailio/kamailio/commit/fa792054a58126b57797675aadc4f0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:27:27+02:00 core: pvapi - use defined types for pv_get_avp_name() name and flags - URL: https://github.com/kamailio/kamailio/commit/4b35f78c57a679723ec77c10c1a2f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:33:01+02:00 corex: use defined types for avp name and flags - URL: https://github.com/kamailio/kamailio/commit/ac9417cb0db60f9a4a0ff9f532edd07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:36:30+02:00 corex: destroy all msg avps after nio event route - URL: https://github.com/kamailio/kamailio/commit/07e5c94cad90474f8e2f2918ca28741… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:55:52+02:00 core: pvar - use defined types for avp type and name - URL: https://github.com/kamailio/kamailio/commit/dedba13bf159d780c3c0ae4dd524e92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:57:24+02:00 core: avp - coherent use of defined types for name and type - URL: https://github.com/kamailio/kamailio/commit/bdd8619d4389b3a84b3ca601d5fe02a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:44:51+02:00 core: cfg.y - use avp flags type - URL: https://github.com/kamailio/kamailio/commit/f8782d7f7522c83ca5490d133a6f696… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:01+02:00 acc: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/b7de3f755d7f613cb324768466d3122… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:04+02:00 avpops: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/4f61b76640f3bca27642a4e0e973b3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:07+02:00 call_control: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/d1bca3506b931164fb7993936107a42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:10+02:00 cfgt: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/dcce0b7f9c742ce2fdc512da87f5b12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:13+02:00 cplc: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e1e2ad2fc278a05a1ad82e7cb18511d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:16+02:00 debugger: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/a6a191be5aa389f82f4f6d56b48eb9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:19+02:00 dialplan: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/896fc467901da9e99426866ce6348fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:22+02:00 drouting: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/ee07ab29297a7ac86fe975d692f2bf5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:25+02:00 exec: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/308246a76a268980038d2435ad7c259… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:28+02:00 h350: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/98504b4f7557299cd5c52e95aeb307e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:31+02:00 ims_registrar_pcscf: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/604f900ca8a0e64757ff123c2f0b6a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:34+02:00 ims_registrar_scscf: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e67ad97d3da4e3b5149ea0de31f0930… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:37+02:00 json: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/2ac3e5daafe8c48835aaf8c488e5aa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:39+02:00 kazoo: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/b523f5e4f4a4f5b8c2f40717c57d093… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:42+02:00 lcr: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/def2e8fcd09ba4bceb21169410da4bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:44+02:00 ldap: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/3bc58f2a3cdf1db930b3836d2d19614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:48+02:00 matrix: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/be98520dd9366d30be74ec9078212f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:50+02:00 mediaproxy: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/b7ae09d3b311a7e5cc6d7ded81fc034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:53+02:00 msilo: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/bf996241f712a8645ffb28906aeb849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:55+02:00 mtree: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/cb7ad3e8cfeb2bfc3b8d092d3b03073… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:59+02:00 nathelper: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/11ac3d05d5d1f1222bf025d26f92f43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:01+02:00 osp: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/dda660bdb3fc3f9257e9291cf38182d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:04+02:00 pdb: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/594a4b39b15a2d4db361554d091e14e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:06+02:00 permissions: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/456608939cf5970eaa3df0919088308… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:09+02:00 pua_dialoginfo: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/53f9a571315c151bdd1bf4a6bd5e21f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:11+02:00 pv: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/59c2ebad7d030fd8b2d2e675e3f481f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:14+02:00 registrar: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/0483f1c74e9f3f48e573b445655a622… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:16+02:00 rtpengine: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e14e80a29a8d6edcef955a66b696c3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:19+02:00 rtpproxy: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/44654f476a7ebc3b8531e3dc0455ccd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:21+02:00 sdpops: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e703f9454f8d2b48562e254d79d6102… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:23+02:00 siptrace: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/72e8f2a201c9084c3ac86f7921c7787… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:25+02:00 siputils: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/32963fa84244fb0b6b80a50101866c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:27+02:00 tm: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/61ed552911e5ac633cdfdabd9ed2a26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:28+02:00 uac: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/72b80c120c28fbc910c946c9a075e87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:31+02:00 xprint: coherent use of defined types for avp flags, name and value

1 0

[kamailio/kamailio] Dialog DMQ sync: Timer needs fixing, firing on wrong node! (Issue #3656)
by Benoît Panizzon 17 Jul '24

17 Jul '24

Situation: Two Kamailio nodes syncing dialog profiles via DMQ Observation: When a dialog timeout is encountered, about half of the time, the timeout is triggered on the peer node not handling the dialog preventing the call to be correctly terminated and also leaving entries in the dialog database which never get deleted. https://kamailio.org/docs/modules/5.7.x/modules/dialog.html#dialog.p.enable… Makes clear, that only the node which is handling the dialog in question, can make changes not related to the dialog profiles. So when a dialog times out, it is this node which has to trigger the timeout, not any other one. When looking at the source code, it is clear, that the 'lifetime' is transmitted via DMQ dialog message to the peer nodes, which in turn arm a timer. So it is obvious, this time will trigger, sometimes before the instance handling the dialog itself triggers that timer. With some assistance of @oej I found a way to alter the JSON payload to extend the lifetime on the peer nodes: ``` route[DMQ_CAPTURE] { if(is_method("KDMQ")) { if(has_body("application/json") && $fU == 'dialog') { if (jansson_get("lifetime", $rb, "$var(lifetime)")) { $var(new_lifetime) = $var(lifetime) + 60; # Add 60 seconds on DMQ peer to make sure it expires AFTER main node. $var(newrb) = $rb; jansson_set("integer", "lifetime", $var(new_lifetime), "$var(newrb)"); set_body("$var(newrb)","application/json"); msg_apply_changes(); } } dmq_handle_message(); exit; } } ``` Testing with this config fixed the issue of the timeout firing on a peer node instead of the node handling the dialog. Issue is present in 5.5, 5.6 and after looking at the code, I assume also on 5.7 -Benoît -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3656 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3656(a)github.com>

6 15

git:master:ba31a006: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 16 Jul '24

16 Jul '24

Module: kamailio Branch: master Commit: ba31a0065af34490650a205738328f52b95a784b URL: https://github.com/kamailio/kamailio/commit/ba31a0065af34490650a205738328f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-07-16T10:31:11+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/ba31a0065af34490650a205738328f5… Patch: https://github.com/kamailio/kamailio/commit/ba31a0065af34490650a205738328f5… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 41f9d7bb812..16c10332df7 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1883,6 +1883,7 @@ kamctl rpc dispatcher.hash 4 bob server.com startup, useful when the hostname of the destination address is a NAPTR or SRV record only. Such addresses cannot be matched anymore with ds_is_from_list(...). + + 32 (bit at index 5 - 1 <<5) - no ping to destination * priority: sets the priority in destination list (based on it is done the initial ordering inside the set) * attributes: extra fields in form of name1=value1;...;nameN=valueN.

1 0

git:master:2ce75082: dispatcher: docs - listed flag 32
by Daniel-Constantin Mierla 16 Jul '24

16 Jul '24

Module: kamailio Branch: master Commit: 2ce75082134a7e03c29e3096316cee5ad455d9af URL: https://github.com/kamailio/kamailio/commit/2ce75082134a7e03c29e3096316cee5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T10:20:17+02:00 dispatcher: docs - listed flag 32 --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2ce75082134a7e03c29e3096316cee5… Patch: https://github.com/kamailio/kamailio/commit/2ce75082134a7e03c29e3096316cee5… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index e50ea26f518..a17e87f68e7 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2372,6 +2372,8 @@ kamctl rpc dispatcher.hash 4 bob server.com useful when the hostname of the destination address is a NAPTR or SRV record only. Such addresses cannot be matched anymore with ds_is_from_list(...).</para> </listitem> + <listitem><para>32 (bit at index 5 - 1 <<5) - no ping to destination</para> + </listitem> </itemizedlist> </para> </listitem>

1 0

git:master:abdd0bfa: dispatcher: new flag 32 to not send ping to destination
by Daniel-Constantin Mierla 16 Jul '24

16 Jul '24

Module: kamailio Branch: master Commit: abdd0bfaf6a2e50fb96e2f522f03a65f331b57b5 URL: https://github.com/kamailio/kamailio/commit/abdd0bfaf6a2e50fb96e2f522f03a65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T10:10:06+02:00 dispatcher: new flag 32 to not send ping to destination --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/abdd0bfaf6a2e50fb96e2f522f03a65… Patch: https://github.com/kamailio/kamailio/commit/abdd0bfaf6a2e50fb96e2f522f03a65… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d36141bbafd..287164f829d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -4069,6 +4069,9 @@ void ds_ping_set(ds_set_t *node) /* skip addresses set in disabled state by admin */ if((node->dlist[j].flags & DS_DISABLED_DST) != 0) continue; + /* skip addresses with no-ping flag */ + if((node->dlist[j].flags & DS_NOPING_DST) != 0) + continue; /* If the Flag of the entry has "Probing set, send a probe: */ if(ds_ping_result_helper(node, j)) { LM_DBG("probing set #%d, URI %.*s\n", node->id, diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 06410225a62..cf1842aeb47 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -46,7 +46,8 @@ #define DS_DISABLED_DST 4 /*!< admin disabled destination */ #define DS_PROBING_DST 8 /*!< checking destination */ #define DS_NODNSARES_DST 16 /*!< no DNS A/AAAA resolve for host in uri */ -#define DS_STATES_ALL 31 /*!< all bits for the states of destination */ +#define DS_NOPING_DST 32 /*!< no ping to destination */ +#define DS_STATES_ALL 63 /*!< all bits for the states of destination */ #define ds_skip_dst(flags) ((flags) & (DS_INACTIVE_DST|DS_DISABLED_DST))

1 0

git:master:eda03789: core: remove unnecessary cleanup when locating a module
by Daniel-Constantin Mierla 16 Jul '24

16 Jul '24

Module: kamailio Branch: master Commit: eda03789f693bb72ec4ee05a8b2b4723e5080504 URL: https://github.com/kamailio/kamailio/commit/eda03789f693bb72ec4ee05a8b2b472… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T08:27:42+02:00 core: remove unnecessary cleanup when locating a module --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/eda03789f693bb72ec4ee05a8b2b472… Patch: https://github.com/kamailio/kamailio/commit/eda03789f693bb72ec4ee05a8b2b472… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index d67e7e44af3..5db20255874 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -535,9 +535,6 @@ int ksr_locate_module(char *mod_path, char **new_path) return 0; error: - if(path != NULL && path != mod_path) { - pkg_free(path); - } return -1; }

1 0

[kamailio/kamailio] nathelper: fixed handle_ruri_alias() for alias being an IPv6 (PR #3913)
by Dragos Vingarzan 15 Jul '24

15 Jul '24

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  `handle_ruri_alias()` wasn't handling correctly the IP address in the alias, in case it was an IPv6. This adds `[` and `]` around the IP if v6 when composing a destination SIP URI, such that the downstream functions will handle it correctly and not be confused by the `:` before the port. Arguably, nathelper is not needed in IPv6. Yet I have discovered a scenario where it could be quite helpful as a way to force some UE routing through an intermediary proxy. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3913 -- Commit Summary -- * nathelper: fixed handle_ruri_alias() for alias being an IPv6 -- File Changes -- M src/modules/nathelper/nathelper.c (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3913.patch https://github.com/kamailio/kamailio/pull/3913.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3913 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3913(a)github.com>

2 5

git:master:52ab6f3d: nathelper: fixed handle_ruri_alias() for alias being an IPv6
by Dragos Vingarzan 15 Jul '24

15 Jul '24

Module: kamailio Branch: master Commit: 52ab6f3dcf5ad8d967be8bdecaa64ef31cbfbe33 URL: https://github.com/kamailio/kamailio/commit/52ab6f3dcf5ad8d967be8bdecaa64ef… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-15T21:50:48+02:00 nathelper: fixed handle_ruri_alias() for alias being an IPv6 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/52ab6f3dcf5ad8d967be8bdecaa64ef… Patch: https://github.com/kamailio/kamailio/commit/52ab6f3dcf5ad8d967be8bdecaa64ef… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 6e6d44ad7ed..9c0bebad3a7 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1139,7 +1139,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) char buf[MAX_URI_SIZE], *val, *sep, *at, *next, *cur_uri, *rest, *port, *trans, *start; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, - ip_port_len; + ip_len, ip_port_len, port_len, i; if(parse_sip_msg_uri(msg) < 0) { LM_ERR("while parsing Request-URI\n"); @@ -1185,18 +1185,46 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) LM_ERR("no '~' in alias param value\n"); return -1; } + // IPv6 needs some [] added when composing a SIP URI, which further + // complicates this code. + ip_len = port - val; + int is_ipv6 = 0; + for(i = 0; i < ip_len; i++) { + if(val[i] == ':') { + is_ipv6 = 1; + break; + } + } *(port++) = ':'; trans = memchr(port, 126 /* ~ */, val_len - (port - val)); if(trans == NULL) { LM_ERR("no second '~' in alias param value\n"); return -1; } + // Compose the URI in a buffer at = &(buf[0]); append_str(at, "sip:", 4); ip_port_len = trans - val; alias_len = _ksr_contact_salias.len + ip_port_len + 2 /* ~n */; - memcpy(at, val, ip_port_len); - at = at + ip_port_len; + if(is_ipv6) { + // IPv6 - add '[' ']' around IP + // then append ':' and copy the port + append_chr(at, '['); + memcpy(at, val, ip_len); + at = at + ip_len; + append_chr(at, ']'); + port_len = trans - port; + if(port_len > 0) { + append_chr(at, ':'); + memcpy(at, port, port_len); + at = at + port_len; + } + } else { + // IPv4 - copy directly as is + // separator '~' between IP and port was changed to ':' + memcpy(at, val, ip_port_len); + at = at + ip_port_len; + } trans = trans + 1; if((ip_port_len + 2 > val_len) || (*trans == ';') || (*trans == '?')) { LM_ERR("no proto in alias param\n");

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2024