sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
490 discussions

git:master:17b9a6ad: xmlrpc: use <nil/> for null string values
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: master Commit: 17b9a6add82781f71b4d84da7c804e0e72c8b026 URL: https://github.com/kamailio/kamailio/commit/17b9a6add82781f71b4d84da7c804e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T18:47:42+01:00 xmlrpc: use <nil/> for null string values - XML-RPC extension listed at https://en.wikipedia.org/wiki/XML-RPC#Data_types --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/17b9a6add82781f71b4d84da7c804e0… Patch: https://github.com/kamailio/kamailio/commit/17b9a6add82781f71b4d84da7c804e0… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index dd64cf06f9..5e2a7466b0 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -264,6 +264,7 @@ static str member_prefix = STR_STATIC_INIT("<member>"); static str member_suffix = STR_STATIC_INIT("</member>"); static str name_prefix = STR_STATIC_INIT("<name>"); static str name_suffix = STR_STATIC_INIT("</name>"); +static str nil_value = STR_STATIC_INIT("<nil/>"); /** Garbage collection data structure. * @@ -1066,17 +1067,29 @@ static int print_value(struct xmlrpc_reply* res, break; case 's': - prefix = string_prefix; - suffix = string_suffix; body.s = va_arg(*ap, char*); - body.len = strlen(body.s); + if(body.s!=NULL) { + prefix = string_prefix; + suffix = string_suffix; + body.len = strlen(body.s); + } else { + prefix = ""; + suffix = ""; + body = nil_value; + } break; case 'S': - prefix = string_prefix; - suffix = string_suffix; sp = va_arg(*ap, str*); - body = *sp; + if(sp!=NULL && sp->s!=NULL) { + prefix = string_prefix; + suffix = string_suffix; + body = *sp; + } else { + prefix = ""; + suffix = ""; + body = nil_value; + } break; default:

1 0

git:5.4:c9a46eb8: ims_qos: typos in comments
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: 5.4 Commit: c9a46eb88365add327b5d6f11f121c26a6230e58 URL: https://github.com/kamailio/kamailio/commit/c9a46eb88365add327b5d6f11f121c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T18:31:49+01:00 ims_qos: typos in comments (cherry picked from commit f9c336aa9a78169cf9c7f3fd9bfcfd22218078fb) --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/c9a46eb88365add327b5d6f11f121c2… Patch: https://github.com/kamailio/kamailio/commit/c9a46eb88365add327b5d6f11f121c2… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index e58dd2c140..a49ee1bd90 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -597,7 +597,7 @@ void callback_pcscf_contact_cb(struct pcontact *c, int type, void *param) if (type == PCSCF_CONTACT_EXPIRE || type == PCSCF_CONTACT_DELETE) { - //we dont need to send STR if no QoS was ever succesfully registered! + // we dont need to send STR if no QoS was ever successfully registered! if (must_send_str && (c->reg_state != PCONTACT_REG_PENDING) && (c->reg_state != PCONTACT_REG_PENDING_AAR)) { LM_DBG("Received notification of contact (in state [%d] deleted for signalling bearer with with Rx session ID: [%.*s]\n", c->reg_state, c->rx_session_id.len, c->rx_session_id.s); diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index d9f242f43b..756ed2a663 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -328,7 +328,8 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e } //at this point we have the contact - /*set the contact state to say we have succesfully done ARR for register and that we dont need to do it again + /*set the contact state to say we have successfully done ARR for register + * and that we dont need to do it again * for the duration of the registration. * */ if (ul.update_rx_regsession(domain_t, &local_data->auth_session_id, pcontact) != 0) {

1 0

