sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

git:master:79f32918: permissions: add note about RPC reload limit
by Victor Seva 05 Nov '20

05 Nov '20

Module: kamailio Branch: master Commit: 79f329189be9b73bbb923ee84870255869cff12f URL: https://github.com/kamailio/kamailio/commit/79f329189be9b73bbb923ee84870255… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-11-05T11:45:11+01:00 permissions: add note about RPC reload limit --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/79f329189be9b73bbb923ee84870255… Patch: https://github.com/kamailio/kamailio/commit/79f329189be9b73bbb923ee84870255… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 170f197f14..adca339d77 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -1278,6 +1278,8 @@ if (allow_trusted("$si", "any", "$ai")) { different tables: address table and subnet table depending on the value of the mask field (IPv6: 64 or smaller, IPv4: 32 or smaller). + Note that there is a rate limiting of maximum one reload in + five seconds. </para> <para>Parameters: <emphasis>none</emphasis></para> </section> @@ -1359,6 +1361,8 @@ if (allow_trusted("$si", "any", "$ai")) { <para> Causes the permissions module to re-read the contents of the trusted database table into cache memory. + Note that there is a rate limiting of maximum one reload in + five seconds. </para> <para>Parameters: <emphasis>none</emphasis></para> </section>

1 0

git:master:c87f5202: permissions: basic safety for concurrent RPC reload
by Victor Seva 05 Nov '20

05 Nov '20

Module: kamailio Branch: master Commit: c87f5202d778cf110ce0fbbc554310c148e997cb URL: https://github.com/kamailio/kamailio/commit/c87f5202d778cf110ce0fbbc554310c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-11-05T11:40:58+01:00 permissions: basic safety for concurrent RPC reload * same logic as 99d5da8d595961063249f871a5d150474fa6f317 --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h Modified: src/modules/permissions/rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/c87f5202d778cf110ce0fbbc554310c… Patch: https://github.com/kamailio/kamailio/commit/c87f5202d778cf110ce0fbbc554310c… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index be22963d81..7e447d14d2 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -88,7 +88,7 @@ str perm_address_file = STR_NULL; /* Full path to file with address records */ static int perm_check_all_branches = 1; - +time_t *perm_rpc_reload_time = NULL; int _perm_max_subnets = 512; int _perm_load_backends = 0xFFFF; @@ -587,6 +587,13 @@ static int mod_init(void) return -1; } + perm_rpc_reload_time = shm_malloc(sizeof(time_t)); + if(perm_rpc_reload_time == NULL) { + SHM_MEM_ERROR; + return -1; + } + *perm_rpc_reload_time = 0; + if(permissions_init_rpc()!=0) { LM_ERR("failed to register RPC commands\n"); return -1; @@ -674,6 +681,11 @@ static void mod_exit(void) { int i; + if(perm_rpc_reload_time!=NULL) { + shm_free(perm_rpc_reload_time); + perm_rpc_reload_time = 0; + } + for(i = 0; i < perm_rules_num; i++) { if(perm_allow[i].rules) free_rule(perm_allow[i].rules); if(perm_allow[i].filename) pkg_free(perm_allow[i].filename); diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h index 785d6c94de..c094185626 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -66,6 +66,7 @@ extern int perm_peer_tag_mode; /* Matching mode */ #define PERM_LOAD_ALLOWFILE (1<<2) #define PERM_LOAD_DENYFILE (1<<3) extern int _perm_load_backends; /* */ +extern time_t *perm_rpc_reload_time; typedef struct int_or_pvar { unsigned int i; diff --git a/src/modules/permissions/rpc.c b/src/modules/permissions/rpc.c index 844cdec674..b6a6f9a420 100644 --- a/src/modules/permissions/rpc.c +++ b/src/modules/permissions/rpc.c @@ -30,10 +30,30 @@ #include "permissions.h" +int rpc_check_reload(rpc_t* rpc, void* ctx) { + if(perm_rpc_reload_time==NULL) { + LM_ERR("not ready for reload\n"); + rpc->fault(ctx, 500, "Not ready for reload"); + return -1; + } + if(*perm_rpc_reload_time!=0 && *perm_rpc_reload_time > time(NULL) - 5) { + LM_ERR("ongoing reload\n"); + rpc->fault(ctx, 500, "ongoing reload"); + return -1; + } + *perm_rpc_reload_time = time(NULL); + return 0; +} + /*! \brief * RPC function to reload trusted table */ void rpc_trusted_reload(rpc_t* rpc, void* c) { + + if(rpc_check_reload(rpc, c) < 0) { + return; + } + if (reload_trusted_table_cmd () != 1) { rpc->fault(c, 500, "Reload failed."); return; @@ -67,6 +87,11 @@ void rpc_trusted_dump(rpc_t* rpc, void* c) { * RPC function to reload address table */ void rpc_address_reload(rpc_t* rpc, void* c) { + + if(rpc_check_reload(rpc, c) < 0) { + return; + } + if (reload_address_table_cmd () != 1) { rpc->fault(c, 500, "Reload failed."); return;

