sr-dev May 2020

sr-dev@lists.kamailio.org

24 participants
393 discussions

git:master:ddd27713: usrloc: change "-" for "_" in stats name to be prometheus compliant

by Federico Cabiddu

Module: kamailio Branch: master Commit: ddd277139165f39406832ddd557c2b56b75a7100 URL: https://github.com/kamailio/kamailio/commit/ddd277139165f39406832ddd557c2b5… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T10:24:04+02:00 usrloc: change "-" for "_" in stats name to be prometheus compliant --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/ddd277139165f39406832ddd557c2b5… Patch: https://github.com/kamailio/kamailio/commit/ddd277139165f39406832ddd557c2b5… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 59ddff92d4..321b72b64a 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++) = '_'; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0;

4 years

json request fails

by Juha Heinanen

I noticed that json rpc commands have started to fail, for example, May 2 15:41:15 char /usr/bin/sip-proxy[10440]: INFO: Executing JSON request <{"jsonrpc":"2.0","method":"siptrace.status","params":["on"],"id":1}> from <127.0.0.1> with host <127.0.0.1:6060> May 2 15:41:15 char /usr/bin/sip-proxy[10440]: ERROR: <core> [core/parser/parse_from.c:53]: parse_from_header(): bad msg or missing FROM header May 2 15:41:15 char /usr/bin/sip-proxy[10440]: ERROR: siptrace [siptrace_send.c:55]: sip_trace_prepare(): cannot parse FROM header Has something changed that I have missed? I didn't find anything related on the wiki upgrade page. -- Juha

4 years

git:master:c840fa6e: siptrace: skip non-sip traffic for db storage using core callbacks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c840fa6eb19b4b5d316e36ce534f4d481805ee0b URL: https://github.com/kamailio/kamailio/commit/c840fa6eb19b4b5d316e36ce534f4d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T15:02:55+02:00 siptrace: skip non-sip traffic for db storage using core callbacks --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/c840fa6eb19b4b5d316e36ce534f4d4… Patch: https://github.com/kamailio/kamailio/commit/c840fa6eb19b4b5d316e36ce534f4d4… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 5b4c064bec..6cc3471fcf 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2077,6 +2077,24 @@ int siptrace_net_data_recv(sr_event_param_t *evp) goto afterdb; } + if(tmsg.first_line.type==SIP_REQUEST) { + if(!IS_SIP(&tmsg)) { + LM_DBG("non sip request message\n"); + free_sip_msg(&tmsg); + goto afterdb; + } + } else if(tmsg.first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(&tmsg)) { + LM_DBG("non sip reply message\n"); + free_sip_msg(&tmsg); + goto afterdb; + } + } else { + LM_DBG("unknown sip message type %d\n", tmsg.first_line.type); + free_sip_msg(&tmsg); + goto afterdb; + } + if(sip_trace_msg_attrs(&tmsg, &sto) < 0) { free_sip_msg(&tmsg); goto afterdb; @@ -2179,6 +2197,24 @@ int siptrace_net_data_send(sr_event_param_t *evp) goto afterdb; } + if(tmsg.first_line.type==SIP_REQUEST) { + if(!IS_SIP(&tmsg)) { + LM_DBG("non sip request message\n"); + free_sip_msg(&tmsg); + goto afterdb; + } + } else if(tmsg.first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(&tmsg)) { + LM_DBG("non sip reply message\n"); + free_sip_msg(&tmsg); + goto afterdb; + } + } else { + LM_DBG("unknown sip message type %d\n", tmsg.first_line.type); + free_sip_msg(&tmsg); + goto afterdb; + } + if(sip_trace_msg_attrs(&tmsg, &sto) < 0) { free_sip_msg(&tmsg); goto afterdb;

4 years

undefined symbol: ul_cseq_delay

by Juha Heinanen

I build my sip proxy from today's master and it didn't start: May 2 15:12:51 char sip-proxy[22422]: 0(22474) ERROR: <core> [core/sr_module.c:512]: load_module(): could not open module </usr/lib/x86_64-linux-gnu/sip-proxy/modules/usrloc.so>: /usr/lib/x86_64-linux-gnu/sip-proxy/modules/usrloc.so: undefined symbol: ul_cseq_delay -- Juha

4 years