git:5.4:68ec1e12: kamdbctl: typo in log message - core tables successfully installed
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: 5.4 Commit: 68ec1e125e5069160696c8a634cac43e14d35ddd URL: https://github.com/kamailio/kamailio/commit/68ec1e125e5069160696c8a634cac43… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T18:31:36+01:00 kamdbctl: typo in log message - core tables successfully installed (cherry picked from commit 571fe52f4ad0cf5ceef98fb2d77c2711f3692c28) --- Modified: utils/kamctl/kamdbctl.mysql Modified: utils/kamctl/kamdbctl.oracle Modified: utils/kamctl/kamdbctl.pgsql Modified: utils/kamctl/kamdbctl.sqlite --- Diff: https://github.com/kamailio/kamailio/commit/68ec1e125e5069160696c8a634cac43… Patch: https://github.com/kamailio/kamailio/commit/68ec1e125e5069160696c8a634cac43… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 4050371bfe..81a730bbe6 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -315,7 +315,7 @@ standard_create () # pars: <database name> fi done - minfo "Core Kamailio tables succesfully created." + minfo "Core Kamailio tables successfully created." if [ -e $DB_SCHEMA/extensions-create.sql ] then @@ -347,7 +347,7 @@ presence_create () # pars: <database name> fi done - minfo "Presence tables succesfully created." + minfo "Presence tables successfully created." } # end presence_create @@ -368,7 +368,7 @@ extra_create () # pars: <database name> exit 1 fi done - minfo "Extra tables succesfully created." + minfo "Extra tables successfully created." } # end extra_create dbuid_create () # pars: <database name> @@ -388,7 +388,7 @@ dbuid_create () # pars: <database name> exit 1 fi done - minfo "UID tables succesfully created." + minfo "UID tables successfully created." } # end uid_create diff --git a/utils/kamctl/kamdbctl.oracle b/utils/kamctl/kamdbctl.oracle index 0b65027d66..e6de52f3a4 100644 --- a/utils/kamctl/kamdbctl.oracle +++ b/utils/kamctl/kamdbctl.oracle @@ -208,7 +208,7 @@ if [ -e $DB_SCHEMA/extensions-create.sql ]; then fi fi -minfo "Core Kamailio tables succesfully created." +minfo "Core Kamailio tables successfully created." get_answer $INSTALL_PRESENCE_TABLES "Install presence related tables? (y/n): " if [ "$ANSWER" = "y" ]; then @@ -244,7 +244,7 @@ if [ $? -ne 0 ] || check_oracle_log ; then exit 1 fi -minfo "Presence tables succesfully created." +minfo "Presence tables successfully created." } extra_create() # pars: <database name> @@ -266,7 +266,7 @@ for TABLE in $EXTRA_MODULES; do fi done -minfo "Extra tables succesfully created." +minfo "Extra tables successfully created." } diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index c41354ffc6..fa1fe1ada8 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -168,7 +168,7 @@ then fi fi -minfo "Core Kamailio tables succesfully created." +minfo "Core Kamailio tables successfully created." get_answer $INSTALL_PRESENCE_TABLES "Install presence related tables? (y/n): " if [ "$ANSWER" = "y" ]; then @@ -216,7 +216,7 @@ for TABLE in $PRESENCE_TABLES; do fi done -minfo "Presence tables succesfully created." +minfo "Presence tables successfully created." } # end presence_create @@ -251,7 +251,7 @@ for TABLE in $EXTRA_TABLES; do fi done -minfo "Extra tables succesfully created." +minfo "Extra tables successfully created." } # end extra_create @@ -272,5 +272,5 @@ dbuid_create () # pars: <database name> exit 1 fi done - minfo "UID tables succesfully created." + minfo "UID tables successfully created." } # end uid_create diff --git a/utils/kamctl/kamdbctl.sqlite b/utils/kamctl/kamdbctl.sqlite index 4915b81a40..1aeae559f2 100644 --- a/utils/kamctl/kamdbctl.sqlite +++ b/utils/kamctl/kamdbctl.sqlite @@ -88,7 +88,7 @@ then fi fi -minfo "Core Kamailio tables succesfully created." +minfo "Core Kamailio tables successfully created." get_answer $INSTALL_PRESENCE_TABLES "Install presence related tables? (y/n): " if [ "$ANSWER" = "y" ]; then @@ -125,7 +125,7 @@ if [ $? -ne 0 ] ; then exit 1 fi -minfo "Presence tables succesfully created." +minfo "Presence tables successfully created." } # end presence_create @@ -147,5 +147,5 @@ for TABLE in $EXTRA_MODULES; do fi done -minfo "Extra tables succesfully created." +minfo "Extra tables successfully created." } # end extra_create

