sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

[kamailio/kamailio] kex: fix and cleanup stats rpc (#2537)

by Alex Hermann

#1762 ## 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) - [x] 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  Fix invalid JSON returned by stats.fetch with multiple modules as parameter. Cleanup by reducing code duplication. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2537 -- Commit Summary -- * kex: Make stats.fetch(n) reply with valid JSON * kex: Remove a lot of duplicate code from rpc_stats_fetch* * kex: Let the RPC server do printf as it may have optimizations -- File Changes -- M src/modules/kex/core_stats.c (222) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2537.patch https://github.com/kamailio/kamailio/pull/2537.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2537

4 years, 1 month

git:master:340374a5: Merge pull request #2537 from hexla/upstream/kex-fix-stats-rpc

by GitHub

Module: kamailio Branch: master Commit: 340374a5e70ea805de79b7855e32ccf619d1affa URL: https://github.com/kamailio/kamailio/commit/340374a5e70ea805de79b7855e32ccf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-05T13:12:19+01:00 Merge pull request #2537 from hexla/upstream/kex-fix-stats-rpc kex: fix and cleanup stats rpc --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/340374a5e70ea805de79b7855e32ccf… Patch: https://github.com/kamailio/kamailio/commit/340374a5e70ea805de79b7855e32ccf…

4 years, 1 month

git:master:2300d0a2: kex: Let the RPC server do printf as it may have optimizations

by Alex Hermann

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) {

4 years, 1 month

git:master:70a5d31f: kex: Remove a lot of duplicate code from rpc_stats_fetch*

by Alex Hermann

Module: kamailio Branch: master Commit: 70a5d31f08231ed161904990c9faadff11d5a9ff URL: https://github.com/kamailio/kamailio/commit/70a5d31f08231ed161904990c9faadf… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-29T15:24:22+01:00 kex: Remove a lot of duplicate code from rpc_stats_fetch* One extra variable can prevent lots of duplicate code. Code paths for string and numeric response are now merged. --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/70a5d31f08231ed161904990c9faadf… Patch: https://github.com/kamailio/kamailio/commit/70a5d31f08231ed161904990c9faadf…

4 years, 1 month

git:master:c33c0f8f: kex: Make stats.fetch(n) reply with valid JSON

by Alex Hermann

Module: kamailio Branch: master Commit: c33c0f8f4d16906ebd79fb020db9505158827574 URL: https://github.com/kamailio/kamailio/commit/c33c0f8f4d16906ebd79fb020db9505… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-29T15:24:22+01:00 kex: Make stats.fetch(n) reply with valid JSON {},{} is not valid json. Convert to {}. --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/c33c0f8f4d16906ebd79fb020db9505… Patch: https://github.com/kamailio/kamailio/commit/c33c0f8f4d16906ebd79fb020db9505… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index 2502a90ba0..048b80dc22 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -525,25 +525,18 @@ static void rpc_fetch_all_grps_cbk(void* p, str* g) /** * All statistic getter RPC callback. */ -static void stats_fetch_all(rpc_t* rpc, void* ctx, char* stat) +static void stats_fetch_all(rpc_t* rpc, void* ctx, void* th, char* stat) { int len = strlen(stat); struct rpc_list_params packed_params; str s_statistic; stat_var *s_stat; - void *th; char nbuf[128]; char vbuf[32]; char *m; char *n; int i; - if (rpc->add(ctx, "{", &th) < 0) - { - rpc->fault(ctx, 500, "Internal error creating root struct"); - return; - } - if (len==3 && strcmp("all", stat)==0) { packed_params.rpc = rpc; packed_params.ctx = ctx; @@ -618,6 +611,7 @@ static void stats_fetch_all(rpc_t* rpc, void* ctx, char* stat) static void rpc_stats_fetch_statistics(rpc_t* rpc, void* ctx) { char* stat; + void *th; if (stats_support()==0) { rpc->fault(ctx, 400, "stats support not enabled"); @@ -627,9 +621,13 @@ static void rpc_stats_fetch_statistics(rpc_t* rpc, void* ctx) rpc->fault(ctx, 400, "Please provide which stats to retrieve"); return; } - stats_fetch_all(rpc, ctx, stat); + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating root struct"); + return; + } + stats_fetch_all(rpc, ctx, th, stat); while((rpc->scan(ctx, "*s", &stat)>0)) { - stats_fetch_all(rpc, ctx, stat); + stats_fetch_all(rpc, ctx, th, stat); } return; } @@ -669,23 +667,17 @@ static void rpc_fetchn_all_grps_cbk(void* p, str* g) /** * All statistic getter RPC callback with number value. */ -static void stats_fetchn_all(rpc_t* rpc, void* ctx, char* stat) +static void stats_fetchn_all(rpc_t* rpc, void* ctx, void* th, char* stat) { int len = strlen(stat); struct rpc_list_params packed_params; str s_statistic; stat_var *s_stat; - void *th; char nbuf[128]; char *m; char *n; int i; - if (rpc->add(ctx, "{", &th) < 0) { - rpc->fault(ctx, 500, "Internal error creating root struct"); - return; - } - if (len==3 && strcmp("all", stat)==0) { packed_params.rpc = rpc; packed_params.ctx = ctx; @@ -757,6 +749,7 @@ static void stats_fetchn_all(rpc_t* rpc, void* ctx, char* stat) static void rpc_stats_fetchn_statistics(rpc_t* rpc, void* ctx) { char* stat; + void *th; if (stats_support()==0) { rpc->fault(ctx, 400, "stats support not enabled"); @@ -766,9 +759,13 @@ static void rpc_stats_fetchn_statistics(rpc_t* rpc, void* ctx) rpc->fault(ctx, 400, "Please provide which stats to retrieve"); return; } - stats_fetchn_all(rpc, ctx, stat); + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating root struct"); + return; + } + stats_fetchn_all(rpc, ctx, th, stat); while((rpc->scan(ctx, "*s", &stat)>0)) { - stats_fetchn_all(rpc, ctx, stat); + stats_fetchn_all(rpc, ctx, th, stat); } return; }

4 years, 1 month

git:master:d488764e: permissions: add missing export for reload_delta parameter

by Victor Seva

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} };

4 years, 1 month

git:master:8fe0fd5a: modules: readme files regenerated - permissions ... [skip ci]

by Kamailio Dev

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…

4 years, 1 month

git:master:0ad80449: permissions: document reload_delta parameter

by Victor Seva

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>

4 years, 1 month

git:master:01fa7503: permissions: add reload_delta parameter

by Victor Seva

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;

4 years, 1 month

git:master:8d885731: modules: readme files regenerated - permissions ... [skip ci]

by Kamailio Dev

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

4 years, 1 month

← Newer
1
...
25
26
27
28
29
30
31
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020