sr-dev April 2025

sr-dev@lists.kamailio.org

14 participants
208 discussions

git:master:d529b511: uac: fix memory corruption from shared tp being freed by another transaction
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: d529b511b1ce722ceccf29dc006e92d45f1f340e URL: https://github.com/kamailio/kamailio/commit/d529b511b1ce722ceccf29dc006e92d… Author: ngash <ngash(a)west.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:33:23+02:00 uac: fix memory corruption from shared tp being freed by another transaction - Shared memory corruption resulting in multiple process core dumps. Triggered by an outbound REGISTER receiving 401 for all requests which resulted in the shared tp being released in uac_resend_tm_callback whilst the current transaction was put on timer and also used after release and then re-released. In order to avoid sharing the tp I changed the code in uac_send_tm_callback to clone the existing tp. Also added a sanity check for null as tp could be released prior to a dereference of tp->event --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/d529b511b1ce722ceccf29dc006e92d… Patch: https://github.com/kamailio/kamailio/commit/d529b511b1ce722ceccf29dc006e92d… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index dd5de24b16c..f8a77b6a6b4 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -807,7 +807,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) /* Callback function */ uac_r.cb = uac_resend_tm_callback; /* Callback parameter */ - uac_r.cbp = (void *)tp; + uac_r.cbp = (void *)uac_send_info_clone(tp); } ret = _uac_send_tmb.t_request_within(&uac_r); @@ -816,13 +816,18 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) goto error; } if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + if(uac_r.cbp != NULL) + shm_free(uac_r.cbp); + shm_free(tp); *ps->param = NULL; tp = NULL; } - if(tp->evroute != 0) { - return; + if(tp != NULL) { + if(tp->evroute != 0) { + return; + } } done:

1 0

git:master:75a2c6ff: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 75a2c6ff992632d7149f2f0ebafa0ea704be28fd URL: https://github.com/kamailio/kamailio/commit/75a2c6ff992632d7149f2f0ebafa0ea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-11T13:31:10+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/75a2c6ff992632d7149f2f0ebafa0ea… Patch: https://github.com/kamailio/kamailio/commit/75a2c6ff992632d7149f2f0ebafa0ea… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 4821b265a91..9ddf3c6a626 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -773,8 +773,12 @@ failure_route["serial"] 3.1. fr_timer (integer) - Timer which hits if no final reply for a request or ACK for a negative - INVITE reply arrives (in milliseconds). + This timer is used for all SIP requests. It hits if no reply for an + request INVITE request or other request has been received within (F in + milliseconds). If a provisional reply is received for an INVITE (any + 1xx), then the fr_inv_timer will be used instead. And if no replies (at + all) for an INVITE are received before fr_timer hits, the transaction + is terminated with a 408 in failure route. Default value is 30000 ms (30 seconds).

1 0