1 0

git:5.4:47b45b60: ipops: use local ip struct for internal resolving
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: 5.4 Commit: 47b45b60a037808a675f7d52dd5b2ee80bfe0868 URL: https://github.com/kamailio/kamailio/commit/47b45b60a037808a675f7d52dd5b2ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T18:31:19+01:00 ipops: use local ip struct for internal resolving - static structure from core can be overwritten on subsequential use - GH #2645 (cherry picked from commit 2ce244825bf7bc38f145699209ef7125ae5480d0) --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/47b45b60a037808a675f7d52dd5b2ee… Patch: https://github.com/kamailio/kamailio/commit/47b45b60a037808a675f7d52dd5b2ee… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 13511e4422..cb7422b988 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1098,15 +1098,22 @@ static int ki_is_ip_rfc1918(sip_msg_t* _msg, str* sval) static inline ip_addr_t *strtoipX(str *ips) { + static ip_addr_t ipb; + /* try to figure out INET class */ if(ips->s[0] == '[' || memchr(ips->s, ':', ips->len)!=NULL) { /* IPv6 */ - return str2ip6(ips); + if(str2ip6buf(ips, &ipb) < 0) { + return &ipb; + } } else { /* IPv4 */ - return str2ip(ips); + if (str2ipbuf(ips, &ipb)<0) { + return &ipb; + } } + return NULL; } static int ki_dns_sys_match_ip(sip_msg_t *msg, str *vhn, str *vip)

1 0

git:5.4:3632d39b: jsonrpcs: use json null value for c null char* or str*
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: 5.4 Commit: 3632d39b557d2b926ccfce4fd83b4c16568e6ee1 URL: https://github.com/kamailio/kamailio/commit/3632d39b557d2b926ccfce4fd83b4c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T18:31:01+01:00 jsonrpcs: use json null value for c null char* or str* (cherry picked from commit c48e409b741821fa470788b3bca0ead32e4d6efc) --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3632d39b557d2b926ccfce4fd83b4c1… Patch: https://github.com/kamailio/kamailio/commit/3632d39b557d2b926ccfce4fd83b4c1… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index c3b8003046..a5a92e1537 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -472,6 +472,7 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) time_t dt; struct tm t; str *sp; + char *cp; switch(fmt) { case 'd': @@ -497,11 +498,20 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) nj = srjson_CreateString(ctx->jrpl, buf); break; case 's': - nj = srjson_CreateString(ctx->jrpl, va_arg(*ap, char*)); + cp = va_arg(*ap, char*); + if(cp!=NULL) { + nj = srjson_CreateString(ctx->jrpl, cp); + } else { + nj = srjson_CreateNull(ctx->jrpl); + } break; case 'S': sp = va_arg(*ap, str*); - nj = srjson_CreateStr(ctx->jrpl, sp->s, sp->len); + if(sp!=NULL && sp->s!=NULL) { + nj = srjson_CreateStr(ctx->jrpl, sp->s, sp->len); + } else { + nj = srjson_CreateNull(ctx->jrpl); + } break; default: LM_ERR("Invalid formatting character [%c]\n", fmt);

1 0

git:5.4:5b6a7722: core: early detect of empty host for check_self()
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: 5.4 Commit: 5b6a77222eca4e927480ed7b18e7f233e3fdf822 URL: https://github.com/kamailio/kamailio/commit/5b6a77222eca4e927480ed7b18e7f23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T18:30:47+01:00 core: early detect of empty host for check_self() (cherry picked from commit 6863cb8b0253c641146633bd063575a53bc6a466) --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/5b6a77222eca4e927480ed7b18e7f23… Patch: https://github.com/kamailio/kamailio/commit/5b6a77222eca4e927480ed7b18e7f23… --- diff --git a/src/core/forward.c b/src/core/forward.c index 716b148f2c..a7f6c06bfc 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -408,6 +408,13 @@ int run_check_self_func(str* host, unsigned short port, unsigned short proto) int check_self(str* host, unsigned short port, unsigned short proto) { int ret = 1; + + if(host==NULL || host->s==NULL || host->len<=0) { + /* no host (e.g., tel uri) - not matching myself */ + LM_DBG("no host value - not matching myself addresses\n"); + return 0; + } + if (grep_sock_info(host, port, proto)) { goto done; }

