sr-dev April 2025

sr-dev@lists.kamailio.org

14 participants
208 discussions

[kamailio/kamailio] clean_sa(): Error sending delete SAs command via netlink socket: Invalid argument (#2707)
by openspring 16 Apr '25

16 Apr '25

### Description  #### Log Messages  ``` 0(117561) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type5, i/count 0/1: type 1(1)/ data 0x7f8583620ef0 0(117561) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type16, i/count 0/3: type 22(16)/ data 0x7f8583621ad8 0(117561) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type16, i/count 1/3: type 8(8)/ data 0x7f8583620fd8 0(117561) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type16, i/count 2/3: type 0(0)/ data 0x7f8500000000 0(117561) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xb914c0)[MT_indialog_reply] to 6 ERROR: bad config file (1 errors) 0(117561) DEBUG: <core> [core/sr_module.c:765]: destroy_modules(): starting modules destroy phase 0(117561) DEBUG: debugger [debugger_api.c:1267]: dbg_destroy_mod_levels(): Destroyed _dbg_mod_table, size 32 0(117561) ERROR: ims_ipsec_pcscf [ipsec.c:567]: clean_sa(): Error sending delete SAs command via netlink socket: Invalid argument 0(117561) WARNING: ims_ipsec_pcscf [cmd.c:998]: ipsec_cleanall(): Error cleaning IPSec Security associations during startup. 0(117561) ERROR: ims_ipsec_pcscf [ipsec.c:609]: clean_policy(): Error sending delete policies command via netlink socket: Invalid argument 0(117561) WARNING: ims_ipsec_pcscf [cmd.c:1002]: ipsec_cleanall(): Error cleaning IPSec Policies during startup. 0(117561) ERROR: ims_ipsec_pcscf [ims_ipsec_pcscf_mod.c:309]: mod_destroy(): Error destroying spi generator 0(117561) ERROR: ims_ipsec_pcscf [ims_ipsec_pcscf_mod.c:313]: mod_destroy(): Error destroying port generator 0(117561) DEBUG: tm [t_funcs.c:84]: tm_shutdown(): start 0(117561) DEBUG: tm [t_funcs.c:87]: tm_shutdown(): emptying hash table 0(117561) DEBUG: tm [t_funcs.c:89]: tm_shutdown(): removing semaphores 0(117561) DEBUG: tm [t_funcs.c:91]: tm_shutdown(): destroying tmcb lists 0(117561) DEBUG: tm [t_funcs.c:94]: tm_shutdown(): done 0(117561) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized 0(117561) DEBUG: <core> [core/mem/shm.c:289]: shm_destroy_manager(): destroying memory manager: q_malloc 0(117561) DEBUG: <core> [core/mem/q_malloc.c:1185]: qm_shm_lock_destroy(): destroying the shared memory lock 0(117561) DEBUG: <core> [core/mem/pkg.c:98]: pkg_destroy_manager(): destroying memory manager: q_malloc ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.4 (x86_64/linux) 8d6c2b flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 8d6c2b compiled on 22:26:30 Apr 11 2021 with gcc 4.8.5 ``` * **Operating System**:  ``` NAME="CentOS Linux" VERSION="7 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="7" PRETTY_NAME="CentOS Linux 7 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:7" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-7" CENTOS_MANTISBT_PROJECT_VERSION="7" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="7" ``` -- 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/2707

5 5

git:master:4767de61: presence: use internal function to get time signed int value
by Daniel-Constantin Mierla 15 Apr '25

15 Apr '25

Module: kamailio Branch: master Commit: 4767de61b274caf7efd16a9010b7f737a4d74a40 URL: https://github.com/kamailio/kamailio/commit/4767de61b274caf7efd16a9010b7f73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-15T22:31:16+02:00 presence: use internal function to get time signed int value --- Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/4767de61b274caf7efd16a9010b7f73… Patch: https://github.com/kamailio/kamailio/commit/4767de61b274caf7efd16a9010b7f73… --- diff --git a/src/modules/presence/publish.c b/src/modules/presence/publish.c index d833b524dce..32499bfa62c 100644 --- a/src/modules/presence/publish.c +++ b/src/modules/presence/publish.c @@ -88,7 +88,7 @@ void ps_presentity_db_timer_clean(unsigned int ticks, void *param) db_ops[n_db_cols] = OP_LT; db_vals[n_db_cols].type = DB1_INT; db_vals[n_db_cols].nul = 0; - db_vals[n_db_cols].val.int_val = (int)time(NULL); + db_vals[n_db_cols].val.int_val = ksr_time_sint(NULL, NULL); n_db_cols++; db_keys[n_db_cols] = &str_expires_col;

1 0

git:master:91e9cba3: nat_traversal: check result for searching port in contact uri
by Daniel-Constantin Mierla 15 Apr '25

15 Apr '25

Module: kamailio Branch: master Commit: 91e9cba3d4e22851275167510b6d8a71bd9e11a1 URL: https://github.com/kamailio/kamailio/commit/91e9cba3d4e22851275167510b6d8a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-15T22:19:09+02:00 nat_traversal: check result for searching port in contact uri --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/91e9cba3d4e22851275167510b6d8a7… Patch: https://github.com/kamailio/kamailio/commit/91e9cba3d4e22851275167510b6d8a7… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 0f952f01d66..f4288ac9a5b 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1611,6 +1611,10 @@ static void send_keepalive(NAT_Contact *contact) //nat_ip.s = strchr(contact->uri, ':') + 1; nat_ip.s = &contact->uri[4]; // skip over "sip:" ptr = strchr(nat_ip.s, ':'); + if(ptr == NULL) { + LM_ERR("searching port failed\n"); + return; + } nat_ip.len = ptr - nat_ip.s; nat_port = strtol(ptr + 1, NULL, 10); lport = 0;

1 0

git:master:9f24f110: lost: simplify freeing local variables on error
by Daniel-Constantin Mierla 13 Apr '25

13 Apr '25

Module: kamailio Branch: master Commit: 9f24f1109d6d491750c6feb19a9a6d0bcb674f90 URL: https://github.com/kamailio/kamailio/commit/9f24f1109d6d491750c6feb19a9a6d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-13T22:22:21+02:00 lost: simplify freeing local variables on error - the helper function has conditions inside --- Modified: src/modules/lost/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/9f24f1109d6d491750c6feb19a9a6d0… Patch: https://github.com/kamailio/kamailio/commit/9f24f1109d6d491750c6feb19a9a6d0… --- diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c index 5c653423144..278f5ea6906 100644 --- a/src/modules/lost/functions.c +++ b/src/modules/lost/functions.c @@ -784,12 +784,8 @@ int lost_held_dereference(struct sip_msg *_m, char *_url, char *_pidf, xmlFreeDoc(doc); } /* clean up string */ - if(res.s != NULL && res.len > 0) { - lost_free_string(&res); - } - if(err.s != NULL && err.len > 0) { - lost_free_string(&err); - } + lost_free_string(&res); + lost_free_string(&err); return LOST_CLIENT_ERROR; } @@ -1345,27 +1341,13 @@ int lost_function(struct sip_msg *_m, char *_con, char *_uri, char *_name, lost_free_geoheader_list(&geolist); lost_free_loc(&loc); /* clean up string */ - if(oldurl.s != NULL && oldurl.len > 0) { - lost_free_string(&oldurl); - } - if(ret.s != NULL && ret.len > 0) { - lost_free_string(&ret); - } - if(req.s != NULL && req.len > 0) { - lost_free_string(&req); - } - if(rereq.s != NULL && rereq.len > 0) { - lost_free_string(&rereq); - } - if(name.s != NULL && name.len > 0) { - lost_free_string(&name); - } - if(uri.s != NULL && uri.len > 0) { - lost_free_string(&uri); - } - if(err.s != NULL && err.len > 0) { - lost_free_string(&err); - } + lost_free_string(&oldurl); + lost_free_string(&ret); + lost_free_string(&req); + lost_free_string(&rereq); + lost_free_string(&name); + lost_free_string(&uri); + lost_free_string(&err); return LOST_CLIENT_ERROR; }

1 0

git:master:28efc761: lost: simplified lost_free_string()
by Daniel-Constantin Mierla 12 Apr '25

12 Apr '25

Module: kamailio Branch: master Commit: 28efc7610d08ee0177b8b252316ba53686bf83bf URL: https://github.com/kamailio/kamailio/commit/28efc7610d08ee0177b8b252316ba53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-12T17:24:11+02:00 lost: simplified lost_free_string() - removed unnecessary memset() for lost_copy_string() --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/28efc7610d08ee0177b8b252316ba53… Patch: https://github.com/kamailio/kamailio/commit/28efc7610d08ee0177b8b252316ba53… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 307a0437d49..2e88a34742f 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -287,7 +287,6 @@ char *lost_copy_string(str src, int *lgth) if(res == NULL) { PKG_MEM_ERROR; } else { - memset(res, 0, src.len); memcpy(res, src.s, src.len); res[src.len] = '\0'; *lgth = (int)strlen(res); @@ -303,21 +302,12 @@ char *lost_copy_string(str src, int *lgth) */ void lost_free_string(str *string) { - str ptr = STR_NULL; - + string->len = 0; if(string->s == NULL) return; - - ptr = *string; - - if(ptr.s != NULL) { - pkg_free(ptr.s); - - LM_DBG("### string object removed\n"); - } - + pkg_free(string->s); + LM_DBG("### string object removed\n"); string->s = NULL; - string->len = 0; return; }

1 0

git:master:f390a654: lost: keep pointer to original geo value
by Daniel-Constantin Mierla 12 Apr '25

12 Apr '25

Module: kamailio Branch: master Commit: f390a654ee9d2c2059669e0209926096c978ff11 URL: https://github.com/kamailio/kamailio/commit/f390a654ee9d2c2059669e020992609… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-12T17:18:23+02:00 lost: keep pointer to original geo value - triming can lose the start pointer and free is going to fail - init more local variables --- Modified: src/modules/lost/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/f390a654ee9d2c2059669e020992609… Patch: https://github.com/kamailio/kamailio/commit/f390a654ee9d2c2059669e020992609… --- diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c index 96886db9a08..5c653423144 100644 --- a/src/modules/lost/functions.c +++ b/src/modules/lost/functions.c @@ -173,9 +173,9 @@ char *lost_held_type(char *type, int *exact, int *lgth) int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url, char *_err, char *_id) { - pv_spec_t *pspidf; - pv_spec_t *psurl; - pv_spec_t *pserr; + pv_spec_t *pspidf = NULL; + pv_spec_t *psurl = NULL; + pv_spec_t *pserr = NULL; pv_value_t pvpidf; pv_value_t pvurl; @@ -187,9 +187,10 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url, xmlNodePtr root = NULL; xmlNodePtr cur_node = NULL; - str geo = STR_NULL; /* return value geolocation uri */ - str res = STR_NULL; /* return value pidf */ - str err = STR_NULL; /* return value error */ + str geo = STR_NULL; /* return value geolocation uri */ + str egeo = STR_NULL; /* entire value geolocation uri */ + str res = STR_NULL; /* return value pidf */ + str err = STR_NULL; /* return value error */ str url = STR_NULL; str did = STR_NULL; @@ -261,6 +262,7 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url, LM_DBG("parsing From header\n"); + lost_free_string(&idhdr); /* id from From header */ idhdr.s = lost_get_from_header(_m, &idhdr.len); if(idhdr.len == 0) { @@ -282,7 +284,6 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url, lost_free_held(&held); /* clean up */ if(que.len == 0) { LM_ERR("held request document error\n"); - que.s = NULL; goto err; } @@ -410,14 +411,16 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url, LM_DBG("*** node '%s' found\n", cur_node->name); + lost_free_string(&egeo); /* get the locationUri element */ - geo.s = lost_get_content( - root, (char *)HELD_TYPE_URI, &geo.len); - if(geo.len == 0) { + egeo.s = lost_get_content( + root, (char *)HELD_TYPE_URI, &egeo.len); + if(egeo.len == 0) { LM_WARN("%s element not found\n", HELD_TYPE_URI); - geo.s = NULL; + lost_free_string(&egeo); } else { - geo.s = lost_trim_content(geo.s, &geo.len); + geo.len = egeo.len; + geo.s = lost_trim_content(egeo.s, &geo.len); } } if(xmlStrcmp(cur_node->name, (const xmlChar *)"presence") @@ -509,7 +512,7 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url, pvurl.flags = PV_VAL_STR; psurl = (pv_spec_t *)_url; psurl->setf(_m, &psurl->pvp, (int)EQ_T, &pvurl); - lost_free_string(&geo); /* clean up */ + lost_free_string(&egeo); /* clean up */ /* return error code in case of response error */ if(err.len > 0) { @@ -536,15 +539,9 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url, xmlFreeDoc(doc); } /* clean up string */ - if(res.s != NULL && res.len > 0) { - lost_free_string(&res); - } - if(geo.s != NULL && geo.len > 0) { - lost_free_string(&geo); - } - if(err.s != NULL && err.len > 0) { - lost_free_string(&err); - } + lost_free_string(&res); + lost_free_string(&egeo); + lost_free_string(&err); return LOST_CLIENT_ERROR; }

1 0

git:master:6b100861: lost: condition only on str pointer to free it
by Daniel-Constantin Mierla 12 Apr '25

12 Apr '25

Module: kamailio Branch: master Commit: 6b1008610861be62bd1b5f419f2cdd9bd2b23ffc URL: https://github.com/kamailio/kamailio/commit/6b1008610861be62bd1b5f419f2cdd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-12T16:43:30+02:00 lost: condition only on str pointer to free it - cover empty strings --- Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/6b1008610861be62bd1b5f419f2cdd9… Patch: https://github.com/kamailio/kamailio/commit/6b1008610861be62bd1b5f419f2cdd9… --- diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index 7ff63ca98a3..64cd55170aa 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -839,10 +839,9 @@ p_lost_info_t lost_get_response_info( } else { tmp.s = lost_get_content(node, name, &tmp.len); } - if(tmp.len > 0 && tmp.s != NULL) { + if(tmp.s != NULL) { res->text = lost_copy_string(tmp, &len); - if(len > 0) { - + if(res->text != NULL) { LM_DBG("###\t\t[%s]\n", res->text); } lost_free_string(&tmp); /* clean up */ diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 802fb597e84..307a0437d49 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -310,7 +310,7 @@ void lost_free_string(str *string) ptr = *string; - if(ptr.s != NULL && ptr.len > 0) { + if(ptr.s != NULL) { pkg_free(ptr.s); LM_DBG("### string object removed\n");

1 0

git:master:cdf0eda2: microhttpd: return on malloc failure
by Daniel-Constantin Mierla 12 Apr '25

12 Apr '25

Module: kamailio Branch: master Commit: cdf0eda22f91f0d237e0ae0a9fc3ad292934fae1 URL: https://github.com/kamailio/kamailio/commit/cdf0eda22f91f0d237e0ae0a9fc3ad2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-12T10:10:20+02:00 microhttpd: return on malloc failure --- Modified: src/modules/microhttpd/microhttpd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cdf0eda22f91f0d237e0ae0a9fc3ad2… Patch: https://github.com/kamailio/kamailio/commit/cdf0eda22f91f0d237e0ae0a9fc3ad2… --- diff --git a/src/modules/microhttpd/microhttpd_mod.c b/src/modules/microhttpd/microhttpd_mod.c index 2853b7b1b5a..7bd8d304644 100644 --- a/src/modules/microhttpd/microhttpd_mod.c +++ b/src/modules/microhttpd/microhttpd_mod.c @@ -500,9 +500,9 @@ static enum MHD_Result ksr_microhttpd_request(void *cls, if(cstream->data.s != NULL) { free(cstream->data.s); free(cstream); - *ptr = NULL; - return MHD_NO; } + *ptr = NULL; + return MHD_NO; } if(cstream->data.s != NULL) { snprintf(buf, bsize, "%s%s", cstream->data.s, upload_data);

1 0

git:6.0:0f5d7744: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 Apr '25

11 Apr '25

Module: kamailio Branch: 6.0 Commit: 0f5d7744976cabdd1ddac0371fadaf22ee19c636 URL: https://github.com/kamailio/kamailio/commit/0f5d7744976cabdd1ddac0371fadaf2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-11T15:01:17+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/0f5d7744976cabdd1ddac0371fadaf2… Patch: https://github.com/kamailio/kamailio/commit/0f5d7744976cabdd1ddac0371fadaf2… --- 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

git:6.0:a68d952d: ims_registrar_scscf: fix reg_fetch_contacts call
by Henning Westerholt 11 Apr '25

11 Apr '25

Module: kamailio Branch: 6.0 Commit: a68d952de5d6a5d91202176877730d53f9c2c580 URL: https://github.com/kamailio/kamailio/commit/a68d952de5d6a5d91202176877730d5… Author: Lyubomir Yatanski <lyubomir.yatanski(a)flolive.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-04-11T12:49:08Z 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 (cherry picked from commit 9caf655c51d5a846fa944bb866e3abadeb8b799c) --- 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/a68d952de5d6a5d91202176877730d5… Patch: https://github.com/kamailio/kamailio/commit/a68d952de5d6a5d91202176877730d5… --- 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
...
10
11
12
13
14
15
16
...
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