git:master:d515c93a: usrloc: fixed missing symbol for ul_cseq_delay

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d515c93a5c9c9eb920f001d04870dc6333ca60dd URL: https://github.com/kamailio/kamailio/commit/d515c93a5c9c9eb920f001d04870dc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T14:29:53+02:00 usrloc: fixed missing symbol for ul_cseq_delay --- Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/d515c93a5c9c9eb920f001d04870dc6… Patch: https://github.com/kamailio/kamailio/commit/d515c93a5c9c9eb920f001d04870dc6… --- diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index faddeac91a..8e5258bfae 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -44,7 +44,7 @@ /*! contact matching mode */ int ul_matching_mode = CONTACT_ONLY; /*! retransmission detection interval in seconds */ -int cseq_delay = 20; +int ul_cseq_delay = 20; /*! * \brief Create and initialize new record structure @@ -801,7 +801,7 @@ int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, return -1; if (_cseq==ptr->cseq) { ul_get_act_time(); - return (ptr->last_modified+cseq_delay>ul_act_time)?-2:-1; + return (ptr->last_modified+ul_cseq_delay>ul_act_time)?-2:-1; } } *_co = ptr;

4 years

git:master:34b9b59b: core: more debug messages when matching myself

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 34b9b59b97f7d529025863992408fd60a27a941a URL: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T08:47:30+02:00 core: more debug messages when matching myself - coherent coding style for related functions --- Modified: src/core/forward.c Modified: src/core/name_alias.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6… Patch: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6…

4 years

git:master:66ef7ab7: kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 66ef7ab7b078794b96ecee13f6867d5f90a8d63e URL: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T08:47:30+02:00 kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser --- Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… Patch: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index bdb8b98ab4..4050371bfe 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -161,9 +161,12 @@ kamailio_db_grant () # pars: <database name> # Users: kamailio is the regular user, kamailioro only for reading sql_query "" "CREATE USER '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST'; - CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "granting privileges to database $1 failed!" @@ -172,9 +175,11 @@ kamailio_db_grant () # pars: <database name> if [ "$DBHOST" != "localhost" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost'; - CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -183,9 +188,11 @@ kamailio_db_grant () # pars: <database name> if [ ! -z "$DBACCESSHOST" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST'; - CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1 @@ -203,8 +210,11 @@ kamailio_db_revoke () # pars: <database name> minfo "revoking privileges to database $1 ..." # Users: kamailio is the regular user, kamailioro only for reading - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST'; - REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "revoking privileges to database $1 failed!" @@ -212,8 +222,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ "$DBHOST" != "localhost" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -221,8 +233,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ ! -z "$DBACCESSHOST" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1

4 years

[kamailio/kamailio] hash table size issue (#2311)

by fborot

I have my hash table set to size = 16 modparam("htable", "htable", "a=>size=16;autoexpire=0;dbtable=htable;") I had around 3000 entries in that table, some entries with more than 10 duplicate keys (key_type = 1) and we found that when reading the entries of the duplicated keys it could not go pass index 9 even though in the physical table there were 17 entries. I deleted some old entries and now the table is about 2000 items and it seems to work properly again ,(loads all value in memory). I say seems because I can not dump all values: ``` ./kamcmd htable.dump a ERROR: reply too big ``` But I check manually all the ones that were not being loaded and they are now Questions: 1- the size parameter is for the buckets or entries size ? 2- is 16 a good value for a table with 3000 entries? ( 2^16 is 65k so I figured it would be ok) 3- can the the way I define my key impose a limitation? 4- what is the max size for an htable to be dumped with the above command? -- 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/2311

4 years

git:5.3:cca28078: core: do not use tcp id for lookup if not needed

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: cca28078f7fe329046744c9b63d01bb9945a8dca URL: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… Author: Donato Sciarra <donato.sciarra(a)bmw.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:55:25+02:00 core: do not use tcp id for lookup if not needed In case the first lookup (with tcp id) is not successfull, the second attempt should have been performed without a tcp id. Issue was introduced with dc43750644 (new global parameter tcp_connection_match) in 5.3. (cherry picked from commit 24a3a172dbdecb6e987df943a3ad1acb4da664b5) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… Patch: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 99d33ee719..1c9859f633 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2029,7 +2029,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, if (likely(port)){ /* try again w/o id */ if(tcp_connection_match==TCPCONN_MATCH_STRICT) { - c=tcpconn_lookup(dst->id, &ip, port, from, try_local_port, con_lifetime); + c=tcpconn_lookup(0, &ip, port, from, try_local_port, con_lifetime); } else { c=tcpconn_get(0, &ip, port, from, con_lifetime); }

4 years

git:5.3:178cbde6: app_python: use -fno-strict-aliasing for gcc

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 178cbde6eac86a86b92b107cf2f039400c578a5f URL: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:54:30+02:00 app_python: use -fno-strict-aliasing for gcc - python2 is known for not confirming strict aliasing - it is EoL and likely not going to be fixed - GH #2298 (cherry picked from commit 3366bf4f3746285d9dc29e8a2461f53983f0acf0) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… Patch: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index 0d8bc98701..d22e63e6a4 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -29,5 +29,9 @@ endif DEFS+=-I${PYTHON_INCDIR} +ifeq ($(CC_NAME), gcc) +DEFS+= -fno-strict-aliasing +endif + include ../../Makefile.modules

4 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2020