1 0

git:master:d0cb5a6e: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 04 Nov '20

04 Nov '20

Module: kamailio Branch: master Commit: d0cb5a6ecf6cb3962e45f28926f4361a64ca613a URL: https://github.com/kamailio/kamailio/commit/d0cb5a6ecf6cb3962e45f28926f4361… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-04T13:01:16+01:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/d0cb5a6ecf6cb3962e45f28926f4361… Patch: https://github.com/kamailio/kamailio/commit/d0cb5a6ecf6cb3962e45f28926f4361…

1 0

git:master:7b70dcb2: dmq: docs - more details about functionality
by Daniel-Constantin Mierla 04 Nov '20

04 Nov '20

Module: kamailio Branch: master Commit: 7b70dcb291f290e6b563fb7baef4df9fc8116a1b URL: https://github.com/kamailio/kamailio/commit/7b70dcb291f290e6b563fb7baef4df9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T12:48:48+01:00 dmq: docs - more details about functionality - use of standard channel term, similar to other distributed message queues - docs for notifications_channel new parameter --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7b70dcb291f290e6b563fb7baef4df9… Patch: https://github.com/kamailio/kamailio/commit/7b70dcb291f290e6b563fb7baef4df9…

1 0

git:master:798494f2: dmq: new parameter notification_channel
by Daniel-Constantin Mierla 04 Nov '20

04 Nov '20

Module: kamailio Branch: master Commit: 798494f2ac16be585e84919f046c4ab43cadbdf5 URL: https://github.com/kamailio/kamailio/commit/798494f2ac16be585e84919f046c4ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T11:29:56+01:00 dmq: new parameter notification_channel - allow setting the channel id for peer availability notifications - default is "notification_peer" --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/798494f2ac16be585e84919f046c4ab… Patch: https://github.com/kamailio/kamailio/commit/798494f2ac16be585e84919f046c4ab… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 509c42c405..337d75c1b9 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -60,6 +60,7 @@ str dmq_server_socket = {0, 0}; sip_uri_t dmq_server_uri = {0}; str dmq_notification_address = {0, 0}; +str dmq_notification_channel = str_init("notification_peer"); int dmq_multi_notify = 0; sip_uri_t dmq_notification_uri = {0}; int dmq_ping_interval = 60; @@ -109,6 +110,7 @@ static param_export_t params[] = { {"ping_interval", INT_PARAM, &dmq_ping_interval}, {"server_address", PARAM_STR, &dmq_server_address}, {"notification_address", PARAM_STR, &dmq_notification_address}, + {"notification_channel", PARAM_STR, &dmq_notification_channel}, {"multi_notify", INT_PARAM, &dmq_multi_notify}, {"worker_usleep", INT_PARAM, &dmq_worker_usleep}, {0, 0, 0} diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 4cb44c0dee..83da389269 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -32,6 +32,7 @@ dmq_resp_cback_t dmq_notification_resp_callback = {&notification_resp_callback_f int *dmq_init_callback_done = 0; +extern str dmq_notification_channel; /** * @brief add notification peer @@ -43,10 +44,8 @@ int add_notification_peer() memset(&not_peer, 0, sizeof(dmq_peer_t)); not_peer.callback = dmq_notification_callback_f; not_peer.init_callback = NULL; - not_peer.description.s = "notification_peer"; - not_peer.description.len = 17; - not_peer.peer_id.s = "notification_peer"; - not_peer.peer_id.len = 17; + not_peer.description = dmq_notification_channel; + not_peer.peer_id = dmq_notification_channel; dmq_notification_peer = register_dmq_peer(&not_peer); if(!dmq_notification_peer) { LM_ERR("error in register_dmq_peer\n");

