sr-dev February 2025

sr-dev@lists.kamailio.org

9 participants
169 discussions

[kamailio/kamailio] Wrong Route header order in called party re-INVITE when using topos (Issue #3778)
by Javi Montoro 24 Feb '25

24 Feb '25

Hi There, We found a situation where topos seems to break, let me explain... Assuming the following scenario: ``` Caller ---- Callee A: ------INVITE-----> Record-Route:A.A.A.A, Record-Route:B.B.B.B B: <-----200 OK------ C: <-----INVITE------ Route: A.A.A.A, B.B.B.B D: ------200 OK-----> Record-Route:B.B.B.B, Record-Route:A.A.A.A (reversed order) E: <======INVITE===== Route: B.B.B.B, A.A.A.A (wrong) ``` A and B establish the connection from caller to callee, and topos works fine. C (re-INVITE from callee) sends the Route header according to the Record-Routes from the original INVITE (A) D is the 200 OK sent from the caller to the first re-INVITE (C) coming from the callee, with the Record-Route headers reversed, because is the order in which the callee received them; and according to the RFC it's working as intended: ``` When a UAS responds to a request with a response that establishes a dialog (such as a 2xx to INVITE), the UAS MUST copy all Record-Route header field values from the request into the response (including the URIs, URI parameters, and any Record-Route header field parameters, whether they are known or unknown to the UAS) and MUST maintain the order of those values. [...] [When a UAC receives a response...] The route set MUST be set to the list of URIs in the Record-Route header field from the response, taken in reverse order and preserving all URI parameters. ``` E takes the Route order from the last 200 OK ignoring they are in reversed order and assuming the top one is the first one, when it should be the other way around, sending to an IP address not reachable from the callee. And I think here is the issue, topos should not update the path on the Record-Routes from a 200 OK but if it does, it should take the reverse order When disabling topos, everything works fine, or with topos enabled, by setting rr_update=0 works for us, but what if there is a real path update, rr_update=0 wouldn't work for us anymore. The Kamailio version is 5.8.0-rc0 Let me know if you need more information. Thanks a lot, Javi -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3778 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3778(a)github.com>

5 16

git:master:2b1ca781: dialog: fixed DLG_FLAG_CHANGED_PROF value and setting DLG_FLAG_DEL
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: 2b1ca7813cf5014553c807c1a5034c404b3685a5 URL: https://github.com/kamailio/kamailio/commit/2b1ca7813cf5014553c807c1a5034c4… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T10:49:47+01:00 dialog: fixed DLG_FLAG_CHANGED_PROF value and setting DLG_FLAG_DEL - GH #4151 --- Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/2b1ca7813cf5014553c807c1a5034c4… Patch: https://github.com/kamailio/kamailio/commit/2b1ca7813cf5014553c807c1a5034c4… --- diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index 804b736b4ee..5d19841465a 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -70,7 +70,7 @@ #define DLG_FLAG_TM (1 << 9) /*!< dialog is set in transaction */ #define DLG_FLAG_EXPIRED (1 << 10) /*!< dialog is expired */ -#define DLG_FLAG_CHANGED_PROF (1 << 10) /*!< dialog-profiles changed DMQ*/ +#define DLG_FLAG_CHANGED_PROF (1 << 11) /*!< dialog-profiles changed - DMQ */ #define DLG_FLAG_DB_LOAD_EXTRA (1 << 12) /*!< dialog loaded extra from db */ /* internal flags stored in db */ diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index db5f61c4e05..3368728297c 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -197,8 +197,8 @@ int set_dlg_variable_unsafe(struct dlg_cell *dlg, str *key, str *val) it_prev->next = it->next; else *var_list = it->next; - /* Set the delete-flag for the current var: */ - it->vflags &= DLG_FLAG_DEL; + /* set the delete-flag for the current var */ + it->vflags |= DLG_FLAG_DEL; } else { /* replace the current it with var and free the it */ var->next = it->next;

1 0

git:master:3b213f1d: dialog: get vars via value instead of reference for kemi functions
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: 3b213f1d008656682f1733d59f6c3bacd474c4b9 URL: https://github.com/kamailio/kamailio/commit/3b213f1d008656682f1733d59f6c3ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T10:49:47+01:00 dialog: get vars via value instead of reference for kemi functions - do lock/unlock - GH #4151 --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/3b213f1d008656682f1733d59f6c3ba… Patch: https://github.com/kamailio/kamailio/commit/3b213f1d008656682f1733d59f6c3ba… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 6871cc960e3..382941c9925 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1852,32 +1852,36 @@ static int fixup_dlg_bridge(void **param, int param_no) return 0; } -static str *ki_dlg_get_var_helper( - sip_msg_t *msg, str *sc, str *sf, str *st, str *key) +static int ki_dlg_get_var_helper( + sip_msg_t *msg, str *sc, str *sf, str *st, str *key, str *val) { dlg_cell_t *dlg = NULL; unsigned int dir = 0; - str *val = NULL; if(sc == NULL || sc->s == NULL || sc->len == 0) { LM_ERR("invalid Call-ID parameter\n"); - return val; + return -1; } if(sf == NULL || sf->s == NULL || sf->len == 0) { LM_ERR("invalid From tag parameter\n"); - return val; + return -1; } if(st == NULL) { LM_ERR("invalid To tag parameter\n"); - return val; + return -1; } dlg = get_dlg(sc, sf, st, &dir); - if(dlg == NULL) - return val; - val = get_dlg_varref(dlg, key); + if(dlg == NULL) { + LM_DBG("dialog not found for call-id: %.*s\n", sc->len, sc->s); + return -1; + } + if(get_dlg_varval(dlg, key, val) != 0) { + dlg_release(dlg); + return -1; + } dlg_release(dlg); - return val; + return 0; } /** @@ -1888,18 +1892,15 @@ static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; static sr_kemi_xval_t *ki_dlg_get_var( sip_msg_t *msg, str *sc, str *sf, str *st, str *key) { - str *val = NULL; - memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); - val = ki_dlg_get_var_helper(msg, sc, sf, st, key); - if(!val) { + if(ki_dlg_get_var_helper(msg, sc, sf, st, key, &_sr_kemi_dialog_xval.v.s) + < 0) { sr_kemi_xval_null(&_sr_kemi_dialog_xval, SR_KEMI_XVAL_NULL_NONE); return &_sr_kemi_dialog_xval; } _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; - _sr_kemi_dialog_xval.v.s = *val; return &_sr_kemi_dialog_xval; } @@ -2504,8 +2505,12 @@ static int ki_dlg_var_sets(sip_msg_t *msg, str *name, str *val) int ret; dlg = dlg_get_msg_dialog(msg); + if(dlg) { + dlg_cell_lock(dlg); + } ret = set_dlg_variable_unsafe(dlg, name, val); if(dlg) { + dlg_cell_unlock(dlg); dlg_release(dlg); } @@ -2518,7 +2523,6 @@ static int ki_dlg_var_sets(sip_msg_t *msg, str *name, str *val) static sr_kemi_xval_t *ki_dlg_var_get_mode(sip_msg_t *msg, str *name, int rmode) { dlg_cell_t *dlg; - str *pval; memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); @@ -2527,14 +2531,12 @@ static sr_kemi_xval_t *ki_dlg_var_get_mode(sip_msg_t *msg, str *name, int rmode) sr_kemi_xval_null(&_sr_kemi_dialog_xval, rmode); return &_sr_kemi_dialog_xval; } - pval = get_dlg_varref(dlg, name); - if(pval == NULL || pval->s == NULL) { + if(get_dlg_varval(dlg, name, &_sr_kemi_dialog_xval.v.s) < 0) { sr_kemi_xval_null(&_sr_kemi_dialog_xval, rmode); goto done; } _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; - _sr_kemi_dialog_xval.v.s = *pval; done: dlg_release(dlg); @@ -2572,7 +2574,12 @@ static int ki_dlg_var_rm(sip_msg_t *msg, str *name) dlg_cell_t *dlg; dlg = dlg_get_msg_dialog(msg); - set_dlg_variable_unsafe(dlg, name, NULL); + if(dlg) { + dlg_cell_lock(dlg); + set_dlg_variable_unsafe(dlg, name, NULL); + dlg_cell_unlock(dlg); + dlg_release(dlg); + } return 1; }

1 0

git:master:862a0f5f: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: 862a0f5fa50ad2d6f97078e3d856f6379e53ff1d URL: https://github.com/kamailio/kamailio/commit/862a0f5fa50ad2d6f97078e3d856f63… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-02-21T09:01:09+01:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README Modified: src/modules/dmq_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/862a0f5fa50ad2d6f97078e3d856f63… Patch: https://github.com/kamailio/kamailio/commit/862a0f5fa50ad2d6f97078e3d856f63…

1 0

[kamailio/kamailio] dmq and dmq_usrloc additions (PR #4134)
by Stefan Mititelu 21 Feb '25

21 Feb '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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add new api function to dmq to get local socket. Use that in dmq_usrloc. Sync dmq_usrloc UL_CONTACT_EXPIRE. Very useful for lost TCP connections, so contacts will be expired on all dmq nodes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4134 -- Commit Summary -- * dmq: add new api function * dmq_usrloc: new value for replicate_socket_info * dmq_usrloc: add new modparam to sync UL_CONTACT_EXPIRE actions -- File Changes -- M src/modules/dmq/bind_dmq.c (1) M src/modules/dmq/bind_dmq.h (2) M src/modules/dmq/dmq_funcs.c (5) M src/modules/dmq/dmq_funcs.h (1) M src/modules/dmq_usrloc/dmq_usrloc.c (3) M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (26) M src/modules/dmq_usrloc/usrloc_sync.c (22) M src/modules/dmq_usrloc/usrloc_sync.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4134.patch https://github.com/kamailio/kamailio/pull/4134.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4134 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4134(a)github.com>

2 4

git:master:f9b503b3: dmq_usrloc: warn log when no dmq module server socket found
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: f9b503b35758b9f0f261ebf7e83ffbbe1d537f9f URL: https://github.com/kamailio/kamailio/commit/f9b503b35758b9f0f261ebf7e83ffbb… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T08:53:34+01:00 dmq_usrloc: warn log when no dmq module server socket found --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/f9b503b35758b9f0f261ebf7e83ffbb… Patch: https://github.com/kamailio/kamailio/commit/f9b503b35758b9f0f261ebf7e83ffbb… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 1760616aed5..87e151b4fa3 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -317,7 +317,7 @@ int usrloc_dmq_initialize() dmq_server_socket = usrloc_dmqb.get_dmq_server_socket(); dmq_server_socket_local = lookup_local_socket(&dmq_server_socket); if(dmq_server_socket_local == 0) { - LM_DBG("dmq local server socket <%.*s> not found ...ignoring\n", + LM_WARN("dmq local server socket <%.*s> not found ...ignoring\n", dmq_server_socket.len, dmq_server_socket.s); }

1 0

git:master:a83ec388: dmq_usrloc: add modparam for cflags replication
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: a83ec38863fca0473685b81f708938660a08da81 URL: https://github.com/kamailio/kamailio/commit/a83ec38863fca0473685b81f7089386… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T08:53:34+01:00 dmq_usrloc: add modparam for cflags replication --- Modified: src/modules/dmq_usrloc/dmq_usrloc.c Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/a83ec38863fca0473685b81f7089386… Patch: https://github.com/kamailio/kamailio/commit/a83ec38863fca0473685b81f7089386… --- diff --git a/src/modules/dmq_usrloc/dmq_usrloc.c b/src/modules/dmq_usrloc/dmq_usrloc.c index 8c4544b1633..a568d3d3148 100644 --- a/src/modules/dmq_usrloc/dmq_usrloc.c +++ b/src/modules/dmq_usrloc/dmq_usrloc.c @@ -37,6 +37,7 @@ static int child_init(int); int dmq_usrloc_enable = 0; int _dmq_usrloc_sync = 1; int _dmq_usrloc_replicate_socket_info = 0; +int _dmq_usrloc_replicate_cflags = 1; int _dmq_usrloc_batch_size = 0; int _dmq_usrloc_batch_msg_contacts = 1; int _dmq_usrloc_batch_msg_size = 60000; @@ -54,6 +55,7 @@ static param_export_t params[] = { {"enable", PARAM_INT, &dmq_usrloc_enable}, {"sync", PARAM_INT, &_dmq_usrloc_sync}, {"replicate_socket_info", PARAM_INT, &_dmq_usrloc_replicate_socket_info}, + {"replicate_cflags", PARAM_INT, &_dmq_usrloc_replicate_cflags}, {"batch_msg_contacts", PARAM_INT, &_dmq_usrloc_batch_msg_contacts}, {"batch_msg_size", PARAM_INT, &_dmq_usrloc_batch_msg_size}, {"batch_size", PARAM_INT, &_dmq_usrloc_batch_size}, diff --git a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index ff612b32eda..5d6727b5c83 100644 --- a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -292,6 +292,44 @@ modparam("dmq_usrloc", "replicate_socket_info", 1) </programlisting> </example> </section> + <section id="usrloc_dmq.p.replicate_cflags"> + <title><varname>replicate_cflags</varname> (int)</title> + <para> + The parameter controls whether the cflags replication is active or not. + This is important for anycast scenarios. + The value can be: + <itemizedlist> + <listitem> + <para> + 0 - disabled + </para> + </listitem> + <listitem> + <para> + 1 - enabled, replicate cflags + </para> + </listitem> + <listitem> + <para> + > 1 - enabled, set cflags corresponding to this value, on replicated peers + </para> + </listitem> + </itemizedlist> + </para> + <para> + <emphasis> + Default value is 1. + </emphasis> + </para> + <example> + <title>Set <varname>replicate_cflags</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq_usrloc", "replicate_cflags", 97) # will set cflags corresponding to 1 + 32 + 64 +... + </programlisting> + </example> + </section> <section id="usrloc_dmq.p.usrloc_delete"> <title><varname>usrloc_delete</varname> (int)</title> <para> diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 73017c52877..1760616aed5 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -60,6 +60,7 @@ static void srjson_to_xavp(srjson_t *json, sr_xavp_t **xavp); extern int _dmq_usrloc_sync; extern int _dmq_usrloc_replicate_socket_info; +extern int _dmq_usrloc_replicate_cflags; extern int _dmq_usrloc_batch_msg_contacts; extern int _dmq_usrloc_batch_msg_size; extern int _dmq_usrloc_batch_size; @@ -421,7 +422,12 @@ static int usrloc_dmq_execute_action(srjson_t *jdoc_action, dmq_node_t *node) } else if(strcmp(it->string, "flags") == 0) { flags = SRJSON_GET_UINT(it); } else if(strcmp(it->string, "cflags") == 0) { - cflags = SRJSON_GET_UINT(it); + if(_dmq_usrloc_replicate_cflags == 1) { + cflags = SRJSON_GET_UINT(it); + } else if(_dmq_usrloc_replicate_cflags > 1) { + cflags = _dmq_usrloc_replicate_cflags; + } + // else don't replicate cflags } else if(strcmp(it->string, "q") == 0) { q = SRJSON_GET_UINT(it); } else if(strcmp(it->string, "last_modified") == 0) {

1 0

git:master:2a1bd40c: dmq_usrloc: add new modparam to sync UL_CONTACT_EXPIRE actions
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: 2a1bd40c0264a600107c653e5803760d7173bdc2 URL: https://github.com/kamailio/kamailio/commit/2a1bd40c0264a600107c653e5803760… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T08:53:34+01:00 dmq_usrloc: add new modparam to sync UL_CONTACT_EXPIRE actions --- Modified: src/modules/dmq_usrloc/dmq_usrloc.c Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/2a1bd40c0264a600107c653e5803760… Patch: https://github.com/kamailio/kamailio/commit/2a1bd40c0264a600107c653e5803760… --- diff --git a/src/modules/dmq_usrloc/dmq_usrloc.c b/src/modules/dmq_usrloc/dmq_usrloc.c index 98f3b222728..8c4544b1633 100644 --- a/src/modules/dmq_usrloc/dmq_usrloc.c +++ b/src/modules/dmq_usrloc/dmq_usrloc.c @@ -43,6 +43,7 @@ int _dmq_usrloc_batch_msg_size = 60000; int _dmq_usrloc_batch_usleep = 0; str _dmq_usrloc_domain = str_init("location"); int _dmq_usrloc_delete = 1; +int _dmq_usrloc_delete_expired = 0; usrloc_api_t dmq_ul; @@ -59,6 +60,7 @@ static param_export_t params[] = { {"batch_usleep", PARAM_INT, &_dmq_usrloc_batch_usleep}, {"usrloc_domain", PARAM_STR, &_dmq_usrloc_domain}, {"usrloc_delete", PARAM_INT, &_dmq_usrloc_delete}, + {"usrloc_delete_expired", PARAM_INT, &_dmq_usrloc_delete_expired}, {0, 0, 0} }; @@ -116,6 +118,7 @@ static int mod_init(void) LM_ERR("Error in dmq_usrloc_initialize()\n"); } } + return 0; } diff --git a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index b94947e2c77..ff612b32eda 100644 --- a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -303,11 +303,30 @@ modparam("dmq_usrloc", "replicate_socket_info", 1) </emphasis> </para> <example> - <title>Set <varname>usrloc_domain</varname> parameter</title> + <title>Set <varname>usrloc_delete</varname> parameter</title> <programlisting format="linespecific"> ... modparam("dmq_usrloc", "usrloc_delete", 0) ... +</programlisting> + </example> + </section> + <section id="usrloc_dmq.p.usrloc_delete_expired"> + <title><varname>usrloc_delete_expired</varname> (int)</title> + <para> + Enable (1) or disable (0) synchronizing usrloc expire actions using delete actions. In other words, sync delete of (UL_CONTACT_EXPIRE) expired contacts. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>usrloc_delete_expired</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq_usrloc", "usrloc_delete_expired", 1) +... </programlisting> </example> </section> diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 00cf877e64b..73017c52877 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -66,6 +66,7 @@ extern int _dmq_usrloc_batch_size; extern int _dmq_usrloc_batch_usleep; extern str _dmq_usrloc_domain; extern int _dmq_usrloc_delete; +extern int _dmq_usrloc_delete_expired; static int add_contact(str aor, ucontact_info_t *ci) { @@ -1043,7 +1044,9 @@ void dmq_ul_cb_contact(ucontact_t *ptr, int type, void *param) } break; case UL_CONTACT_EXPIRE: - //usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE); + if(_dmq_usrloc_delete_expired >= 1) { + usrloc_dmq_send_contact(ptr, aor, DMQ_RM, 0); + } LM_DBG("Contact <%.*s> expired\n", aor.len, aor.s); break; }

1 0

git:master:7d4cd4ca: dmq_usrloc: new value for replicate_socket_info
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: 7d4cd4cac82815c44fafa465efb8f15c51d64810 URL: https://github.com/kamailio/kamailio/commit/7d4cd4cac82815c44fafa465efb8f15… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T08:53:34+01:00 dmq_usrloc: new value for replicate_socket_info To always use local dmq server_socket in "Socket:" field of replicated contacts. --- Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml Modified: src/modules/dmq_usrloc/usrloc_sync.c Modified: src/modules/dmq_usrloc/usrloc_sync.h --- Diff: https://github.com/kamailio/kamailio/commit/7d4cd4cac82815c44fafa465efb8f15… Patch: https://github.com/kamailio/kamailio/commit/7d4cd4cac82815c44fafa465efb8f15… --- diff --git a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index cd1b5279d86..b94947e2c77 100644 --- a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -271,6 +271,11 @@ modparam("dmq_usrloc", "usrloc_domain", "my_domain") 2 - enabled, replicate socket by socket name </para> </listitem> + <listitem> + <para> + 3 - enabled, use local socket from dmq server_socket modparam + </para> + </listitem> </itemizedlist> </para> <para> diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index ab134872d93..00cf877e64b 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -38,6 +38,7 @@ static str dmq_400_rpl = str_init("Bad Request"); static str dmq_500_rpl = str_init("Server Internal Error"); static int *usrloc_dmq_recv = 0; +static struct socket_info *dmq_server_socket_local = 0; dmq_api_t usrloc_dmqb; dmq_peer_t *usrloc_dmq_peer = NULL; @@ -287,6 +288,7 @@ void usrloc_get_all_ucontact(dmq_node_t *node) int usrloc_dmq_initialize() { dmq_peer_t not_peer; + str dmq_server_socket; /* load the DMQ API */ if(dmq_load_api(&usrloc_dmqb) != 0) { @@ -308,6 +310,15 @@ int usrloc_dmq_initialize() } else { LM_DBG("dmq peer registered\n"); } + + /* get local socket from DMQ API */ + dmq_server_socket = usrloc_dmqb.get_dmq_server_socket(); + dmq_server_socket_local = lookup_local_socket(&dmq_server_socket); + if(dmq_server_socket_local == 0) { + LM_DBG("dmq local server socket <%.*s> not found ...ignoring\n", + dmq_server_socket.len, dmq_server_socket.s); + } + return 0; error: return -1; @@ -430,8 +441,10 @@ static int usrloc_dmq_execute_action(srjson_t *jdoc_action, dmq_node_t *node) ci.ruid = ruid; ci.c = &c; ci.received = received; - if(_dmq_usrloc_replicate_socket_info - & (DMQ_USRLOC_REPLICATE_SOCKET | DMQ_USRLOC_REPLICATE_SOCKNAME)) + if(_dmq_usrloc_replicate_socket_info == DMQ_USRLOC_REPLICATE_SOCKET_LOCAL) { + sock = dmq_server_socket_local; + } + if(_dmq_usrloc_replicate_socket_info != 0) ci.sock = sock; ci.path = &path; ci.expires = expires; diff --git a/src/modules/dmq_usrloc/usrloc_sync.h b/src/modules/dmq_usrloc/usrloc_sync.h index cb55f3bb344..85cfc27e414 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.h +++ b/src/modules/dmq_usrloc/usrloc_sync.h @@ -31,6 +31,7 @@ #define DMQ_USRLOC_REPLICATE_SOCKET 1 #define DMQ_USRLOC_REPLICATE_SOCKNAME 2 +#define DMQ_USRLOC_REPLICATE_SOCKET_LOCAL 3 extern usrloc_api_t dmq_ul;

1 0

git:master:e1fef001: dmq: add new api function
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: e1fef0016d6162c4177c0d05cefdf0546685d183 URL: https://github.com/kamailio/kamailio/commit/e1fef0016d6162c4177c0d05cefdf05… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T08:53:34+01:00 dmq: add new api function To return the dmq local server socket address. --- Modified: src/modules/dmq/bind_dmq.c Modified: src/modules/dmq/bind_dmq.h Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmq_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/e1fef0016d6162c4177c0d05cefdf05… Patch: https://github.com/kamailio/kamailio/commit/e1fef0016d6162c4177c0d05cefdf05… --- diff --git a/src/modules/dmq/bind_dmq.c b/src/modules/dmq/bind_dmq.c index ea38d982503..a0cdaeada20 100644 --- a/src/modules/dmq/bind_dmq.c +++ b/src/modules/dmq/bind_dmq.c @@ -37,5 +37,6 @@ int bind_dmq(dmq_api_t *api) api->send_message = dmq_send_message; api->bcast_message = bcast_dmq_message; api->find_dmq_node_uri = find_dmq_node_uri2; + api->get_dmq_server_socket = get_dmq_server_socket; return 0; } diff --git a/src/modules/dmq/bind_dmq.h b/src/modules/dmq/bind_dmq.h index a946718fa11..f6b7a378d14 100644 --- a/src/modules/dmq/bind_dmq.h +++ b/src/modules/dmq/bind_dmq.h @@ -36,6 +36,7 @@ typedef int (*bcast_message_t)(dmq_peer_t *peer, str *body, dmq_node_t *except, typedef int (*send_message_t)(dmq_peer_t *peer, str *body, dmq_node_t *node, dmq_resp_cback_t *resp_cback, int max_forwards, str *content_type); typedef dmq_node_t *(*find_dmq_node_uri_t)(str *uri); +typedef str (*get_dmq_server_socket_t)(); typedef struct dmq_api { @@ -43,6 +44,7 @@ typedef struct dmq_api bcast_message_t bcast_message; send_message_t send_message; find_dmq_node_uri_t find_dmq_node_uri; + get_dmq_server_socket_t get_dmq_server_socket; } dmq_api_t; typedef int (*bind_dmq_f)(dmq_api_t *api); diff --git a/src/modules/dmq/dmq_funcs.c b/src/modules/dmq/dmq_funcs.c index a5ba3b4866c..52d0d6bbc18 100644 --- a/src/modules/dmq/dmq_funcs.c +++ b/src/modules/dmq/dmq_funcs.c @@ -566,3 +566,8 @@ void ping_servers(unsigned int ticks, void *param) LM_ERR("error broadcasting message\n"); } } + +str get_dmq_server_socket() +{ + return dmq_server_socket; +} diff --git a/src/modules/dmq/dmq_funcs.h b/src/modules/dmq/dmq_funcs.h index 3f04a860f9f..ba8688d361f 100644 --- a/src/modules/dmq/dmq_funcs.h +++ b/src/modules/dmq/dmq_funcs.h @@ -70,5 +70,6 @@ int ki_dmq_bcast_message( int is_from_remote_node(sip_msg_t *msg); int ki_dmq_t_replicate(struct sip_msg *msg); int ki_dmq_t_replicate_mode(struct sip_msg *msg, int mode); +str get_dmq_server_socket(); #endif

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2025