sr-dev May 2020

sr-dev@lists.kamailio.org

24 participants
393 discussions

git:master:855c06f4: sqlops: functions to get null result value as empty or zero
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: 855c06f45ff69918c3e9502e7198cffc21be5cd9 URL: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 sqlops: functions to get null result value as empty or zero --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… Patch: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 7172bcc8b4..b3f21f6ff3 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -540,7 +540,8 @@ static sr_kemi_xval_t _ksr_kemi_sqlops_xval = {0}; /** * */ -static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, int col) +static sr_kemi_xval_t* ki_sqlops_result_get_mode(sip_msg_t *msg, str *resid, + int row, int col, int rmode) { sql_result_t *res = NULL; @@ -548,31 +549,31 @@ static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, if (resid == NULL || resid->s == NULL || resid->len == 0) { LM_ERR("invalid result name\n"); - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } res = sql_get_result(resid); if(res==NULL) { LM_ERR("invalid result container [%.*s]\n", resid->len, resid->s); - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(row >= res->nrows) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(col >= res->ncols) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(res->vals[row][col].flags&PV_VAL_NULL) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(res->vals[row][col].flags&PV_VAL_INT) { - _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_INT; _ksr_kemi_sqlops_xval.v.n = res->vals[row][col].value.n; return &_ksr_kemi_sqlops_xval; } @@ -581,6 +582,36 @@ static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, return &_ksr_kemi_sqlops_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_gete(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_getz(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_ZERO); +} + /** * */ @@ -626,6 +657,16 @@ static sr_kemi_t sr_kemi_sqlops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sqlops"), str_init("sql_result_gete"), + SR_KEMIP_XVAL, ki_sqlops_result_gete, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sqlops"), str_init("sql_result_getz"), + SR_KEMIP_XVAL, ki_sqlops_result_getz, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:e46dcd29: core: kemi - option to return 0 instead of null for xval
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: e46dcd2930c97855b9d87061ec4e4167b119d232 URL: https://github.com/kamailio/kamailio/commit/e46dcd2930c97855b9d87061ec4e416… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 core: kemi - option to return 0 instead of null for xval --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/e46dcd2930c97855b9d87061ec4e416… Patch: https://github.com/kamailio/kamailio/commit/e46dcd2930c97855b9d87061ec4e416… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index d389c4b4e0..8a77c227b7 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2377,16 +2377,24 @@ static sr_kemi_t _sr_kemi_hdr[] = { */ void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode) { - if(rmode==SR_KEMI_XVAL_NULL_PRINT) { - xval->vtype = SR_KEMIP_STR; - xval->v.s = *pv_get_null_str(); - } else if(rmode==SR_KEMI_XVAL_NULL_EMPTY) { - xval->vtype = SR_KEMIP_STR; - xval->v.s = *pv_get_empty_str(); - } else { - xval->vtype = SR_KEMIP_NULL; - xval->v.s.s = NULL; - xval->v.s.len = 0; + switch(rmode) { + case SR_KEMI_XVAL_NULL_PRINT: + xval->vtype = SR_KEMIP_STR; + xval->v.s = *pv_get_null_str(); + return; + case SR_KEMI_XVAL_NULL_EMPTY: + xval->vtype = SR_KEMIP_STR; + xval->v.s = *pv_get_empty_str(); + return; + case SR_KEMI_XVAL_NULL_ZERO: + xval->vtype = SR_KEMIP_INT; + xval->v.n = 0; + return; + default: + xval->vtype = SR_KEMIP_NULL; + xval->v.s.s = NULL; + xval->v.s.len = 0; + return; } } diff --git a/src/core/kemi.h b/src/core/kemi.h index 85cd521512..dd7d4bf50b 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -222,6 +222,7 @@ sr_kemi_t* sr_kemi_exports_get_pv(void); #define SR_KEMI_XVAL_NULL_NONE 0 #define SR_KEMI_XVAL_NULL_PRINT 1 #define SR_KEMI_XVAL_NULL_EMPTY 2 +#define SR_KEMI_XVAL_NULL_ZERO 3 void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode); void sr_kemi_xval_free(sr_kemi_xval_t *xval); #endif

1 0

[kamailio/kamailio] presence module with in-memory presentity records (#2294)
by Daniel-Constantin Mierla 02 May '20

02 May '20

Track the issues discovered by different developers while implementing in-memory only presentity records for presence module. -- 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/issues/2294

2 10

[kamailio/kamailio] usrloc: change "-" for "_" in stats name to be prometheus compliant (#2304)
by Federico Cabiddu 02 May '20

02 May '20

#### 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  usrloc generated statistics (contacts, expires, users) contain "-" in their names (usrloc-contacs and so on), which is not valid according to prometheus naming convention. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2304 -- Commit Summary -- * usrloc: change "-" for "_" in stats name to be prometheus compliant -- File Changes -- M src/modules/usrloc/udomain.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2304.patch https://github.com/kamailio/kamailio/pull/2304.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/2304

3 16

git:master:f6c68817: Merge pull request #2304 from kamailio/grumvalski/usrloc_stats
by GitHub 02 May '20

02 May '20

Module: kamailio Branch: master Commit: f6c688178902138dff8115cdabd72e8631a635dc URL: https://github.com/kamailio/kamailio/commit/f6c688178902138dff8115cdabd72e8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-02T16:22:06+02:00 Merge pull request #2304 from kamailio/grumvalski/usrloc_stats usrloc: change "-" for "_" in stats name to be prometheus compliant --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/counters.c Modified: src/core/counters.h Modified: src/core/globals.h Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/f6c688178902138dff8115cdabd72e8… Patch: https://github.com/kamailio/kamailio/commit/f6c688178902138dff8115cdabd72e8…

1 0

git:master:9948696f: core: remove stats_name_separator from cfg_group_core
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 9948696fd84605919e6ce6a7106099f1cdd0de98 URL: https://github.com/kamailio/kamailio/commit/9948696fd84605919e6ce6a7106099f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-05-02T10:14:23+02:00 core: remove stats_name_separator from cfg_group_core --- Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/config.h Modified: src/core/counters.c Modified: src/core/counters.h Modified: src/core/globals.h Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/9948696fd84605919e6ce6a7106099f… Patch: https://github.com/kamailio/kamailio/commit/9948696fd84605919e6ce6a7106099f…

1 0

git:master:3203a657: core: new core parameter stats_name_separator
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 3203a6572b874d191c3be61519853005bd5ab056 URL: https://github.com/kamailio/kamailio/commit/3203a6572b874d191c3be6151985300… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-05-01T13:02:39+02:00 core: new core parameter stats_name_separator --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/config.h Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/3203a6572b874d191c3be6151985300… Patch: https://github.com/kamailio/kamailio/commit/3203a6572b874d191c3be6151985300…

1 0

git:master:0595795c: ims_usrloc_pcscf, p_usrloc, usrloc: use KSR_STATS_NAMESEP for stats names
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 0595795c659f6af586e63837efe56b45808cd735 URL: https://github.com/kamailio/kamailio/commit/0595795c659f6af586e63837efe56b4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T16:24:24+02:00 ims_usrloc_pcscf, p_usrloc, usrloc: use KSR_STATS_NAMESEP for stats names --- Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/0595795c659f6af586e63837efe56b4… Patch: https://github.com/kamailio/kamailio/commit/0595795c659f6af586e63837efe56b4… --- diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index 7f63932e6b..bd5fabdb60 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -82,7 +82,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '_'; + *(p++) = KSR_STATS_NAMESEP; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0; diff --git a/src/modules/p_usrloc/udomain.c b/src/modules/p_usrloc/udomain.c index 88612e957b..91db944a0c 100644 --- a/src/modules/p_usrloc/udomain.c +++ b/src/modules/p_usrloc/udomain.c @@ -55,7 +55,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '_'; + *(p++) = KSR_STATS_NAMESEP; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0; diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 321b72b64a..9f5e78cfd6 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -61,7 +61,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '_'; + *(p++) = KSR_STATS_NAMESEP; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0;

1 0

git:master:4357b5e6: core: define KSR_STATS_NAMESEP for stats name separator
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 4357b5e6be2a71a401e9d53c43e787b9bfcc8ed0 URL: https://github.com/kamailio/kamailio/commit/4357b5e6be2a71a401e9d53c43e787b… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T16:22:40+02:00 core: define KSR_STATS_NAMESEP for stats name separator --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/4357b5e6be2a71a401e9d53c43e787b… Patch: https://github.com/kamailio/kamailio/commit/4357b5e6be2a71a401e9d53c43e787b… --- diff --git a/src/core/config.h b/src/core/config.h index 63ff8dc26c..6af3dfecfd 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -211,4 +211,6 @@ #define DEFAULT_MAX_WHILE_LOOPS 100 /*!< Maximum allowed iterations for a while (to catch runaways) */ +#define KSR_STATS_NAMESEP '_' + #endif

1 0

git:master:2fe0378c: p_usrloc, ims_usrloc_pcscf: change "-" for "_" in stats name to be prometheus compliant
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 2fe0378c3d0596e30d8ec9ea4cb7d828321d2030 URL: https://github.com/kamailio/kamailio/commit/2fe0378c3d0596e30d8ec9ea4cb7d82… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T14:48:59+02:00 p_usrloc, ims_usrloc_pcscf: change "-" for "_" in stats name to be prometheus compliant --- Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe0378c3d0596e30d8ec9ea4cb7d82… Patch: https://github.com/kamailio/kamailio/commit/2fe0378c3d0596e30d8ec9ea4cb7d82… --- diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index 1be609ad42..7f63932e6b 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -82,7 +82,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '-'; + *(p++) = '_'; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0; diff --git a/src/modules/p_usrloc/udomain.c b/src/modules/p_usrloc/udomain.c index c25f1c6253..88612e957b 100644 --- a/src/modules/p_usrloc/udomain.c +++ b/src/modules/p_usrloc/udomain.c @@ -55,7 +55,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '-'; + *(p++) = '_'; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0;

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 May 2020