sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
381 discussions

git:master:f35fd46d: core: print modparam type as string in log message
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: f35fd46de42a26d910e637023396a801c0ad404c URL: https://github.com/kamailio/kamailio/commit/f35fd46de42a26d910e637023396a80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T15:18:22+01:00 core: print modparam type as string in log message --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/f35fd46de42a26d910e637023396a80… Patch: https://github.com/kamailio/kamailio/commit/f35fd46de42a26d910e637023396a80… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 1a7d8acd78..e169e651a2 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -34,6 +34,30 @@ #include <regex.h> #include <string.h> +static char *get_mod_param_type_str(int ptype) +{ + if(ptype & PARAM_USE_FUNC) { + if(ptype & PARAM_STRING) { + return "func-string"; + } else if (ptype & PARAM_INT) { + return "func-int"; + } else if (ptype & PARAM_STR) { + return "func-str"; + } else { + return "func-unknown"; + } + } + if(ptype & PARAM_STRING) { + return "string"; + } else if (ptype & PARAM_INT) { + return "int"; + } else if (ptype & PARAM_STR) { + return "str"; + } else { + return "unknown"; + } +} + int set_mod_param(char* _mod, char* _name, modparam_t _type, void* _val) { return set_mod_param_regex(_mod, _name, _type, _val); @@ -137,8 +161,8 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) } } else { - LM_ERR("parameter <%s> of type <%d> not found in module <%s>\n", - name, type, t->exports.name); + LM_ERR("parameter <%s> of type <%d:%s> not found in module <%s>\n", + name, type, get_mod_param_type_str(type), t->exports.name); regfree(&preg); pkg_free(reg); return -3;

1 0

git:master:a0e04cb2: rr: debug messages when setting send socket on double rr
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: a0e04cb2a06ec2cae9a066003732746cb8d609d0 URL: https://github.com/kamailio/kamailio/commit/a0e04cb2a06ec2cae9a066003732746… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T11:25:46+01:00 rr: debug messages when setting send socket on double rr --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/a0e04cb2a06ec2cae9a066003732746… Patch: https://github.com/kamailio/kamailio/commit/a0e04cb2a06ec2cae9a066003732746… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index fed7cc7140..1440b6da98 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -754,9 +754,13 @@ static inline void rr_do_force_send_socket(sip_msg_t *_m, sip_uri_t *puri, if ((si = grep_sock_info(&puri->host, puri->port_no?puri->port_no:proto_default_port(puri->proto), puri->proto)) != 0) { + LM_DBG("set send socket %p for local route uri: %.*s\n", si, + rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); set_force_socket(_m, si); } else if ((si = grep_sock_info(&puri->host, puri->port_no, puri->proto)) != 0) { + LM_DBG("set send socket %p for local route uri: %.*s\n", si, + rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); set_force_socket(_m, si); } else { if (enable_socket_mismatch_warning && rr2on) { @@ -766,6 +770,9 @@ static inline void rr_do_force_send_socket(sip_msg_t *_m, sip_uri_t *puri, LM_WARN("second RR uri is not myself (%.*s)\n", rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); } + } else { + LM_DBG("no socket found to match second RR (%.*s)\n", + rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); } } }

1 0

