sr-dev February 2025

sr-dev@lists.kamailio.org

9 participants
163 discussions

[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

[kamailio/kamailio] dmq: added remove_inactive parameter (PR #4146)
by Viktor Litvinov 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 parameter for dmq module "remove_inactive" that controls removing nodes behavior. Default value is 1, so the behavior will not changed by default. This is useful especially with notification peers that are defined as dns record together with enabled multi_notify option. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4146 -- Commit Summary -- * dmq: added remove_inactive parameter -- File Changes -- M src/modules/dmq/dmq.c (2) M src/modules/dmq/dmq.h (1) M src/modules/dmq/doc/dmq_admin.xml (20) M src/modules/dmq/notification_peer.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4146.patch https://github.com/kamailio/kamailio/pull/4146.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4146 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4146(a)github.com>

2 2

git:master:bd62a2fc: dmq: added remove_inactive parameter
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: bd62a2fcd24eb038156c7d80c66e8d8c14e4e6a3 URL: https://github.com/kamailio/kamailio/commit/bd62a2fcd24eb038156c7d80c66e8d8… Author: Viktor Litvinov <viktor.litvinov(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T08:52:22+01:00 dmq: added remove_inactive parameter --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq.h Modified: src/modules/dmq/doc/dmq_admin.xml Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/bd62a2fcd24eb038156c7d80c66e8d8… Patch: https://github.com/kamailio/kamailio/commit/bd62a2fcd24eb038156c7d80c66e8d8… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 7c430ac0f53..5fc5f84c500 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -68,6 +68,7 @@ str dmq_notification_channel = str_init("notification_peer"); int dmq_multi_notify = 0; static sip_uri_t dmq_notification_uri = {0}; int dmq_ping_interval = 60; +int dmq_remove_inactive = 1; /* TM bind */ struct tm_binds _dmq_tmb = {0}; @@ -125,6 +126,7 @@ static param_export_t params[] = { {"notification_channel", PARAM_STR, &dmq_notification_channel}, {"multi_notify", PARAM_INT, &dmq_multi_notify}, {"worker_usleep", PARAM_INT, &dmq_worker_usleep}, + {"remove_inactive", PARAM_INT, &dmq_remove_inactive}, {0, 0, 0} }; diff --git a/src/modules/dmq/dmq.h b/src/modules/dmq/dmq.h index 6ebce766d40..cca70bc3266 100644 --- a/src/modules/dmq/dmq.h +++ b/src/modules/dmq/dmq.h @@ -50,6 +50,7 @@ extern str dmq_server_socket; extern sip_uri_t dmq_server_uri; extern str_list_t *dmq_notification_address_list; extern int dmq_multi_notify; +extern int dmq_remove_inactive; /* sl and tm */ extern struct tm_binds _dmq_tmb; extern sl_api_t _dmq_slb; diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index dade156af06..b75b43e8490 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -297,6 +297,26 @@ modparam("dmq", "ping_interval", 90) </programlisting> </example> </section> + <section id="dmq.p.remove_inactive"> + <title><varname>remove_inactive</varname>(int)</title> + <para> + A value of zero disable removing dmq nodes. Node status will be changed to pending. + A non-zero value (default is 1) enable removing nodes. + For node that is defined as notification address status will be changed to pending. + Otherwise it will be marked as disabled and then will be removed. + </para> + <para> + <emphasis>Default value is <quote>1</quote>.</emphasis> + </para> + <example> + <title>Set <varname>remove_inactive</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq", "remove_inactive", 0) +... +</programlisting> + </example> + </section> </section> <section> diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 0b8a41b3b91..7a88209a7b4 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -628,6 +628,11 @@ int notification_resp_callback_f( run_init_callbacks(); } } else if(code == 408) { + if(!dmq_remove_inactive) { + /* put the node in pending state */ + update_dmq_node_status(dmq_node_list, node, DMQ_NODE_PENDING); + return 0; + } /* TODO this probably do not work for dmq_multi_notify */ slp = dmq_notification_address_list; while(slp != NULL) {

1 0

[kamailio/kamailio] topos_htable: fix xtag and add more snprintf checks (PR #4133)
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 - [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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Few fixes to topos_htable module. To be backported in 6.0 branch. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4133 -- Commit Summary -- * topos_htable: fix xtag and add more snprintf checks -- File Changes -- M src/modules/topos_htable/topos_htable_storage.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4133.patch https://github.com/kamailio/kamailio/pull/4133.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4133 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4133(a)github.com>

2 3

git:master:e0e08846: topos_htable: fix xtag and add more snprintf checks
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: e0e0884627609804661082a1235f87a7bbb5e67a URL: https://github.com/kamailio/kamailio/commit/e0e0884627609804661082a1235f87a… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T08:47:15+01:00 topos_htable: fix xtag and add more snprintf checks --- Modified: src/modules/topos_htable/topos_htable_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e0e0884627609804661082a1235f87a… Patch: https://github.com/kamailio/kamailio/commit/e0e0884627609804661082a1235f87a… --- diff --git a/src/modules/topos_htable/topos_htable_storage.c b/src/modules/topos_htable/topos_htable_storage.c index 043652e5280..eec48ce7641 100644 --- a/src/modules/topos_htable/topos_htable_storage.c +++ b/src/modules/topos_htable/topos_htable_storage.c @@ -185,7 +185,7 @@ static int tps_htable_insert_initial_method_branch( } if(ret < 0 || ret >= TPS_HTABLE_SIZE_VAL) { - LM_ERR("failed to build htable value\n"); + LM_ERR("failed to build htable val\n"); return -1; } @@ -758,7 +758,7 @@ static int tps_htable_insert_dialog_helper(tps_data_t *td, int set_expire) td->a_uuid.len, td->a_uuid.s) : snprintf(ptr, TPS_HTABLE_SIZE_KEY, "%.*s", td->b_uuid.len, td->b_uuid.s); - if(ret < 0) { + if(ret < 0 || ret >= TPS_HTABLE_SIZE_KEY) { LM_ERR("failed to build htable key\n"); return -1; } @@ -771,6 +771,11 @@ static int tps_htable_insert_dialog_helper(tps_data_t *td, int set_expire) ret = snprintf(ptr, TPS_HTABLE_SIZE_KEY, "%s", _tps_base64_buf[0]); } + if(ret < 0 || ret >= TPS_HTABLE_SIZE_KEY) { + LM_ERR("failed to build htable key\n"); + return -1; + } + // build val rectime = (unsigned long)time(NULL); @@ -849,7 +854,7 @@ static int tps_htable_insert_dialog_helper(tps_data_t *td, int set_expire) td->x_context.s); } - if(ret < 0) { + if(ret < 0 || ret >= TPS_HTABLE_SIZE_VAL) { LM_ERR("failed to build htable val\n"); return -1; } @@ -919,7 +924,7 @@ int tps_htable_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) md->a_uuid.len, md->a_uuid.s) : snprintf(ptr, TPS_HTABLE_SIZE_KEY, "%.*s", md->b_uuid.len, md->b_uuid.s); - if(ret < 0) { + if(ret < 0 || ret >= TPS_HTABLE_SIZE_KEY) { LM_ERR("failed to build htable key\n"); return -1; } @@ -931,6 +936,10 @@ int tps_htable_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) _tps_base64_buf[0], TPS_BASE64_SIZE - 1); ret = snprintf(ptr, TPS_HTABLE_SIZE_KEY, "%s", _tps_base64_buf[0]); } + if(ret < 0 || ret >= TPS_HTABLE_SIZE_KEY) { + LM_ERR("failed to build htable key\n"); + return -1; + } hkey.s = _tps_htable_key_buf; hkey.len = strlen(_tps_htable_key_buf); @@ -1190,7 +1199,7 @@ int tps_htable_end_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) sd->a_uuid.len, sd->a_uuid.s) : snprintf(ptr, TPS_HTABLE_SIZE_KEY, "%.*s", sd->b_uuid.len, sd->b_uuid.s); - if(ret < 0) { + if(ret < 0 || ret >= TPS_HTABLE_SIZE_KEY) { LM_ERR("failed to build htable key\n"); return -1; } @@ -1202,6 +1211,10 @@ int tps_htable_end_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) _tps_base64_buf[0], TPS_BASE64_SIZE - 1); ret = snprintf(ptr, TPS_HTABLE_SIZE_KEY, "%s", _tps_base64_buf[0]); } + if(ret < 0 || ret >= TPS_HTABLE_SIZE_KEY) { + LM_ERR("failed to build htable key\n"); + return -1; + } // dialog ended -- keep it for branch lifetime only

1 0

← Newer
1
2
3
4
5
6
7
8
...
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