[kamailio/kamailio] tm: Update docs of fr_timer to match the implementation (PR #4207)
by Xenofon Karamanos 11 Apr '25

11 Apr '25

- Use description found in https://sip-router.org/wiki/ref_manual/timers   #### 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 - [ ] Tested changes locally - [x] Related to issue #3939 #### Description  Fix documentation according to the description found in https://sip-router.org/wiki/ref_manual/timers. They better reflect the actual procedure. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4207 -- Commit Summary -- * tm: Update docs of fr_timer to match the implementation -- File Changes -- M src/modules/tm/doc/params.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4207.patch https://github.com/kamailio/kamailio/pull/4207.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4207 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4207(a)github.com>

2 1

git:master:11952522: tm: Update docs of fr_timer to match the implementation
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 1195252256858dc4419c179e5b72541018f5feab URL: https://github.com/kamailio/kamailio/commit/1195252256858dc4419c179e5b72541… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:29:33+02:00 tm: Update docs of fr_timer to match the implementation - Use description found in https://sip-router.org/wiki/ref_manual/timers --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/1195252256858dc4419c179e5b72541… Patch: https://github.com/kamailio/kamailio/commit/1195252256858dc4419c179e5b72541… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 1dd77f1df3f..31c7c55b9ef 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -18,8 +18,12 @@ <section id="tm.p.fr_timer"> <title><varname>fr_timer</varname> (integer)</title> <para> - Timer which hits if no final reply for a request or ACK for a - negative INVITE reply arrives (in milliseconds). + This timer is used for all SIP requests. It hits if no reply for an + request INVITE request or other request has been received + within (F in milliseconds). If a provisional reply is received for an + INVITE (any 1xx), then the fr_inv_timer will be used instead. And if + no replies (at all) for an INVITE are received before fr_timer hits, + the transaction is terminated with a 408 in failure route. </para> <para> Default value is 30000 ms (30 seconds).

1 0

git:master:3988ad29: core: added kemi function KSR.is_TCPX()
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 3988ad296772b09353324557a867425d677fe706 URL: https://github.com/kamailio/kamailio/commit/3988ad296772b09353324557a867425… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:19:28+02:00 core: added kemi function KSR.is_TCPX() - return true if incoming base connection is tcp (tcp, tls, ws, wss) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3988ad296772b09353324557a867425… Patch: https://github.com/kamailio/kamailio/commit/3988ad296772b09353324557a867425… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 1f936453225..fe2f20078a4 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1139,6 +1139,17 @@ static int sr_kemi_core_is_proto_tcp(sip_msg_t *msg) return (msg->rcv.proto == PROTO_TCP) ? SR_KEMI_TRUE : SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_is_proto_tcpx(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_TCP || msg->rcv.proto == PROTO_TLS + || msg->rcv.proto == PROTO_WSS || msg->rcv.proto == PROTO_WS) + ? SR_KEMI_TRUE + : SR_KEMI_FALSE; +} + /** * */ @@ -2102,6 +2113,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_TCPX"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_tcpx, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_TLS"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_tls, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] modparam("ims_ipsec_pcscf", "ipsec_preferred_ealg", "aes-cbc") doesn't take effect (Issue #4211)
by Hampas-J 11 Apr '25

11 Apr '25

Hampas-J created an issue (kamailio/kamailio#4211) Hi, I'm using "version: kamailio 6.0.0-dev2 (x86_64/linux) 0da3eb" to setup IMS and configured modparam("ims_ipsec_pcscf", "ipsec_preferred_ealg", "aes-cbc") to encrypt ESP payload, I can make a call, but I see the ealg is still null in SIP 401 Unauthorized message and ESP payload is not encrypted: <img width="211" alt="Image" src="https://github.com/user-attachments/assets/f0d75ff0-1e40-429a-9511-da30cf63…" /> Is there any configuration missing? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4211 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4211(a)github.com>

1 2

Re: [open5gs/open5gs] open5gs-smfd crashes when starting (Issue #3074)
by Victor Seva 11 Apr '25

11 Apr '25

linuxmaniac left a comment (open5gs/open5gs#3074) After some debugging: ``` (gdb) p *((struct dict_application_data *)data) $33 = {application_id = 4, application_name = 0x7fffdc224000 "Diameter Credit Control Application"} (gdb) bt #0 fd_dict_new (dict=0x55555576cb70, type=type@entry=DICT_APPLICATION, data=data@entry=0x7fffffffde60, parent=parent@entry=0x0, ref=ref@entry=0x7fffffffdd40) at ./libfdproto/dictionary.c:1519 #1 0x00007fffdc21d23b in dict_dcca_entry (conffile=<optimized out>) at ./extensions/dict_dcca/dict_dcca.c:75 #2 0x00007ffff7282cae in fd_ext_load () from /lib/x86_64-linux-gnu/libfdcore.so.6 #3 0x00007ffff727b27d in fd_core_parseconf () from /lib/x86_64-linux-gnu/libfdcore.so.6 #4 0x00007ffff7e5a8ad in ogs_diam_init (mode=mode@entry=3, conffile=0x55555563b410 "/etc/freeDiameter/smf.conf", fd_config=fd_config@entry=0x5555555df760 <g_diam_conf>) at ../lib/diameter/common/init.c:51 #5 0x00005555555869dc in smf_fd_init () at ../src/smf/fd-path.c:34 #6 0x00005555555624c6 in smf_initialize () at ../src/smf/init.c:78 #7 0x0000555555561fc6 in app_initialize (argv=argv@entry=0x7fffffffe290) at ../src/smf/app.c:26 #8 0x0000555555561e46 in main (argc=<optimized out>, argv=0x7fffffffe498) at ../src/main.c:219 (gdb) c Continuing. Thread 1 "open5gs-smfd" hit Breakpoint 3, fd_dict_new (dict=0x55555576cb70, type=type@entry=DICT_APPLICATION, data=data@entry=0x7fffffffdc80, parent=0x5555557edc60, ref=ref@entry=0x0) at ./libfdproto/dictionary.c:1519 1519 { (gdb) bt #0 fd_dict_new (dict=0x55555576cb70, type=type@entry=DICT_APPLICATION, data=data@entry=0x7fffffffdc80, parent=0x5555557edc60, ref=ref@entry=0x0) at ./libfdproto/dictionary.c:1519 #1 0x00007ffff7e6323a in ogs_dict_gx_entry (conffile=conffile@entry=0x0) at ../lib/diameter/gx/dict.c:154 #2 0x00007ffff7e64955 in ogs_diam_gx_init () at ../lib/diameter/gx/message.c:97 #3 0x000055555558eb69 in smf_gx_init () at ../src/smf/gx-path.c:1396 #4 0x00005555555869e9 in smf_fd_init () at ../src/smf/fd-path.c:38 #5 0x00005555555624c6 in smf_initialize () at ../src/smf/init.c:78 #6 0x0000555555561fc6 in app_initialize (argv=argv@entry=0x7fffffffe290) at ../src/smf/app.c:26 #7 0x0000555555561e46 in main (argc=<optimized out>, argv=0x7fffffffe498) at ../src/main.c:219 (gdb) p *((struct dict_application_data *)data) $34 = {application_id = 16777238, application_name = 0x7ffff7e67019 "Gx"} (gdb) c Continuing. Thread 1 "open5gs-smfd" hit Breakpoint 1, ogs_dict_gy_entry (conffile=conffile@entry=0x0) at ../lib/diameter/gy/dict.c:147 147 { (gdb) c Continuing. Thread 1 "open5gs-smfd" hit Breakpoint 3, fd_dict_new (dict=0x55555576cb70, type=type@entry=DICT_APPLICATION, data=data@entry=0x7fffffffde80, parent=parent@entry=0x0, ref=ref@entry=0x0) at ./libfdproto/dictionary.c:1519 1519 { (gdb) p *((struct dict_application_data *)data) $35 = {application_id = 4, application_name = 0x7ffff7e4f000 "Gy"} (gdb) [...] 1690 if (ret == EEXIST) { (gdb) 1692 switch (type) { (gdb) 1706 TRACE_DEBUG(FULL, "Application %s already in dictionary", new->data.application.application_name); (gdb) 1708 if (fd_os_cmp(locref->data.application.application_name, locref->datastr_len, (gdb) 1710 TRACE_DEBUG(FULL, "Conflicting application name"); (gdb) 1839 if (ref) (gdb) 1850 CHECK_MALLOC( dict_obj_info[CHECK_TYPE(type) ? type : 0].dump_data(&buf, &len, &offset, data) ); (gdb) 1853 TRACE_DEBUG(INFO, "An error occurred while adding the following data in the dictionary: %s", buf); (gdb) 1855 if (ret == EEXIST) { (gdb) 1856 offset=0; (gdb) 1857 CHECK_MALLOC( dump_object(&buf, &len, &offset, locref, 0, 0, 0) ); (gdb) 1858 TRACE_DEBUG(INFO, "Conflicting entry in the dictionary: %s", buf); (gdb) 1860 free(buf); (gdb) 1863 free(new); (gdb) 1864 return ret; ``` Now it's clear that ``application_id`` 4 is used twice: * https://github.com/freeDiameter/freeDiameter/blob/master/extensions/dict_dc… ``` /* DCCA */ { struct dict_application_data data = { 4, "Diameter Credit Control Application" }; CHECK_dict_new( DICT_APPLICATION, &data, NULL, &dcca); } ``` * https://github.com/open5gs/open5gs/blob/main/lib/diameter/gy/message.c#L89 ``` int ogs_diam_gy_init(void) { application_id_t id = OGS_DIAM_GY_APPLICATION_ID; ogs_assert(ogs_dict_gy_entry(NULL) == 0); ``` defined at: https://github.com/open5gs/open5gs/blob/main/lib/diameter/gy/message.h#L34 ``` /* Gy interface, 3GPP TS 32.299 */ #define OGS_DIAM_GY_APPLICATION_ID 4 ``` -- Reply to this email directly or view it on GitHub: https://github.com/open5gs/open5gs/issues/3074#issuecomment-2796155952 You are receiving this because you commented. Message ID: <open5gs/open5gs/issues/3074/2796155952(a)github.com>

1 0

git:master:92e99afa: modules: readme files regenerated - ims_registrar_scscf ... [skip ci]
by Kamailio Dev 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 92e99afa95df80c762ce60f3b9eca7b7936c74b9 URL: https://github.com/kamailio/kamailio/commit/92e99afa95df80c762ce60f3b9eca7b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-11T10:01:17+02:00 modules: readme files regenerated - ims_registrar_scscf ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/92e99afa95df80c762ce60f3b9eca7b… Patch: https://github.com/kamailio/kamailio/commit/92e99afa95df80c762ce60f3b9eca7b… --- diff --git a/src/modules/ims_registrar_scscf/README b/src/modules/ims_registrar_scscf/README index 100ea1e657c..5ef62cbb0e1 100644 --- a/src/modules/ims_registrar_scscf/README +++ b/src/modules/ims_registrar_scscf/README @@ -682,7 +682,7 @@ switch ($retcode) { 4.8. reg_fetch_contacts(domain, uri, profile) The function fetches the contacts for 'uri' from table 'domain' to - pseudo-variable $imssulc(profile) [imssulc = ims scscf ulc]. + pseudo-variable $ulc(profile) [ulc = ims scscf ulc]. Meaning of the parameters is as follows: * domain - Name of table that should be used for the lookup of @@ -690,8 +690,8 @@ switch ($retcode) { * uri - The SIP URI address of the user which to fetch the contact addresses for. It can contain pseudo-variables that are evaluated at runtime. - * profile - Name of $imssulc pseudo-variable profile that will store - the fetched contacts. It is a static string. + * profile - Name of $ulc pseudo-variable profile that will store the + fetched contacts. It is a static string. This function can be used in REQUEST_ROUTE, FAILURE_ROUTE @@ -709,7 +709,7 @@ reg_fetch_contacts("location", "sip:user@kamailio.org", "caller"); data in that profile. Meaning of the parameters is as follows: - * profile - Name of $imssulc pseudo-variable profile that stores the + * profile - Name of $ulc pseudo-variable profile that stores the contacts. It is a static string. This function can be used in REQUEST_ROUTE, FAILURE_ROUTE

1 0

[kamailio/kamailio] Ims registrar scscf regpv fix (PR #4166)
by Lyubomir Yatanski 11 Apr '25

11 Apr '25

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4166 -- Commit Summary -- * ims_registrar_scscf: fix reg_fetch_contacts call * ims_registrar_scscf: fix documentation -- File Changes -- M src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml (6) M src/modules/ims_registrar_scscf/regpv.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4166.patch https://github.com/kamailio/kamailio/pull/4166.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4166 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4166(a)github.com>

3 18

git:master:9caf655c: ims_registrar_scscf: fix reg_fetch_contacts call
by Henning Westerholt 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 9caf655c51d5a846fa944bb866e3abadeb8b799c URL: https://github.com/kamailio/kamailio/commit/9caf655c51d5a846fa944bb866e3aba… Author: Lyubomir Yatanski <lyubomir.yatanski(a)flolive.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-04-11T09:53:57+02:00 ims_registrar_scscf: fix reg_fetch_contacts call The implementation of reg_fetch_contacts was hard-coded to empty result. The fix: - adds iteration over contacts and - adds impi to the ulc variable - improve documentation in the documentation $ulc variable is referred with misleading name cleanup the $imssulc mentions to avoid confusion --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml Modified: src/modules/ims_registrar_scscf/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/9caf655c51d5a846fa944bb866e3aba… Patch: https://github.com/kamailio/kamailio/commit/9caf655c51d5a846fa944bb866e3aba… --- diff --git a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml index afea49ee318..5df8c2f554e 100644 --- a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml +++ b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml @@ -744,7 +744,7 @@ switch ($retcode) { profile)</function></title> <para>The function fetches the contacts for 'uri' from table 'domain' to - pseudo-variable $imssulc(profile) [imssulc = ims scscf ulc].</para> + pseudo-variable $ulc(profile) [ulc = ims scscf ulc].</para> <para>Meaning of the parameters is as follows:</para> @@ -761,7 +761,7 @@ switch ($retcode) { </listitem> <listitem> - <para><emphasis>profile</emphasis> - Name of $imssulc + <para><emphasis>profile</emphasis> - Name of $ulc pseudo-variable profile that will store the fetched contacts. It is a static string.</para> </listitem> @@ -793,7 +793,7 @@ reg_fetch_contacts("location", "sip:user@kamailio.org", "caller"); <itemizedlist> <listitem> - <para><emphasis>profile</emphasis> - Name of $imssulc + <para><emphasis>profile</emphasis> - Name of $ulc pseudo-variable profile that stores the contacts. It is a static string.</para> </listitem> diff --git a/src/modules/ims_registrar_scscf/regpv.c b/src/modules/ims_registrar_scscf/regpv.c index 9ef1da8f2be..236406951c0 100644 --- a/src/modules/ims_registrar_scscf/regpv.c +++ b/src/modules/ims_registrar_scscf/regpv.c @@ -45,6 +45,7 @@ typedef struct _regpv_profile str pname; str domain; str aor; + str impi; int flags; unsigned int aorhash; int nrc; @@ -121,6 +122,11 @@ static void regpv_free_profile(regpv_profile_t *rpp) rpp->aor.s = 0; rpp->aor.len = 0; } + if(rpp->impi.s != NULL) { + pkg_free(rpp->impi.s); + rpp->impi.s = 0; + rpp->impi.len = 0; + } rpp->flags = 0; rpp->aorhash = 0; @@ -245,6 +251,9 @@ int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) case 17: /* count */ return pv_get_sintval(msg, param, res, rpp->nrc); break; + case 18: /* impi */ + return pv_get_strval(msg, param, res, &rpp->impi); + break; } return pv_get_null(msg, param, res); @@ -323,6 +332,8 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) rp->attr = 4; else if(strncmp(pa.s, "cseq", 4) == 0) rp->attr = 9; + else if(strncmp(pa.s, "impi", 4) == 0) + rp->attr = 18; else goto error; break; @@ -437,10 +448,18 @@ int pv_fetch_contacts( if(res != 0) { LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); ul.unlock_udomain((udomain_t *)table, &aor); - return -1; + goto error; + } + + rpp->impi.s = (char *)pkg_malloc(r->private_identity.len * sizeof(char)); + if(rpp->impi.s == NULL) { + LM_ERR("no mem for impi\n"); + goto error; } + memcpy(rpp->impi.s, r->private_identity.s, r->private_identity.len); + rpp->impi.len = r->private_identity.len; - ptr = 0; //r->contacts;TODO + ptr = r->linked_contacts.head ? r->linked_contacts.head->contact : NULL; ptr0 = NULL; n = 0; while(ptr) { @@ -455,8 +474,8 @@ int pv_fetch_contacts( goto error; } memcpy(c0, ptr, ilen); - //c0->domain = {0,0};//NULL;TODO - //c0->aor = {0,0};//NULL; + c0->domain = (str){NULL, 0}; + c0->aor = (str){NULL, 0}; c0->next = NULL; c0->prev = NULL;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2025