[kamailio/kamailio] Avoid full table scan for dispatcher table using db_redis using ds_reload() from config script In (#2149)
by Joel Serrano 26 Nov '19

26 Nov '19

# Description Trying to avoid getting this warning: Nov 22 20:36:35 test COPS[25531]: WARNING: db_redis [redis_dbase.c:1098]: db_redis_perform_query(): performing full table scan on table 'dispatcher' while performing query ### Troubleshooting Having: ``` modparam("db_redis", "keys", "version=entry:table_name") modparam("db_redis", "keys", "dispatcher=entry:id") ``` And debug logs showing the key being found: ``` #### Reproduction  zzzzzzzzzz #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2149

2 2

git:master:13c1c0bf: db_redis: do not print full table scan warning when loading the entire table
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: 13c1c0bfdd93d2f727ff65275e93f4a780143dee URL: https://github.com/kamailio/kamailio/commit/13c1c0bfdd93d2f727ff65275e93f4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T09:14:42+01:00 db_redis: do not print full table scan warning when loading the entire table - GH #2149 --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/13c1c0bfdd93d2f727ff65275e93f4a… Patch: https://github.com/kamailio/kamailio/commit/13c1c0bfdd93d2f727ff65275e93f4a… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index a33f897796..f3b7c1f019 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1451,11 +1451,15 @@ static int db_redis_perform_query(const db1_con_t* _h, km_redis_con_t *con, cons RES_COL_N(*_r) = _nc; if (!(*keys_count) && do_table_scan) { - LM_WARN("performing full table scan on table '%.*s' while performing query\n", + if(_n > 0) { + LM_WARN("performing full table scan on table '%.*s' while doing the query\n", CON_TABLE(_h)->len, CON_TABLE(_h)->s); - for(i = 0; i < _n; ++i) { - LM_WARN(" scan key %d is '%.*s'\n", - i, _k[i]->len, _k[i]->s); + for(i = 0; i < _n; ++i) { + LM_WARN(" scan key %d is '%.*s'\n", + i, _k[i]->len, _k[i]->s); + } + } else { + LM_DBG("loading full table: '%.*s\n", CON_TABLE(_h)->len, CON_TABLE(_h)->s); } if (db_redis_scan_query_keys(con, CON_TABLE(_h), _n, keys, keys_count,

1 0

[kamailio/kamailio] enforce REGISTER with AKAv1 (IMS) (#2150)
by moshe-av 26 Nov '19

26 Nov '19

Can kamailio enforce client to REGISTER with AKAv1? Here our setup: 1. kamailio version 4.3.4 for IMS 2. Boghe IMS client v1.0.58.550 3. scscf.cfg is configure with: #!define REG_AUTH_DEFAULT_ALG "AKAv1-MD5" a. First REGISTER fails with 401 Unauthorized b. Second REGISTER 200 OK, but the REGISTER is MD5 and not AKAv1 Authorization: Digest username="bob(a)net1.test", realm="net1.test", nonce="XdzPaF3czjz0oMKPeNLScpKAfb9prE7x", uri="sip:net1.test", response="854d9c2f3fe3dd3c96c14f8a2d20c2f9", algorithm=MD5 Thank you, -- 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/2150

2 2

git:master:1c402ddc: core: new command line parameter --modparam
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: 1c402ddc4cc499700e186b65108303a2aaec6287 URL: https://github.com/kamailio/kamailio/commit/1c402ddc4cc499700e186b65108303a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T08:49:02+01:00 core: new command line parameter --modparam - allow setting a module parameter via command line - format: --modparam=modname:paramname:type:valye - type can be: 'i' for integer value; 's' for string value - example: kamailio --loadmodule=xprint.so --modparam=xprint:buf_size:i:2048 --- Modified: src/core/modparam.c Modified: src/core/modparam.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1c402ddc4cc499700e186b65108303a… Patch: https://github.com/kamailio/kamailio/commit/1c402ddc4cc499700e186b65108303a… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 72ad2fbc9e..1a7d8acd78 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -154,3 +154,63 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) } return 0; } + +int set_mod_param_serialized(char* mval) +{ +#define MPARAM_MBUF_SIZE 256 + char mbuf[MPARAM_MBUF_SIZE]; + char *mname = NULL; + char *mparam = NULL; + char *sval = NULL; + int ival = 0; + int ptype = PARAM_STRING; + char *p = NULL; + + if(strlen(mval) >= MPARAM_MBUF_SIZE) { + LM_ERR("argument is too long: %s\n", mval); + return -1; + } + strcpy(mbuf, mval); + mname = mbuf; + p = strchr(mbuf, ':'); + if(p==NULL) { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + *p = '\0'; + p++; + mparam = p; + p = strchr(p, ':'); + if(p==NULL) { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + *p = '\0'; + p++; + if(*p=='i' || *p=='I') { + ptype = PARAM_INT; + } else if(*p=='s' || *p=='S') { + ptype = PARAM_STRING; + } else { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + p++; + if(*p!=':') { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + p++; + sval = p; + + if(ptype == PARAM_STRING) { + return set_mod_param_regex(mname, mparam, PARAM_STRING, sval); + } else { + if(strlen(sval) <= 0) { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + strz2sint(sval, &ival); + return set_mod_param_regex(mname, mparam, PARAM_INT, (void*)(long)ival); + } +} diff --git a/src/core/modparam.h b/src/core/modparam.h index 91c6867d59..0a4241ad4a 100644 --- a/src/core/modparam.h +++ b/src/core/modparam.h @@ -34,4 +34,6 @@ int set_mod_param(char* _mod, char* _name, modparam_t _type, void* _val); int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val); +int set_mod_param_serialized(char* mval); + #endif diff --git a/src/main.c b/src/main.c index 31af3d2cef..0bc2e650dc 100644 --- a/src/main.c +++ b/src/main.c @@ -78,6 +78,7 @@ #include "core/mem/shm_mem.h" #include "core/shm_init.h" #include "core/sr_module.h" +#include "core/modparam.h" #include "core/timer.h" #include "core/parser/msg_parser.h" #include "core/ip_addr.h" @@ -196,6 +197,9 @@ Options:\n\ --loadmodule=name load the module specified by name\n\ -L path Modules search path (default: " MODS_DIR ")\n\ -m nr Size of shared memory allocated in Megabytes\n\ + --modparam=modname:paramname:type:value set the module parameter\n\ + type has to be 's' for string value and 'i' for int value, \n\ + example: --modparam=corex:alias_subdomains:s:" NAME ".org\n\ -M nr Size of private memory allocated, in Megabytes\n\ -n processes Number of child processes to fork per interface\n\ (default: 8)\n" @@ -1924,6 +1928,7 @@ int main(int argc, char** argv) {"substdefs", required_argument, 0, KARGOPTVAL + 3}, {"server-id", required_argument, 0, KARGOPTVAL + 4}, {"loadmodule", required_argument, 0, KARGOPTVAL + 5}, + {"modparam", required_argument, 0, KARGOPTVAL + 6}, {0, 0, 0, 0 } }; @@ -2140,6 +2145,7 @@ int main(int argc, char** argv) case 's': case 'Y': case KARGOPTVAL+5: + case KARGOPTVAL+6: break; /* long options */ @@ -2239,6 +2245,12 @@ int main(int argc, char** argv) goto error; } break; + case KARGOPTVAL+6: + if(set_mod_param_serialized(optarg) < 0) { + LM_ERR("failed to set modparam: %s\n", optarg); + goto error; + } + break; default: break; }

1 0

git:master:b36da1dc: core: utils functions to converts strz to integer
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: b36da1dca71036ea3aa52675d3166317851e6594 URL: https://github.com/kamailio/kamailio/commit/b36da1dca71036ea3aa52675d316631… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T08:49:02+01:00 core: utils functions to converts strz to integer --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/b36da1dca71036ea3aa52675d316631… Patch: https://github.com/kamailio/kamailio/commit/b36da1dca71036ea3aa52675d316631… --- diff --git a/src/core/ut.h b/src/core/ut.h index 8b64070947..a841449164 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -689,6 +689,62 @@ static inline int str2sint(str* _s, int* _r) } +/* + * Convert a str into integer + */ +static inline int strz2int(char* _s, unsigned int* _r) +{ + int i; + + if (_r == NULL) return -1; + *_r = 0; + if (_s == NULL) return -1; + + for(i = 0; _s[i] != '\0'; i++) { + if ((_s[i] >= '0') && (_s[i] <= '9')) { + *_r *= 10; + *_r += _s[i] - '0'; + } else { + return -1; + } + } + + return 0; +} + +/* + * Convert an str to signed integer + */ +static inline int strz2sint(char* _s, int* _r) +{ + int i; + int sign; + + if (_r == NULL) return -1; + *_r = 0; + if (_s == NULL) return -1; + + sign = 1; + i = 0; + if (_s[0] == '+') { + i++; + } else if (_s[0] == '-') { + sign = -1; + i++; + } + for(; _s[i] != '\0'; i++) { + if ((_s[i] >= '0') && (_s[i] <= '9')) { + *_r *= 10; + *_r += _s[i] - '0'; + } else { + return -1; + } + } + *_r *= sign; + + return 0; +} + /** * \brief Make a copy of a str structure to a str using shm_malloc

1 0

git:master:cef6284f: nathelper: remove AVP from log message, use generic term
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: cef6284f18e0d4c606dcee3198f77e34e4c0863d URL: https://github.com/kamailio/kamailio/commit/cef6284f18e0d4c606dcee3198f77e3… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:53:37+01:00 nathelper: remove AVP from log message, use generic term --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/cef6284f18e0d4c606dcee3198f77e3… Patch: https://github.com/kamailio/kamailio/commit/cef6284f18e0d4c606dcee3198f77e3… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index be95ddd8cd..aae1791b94 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2544,7 +2544,7 @@ static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp){ memset(&valx, 0, sizeof(pv_value_t)); if(!data->s){ - LM_ERR("There isn't any data to write to avp\n"); + LM_ERR("There isn't any data to write to the destination\n"); return -1; }

1 0

git:master:9ba1a6c8: nathelper: remove redundant check for zero
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 9ba1a6c851aafc402f5fbe211638159717120c31 URL: https://github.com/kamailio/kamailio/commit/9ba1a6c851aafc402f5fbe211638159… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:48:05+01:00 nathelper: remove redundant check for zero --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/9ba1a6c851aafc402f5fbe211638159… Patch: https://github.com/kamailio/kamailio/commit/9ba1a6c851aafc402f5fbe211638159… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index afc38f727b..be95ddd8cd 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2581,7 +2581,7 @@ static int alias_to_uri(str *contact_header, str *alias_uri){ i=i+SALIAS_LEN; host.s = &contact_header->s[i]; memchr_pointer = memchr(host.s , 126 /* ~ */,contact_header->len-i); - if(memchr_pointer == NULL || memchr_pointer == 0) { + if(memchr_pointer == NULL) { LM_ERR("No alias parameter found for host\n"); return -1; } else {

1 0

git:master:0cc8a34d: nathelper: small spelling fix in docs
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 0cc8a34d3ddf2239fa8b9585d2b4432fe8362116 URL: https://github.com/kamailio/kamailio/commit/0cc8a34d3ddf2239fa8b9585d2b4432… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:45:46+01:00 nathelper: small spelling fix in docs --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0cc8a34d3ddf2239fa8b9585d2b4432… Patch: https://github.com/kamailio/kamailio/commit/0cc8a34d3ddf2239fa8b9585d2b4432… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 8c3245c5b8..732a617396 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -829,7 +829,7 @@ if(is_rfc1918("$rd")) { </title> <para> Reads <quote>;alias=ip~port~transport</quote> from Contact header then - writes to target avp as a sip uri. + writes to target pseudo-variable as a sip uri. </para> <para> This function can be used from

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019