sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
313 discussions

git:5.4:30b33f77: async: safety check for async ms list
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 30b33f772739c593f1b58a2b871e127effd12f58 URL: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:37+02:00 async: safety check for async ms list (cherry picked from commit 5b0e74c1832d2d09fe36424e1e1aaaacde920b31) (cherry picked from commit 93dc038f3f1f854b1e0987ec28e49d8a70293e19) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… Patch: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 1e81d3318c..bd17b0e1d9 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -370,6 +370,10 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn async_task_param_t *atp; async_task_t *at; + if (_async_ms_list==NULL) { + LM_ERR("async timer list not initialized - check modparams\n"); + return -1; + } if(milliseconds <= 0) { LM_ERR("negative or zero sleep time (%d)\n", milliseconds); return -1;

1 0

git:5.4:b5ae51af: core: parse via - fixed whitespacing
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: b5ae51af479d4e54e5d8c3f5e85908e68183e9d4 URL: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:22+02:00 core: parse via - fixed whitespacing (cherry picked from commit 01664d1d82dcfe952fce29033b4fcd5e44cf2319) (cherry picked from commit 19901d0cdb6cf06a84315c19a27986bca7a05025) --- Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… Patch: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… --- diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index fca486e358..e4957961f1 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -32,11 +32,11 @@ struct sip_msg; /* via param types - * WARNING: keep in sync with parse_via.c FIN_HIDDEN... + * WARNING: keep in sync with parse_via.c FIN_HIDDEN... * and with tm/sip_msg.c via_body_cloner */ enum { - PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, + PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, PARAM_MADDR, PARAM_RECEIVED, PARAM_RPORT, PARAM_I, PARAM_ALIAS, #ifdef USE_COMP PARAM_COMP, @@ -60,12 +60,12 @@ typedef struct via_param { /* Format: name/version/transport host:port;params comment */ - /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ -typedef struct via_body { +/* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ +typedef struct via_body { int error; str hdr; /* Contains "Via" or "v" */ str name; - str version; + str version; str transport; str host; short proto; /* transport */ @@ -80,7 +80,7 @@ typedef struct via_body { struct via_param* param_lst; /* list of parameters*/ struct via_param* last_param; /*last via parameter, internal use*/ - /* shortcuts to "important" params*/ + /* shortcuts to "important" params*/ struct via_param* branch; str tid; /* transaction id, part of branch */ struct via_param* received; @@ -90,8 +90,8 @@ typedef struct via_body { #ifdef USE_COMP struct via_param* comp; /* see rfc3486 */ #endif - struct via_body* next; /* pointer to next via body string if - compact via or null */ + struct via_body* next; /* pointer to next via body string + if compact via or null */ } via_body_t;

1 0

git:5.4:df8fb404: mtree: check if pv_count var is r/w
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: df8fb404c1f3d016f97872d78fe07d604de6ef8b URL: https://github.com/kamailio/kamailio/commit/df8fb404c1f3d016f97872d78fe07d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:13+02:00 mtree: check if pv_count var is r/w - reported by GH #2750 (cherry picked from commit 63b0345207ba67fcc6290d6dfc55f99ba58b13c9) (cherry picked from commit 7323d812dc4a39c0e60f11668e09a50ef586a8f7) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/df8fb404c1f3d016f97872d78fe07d6… Patch: https://github.com/kamailio/kamailio/commit/df8fb404c1f3d016f97872d78fe07d6… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index c04f031cfd..63180bbfb7 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -203,7 +203,7 @@ static int mod_init(void) } if(pv_parse_spec(&count_param, &pv_count) < 0 - || !(pv_is_w(&pv_weight))) + || !(pv_is_w(&pv_count))) { LM_ERR("cannot parse count pv or pv is read-only\n"); return -1;

1 0

git:5.4:00d71875: mtree: Fix some typos, adjust some formatting
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 00d7187532b87507367b00110f22bd8e0e14db7c URL: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:11:43+02:00 mtree: Fix some typos, adjust some formatting (cherry picked from commit 316c80607243387015e35ac423238c5a32401a44) (cherry picked from commit 3bfb1773c01731177824b907180a7eeb7e43d3af) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… Patch: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index badbd09dc8..c04f031cfd 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -175,37 +175,37 @@ static int mod_init(void) return -1; } - if(pv_parse_spec(&value_param, &pv_value)<00 + if(pv_parse_spec(&value_param, &pv_value) < 0 || !(pv_is_w(&pv_value))) { - LM_ERR("cannot parse value pv or is read only\n"); + LM_ERR("cannot parse value pv or pv is read-only\n"); return -1; } - if (pv_parse_spec(&values_param, &pv_values) <0 + if (pv_parse_spec(&values_param, &pv_values) < 0 || pv_values.type != PVT_AVP) { LM_ERR("cannot parse values avp\n"); return -1; } - if(pv_parse_spec(&dstid_param, &pv_dstid)<0 + if(pv_parse_spec(&dstid_param, &pv_dstid) < 0 || pv_dstid.type!=PVT_AVP) { LM_ERR("cannot parse dstid avp\n"); return -1; } - if(pv_parse_spec(&weight_param, &pv_weight)<0 + if(pv_parse_spec(&weight_param, &pv_weight) < 0 || pv_weight.type!=PVT_AVP) { - LM_ERR("cannot parse dstid avp\n"); + LM_ERR("cannot parse weight avp\n"); return -1; } - if(pv_parse_spec(&count_param, &pv_count)<0 + if(pv_parse_spec(&count_param, &pv_count) < 0 || !(pv_is_w(&pv_weight))) { - LM_ERR("cannot parse count pv or is read-only\n"); + LM_ERR("cannot parse count pv or pv is read-only\n"); return -1; } @@ -220,7 +220,7 @@ static int mod_init(void) LM_DBG("mt_char_list=%s \n", mt_char_list.s); mt_char_table_init(); - /* binding to mysql module */ + /* binding to database module */ if(db_bind_mod(&db_url, &mt_dbf)) { LM_ERR("database module not found\n"); @@ -614,7 +614,7 @@ static int mt_load_db(m_tree_t *pt) if(RES_ROWS(db_res)[0].values[0].type != DB1_STRING || RES_ROWS(db_res)[0].values[1].type != DB1_STRING) { - LM_ERR("wrond column types in db table (%d / %d)\n", + LM_ERR("wrong column types in db table (%d / %d)\n", RES_ROWS(db_res)[0].values[0].type, RES_ROWS(db_res)[0].values[1].type); goto error; @@ -1029,7 +1029,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) if(tr==NULL) { /* no tree with such name*/ - rpc->fault(ctx, 404, "Not found tree"); + rpc->fault(ctx, 404, "Tree not found"); goto error; } @@ -1038,7 +1038,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) LM_DBG("no prefix found in [%.*s] for [%.*s]\n", tname.len, tname.s, tomatch.len, tomatch.s); - rpc->fault(ctx, 404, "Not found"); + rpc->fault(ctx, 404, "Prefix not found"); } error:

1 0

git:5.4:2c501f4d: snmpstats: Fix typo in MIB
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 2c501f4d7b9678f0cfad3afec5e3095fd61e1763 URL: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:10:43+02:00 snmpstats: Fix typo in MIB Reported by arkadiam on Github (cherry picked from commit 7f017707c91659641ce9ca87ee4149b2e39379f7) (cherry picked from commit dbd8e3899335eb8795763fd52b1f91aebfad1c92) --- Modified: src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB --- Diff: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… Patch: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… --- diff --git a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB index 3351a9e424..2aaddf01ca 100644 --- a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB +++ b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB @@ -562,7 +562,7 @@ KAMAILIO-SIP-SERVER-MIB DEFINITIONS ::= BEGIN set the row-status to createAndGo. Then the client can do an SNMP GET on this table with the - aquired index. If the row-status is 'active', then the + acquired index. If the row-status is 'active', then the kamailioSIPRegUserIndex is the index into the kamailioSIPRegUserTable that has the specified URI (0 zero indicates no such URI). The client should then set the

1 0

git:5.4:34ee120a: pv: more details in err log message for s.select parsing
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 34ee120ab555b9aab364af4570033c3a08451fda URL: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:10:28+02:00 pv: more details in err log message for s.select parsing (cherry picked from commit 02ad9e1b87f89b9456d0d85e16c2fe0cda67ab64) (cherry picked from commit 2273d7d856b5c1fca1ec24fbb6ee249793ea6719) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… Patch: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 0ce73c4542..2f5c2cd48d 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2532,8 +2532,8 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid select transformation: %.*s!!\n", - in->len, in->s); + LM_ERR("invalid select transformation: %.*s (c:%c/%d - p:%d)!!\n", + in->len, in->s, *p, *p, (int)(p - in->s)); goto error; } goto done;

1 0

git:5.5:97f9ede8: secsipid: note about libsecsipid location and failure return codes
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 97f9ede8b82cff8063c3fd1908d3c323997e9566 URL: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:32+02:00 secsipid: note about libsecsipid location and failure return codes (cherry picked from commit 59719a1ac97337ca7f8b83b0e8a9d63bf6ec0c7e) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… Patch: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1e22e371fb..0d7147c35f 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -30,6 +30,17 @@ loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. </para> + <para> + The libsecsipid is provided by secsipidx project: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> + <para> + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much + at the top of: + <ulink url="https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go" + >https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go</ulink>. + </para> </section> <section> <title>Dependencies</title>

1 0

git:5.5:93dc038f: async: safety check for async ms list
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 93dc038f3f1f854b1e0987ec28e49d8a70293e19 URL: https://github.com/kamailio/kamailio/commit/93dc038f3f1f854b1e0987ec28e49d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:16+02:00 async: safety check for async ms list (cherry picked from commit 5b0e74c1832d2d09fe36424e1e1aaaacde920b31) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/93dc038f3f1f854b1e0987ec28e49d8… Patch: https://github.com/kamailio/kamailio/commit/93dc038f3f1f854b1e0987ec28e49d8… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 1e81d3318c..bd17b0e1d9 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -370,6 +370,10 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn async_task_param_t *atp; async_task_t *at; + if (_async_ms_list==NULL) { + LM_ERR("async timer list not initialized - check modparams\n"); + return -1; + } if(milliseconds <= 0) { LM_ERR("negative or zero sleep time (%d)\n", milliseconds); return -1;

1 0

git:5.5:45310834: secsipid: log message on identity generation failure
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 45310834376d9eee2778e16c5fdc706ab1e6f97b URL: https://github.com/kamailio/kamailio/commit/45310834376d9eee2778e16c5fdc706… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:04+02:00 secsipid: log message on identity generation failure (cherry picked from commit 4b7eedf5af9a461d5a1de1148c814faa5db8cbaa) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/45310834376d9eee2778e16c5fdc706… Patch: https://github.com/kamailio/kamailio/commit/45310834376d9eee2778e16c5fdc706… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 30357a235e..18f962d362 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -327,6 +327,7 @@ static int ki_secsipid_add_identity(sip_msg_t *msg, str *origtn, str *desttn, attest->s, origid->s, x5u->s, keypath->s, &ibody.s); if(ibody.len<=0) { + LM_ERR("failed to get identity header body (%d)\n", ibody.len); goto error; } @@ -526,9 +527,7 @@ static int secsipid_libopt_param(modparam_t type, void *val) return -1; } sit->s = *((str*)val); - if(secsipid_libopt_list!=NULL) { - sit->next = secsipid_libopt_list; - } + sit->next = secsipid_libopt_list; secsipid_libopt_list = sit; return 0;

1 0

git:5.5:84c87444: ldap: several functions exported to kemi framework
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 84c87444a50c4e46c3786904378e980f0262309f URL: https://github.com/kamailio/kamailio/commit/84c87444a50c4e46c3786904378e980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:58:29+02:00 ldap: several functions exported to kemi framework (cherry picked from commit 2d4b4939d1845fffdc3fa3ced9889720d0213d47) --- Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/84c87444a50c4e46c3786904378e980… Patch: https://github.com/kamailio/kamailio/commit/84c87444a50c4e46c3786904378e980…

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 June 2021