1 0

git:5.4:908acb8f: rr: catch uri without host part when matching local addresses
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: 5.4 Commit: 908acb8f0995d10b1ed9334fc7b81166b14ab8cc URL: https://github.com/kamailio/kamailio/commit/908acb8f0995d10b1ed9334fc7b8116… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T18:30:33+01:00 rr: catch uri without host part when matching local addresses - can happen for tel or urn uri (cherry picked from commit 81cd9c5d6934392cafd4b73541a19dbfa4b553f9) --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/908acb8f0995d10b1ed9334fc7b8116… Patch: https://github.com/kamailio/kamailio/commit/908acb8f0995d10b1ed9334fc7b8116… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 0ba6ad5e5a..9bf8388ca5 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -122,6 +122,11 @@ static inline int is_myself(sip_uri_t *_puri) { int ret; + if(_puri->host.len==0) { + /* catch uri without host (e.g., tel uri) */ + return 0; + } + ret = check_self(&_puri->host, _puri->port_no?_puri->port_no:SIP_PORT, 0);/* match all protos*/ if (ret < 0) return 0;

1 0

git:master:62019416: topos: one more update to enable processing ofr 100
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: master Commit: 620194165e0c6c27dfe9dbe382dc2e7b58be13b5 URL: https://github.com/kamailio/kamailio/commit/620194165e0c6c27dfe9dbe382dc2e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T18:16:00+01:00 topos: one more update to enable processing ofr 100 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/620194165e0c6c27dfe9dbe382dc2e7… Patch: https://github.com/kamailio/kamailio/commit/620194165e0c6c27dfe9dbe382dc2e7… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index e3616391ad..3130a98f8b 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -926,11 +926,6 @@ int tps_response_received(sip_msg_t *msg) LM_DBG("handling incoming response\n"); - if(msg->first_line.u.reply.statuscode==100) { - /* nothing to do - it should be absorbed */ - return 0; - } - memset(&mtsd, 0, sizeof(tps_data_t)); memset(&stsd, 0, sizeof(tps_data_t)); memset(&btsd, 0, sizeof(tps_data_t));

1 0

git:master:80e812ca: topos: handle 100 response completely
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: master Commit: 80e812caf83a131c5f830b7d23de754136fd54f7 URL: https://github.com/kamailio/kamailio/commit/80e812caf83a131c5f830b7d23de754… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T17:19:03+01:00 topos: handle 100 response completely - it may be needed by other modules to be processed with all via stack --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/80e812caf83a131c5f830b7d23de754… Patch: https://github.com/kamailio/kamailio/commit/80e812caf83a131c5f830b7d23de754… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index a248e60600..a8dbf5b9be 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -389,10 +389,6 @@ int tps_msg_received(sr_event_param_t *evp) } } else { /* reply */ - if(msg.first_line.u.reply.statuscode==100) { - /* nothing to do - it should be absorbed */ - goto done; - } tps_response_received(&msg); }

1 0

[kamailio/kamailio] add ASAN build options (#2650)
by sergey-safarov 01 Mar '21

01 Mar '21

### Description I want to be sure my customization does not produce memory leack. To get this work I want to use the ASAN project. Could you add `mode=asan` build option that adds gcc ` -fsanitize=address -static-libasan` options `-lasan` linker flags. More info https://www.osc.edu/resources/getting_started/howto/howto_use_address_sanit… Maybe important. ASAN expects linked first ``` [root@b276215a3a22 kamailio]# kamailio -DD -E ==13760==ASan runtime does not come first in initial library list; you should either link runtime to your application or manually preload it with LD_PRELOAD. ``` -- 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/2650

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021