sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:5.1:a40d65a8: db_mysql: remove build warning, unneeded include (#1777)
by Henning Westerholt 06 Aug '19

06 Aug '19

Module: kamailio Branch: 5.1 Commit: a40d65a8ae22d900118f92e3010e383825db9ebd URL: https://github.com/kamailio/kamailio/commit/a40d65a8ae22d900118f92e3010e383… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-06T09:48:58+02:00 db_mysql: remove build warning, unneeded include (#1777) db_mysql: mysql_version.h is already included at mysql.h (GH #1777) > In file included from km_dbase.c:38: > /usr/include/mariadb/mysql_version.h:3:2: warning: This file should not be included by clients, include only <mysql.h> [-W#warnings] > #warning This file should not be included by clients, include only <mysql.h> (cherry picked from commit 57263490bd1dedbb4b7fdad6046880980feea040) --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a40d65a8ae22d900118f92e3010e383… Patch: https://github.com/kamailio/kamailio/commit/a40d65a8ae22d900118f92e3010e383… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index aa960f4963..850dd89d9c 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -35,7 +35,6 @@ #include <string.h> #include <mysql.h> #include <errmsg.h> -#include <mysql_version.h> #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h"

1 0

git:master:36ef1bf7: corex: fix parser for alias_subdomain modparam, extend debugging output
by Henning Westerholt 06 Aug '19

06 Aug '19

Module: kamailio Branch: master Commit: 36ef1bf77f9df7bc5022c1dc350e54df2d168cf3 URL: https://github.com/kamailio/kamailio/commit/36ef1bf77f9df7bc5022c1dc350e54d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-06T09:44:38+02:00 corex: fix parser for alias_subdomain modparam, extend debugging output - fix parser for alias_subdomain modparam, it was not working correctly for all proto:hostname:port combinations (e.g. hostname/proto mixed up) - extend debugging output for alias adding and also alias matching --- Modified: src/modules/corex/corex_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/36ef1bf77f9df7bc5022c1dc350e54d… Patch: https://github.com/kamailio/kamailio/commit/36ef1bf77f9df7bc5022c1dc350e54d… --- diff --git a/src/modules/corex/corex_lib.c b/src/modules/corex/corex_lib.c index 377654158d..ec5334cb2e 100644 --- a/src/modules/corex/corex_lib.c +++ b/src/modules/corex/corex_lib.c @@ -114,6 +114,7 @@ int corex_add_alias_subdomains(char* aliasval) corex_alias_t ta; corex_alias_t *na; + LM_DBG("try to add alias: %s\n", aliasval); memset(&ta, 0, sizeof(corex_alias_t)); p = strchr(aliasval, ':'); @@ -134,27 +135,38 @@ int corex_add_alias_subdomains(char* aliasval) } else if((p-aliasval)==4 && strncasecmp(aliasval, "sctp", 4)==0) { ta.proto = PROTO_SCTP; } else { - /* use hostname */ - ta.alias.s = aliasval; - ta.alias.len = p - aliasval; + /* invalid protocol */ + LM_ERR("invalid protocol %.*s", (int) (p-aliasval), aliasval); + goto error; } - } - if(ta.alias.len==0) { + /* hostname */ p++; - if(p>=aliasval+strlen(aliasval)) + ta.alias.s = aliasval + (p-aliasval); + + if(p>=aliasval+strlen(aliasval)) { goto error; - ta.alias.s = p; + } + /* port */ p = strchr(ta.alias.s, ':'); if(p==NULL) { ta.alias.len = strlen(ta.alias.s); goto done; } + ta.alias.len = p - ta.alias.s; + p++; + ta.port = str2s(p, strlen(p), NULL); + + } else { + /* hostname */ + ta.alias.s = aliasval; + ta.alias.len = p - ta.alias.s; + /* port */ + p++; + if(p>=aliasval+strlen(aliasval)) { + goto error; + } + ta.port = str2s(p, strlen(p), NULL); } - /* port */ - p++; - if(p>=aliasval+strlen(aliasval)) - goto error; - ta.port = str2s(p, strlen(p), NULL); done: if(ta.alias.len==0) @@ -169,6 +181,8 @@ int corex_add_alias_subdomains(char* aliasval) na->next = _corex_alias_list; _corex_alias_list = na; + LM_DBG("alias: %d:%.*s:%d from value: %s added\n", ta.proto, + ta.alias.len, ta.alias.s, ta.port, aliasval); return 0; error: @@ -181,6 +195,8 @@ int corex_check_self(str* host, unsigned short port, unsigned short proto) { corex_alias_t *ta; + LM_DBG("check self for: %d:%.*s:%d\n", (int) proto, host->len, + host->s, (int)port); for(ta=_corex_alias_list; ta; ta=ta->next) { if(host->len<ta->alias.len) continue; @@ -191,21 +207,22 @@ int corex_check_self(str* host, unsigned short port, unsigned short proto) if(host->len==ta->alias.len && strncasecmp(host->s, ta->alias.s, host->len)==0) { /* match domain */ - LM_DBG("check self domain match: %d:%.*s:%d\n", (int)ta->port, - ta->alias.len, ta->alias.s, (int)ta->proto); + LM_DBG("check self domain match: %d:%.*s:%d\n", (int)ta->proto, + ta->alias.len, ta->alias.s, (int)ta->port); return 1; } if(strncasecmp(ta->alias.s, host->s + host->len - ta->alias.len, ta->alias.len)==0) { if(host->s[host->len - ta->alias.len - 1]=='.') { /* match sub-domain */ - LM_DBG("check self sub-domain match: %d:%.*s:%d\n", (int)ta->port, - ta->alias.len, ta->alias.s, (int)ta->proto); + LM_DBG("check self sub-domain match: %d:%.*s:%d\n", + (int)ta->proto, ta->alias.len, ta->alias.s, + (int)ta->port); return 1; } } } - + LM_DBG("no match found\n"); return 0; /* no match */ }

1 0

git:master:b2814a12: modules: readme files regenerated - app_ruby ... [skip ci]
by Kamailio Dev 05 Aug '19

05 Aug '19

Module: kamailio Branch: master Commit: b2814a12119c4419dfea8fae68cbec73bf788eb1 URL: https://github.com/kamailio/kamailio/commit/b2814a12119c4419dfea8fae68cbec7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-05T18:31:42+02:00 modules: readme files regenerated - app_ruby ... [skip ci] --- Modified: src/modules/app_ruby/README --- Diff: https://github.com/kamailio/kamailio/commit/b2814a12119c4419dfea8fae68cbec7… Patch: https://github.com/kamailio/kamailio/commit/b2814a12119c4419dfea8fae68cbec7… --- diff --git a/src/modules/app_ruby/README b/src/modules/app_ruby/README index 56b7731e4a..cf1ba153b0 100644 --- a/src/modules/app_ruby/README +++ b/src/modules/app_ruby/README @@ -34,7 +34,7 @@ Daniel-Constantin Mierla 5. RPC Commands 5.1. app_ruby.reload - 5.2. ruby_jsdt.api_list + 5.2. app_ruby.api_list 6. Example of usage @@ -64,7 +64,7 @@ Chapter 1. Admin Guide 5. RPC Commands 5.1. app_ruby.reload - 5.2. ruby_jsdt.api_list + 5.2. app_ruby.api_list 6. Example of usage @@ -140,7 +140,7 @@ ruby_run("rb_funcx", "$rU", "2"); 5. RPC Commands 5.1. app_ruby.reload - 5.2. ruby_jsdt.api_list + 5.2. app_ruby.api_list 5.1. app_ruby.reload @@ -157,11 +157,11 @@ ruby_run("rb_funcx", "$rU", "2"); kamcmd app_ruby.reload ... -5.2. ruby_jsdt.api_list +5.2. app_ruby.api_list List the functions available via Kemi framework. - Name: ruby_jsdt.api_list + Name: app_ruby.api_list Parameters: none

1 0

git:master:5773fba2: app_ruby: docs - fix rpc command name for listing the api
by Daniel-Constantin Mierla 05 Aug '19

05 Aug '19

Module: kamailio Branch: master Commit: 5773fba2765c8a08be7016e82a6ec02579b49215 URL: https://github.com/kamailio/kamailio/commit/5773fba2765c8a08be7016e82a6ec02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-05T18:29:42+02:00 app_ruby: docs - fix rpc command name for listing the api --- Modified: src/modules/app_ruby/doc/app_ruby_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5773fba2765c8a08be7016e82a6ec02… Patch: https://github.com/kamailio/kamailio/commit/5773fba2765c8a08be7016e82a6ec02… --- diff --git a/src/modules/app_ruby/doc/app_ruby_admin.xml b/src/modules/app_ruby/doc/app_ruby_admin.xml index 8a2c311bc2..d69d4d880a 100644 --- a/src/modules/app_ruby/doc/app_ruby_admin.xml +++ b/src/modules/app_ruby/doc/app_ruby_admin.xml @@ -143,13 +143,13 @@ ruby_run("rb_funcx", "$rU", "2"); </section> <section id="app_ruby.r.api_list"> <title> - <function moreinfo="none">ruby_jsdt.api_list</function> + <function moreinfo="none">app_ruby.api_list</function> </title> <para> List the functions available via Kemi framework. </para> <para> - Name: <emphasis>ruby_jsdt.api_list</emphasis> + Name: <emphasis>app_ruby.api_list</emphasis> </para> <para>Parameters: <emphasis>none</emphasis></para> <para>

1 0

git:master:ea526a8d: app_ruby: print pointers in error log message
by Daniel-Constantin Mierla 05 Aug '19

05 Aug '19

Module: kamailio Branch: master Commit: ea526a8de9c961a57858ecc4c47ce4ba24e03908 URL: https://github.com/kamailio/kamailio/commit/ea526a8de9c961a57858ecc4c47ce4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-05T18:11:00+02:00 app_ruby: print pointers in error log message --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/ea526a8de9c961a57858ecc4c47ce4b… Patch: https://github.com/kamailio/kamailio/commit/ea526a8de9c961a57858ecc4c47ce4b… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index a346ceeb2f..8a4679d775 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -462,7 +462,8 @@ VALUE sr_kemi_ruby_exec_func_ex(ksr_ruby_context_t *R, sr_kemi_t *ket, int argc, env_R = app_ruby_sr_env_get(); if(env_R==NULL || env_R->msg==NULL || ket==NULL) { - LM_ERR("invalid ruby environment attributes or parameters\n"); + LM_ERR("invalid ruby environment attributes or parameters (%p/%p/%p)\n", + env_R, env_R->msg, ket); return Qfalse; }

1 0

git:master:7a4c490a: uac: debug messages when restoring from/to headers
by Daniel-Constantin Mierla 05 Aug '19

05 Aug '19

Module: kamailio Branch: master Commit: 7a4c490a63cd3fa924b6921fcd20ba77a6d661fb URL: https://github.com/kamailio/kamailio/commit/7a4c490a63cd3fa924b6921fcd20ba7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-05T18:04:08+02:00 uac: debug messages when restoring from/to headers --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/7a4c490a63cd3fa924b6921fcd20ba7… Patch: https://github.com/kamailio/kamailio/commit/7a4c490a63cd3fa924b6921fcd20ba7… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 6231b5a7ae..8da8fc7441 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -622,6 +622,7 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, } old_body = (struct to_body*) msg->to->parsed; flag = FL_USE_UAC_TO; + LM_DBG("replacing in To header\n"); } else { /* replace the FROM URI */ if ( parse_from_header(msg)<0 ) { @@ -630,6 +631,7 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, } old_body = (struct to_body*) msg->from->parsed; flag = FL_USE_UAC_FROM; + LM_DBG("replacing in From header\n"); } if(restore_avp->s) {

1 0

Re: [sr-dev] [SR-Users] The domain module in 5.1.8 has a memory leak
by Henning Westerholt 04 Aug '19

04 Aug '19

Hi Mack, looks indeed like an issue. Can you try with git master commit f50177003c21f. If your test is also ok, I will backport to stable branch Cheers, Henning Am 04.08.19 um 19:49 schrieb Mack Hendricks: Based on my tests, the memory leak is only exposed when you are using domain attributes, which are stored in the domain_attrs table. I wanted to see if anymore else is running into this issue. Reproducible use case: 1) Insert the following into the database insert into domain values (null,"aprilco.com<http://aprilco.com>","aprilco.com<http://aprilco.com>",now()); insert into domain_attrs values (null,"aprilco.com<http://aprilco.com>","pbx_type",0,"0",now()); insert into domain_attrs values (null,"aprilco.com<http://aprilco.com>","pbx_id",0,"65",now()); 2) Open a new terminal window and execute: watch "kamcmd core.shmmem" 3) Open up another terminal windows and execute: while true; do kamcmd domain.reload; done Expected Results: You will see the shared memory being allocated, but never freed. The more entries you have in the domain_attrs table, the faster it will run out of memory. Thanks, Mack Hendricks / Head of Support / dOpenSource web: http://dopensource.com<http://dopensource.com/> support: +888-907-2085 dSIPRouter<http://dsiprouter.org/> - GUI focused on implementing Kamailio to provide SIP Trunking and PBX Hosting Services _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

