- sr-dev - kamailio.org

[kamailio/kamailio] dispatcher: fix sock overwrite by ping_socket (PR #4217)
by Michael Furmur 17 Apr '25

17 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, ...) - [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 fixes bug when `ping_socket` for destination overwrites `dp->sock` which is used for normal (not probing OPTIONS) requests You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4217 -- Commit Summary -- * dispatcher: fix sock overwrite by ping_socket -- File Changes -- M src/modules/dispatcher/dispatch.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4217.patch https://github.com/kamailio/kamailio/pull/4217.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4217 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4217(a)github.com>

2 3

git:master:586802db: dispatcher: fix sock overwrite by ping_socket
by Henning Westerholt 17 Apr '25

17 Apr '25

Module: kamailio Branch: master Commit: 586802dbf0bc6a0e5fc50c4404fff1bda9a82add URL: https://github.com/kamailio/kamailio/commit/586802dbf0bc6a0e5fc50c4404fff1b… Author: Michael Furmur <furmur(a)pm.me> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-04-17T21:03:59+02:00 dispatcher: fix sock overwrite by ping_socket fixes bug when 'ping_socket' for destination overwrites dp->sock which is used for normal (not probing OPTIONS) requests --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/586802dbf0bc6a0e5fc50c4404fff1b… Patch: https://github.com/kamailio/kamailio/commit/586802dbf0bc6a0e5fc50c4404fff1b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 77c9dd92e20..a49e5638cd3 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -669,8 +669,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) goto err; } STR_ZTOV(dp->attrs.ping_socket.s[dp->attrs.ping_socket.len], c); - dp->sock = grep_sock_info(&host, (unsigned short)port, proto); - if(dp->sock == 0) { + if(grep_sock_info(&host, (unsigned short)port, proto) == 0) { LM_ERR("non-local socket <%.*s>\n", dp->attrs.ping_socket.len, dp->attrs.ping_socket.s); goto err;

1 0

[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

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

11 Apr '25

Module: kamailio Branch: master Commit: e66a876c2cf694f7389cceab6f9739acf763d104 URL: https://github.com/kamailio/kamailio/commit/e66a876c2cf694f7389cceab6f9739a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-11T13:46:12+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/e66a876c2cf694f7389cceab6f9739a… Patch: https://github.com/kamailio/kamailio/commit/e66a876c2cf694f7389cceab6f9739a…

1 0

[kamailio/kamailio] DMQ improvements related to node status (PR #4182)
by Stefan Mititelu 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, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Some improvements related to DMQ node status: 1. Allow other modules that use DMQ to detect NOT_ACTIVE nodes via default response callback. Note that only internal dmq ping mechanism can set them back to DMQ_NODE_ACTIVE status. 2. Simplify node status and merge DMQ_NODE_PENDING + DMQ_NODE_TIMEOUT into DMQ_NODE_NOT_ACTIVE since those specific states were never used to be compared against. 3. Add new mod parameters which will control after how many fails the node should be moved to DMQ_NODE_NOT_ACTIVE state. Under testing currently. Will update if any bugs found. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4182 -- Commit Summary -- * dmq: add default response callback * dmq: simplify node status * dmq: add two new modparams -- File Changes -- M src/modules/dialog/dlg_dmq.c (16) M src/modules/dialog/dlg_dmq.h (3) M src/modules/dmq/dmq.c (4) M src/modules/dmq/dmq.h (2) M src/modules/dmq/dmq_funcs.c (6) M src/modules/dmq/dmqnode.c (70) M src/modules/dmq/dmqnode.h (9) M src/modules/dmq/doc/dmq_admin.xml (64) M src/modules/dmq/notification_peer.c (80) M src/modules/dmq/notification_peer.h (3) M src/modules/dmq_usrloc/usrloc_sync.c (12) M src/modules/dmq_usrloc/usrloc_sync.h (2) M src/modules/htable/ht_dmq.c (15) M src/modules/htable/ht_dmq.h (3) M src/modules/presence/presence_dmq.c (16) M src/modules/presence/presence_dmq.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4182.patch https://github.com/kamailio/kamailio/pull/4182.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4182 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4182(a)github.com>

4 8

git:master:c3eabac0: presence: use NULL for dmq response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: c3eabac00a5bc6a3d8d9008229e4a858e92c22d7 URL: https://github.com/kamailio/kamailio/commit/c3eabac00a5bc6a3d8d9008229e4a85… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 presence: use NULL for dmq response callback --- Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presence_dmq.h --- Diff: https://github.com/kamailio/kamailio/commit/c3eabac00a5bc6a3d8d9008229e4a85… Patch: https://github.com/kamailio/kamailio/commit/c3eabac00a5bc6a3d8d9008229e4a85… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 2e26187383f..139613aed60 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -33,7 +33,6 @@ static int *pres_dmq_recv = 0; dmq_api_t pres_dmqb; dmq_peer_t *pres_dmq_peer = NULL; -dmq_resp_cback_t pres_dmq_resp_callback = {&pres_dmq_resp_callback_f, 0}; int pres_dmq_send_all_presentities(dmq_node_t *dmq_node); int pres_dmq_request_sync(); @@ -143,12 +142,12 @@ int pres_dmq_send(str *body, dmq_node_t *node) } if(node) { LM_DBG("sending dmq message ...\n"); - pres_dmqb.send_message(pres_dmq_peer, body, node, - &pres_dmq_resp_callback, 1, &pres_dmq_content_type); + pres_dmqb.send_message( + pres_dmq_peer, body, node, NULL, 1, &pres_dmq_content_type); } else { LM_DBG("sending dmq broadcast...\n"); - pres_dmqb.bcast_message(pres_dmq_peer, body, 0, &pres_dmq_resp_callback, - 1, &pres_dmq_content_type); + pres_dmqb.bcast_message( + pres_dmq_peer, body, 0, NULL, 1, &pres_dmq_content_type); } return 0; } @@ -490,14 +489,3 @@ int pres_dmq_send_all_presentities(dmq_node_t *dmq_node) return 0; } - - -/** -* @brief dmq response callback -*/ -int pres_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param) -{ - LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); - return 0; -} diff --git a/src/modules/presence/presence_dmq.h b/src/modules/presence/presence_dmq.h index cc6eb764f68..3bf82c084ca 100644 --- a/src/modules/presence/presence_dmq.h +++ b/src/modules/presence/presence_dmq.h @@ -33,7 +33,6 @@ extern dmq_api_t pres_dmqb; extern dmq_peer_t *pres_dmq_peer; -extern dmq_resp_cback_t pres_dmq_resp_callback; typedef enum { @@ -47,6 +46,4 @@ int pres_dmq_handle_msg( struct sip_msg *msg, peer_reponse_t *resp, dmq_node_t *node); int pres_dmq_replicate_presentity(presentity_t *presentity, str *body, int new_t, str *cur_etag, char *sphere, str *ruid, dmq_node_t *node); -int pres_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param); #endif

1 0

git:master:14a61f13: dmq_usrloc: use NULL for dmq response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 14a61f1377e7711a1feee4e30a648fb0cd6ff25f URL: https://github.com/kamailio/kamailio/commit/14a61f1377e7711a1feee4e30a648fb… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 dmq_usrloc: use NULL for dmq response callback --- Modified: src/modules/dmq_usrloc/usrloc_sync.c Modified: src/modules/dmq_usrloc/usrloc_sync.h --- Diff: https://github.com/kamailio/kamailio/commit/14a61f1377e7711a1feee4e30a648fb… Patch: https://github.com/kamailio/kamailio/commit/14a61f1377e7711a1feee4e30a648fb… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 87e151b4fa3..79a54eb2b19 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -42,7 +42,6 @@ static struct socket_info *dmq_server_socket_local = 0; dmq_api_t usrloc_dmqb; dmq_peer_t *usrloc_dmq_peer = NULL; -dmq_resp_cback_t usrloc_dmq_resp_callback = {&usrloc_dmq_resp_callback_f, 0}; int usrloc_dmq_send_all(); int usrloc_dmq_request_sync(); @@ -335,12 +334,12 @@ int usrloc_dmq_send(str *body, dmq_node_t *node) } if(node) { LM_DBG("sending dmq message ...\n"); - usrloc_dmqb.send_message(usrloc_dmq_peer, body, node, - &usrloc_dmq_resp_callback, 1, &usrloc_dmq_content_type); + usrloc_dmqb.send_message( + usrloc_dmq_peer, body, node, NULL, 1, &usrloc_dmq_content_type); } else { LM_DBG("sending dmq broadcast...\n"); - usrloc_dmqb.bcast_message(usrloc_dmq_peer, body, 0, - &usrloc_dmq_resp_callback, 1, &usrloc_dmq_content_type); + usrloc_dmqb.bcast_message( + usrloc_dmq_peer, body, 0, NULL, 1, &usrloc_dmq_content_type); } return 0; } @@ -1016,13 +1015,6 @@ void srjson_to_xavp(srjson_t *json, sr_xavp_t **xavp) } } -int usrloc_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param) -{ - LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); - return 0; -} - void dmq_ul_cb_contact(ucontact_t *ptr, int type, void *param) { str aor; diff --git a/src/modules/dmq_usrloc/usrloc_sync.h b/src/modules/dmq_usrloc/usrloc_sync.h index 85cfc27e414..ba08cde9372 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.h +++ b/src/modules/dmq_usrloc/usrloc_sync.h @@ -43,8 +43,6 @@ typedef enum DMQ_SYNC, } usrloc_dmq_action_t; -int usrloc_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param); int usrloc_dmq_initialize(); int usrloc_dmq_handle_msg( struct sip_msg *msg, peer_reponse_t *resp, dmq_node_t *node);

1 0

git:master:08f542ef: htable: use NULL for dmq response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 08f542efffa4845247cc4a4795f1d90bd3957130 URL: https://github.com/kamailio/kamailio/commit/08f542efffa4845247cc4a4795f1d90… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 htable: use NULL for dmq response callback --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h --- Diff: https://github.com/kamailio/kamailio/commit/08f542efffa4845247cc4a4795f1d90… Patch: https://github.com/kamailio/kamailio/commit/08f542efffa4845247cc4a4795f1d90… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index ead9171e17d..a5fd41f3e44 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -56,7 +56,6 @@ extern int ht_dmq_init_sync; dmq_api_t ht_dmqb; dmq_peer_t *ht_dmq_peer = NULL; -dmq_resp_cback_t ht_dmq_resp_callback = {&ht_dmq_resp_callback_f, 0}; int ht_dmq_send(str *body, dmq_node_t *node); int ht_dmq_send_sync(dmq_node_t *node, str *htname); @@ -245,12 +244,12 @@ int ht_dmq_send(str *body, dmq_node_t *node) } if(node) { LM_DBG("sending dmq message ...\n"); - ht_dmqb.send_message(ht_dmq_peer, body, node, &ht_dmq_resp_callback, 1, - &ht_dmq_content_type); + ht_dmqb.send_message( + ht_dmq_peer, body, node, NULL, 1, &ht_dmq_content_type); } else { LM_DBG("sending dmq broadcast...\n"); - ht_dmqb.bcast_message(ht_dmq_peer, body, 0, &ht_dmq_resp_callback, 1, - &ht_dmq_content_type); + ht_dmqb.bcast_message( + ht_dmq_peer, body, 0, NULL, 1, &ht_dmq_content_type); } return 0; } @@ -644,13 +643,3 @@ int ht_dmq_handle_sync(srjson_doc_t *jdoc) } return 0; } - -/** - * @brief dmq response callback - */ -int ht_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param) -{ - LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); - return 0; -} diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index aaa1eb5efc0..e0f3d2279c4 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -31,7 +31,6 @@ extern dmq_api_t ht_dmqb; extern dmq_peer_t *ht_dmq_peer; -extern dmq_resp_cback_t ht_dmq_resp_callback; typedef enum { @@ -55,7 +54,5 @@ int ht_dmq_replay_action(ht_dmq_action_t action, str *htname, str *cname, int type, int_str *val, int mode); int ht_dmq_request_sync(str *htname); int ht_dmq_request_sync_all(); -int ht_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param); #endif

1 0

git:master:3b915121: dialog: use NULL for dmq response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 3b915121d7e912a3edc609800bf5c336f35cbbde URL: https://github.com/kamailio/kamailio/commit/3b915121d7e912a3edc609800bf5c33… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 dialog: use NULL for dmq response callback --- Modified: src/modules/dialog/dlg_dmq.c Modified: src/modules/dialog/dlg_dmq.h --- Diff: https://github.com/kamailio/kamailio/commit/3b915121d7e912a3edc609800bf5c33… Patch: https://github.com/kamailio/kamailio/commit/3b915121d7e912a3edc609800bf5c33… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 6cd8d898762..669f9c97eef 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -33,7 +33,6 @@ static str dmq_500_rpl = str_init("Server Internal Error"); dmq_api_t dlg_dmqb; dmq_peer_t *dlg_dmq_peer = NULL; -dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; int dmq_send_all_dlgs(dmq_node_t *dmq_node); int dlg_dmq_request_sync(); @@ -82,12 +81,12 @@ int dlg_dmq_send(str *body, dmq_node_t *node) } if(node) { LM_DBG("sending dmq message ...\n"); - dlg_dmqb.send_message(dlg_dmq_peer, body, node, &dlg_dmq_resp_callback, - 1, &dlg_dmq_content_type); + dlg_dmqb.send_message( + dlg_dmq_peer, body, node, NULL, 1, &dlg_dmq_content_type); } else { LM_DBG("sending dmq broadcast...\n"); - dlg_dmqb.bcast_message(dlg_dmq_peer, body, 0, &dlg_dmq_resp_callback, 1, - &dlg_dmq_content_type); + dlg_dmqb.bcast_message( + dlg_dmq_peer, body, 0, NULL, 1, &dlg_dmq_content_type); } return 0; } @@ -684,14 +683,3 @@ int dmq_send_all_dlgs(dmq_node_t *dmq_node) return 0; } - - -/** -* @brief dmq response callback -*/ -int dlg_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param) -{ - LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); - return 0; -} diff --git a/src/modules/dialog/dlg_dmq.h b/src/modules/dialog/dlg_dmq.h index f545917b900..10caf81ba8a 100644 --- a/src/modules/dialog/dlg_dmq.h +++ b/src/modules/dialog/dlg_dmq.h @@ -33,7 +33,6 @@ extern dmq_api_t dlg_dmqb; extern dmq_peer_t *dlg_dmq_peer; -extern dmq_resp_cback_t dlg_dmq_resp_callback; typedef enum { @@ -49,6 +48,4 @@ int dlg_dmq_handle_msg( struct sip_msg *msg, peer_reponse_t *resp, dmq_node_t *node); int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t *dlg, int needlock, dmq_node_t *node); -int dlg_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param); #endif

1 0

git:master:e9af7b56: dmq: rework node status and add default response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: e9af7b56539a2636d35691ffebecb166d1ae1c41 URL: https://github.com/kamailio/kamailio/commit/e9af7b56539a2636d35691ffebecb16… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 dmq: rework node status and add default response callback - rework node statuses to: DMN_NODE_ACTIVE, DMQ_NODE_NOT_ACTIVE, DMQ_NODE_DISABLED - add default callback to be used when NULL - add 3 modparams related to fail_count; increment fail_count only on 408; print fail count on rpc list_nodes command --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq.h Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/doc/dmq_admin.xml Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/notification_peer.h --- Diff: https://github.com/kamailio/kamailio/commit/e9af7b56539a2636d35691ffebecb16… Patch: https://github.com/kamailio/kamailio/commit/e9af7b56539a2636d35691ffebecb16…

1 0

[kamailio/kamailio] dispatcher: added ping socket configuration (PR #4186)
by Michael Furmur 11 Apr '25

11 Apr '25

- add dispatcher modparam `ds_ping_socket` - add gateway param `ping_socket`   #### 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) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description could be useful for HA use cases where multiple kamailio nodes share a common Virtual IP (e.g.: managed by the VRRP). we need to route requests using Virtual IP socket configured with `ds_default_sockname`/`socket` and to perform destinations probing using self-IP socket configured with `ds_ping_socket`/`ping_socket`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4186 -- Commit Summary -- * dispatcher: added ping socket configuration -- File Changes -- M src/modules/dispatcher/dispatch.c (32) M src/modules/dispatcher/dispatch.h (2) M src/modules/dispatcher/dispatcher.c (25) M src/modules/dispatcher/doc/dispatcher_admin.xml (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4186.patch https://github.com/kamailio/kamailio/pull/4186.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4186 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4186(a)github.com>

3 5

git:master:1414fe8d: dispatcher: added ping socket configuration
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 1414fe8d97e138dd070fde1f85e1000770b12e1c URL: https://github.com/kamailio/kamailio/commit/1414fe8d97e138dd070fde1f85e1000… Author: Michael Furmur <furmur(a)pm.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:35:54+02:00 dispatcher: added ping socket configuration - new dispatcher modparam 'ds_ping_socket' - new gateway param 'ping_socket' --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1414fe8d97e138dd070fde1f85e1000… Patch: https://github.com/kamailio/kamailio/commit/1414fe8d97e138dd070fde1f85e1000…

1 0

[kamailio/kamailio] uac: fix memory corruption from shared tp being freed by another tran… (PR #4210)
by nickgashcc 11 Apr '25

11 Apr '25

…saction   #### 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  When the UAC is used to send an outbound REGISTER message to an endpoint and has an incorrect password resulting in all messages with or without an authorization header being responded to with a 401/407 it is possible and likely that shared memory will be corrupted resulting in core dumps. The response to the initial register calls into the uac modules uac_send_tm_callback where it generates the authorization constructs a a new request info that has a reference to the existing tp. As a result the 2 transactions and associated timers will have race conditions and ultimately can both attempt to deallocate the shared tp object in either uac_send_tm_callback or uac_resend_tm_callback. As a solution I use the existing clone function uac_r.cbp = (void *)uac_send_info_clone(tp); which allows each transaction to use and deallocate only their own copy. In addition to this a sanity check was also added around the to object where it was being used after a possible deallocation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4210 -- Commit Summary -- * uac: fix memory corruption from shared tp being freed by another transaction -- File Changes -- M src/modules/uac/uac_send.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4210.patch https://github.com/kamailio/kamailio/pull/4210.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4210 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4210(a)github.com>

2 1

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev