sr-dev

sr-dev@lists.kamailio.org

4 participants
45456 discussions

git:master:2300d0a2: kex: Let the RPC server do printf as it may have optimizations
by Alex Hermann 05 Nov '20

05 Nov '20

Module: kamailio Branch: master Commit: 2300d0a2a9c78c72c67596eb129cf7bf86bf300b URL: https://github.com/kamailio/kamailio/commit/2300d0a2a9c78c72c67596eb129cf7b… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-29T15:24:22+01:00 kex: Let the RPC server do printf as it may have optimizations Some RPC server implementations may print directly to the output buffer, so this eliminates a string copy. --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/2300d0a2a9c78c72c67596eb129cf7b… Patch: https://github.com/kamailio/kamailio/commit/2300d0a2a9c78c72c67596eb129cf7b… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index 1ebd235752..a1f14a7dc6 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -492,15 +492,13 @@ static void rpc_stats_get_statistics(rpc_t* rpc, void* ctx) static void rpc_fetch_add_stat(rpc_t* rpc, void* ctx, void* hst, char* g, char* n, unsigned long val, int numeric) { char nbuf[128]; - char vbuf[32]; int res; snprintf(nbuf, 127, "%s.%s", g, n); if (numeric) { res = rpc->struct_add(hst, "d", nbuf, val); } else { - snprintf(vbuf, 31, "%lu", val); - res = rpc->struct_add(hst, "s", nbuf, vbuf); + res = rpc->struct_printf(hst, nbuf, "%lu", val); } if (res<0) {

1 0

git:master:d488764e: permissions: add missing export for reload_delta parameter
by Victor Seva 05 Nov '20

05 Nov '20

Module: kamailio Branch: master Commit: d488764e82311de440969b34ed7a822a54df6a45 URL: https://github.com/kamailio/kamailio/commit/d488764e82311de440969b34ed7a822… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-11-05T12:42:54+01:00 permissions: add missing export for reload_delta parameter * fix 01fa7503433f4e23dea156e1034a87bbb49a4a1d --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/d488764e82311de440969b34ed7a822… Patch: https://github.com/kamailio/kamailio/commit/d488764e82311de440969b34ed7a822… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 7dd6d981c6..12ab2d889a 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -187,6 +187,7 @@ static param_export_t params[] = { {"port_col", PARAM_STR, &perm_port_col }, {"max_subnets", PARAM_INT, &_perm_max_subnets }, {"load_backends", PARAM_INT, &_perm_load_backends }, + {"reload_delta", PARAM_INT, &perm_reload_delta }, {0, 0, 0} };

1 0

git:master:8fe0fd5a: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 05 Nov '20

05 Nov '20

Module: kamailio Branch: master Commit: 8fe0fd5ad866e94676944d3b26a85c50a10dfd78 URL: https://github.com/kamailio/kamailio/commit/8fe0fd5ad866e94676944d3b26a85c5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-05T12:31:16+01:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/8fe0fd5ad866e94676944d3b26a85c5… Patch: https://github.com/kamailio/kamailio/commit/8fe0fd5ad866e94676944d3b26a85c5…

1 0

git:master:01fa7503: permissions: add reload_delta parameter
by Victor Seva 05 Nov '20

05 Nov '20