1 0

git:master:f5017700: domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list)
by Henning Westerholt 04 Aug '19

04 Aug '19

Module: kamailio Branch: master Commit: f50177003c21f53564be6349c0bb4935be184e2d URL: https://github.com/kamailio/kamailio/commit/f50177003c21f53564be6349c0bb493… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-04T21:12:48+02:00 domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list) - fix memory leak on domain reload, reported by Mack Hendricks - related to domain_attr table, structure domain_list --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/f50177003c21f53564be6349c0bb493… Patch: https://github.com/kamailio/kamailio/commit/f50177003c21f53564be6349c0bb493… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 257d374dba..b093dbc3e4 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,6 +204,7 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + shm_free(np); np = np->next; }

1 0

git:master:50b0e539: tm: remove CANCEL_REASON_SUPPORT #define, activated as default since 2010
by Henning Westerholt 02 Aug '19

02 Aug '19

Module: kamailio Branch: master Commit: 50b0e5398b0ce698b287818d2c6fe4266d972152 URL: https://github.com/kamailio/kamailio/commit/50b0e5398b0ce698b287818d2c6fe42… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-02T21:36:05+02:00 tm: remove CANCEL_REASON_SUPPORT #define, activated as default since 2010 - remove CANCEL_REASON_SUPPORT #define from module - remove now unneeded defs.h include file - activated as default since commit bf5d1d6f1df303019ccf4 in 2010 - tm does not compile anymore if deactivated --- Modified: src/modules/tm/config.h Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/lock.c Modified: src/modules/tm/lock.h Modified: src/modules/tm/sip_msg.c Modified: src/modules/tm/sip_msg.h Modified: src/modules/tm/t_append_branches.h Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_cancel.h Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_funcs.h Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_fwd.h Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_hooks.h Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h Modified: src/modules/tm/t_stats.c Modified: src/modules/tm/t_stats.h Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h Modified: src/modules/tm/tm.c Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h Removed: src/modules/tm/defs.h --- Diff: https://github.com/kamailio/kamailio/commit/50b0e5398b0ce698b287818d2c6fe42… Patch: https://github.com/kamailio/kamailio/commit/50b0e5398b0ce698b287818d2c6fe42…

1 0

Missing 200 Ok reply message
by Salahuddin Ahmed 02 Aug '19

02 Aug '19

Hello, Recently we update kamailio fromversion 4.1.1 to 5.2. In this new version we have facing following issue. [image: missing_leg.png] We tried to catch this message using t_on_reply and on_sl_reply but no luck. Actually we need to forward those message to another server using sip_trace. If using trace_mode=1 then all message forwarded perfectly. But I need to set correlation_id with sip_trace method. So we need to catch that message and tag the correlation_id with that. Could anyone please help me on this? Is there anything I missing or any way to fix this? Thanks in advance, Salah

2 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019