1 0

git:master:960b60ed: dialog: skip doing cseq update processing for non-sip requests
by Daniel-Constantin Mierla 04 Nov '20

04 Nov '20

Module: kamailio Branch: master Commit: 960b60ede8543f38b61ad2769e81e11d5a777df8 URL: https://github.com/kamailio/kamailio/commit/960b60ede8543f38b61ad2769e81e11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T11:15:10+01:00 dialog: skip doing cseq update processing for non-sip requests --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/960b60ede8543f38b61ad2769e81e11… Patch: https://github.com/kamailio/kamailio/commit/960b60ede8543f38b61ad2769e81e11… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index a85b726514..17c63bbb1c 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,12 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len<=0)) { + if(!IS_SIP(&msg)) { + /* nothing to do for non-sip requests */ + goto done; + } + + if(get_to(&msg)->tag_value.len<=0) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;

1 0

git:5.3:5ffe28d4: dialog: proper to-tag check for initial requests to skip cseq updates
by Daniel-Constantin Mierla 04 Nov '20

04 Nov '20

Module: kamailio Branch: 5.3 Commit: 5ffe28d4b83b1a75b1706bd851b76575b3d09c45 URL: https://github.com/kamailio/kamailio/commit/5ffe28d4b83b1a75b1706bd851b7657… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T08:12:28+01:00 dialog: proper to-tag check for initial requests to skip cseq updates (cherry picked from commit 81d3e7a43a249dfc9eaa075c698e1eb3237a517e) (cherry picked from commit 5bd72f2758b2059759ce152e6d97b6a1955bc5bc) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/5ffe28d4b83b1a75b1706bd851b7657… Patch: https://github.com/kamailio/kamailio/commit/5ffe28d4b83b1a75b1706bd851b7657… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 021cc101e8..a85b726514 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len>0)) { + if((get_to(&msg)->tag_value.len<=0)) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;

1 0

git:5.4:5bd72f27: dialog: proper to-tag check for initial requests to skip cseq updates
by Daniel-Constantin Mierla 04 Nov '20

04 Nov '20

Module: kamailio Branch: 5.4 Commit: 5bd72f2758b2059759ce152e6d97b6a1955bc5bc URL: https://github.com/kamailio/kamailio/commit/5bd72f2758b2059759ce152e6d97b6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T08:11:34+01:00 dialog: proper to-tag check for initial requests to skip cseq updates (cherry picked from commit 81d3e7a43a249dfc9eaa075c698e1eb3237a517e) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/5bd72f2758b2059759ce152e6d97b6a… Patch: https://github.com/kamailio/kamailio/commit/5bd72f2758b2059759ce152e6d97b6a… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 021cc101e8..a85b726514 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len>0)) { + if((get_to(&msg)->tag_value.len<=0)) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;

1 0

git:master:81d3e7a4: dialog: proper to-tag check for initial requests to skip cseq updates
by Daniel-Constantin Mierla 04 Nov '20

04 Nov '20

Module: kamailio Branch: master Commit: 81d3e7a43a249dfc9eaa075c698e1eb3237a517e URL: https://github.com/kamailio/kamailio/commit/81d3e7a43a249dfc9eaa075c698e1eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T08:09:39+01:00 dialog: proper to-tag check for initial requests to skip cseq updates --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/81d3e7a43a249dfc9eaa075c698e1eb… Patch: https://github.com/kamailio/kamailio/commit/81d3e7a43a249dfc9eaa075c698e1eb… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 021cc101e8..a85b726514 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len>0)) { + if((get_to(&msg)->tag_value.len<=0)) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;

1 0

git:master:00a4efc8: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 03 Nov '20

03 Nov '20

Module: kamailio Branch: master Commit: 00a4efc80c8023dddcc0da8e0b19da89147714ab URL: https://github.com/kamailio/kamailio/commit/00a4efc80c8023dddcc0da8e0b19da8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-03T15:16:14+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/00a4efc80c8023dddcc0da8e0b19da8… Patch: https://github.com/kamailio/kamailio/commit/00a4efc80c8023dddcc0da8e0b19da8…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020