Module: kamailio Branch: master Commit: 01fa7503433f4e23dea156e1034a87bbb49a4a1d URL: https://github.com/kamailio/kamailio/commit/01fa7503433f4e23dea156e1034a87b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-11-05T12:21:22+01:00 permissions: add reload_delta parameter - make the rate limit of maximum allowed RPC reload configurable using the new 'reload_delta' paramenter. --- 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/01fa7503433f4e23dea156e1034a87b… Patch: https://github.com/kamailio/kamailio/commit/01fa7503433f4e23dea156e1034a87b… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 7e447d14d2..7dd6d981c6 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -60,6 +60,7 @@ static char* perm_deny_suffix = ".deny"; /* for allow_trusted and allow_address function */ str perm_db_url = {NULL, 0}; /* Don't connect to the database by default */ +int perm_reload_delta = 5; /* for allow_trusted function */ int perm_db_mode = DISABLE_CACHE; /* Database usage mode: 0=no cache, 1=cache */ @@ -594,6 +595,9 @@ static int mod_init(void) } *perm_rpc_reload_time = 0; + if(perm_reload_delta < 0) + perm_reload_delta = 5; + if(permissions_init_rpc()!=0) { LM_ERR("failed to register RPC commands\n"); return -1; diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h index c094185626..2a417ffd58 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -59,6 +59,7 @@ extern str perm_ip_addr_col; /* Name of ip address column */ extern str perm_mask_col; /* Name of mask column */ extern str perm_port_col; /* Name of port column */ extern int perm_peer_tag_mode; /* Matching mode */ +extern int perm_reload_delta; /* seconds between RPC reloads */ /* backends to be loaded */ #define PERM_LOAD_ADDRESSDB (1<<0) diff --git a/src/modules/permissions/rpc.c b/src/modules/permissions/rpc.c index b6a6f9a420..cff9523406 100644 --- a/src/modules/permissions/rpc.c +++ b/src/modules/permissions/rpc.c @@ -30,13 +30,15 @@ #include "permissions.h" -int rpc_check_reload(rpc_t* rpc, void* ctx) { - if(perm_rpc_reload_time==NULL) { +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) { + if(*perm_rpc_reload_time != 0 + && *perm_rpc_reload_time > time(NULL) - perm_reload_delta) { LM_ERR("ongoing reload\n"); rpc->fault(ctx, 500, "ongoing reload"); return -1;

1 0

git:master:0ad80449: permissions: document reload_delta parameter
by Victor Seva 05 Nov '20

05 Nov '20

Module: kamailio Branch: master Commit: 0ad80449d8da33732b7b67f1a681fa68c45280e4 URL: https://github.com/kamailio/kamailio/commit/0ad80449d8da33732b7b67f1a681fa6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-11-05T12:21:23+01:00 permissions: document reload_delta parameter --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0ad80449d8da33732b7b67f1a681fa6… Patch: https://github.com/kamailio/kamailio/commit/0ad80449d8da33732b7b67f1a681fa6… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index adca339d77..e3b65816e5 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -846,6 +846,33 @@ modparam("permissions", "load_backends", 1) </programlisting> </example> </section> + <section id ="permissions.p.reload_delta"> + <title><varname>reload_delta</varname> (int)</title> + <para> + The number of seconds that have to be waited before executing a new + RPC reload. By default there is a rate limiting of maximum one reload + in five seconds. + </para> + <para> + If set to 0, no rate limit is configured. Note carefully: use this + configuration only in tests environments because executing two RPC + reloads of the same table at the same time can cause to kamailio + to crash. + </para> + <para> + <emphasis> + Default value is <quote>5</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>reload_delta</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "reload_delta", 1) +... + </programlisting> + </example> + </section> </section> <section> @@ -1278,8 +1305,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. + Note that there is a rate limiting defined by 'reload_delta' + paramenter. By default is allowed maximum one reload in five seconds. </para> <para>Parameters: <emphasis>none</emphasis></para> </section> @@ -1361,8 +1388,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. + Note that there is a rate limiting defined by 'reload_delta' + paramenter. By default is allowed maximum one reload in five seconds. </para> <para>Parameters: <emphasis>none</emphasis></para> </section>

1 0

git:master:8d885731: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 05 Nov '20

05 Nov '20

Module: kamailio Branch: master Commit: 8d8857314a6d7979dbd5fde584d24919ac1c3328 URL: https://github.com/kamailio/kamailio/commit/8d8857314a6d7979dbd5fde584d2491… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-05T11:46:32+01:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/8d8857314a6d7979dbd5fde584d2491… Patch: https://github.com/kamailio/kamailio/commit/8d8857314a6d7979dbd5fde584d2491… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 9837cfd1b2..ebb097b2cd 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -1024,7 +1024,8 @@ if (allow_trusted("$si", "any", "$ai")) { database table into cache memory. In cache memory the entries are for performance reasons stored in two different tables: address table and subnet table depending on the value of the mask field (IPv6: 64 or - smaller, IPv4: 32 or smaller). + smaller, IPv4: 32 or smaller). Note that there is a rate limiting of + maximum one reload in five seconds. Parameters: none @@ -1066,7 +1067,8 @@ if (allow_trusted("$si", "any", "$ai")) { 5.7. permissions.trustedReload Causes the permissions module to re-read the contents of the trusted - database table into cache memory. + database table into cache memory. Note that there is a rate limiting of + maximum one reload in five seconds. Parameters: none

1 0

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: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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev