sr-dev

sr-dev@lists.kamailio.org

7 participants
44581 discussions

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

[kamailio/kamailio] rtpengine: fix race condn (same ip:port) in parallel forks due to gencookie (PR #4139)
by Souradeep Bera 21 Feb '25

21 Feb '25

- avoid parallel calls to gencookie from generating the same cookie for rtpengine #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4139 -- Commit Summary -- * rtpengine: fix race condn assigning same ip:port due to gencookie in parallel forks -- File Changes -- M src/modules/rtpengine/rtpengine.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4139.patch https://github.com/kamailio/kamailio/pull/4139.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4139 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4139(a)github.com>

3 3

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

21 Feb '25

Module: kamailio Branch: master Commit: c67afd6ba65c612125b13ea9f264657a532f7396 URL: https://github.com/kamailio/kamailio/commit/c67afd6ba65c612125b13ea9f264657… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-02-21T08:46:10+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/c67afd6ba65c612125b13ea9f264657… Patch: https://github.com/kamailio/kamailio/commit/c67afd6ba65c612125b13ea9f264657…

1 0

[kamailio/kamailio] dispatcher: skip ping for DS_NODNSARES_DST (PR #4150)
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  Dispatcher timer regularly pings the nodes. Should skip resolving and pinging the no-dns-A flag ones since those node do not have an A record by definition. Otherwise that no-dns-A flag(state) is overwritten by the pinging process. This leads to node removal from group, after RPC commands e.g. "kamcmd dispatcher.add/remove". You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4150 -- Commit Summary -- * dispatcher: skip ping for DS_NODNSARES_DST -- File Changes -- M src/modules/dispatcher/dispatch.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4150.patch https://github.com/kamailio/kamailio/pull/4150.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4150 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4150(a)github.com>

2 2

git:master:5f29b449: dispatcher: skip ping for DS_NODNSARES_DST
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: 5f29b4491634c360ade5691977d622617ae014ad URL: https://github.com/kamailio/kamailio/commit/5f29b4491634c360ade5691977d6226… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T08:44:12+01:00 dispatcher: skip ping for DS_NODNSARES_DST --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/5f29b4491634c360ade5691977d6226… Patch: https://github.com/kamailio/kamailio/commit/5f29b4491634c360ade5691977d6226… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9968eab5537..fb0e233df7c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -4114,6 +4114,9 @@ void ds_ping_set(ds_set_t *node) /* skip addresses with no-ping flag */ if((node->dlist[j].flags & DS_NOPING_DST) != 0) continue; + /* skip addresses with no-DNS-A flag */ + if((node->dlist[j].flags & DS_NODNSARES_DST) != 0) + continue; /* If the Flag of the entry has "Probing set, send a probe: */ if(ds_ping_result_helper(node, j)) { LM_DBG("probing set #%d, URI %.*s\n", node->id,

1 0

[kamailio/kamailio] nathelper: Add modparam to not send ping to Path (PR #4152)
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  OPTIONS ping is always sent to Path uri, if contact has it set. Add option to ignore this and still send OPTIONS to contact. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4152 -- Commit Summary -- * nathelper: Add modparam to not send ping to Path -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (20) M src/modules/nathelper/nathelper.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4152.patch https://github.com/kamailio/kamailio/pull/4152.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4152 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4152(a)github.com>

2 2

← Newer
1
...
8
9
10
11
12
13
14
...
4459
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev