- sr-dev - kamailio.org

git:master:d7972d83: textops: new function remove_hf_exp(match, skip)
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: d7972d83b3f12f64d4f70d8e6eacb88ec34648f1 URL: https://github.com/kamailio/kamailio/commit/d7972d83b3f12f64d4f70d8e6eacb88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T14:03:52+02:00 textops: new function remove_hf_exp(match, skip) - remove header fields that do not match regex ''skip', but match regex 'match' --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/d7972d83b3f12f64d4f70d8e6eacb88… Patch: https://github.com/kamailio/kamailio/commit/d7972d83b3f12f64d4f70d8e6eacb88… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cd116a8fe9..cd32f0074a 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -129,6 +129,7 @@ static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ); static int cmp_istr_f(struct sip_msg *msg, char *str1, char *str2 ); static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ); static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo); +static int remove_hf_exp_f(sip_msg_t* msg, char* ematch, char* eskip); static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int is_audio_on_hold_f(struct sip_msg *msg, char *str1, char *str2 ); static int fixup_substre(void**, int); @@ -207,6 +208,9 @@ static cmd_export_t cmds[]={ {"remove_hf_re", (cmd_function)remove_hf_re_f, 1, fixup_regexp_null, fixup_free_regexp_null, ANY_ROUTE}, + {"remove_hf_exp", (cmd_function)remove_hf_exp_f, 1, + fixup_regexp_regexp, fixup_free_regexp_regexp, + ANY_ROUTE}, {"is_present_hf", (cmd_function)is_present_hf_f, 1, hname_fixup, free_hname_fixup, ANY_ROUTE}, @@ -1052,16 +1056,14 @@ int remove_hf_f(struct sip_msg* msg, char* str_hf, char* foo) return cnt==0 ? -1 : 1; } -static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) +static int remove_hf_re(sip_msg_t* msg, regex_t *re) { struct hdr_field *hf; struct lump* l; int cnt; - regex_t *re; char c; regmatch_t pmatch; - re = (regex_t*)key; cnt=0; /* we need to be sure we have seen all HFs */ @@ -1091,6 +1093,59 @@ static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) return cnt==0 ? -1 : 1; } +static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) +{ + return remove_hf_re(msg, (regex_t*)key); +} + +static int remove_hf_exp_re(sip_msg_t* msg, regex_t *mre, regex_t *sre) +{ + struct hdr_field *hf; + struct lump* l; + int cnt; + char c; + regmatch_t pmatch; + + cnt=0; + + /* we need to be sure we have seen all HFs */ + if(parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_ERR("error while parsing message headers\n"); + return -1; + } + + for (hf=msg->headers; hf; hf=hf->next) + { + c = hf->name.s[hf->name.len]; + hf->name.s[hf->name.len] = '\0'; + if (regexec(sre, hf->name.s, 1, &pmatch, 0)==0) + { + hf->name.s[hf->name.len] = c; + continue; + } + if (regexec(mre, hf->name.s, 1, &pmatch, 0)!=0) + { + hf->name.s[hf->name.len] = c; + continue; + } + hf->name.s[hf->name.len] = c; + l=del_lump(msg, hf->name.s-msg->buf, hf->len, 0); + if (l==0) + { + LM_ERR("cannot remove header\n"); + return -1; + } + cnt++; + } + + return cnt==0 ? -1 : 1; +} + +static int remove_hf_exp_f(struct sip_msg* msg, char* ematch, char* eskip) +{ + return remove_hf_exp_re(msg, (regex_t*)ematch, (regex_t*)eskip); +} + static int is_present_hf_helper_f(struct sip_msg* msg, gparam_t* gp) { struct hdr_field *hf;

1 0

git:master:85136705: core: fixup helper function for two regex parameters
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 851367053d6b4d64161a50fa7408d0dd750922d5 URL: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T14:03:29+02:00 core: fixup helper function for two regex parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0d… Patch: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0d… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 4fd0fa4ca7..d817b75565 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -207,7 +207,7 @@ struct regex_fixup { int fixup_regexp_null(void** param, int param_no) { struct regex_fixup* re; - + if (param_no != 1) return E_UNSPEC; if ((re=pkg_malloc(sizeof(*re))) ==0) { @@ -226,11 +226,15 @@ int fixup_regexp_null(void** param, int param_no) return E_UNSPEC; } +int fixup_regexp_regexp(void** param, int param_no) +{ + return fixup_regexp_null(param, 1); +} int fixup_free_regexp_null(void** param, int param_no) { struct regex_fixup* re; - + if (param_no != 1) return E_UNSPEC; if (*param) { @@ -242,6 +246,11 @@ int fixup_free_regexp_null(void** param, int param_no) return 0; } +int fixup_free_regexp_regexp(void** param, int param_no) +{ + return fixup_free_regexp_null(param, 1); +} + /* fixup_pvar_*() has to be written "by hand", since it needs to save the original pointer (the fixup users expects a pointer to the pv_spec_t in *param and hence the original value @@ -638,4 +647,4 @@ int fixup_free_spve_pvar(void** param, int param_no) if(param_no==2) return fixup_free_pvar_null(param, 1); return E_UNSPEC; -} \ No newline at end of file +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a8388ee84d..835342ab86 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any @@ -36,7 +36,7 @@ /** * generic parameter that holds a string, an int, a pseudo-variable * or a ser select, avp, or subst. - * + * * Note: used only for compatibility with existing kamailio code, * please use fparam_t directly in the future. * @@ -86,13 +86,8 @@ int fixup_uint_uint(void** param, int param_no); int fixup_regexp_null(void** param, int param_no); int fixup_free_regexp_null(void** param, int param_no); -#if 0 -int fixup_regexp_none(void** param, int param_no); -int fixup_free_regexp_none(void** param, int param_no); -/* not implemened yet */ -int fixup_regexpNL_null(void** param, int param_no); -int fixup_regexpNL_none(void** param, int param_no); -#endif +int fixup_regexp_regexp(void** param, int param_no); +int fixup_free_regexp_regexp(void** param, int param_no); int fixup_pvar_null(void **param, int param_no); int fixup_free_pvar_null(void** param, int param_no);

1 0

git:master:4220c41f: dispatcher: try to add sip: scheme to dst uri, if initial parse fails
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 4220c41f9a443d275cf94e1db3a33fbd3ca14d1b URL: https://github.com/kamailio/kamailio/commit/4220c41f9a443d275cf94e1db3a33fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T13:33:16+02:00 dispatcher: try to add sip: scheme to dst uri, if initial parse fails - operation done when records are loaded from database or file --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/4220c41f9a443d275cf94e1db3a33fb… Patch: https://github.com/kamailio/kamailio/commit/4220c41f9a443d275cf94e1db3a33fb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index bea737f4bc..67f706388c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -282,20 +282,43 @@ int ds_set_attrs(ds_dest_t *dest, str *attrs) /** * */ -ds_dest_t *pack_dest(str uri, int flags, int priority, str *attrs) +ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) { ds_dest_t *dp = NULL; /* For DNS-Lookups */ static char hn[256]; + char ub[512]; struct hostent *he; struct sip_uri puri; str host; int port, proto; char c = 0; + str uri; + uri = iuri; /* check uri */ - if(parse_uri(uri.s, uri.len, &puri) != 0 || puri.host.len > 254) { - LM_ERR("bad uri [%.*s]\n", uri.len, uri.s); + if(parse_uri(uri.s, uri.len, &puri) != 0) { + if(iuri.len>4 && strncmp(iuri.s, "sip:", 4)!=0 && iuri.len<500) { + strncpy(ub, "sip:", 4); + strncpy(ub+4, iuri.s, iuri.len); + ub[iuri.len+4] = '\0'; + uri.s = ub; + uri.len = iuri.len+4; + if(parse_uri(uri.s, uri.len, &puri) != 0) { + LM_ERR("bad uri [%.*s]\n", iuri.len, iuri.s); + goto err; + } else { + LM_INFO("uri without sip scheme - fixing it: %.*s\n", + iuri.len, iuri.s); + } + } else { + LM_ERR("bad uri [%.*s]\n", iuri.len, iuri.s); + goto err; + } + } + + if(puri.host.len > 254) { + LM_ERR("hostname in uri is too long [%.*s]\n", uri.len, uri.s); goto err; }

1 0

git:master:86e34946: pv: free var in case pkg alloc failure
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 86e349463c7d573e9a5e68bd3984ecc95808adb4 URL: https://github.com/kamailio/kamailio/commit/86e349463c7d573e9a5e68bd3984ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:53:38+02:00 pv: free var in case pkg alloc failure --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/86e349463c7d573e9a5e68bd3984ecc… Patch: https://github.com/kamailio/kamailio/commit/86e349463c7d573e9a5e68bd3984ecc… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index d1e638512c..1245cef7f5 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -66,6 +66,7 @@ script_var_t* add_var(str *name, int vtype) if(it->name.s==0) { + pkg_free(it); LM_ERR("out of pkg mem!\n"); return 0; }

1 0

git:master:72b4cc24: textops: fixed whitespacing and few malloc size adjustmets for safety
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 72b4cc243d48cf4ee2302afd45c7ef1a290b7d16 URL: https://github.com/kamailio/kamailio/commit/72b4cc243d48cf4ee2302afd45c7ef1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:31:37+02:00 textops: fixed whitespacing and few malloc size adjustmets for safety --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/72b4cc243d48cf4ee2302afd45c7ef1… Patch: https://github.com/kamailio/kamailio/commit/72b4cc243d48cf4ee2302afd45c7ef1…

1 0

git:master:080bffeb: jsonrpcs: safety vars init and release checks
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 080bffeb53181131f8fb8fab0ddcb771bbdd37dc URL: https://github.com/kamailio/kamailio/commit/080bffeb53181131f8fb8fab0ddcb77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:48:53+02:00 jsonrpcs: safety vars init and release checks --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/080bffeb53181131f8fb8fab0ddcb77… Patch: https://github.com/kamailio/kamailio/commit/080bffeb53181131f8fb8fab0ddcb77… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 7e0502964b..cd99ad8a01 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -756,6 +756,7 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) while(*fmt) { mname.s = va_arg(ap, char*); mname.len = (mname.s?strlen(mname.s):0); + if(mname.s==NULL) mname.s = ""; if (*fmt == '{' || *fmt == '[') { void_ptr = va_arg(ap, void**); diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index fbc9f8f5e6..c61fa6da28 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -388,9 +388,9 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, return 0; err_both: - close(socks->tx_sock); + if(socks->tx_sock>=0) close(socks->tx_sock); err_rx: - close(socks->rx_sock); + if(socks->rx_sock>=0) close(socks->rx_sock); return -1; } @@ -528,7 +528,7 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, { int n; unsigned int optlen = sizeof(int); - int optval; + int optval = 0; if(len == 0 || tolen ==0) return -1; @@ -536,7 +536,9 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, /*LM_DBG("destination address length is %i\n", tolen);*/ n=sendto(fd, buf, len, 0, to, tolen); if(n!=len) { - getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (int*)&optval, &optlen); + if(getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (int*)&optval, &optlen)==-1) { + LM_ERR("getsockopt failed\n"); + } LM_ERR("failed to send the response - ret: %d, len: %d (%d)," " err: %d - %s)\n", n, len, optval, errno, strerror(errno));

1 0

git:master:7987122d: textopsx: free in case of error inside sel_hf_value_name()
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 7987122d25003dd4b5f0ce47caf3e5c9811917b3 URL: https://github.com/kamailio/kamailio/commit/7987122d25003dd4b5f0ce47caf3e5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:29:41+02:00 textopsx: free in case of error inside sel_hf_value_name() --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7987122d25003dd4b5f0ce47caf3e5c… Patch: https://github.com/kamailio/kamailio/commit/7987122d25003dd4b5f0ce47caf3e5c… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 7f99a394f4..d7a948c8ea 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -370,7 +370,10 @@ static int keep_hf_helper(sip_msg_t *msg, regex_t *re) struct lump *l; /* we need to be sure we have seen all HFs */ - parse_headers(msg, HDR_EOH_F, 0); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("Error while parsing message\n"); + return -1; + } for(hf = msg->headers; hf; hf = hf->next) { switch(hf->type) { case HDR_FROM_T: @@ -1723,8 +1726,10 @@ static int sel_hf_value_name(str *res, select_t *s, struct sip_msg *msg) hname->hname = s->params[1].v.s; parse_hname2(buf, buf + i, &hdr); - if(hdr.type == HDR_ERROR_T) + if(hdr.type == HDR_ERROR_T) { + pkg_free(hname); return E_CFG; + } hname->htype = hdr.type; s->params[1].v.p = hname;

1 0

git:master:74653204: msrp: safety checks to avoid analyzer reports
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 74653204f45195944acc42979d0939cef9513cd4 URL: https://github.com/kamailio/kamailio/commit/74653204f45195944acc42979d0939c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:10:14+02:00 msrp: safety checks to avoid analyzer reports --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/74653204f45195944acc42979d0939c… Patch: https://github.com/kamailio/kamailio/commit/74653204f45195944acc42979d0939c… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index 16c204b362..a6310cea93 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -642,7 +642,8 @@ int msrp_explode_str(str **arr, str *in, str *del) { if(in->s[i]==del->s[j]) { - larr[k].len = in->s + i - larr[k].s; + if(k<n) + larr[k].len = in->s + i - larr[k].s; k++; if(k<n) larr[k].s = in->s + i + 1; @@ -650,7 +651,8 @@ int msrp_explode_str(str **arr, str *in, str *del) } } } - larr[k].len = in->s + i - larr[k].s; + if(k<n) + larr[k].len = in->s + i - larr[k].s; *arr = larr;

1 0

git:master:92be1114: topos_redis: increase the array size used for storage ops
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 92be111419f8884976dc3f6125e6df9db2f116a5 URL: https://github.com/kamailio/kamailio/commit/92be111419f8884976dc3f6125e6df9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:03:01+02:00 topos_redis: increase the array size used for storage ops --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/92be111419f8884976dc3f6125e6df9… Patch: https://github.com/kamailio/kamailio/commit/92be111419f8884976dc3f6125e6df9… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 6a39f03cbe..f8d47999c2 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -49,7 +49,7 @@ static str _tps_redis_dprefix = str_init("d:z:"); // void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen); -#define TPS_REDIS_NR_KEYS 32 +#define TPS_REDIS_NR_KEYS 48 #define TPS_REDIS_DATA_SIZE 8192 static char _tps_redis_cbuf[TPS_DATA_SIZE];

1 0

Re: [sr-dev] Route Blocks?
by Cléviton Mendes de Araújo 05 Jul '17

05 Jul '17

Thanks David for your attention. That content does not clarify at all one essential question in which block sections of the cfg script I can allowing the exported functions of my module. Or put it another way, what care should I take when allowing my exported functions to be called from the one script block section? Regards, CMA Date: Wed, 5 Jul 2017 00:01:05 +0200 From: David Villasmil <david.villasmil.work(a)gmail.com> To: "Kamailio (SER) - Development Mailing List" <sr-dev(a)lists.kamailio.org> Subject: Re: [sr-dev] Route Blocks? Message-ID: <CAFGRPVpkAufkJ+w=6Drw3O1v1LbbShQU9kh68YktraOTNAJtDQ@mail. gmail.com> Content-Type: text/plain; charset="utf-8" An excerpt from: https://www.kamailio.org/dokuwiki/doku.php/development:write-module It reads: *flags* *int* - Can't have a structure without flags! The flags tell the script when it is legal to call the function. The flag values can be “or'ed” together if the function can be called from more then one routing section of the openser.cfg script. i.e. *REQUEST_ROUTE | ONREPLY_ROUTE* - *REQUEST_ROUTE* - The function can be called in the request route section of the openser.cfg script. - *FAILURE_ROUTE* - The function can be called in the failure route section of the openser.cfg script. - *ONREPLY_ROUTE* - The function can be called in the reply route section of the openser.cfg script. - *BRANCH_ROUTE* - The function can be called in the branch route section of the openser.cfg script. ᐧ Regards, David Villasmil email: david.villasmil.work(a)gmail.com phone: +34669448337 On Tue, Jul 4, 2017 at 4:36 PM, Cléviton Mendes de Araújo < clevitonmendes(a)gmail.com> wrote: > Hi Folks > > Let me do one design question about to writing code module when write it. > > What’s conditions to allow an module exported function may be running from > Kamailio route blocks? > > Why can I running an module function from REQUST_ROUTE and isn’t from > REPLY_ROUTE block? > > What restricts me to run from one block and not another? > > Best regards > > CMA > > _______________________________________________ > Kamailio (SER) - Development Mailing List > sr-dev(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev >

2 1

git:master:61d3d4ad: rls: added missing license headers, coherent indentation
by Daniel-Constantin Mierla 05 Jul '17

05 Jul '17

Module: kamailio Branch: master Commit: 61d3d4ad675032b7a1fc059acef68e81c40b4eba URL: https://github.com/kamailio/kamailio/commit/61d3d4ad675032b7a1fc059acef68e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-05T15:30:36+02:00 rls: added missing license headers, coherent indentation --- Modified: src/modules/rls/api.h Modified: src/modules/rls/list.h Modified: src/modules/rls/notify.c Modified: src/modules/rls/notify.h Modified: src/modules/rls/resource_notify.c Modified: src/modules/rls/resource_notify.h Modified: src/modules/rls/rls.c Modified: src/modules/rls/rls_db.c Modified: src/modules/rls/subscribe.c Modified: src/modules/rls/subscribe.h Modified: src/modules/rls/utils.c Modified: src/modules/rls/utils.h --- Diff: https://github.com/kamailio/kamailio/commit/61d3d4ad675032b7a1fc059acef68e8… Patch: https://github.com/kamailio/kamailio/commit/61d3d4ad675032b7a1fc059acef68e8…

1 0

Developing charging module for kamailio-ims
by Prasannakumar Merugu 05 Jul '17

05 Jul '17

Hi all, We are developing charging module for kamailio-ims. We need events event_route[dialog:start] event_route[dialog:end] for detecting call begin and call end. We have to use ims_dialog module for IMS implementation. But observed that ims_dialog module doesnt have the above said events [dialog:start and end]. How do we implement those events using ims_dialog. Is there any other way out. Kindly suggest. Thanks, Prasannakumar Merugu.

1 1

Route Blocks?
by Cléviton Mendes de Araújo 04 Jul '17

04 Jul '17

Hi Folks Let me do one design question about to writing code module when write it. What’s conditions to allow an module exported function may be running from Kamailio route blocks? Why can I running an module function from REQUST_ROUTE and isn’t from REPLY_ROUTE block? What restricts me to run from one block and not another? Best regards CMA

2 1

[kamailio/kamailio] Cfg reset function (#1179)
by hdikme 04 Jul '17

04 Jul '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  kamcmd cfg.reset "group_name", cfg.reset has been created in order to reset all the variables of the referred group to be set to their initial values (default). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1179 -- Commit Summary -- * cfg_rpc: rpc_reset() function has been created * Merge branch 'master' of https://github.com/kamailio/kamailio into cfg_reset * README file has been re-created. * Merge branch 'master' of https://github.com/kamailio/kamailio into cfg_reset * Compilation problem has been solved * Merge branch 'master' of https://github.com/kamailio/kamailio into cfg_reset -- File Changes -- M src/core/cfg/cfg_ctx.c (68) M src/core/cfg/cfg_ctx.h (3) M src/modules/cfg_rpc/README (118) M src/modules/cfg_rpc/cfg_rpc.c (56) M src/modules/cfg_rpc/doc/rpc.xml (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1179.patch https://github.com/kamailio/kamailio/pull/1179.diff -- 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/pull/1179

2 2

CDR information is not getting logged, when dialog:end takes too long
by Paul Claudiu Boriga 04 Jul '17

04 Jul '17

Hello, We are experiencing an issue when having some blocking code in the dialog:end event route. If the code takes too long to execute then CDR information is not logged. In our case we have a blocking socket trying to establish a connection and waiting 500ms before failing. When it timeouts, the accounting module will never log any CDR logs for that call. It appears that the callbacks for DLGCB_TERMINATED_CONFIRMED event are never called. That is because the function dlg_terminated_confirmed is never called (this function is registered as a callback to the TMCB_RESPONSE_OUT event from tm module). After further investigation, the problem seems to be related to a race condition between two processes when dealing with ending a dialog: From what we saw the dialog:end event route is treated when a BYE request is received. But if that takes too long, and that BYE request will be retransmitted (we are using SIPp to test this, and SIPp will automatically retransmit the message), it will then be treated by a different process. When this happens, the first process has already modified the dialog state, so the second process will not execute code specific to dialog ending from the dialog module dlg_onroute function. It will not execute the event route, nor the DLGCB_TERMINATED event callbacks, and it will neither register the dlg_terminated_confirmed function to the TMCB_RESPONSE_OUT event. This means that the second process will actually finish processing the BYE faster then the first process. By the time the first process finishes with processing the dialog:end event route, the transaction corresponding to the BYE request is already created, and even though dlg_terminated_confirmed function is eventually registered for the TMCB_RESPONSE_OUT event, it is too late because this event was already treated, and all callbacks registered for it were called. This means that DLGCB_TERMINATED_CONFIRMED event will never be treated, and the registered callbacks for this event (including the accounting module functions) will not get called. We managed to work around this behavior by decreasing the timeout of the socket so that the BYE can be processed before a retransmit occurs, but maybe there is a different solution to fix this issue. Do you have any suggestions on how to solve this problem? Thank you, Claudiu Boriga.

2 2

git:master:f8fa313f: Merge pull request #1180 from smititelu/master
by GitHub 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: f8fa313fd372ffc94fad0c11dba76774c1e3002a URL: https://github.com/kamailio/kamailio/commit/f8fa313fd372ffc94fad0c11dba7677… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-04T12:33:11+02:00 Merge pull request #1180 from smititelu/master dispatcher: Increase line buffer size --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f8fa313fd372ffc94fad0c11dba7677… Patch: https://github.com/kamailio/kamailio/commit/f8fa313fd372ffc94fad0c11dba7677… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 155be57ca5..bea737f4bc 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -623,7 +623,7 @@ int reindex_dests(ds_set_t *node) /*! \brief load groups of destinations from file */ int ds_load_list(char *lfile) { - char line[256], *p; + char line[1024], *p; FILE *f = NULL; int id, setn, flags, priority; str uri; @@ -650,7 +650,7 @@ int ds_load_list(char *lfile) *next_idx = (*crt_idx + 1) % 2; ds_avl_destroy(&ds_lists[*next_idx]); - p = fgets(line, 256, f); + p = fgets(line, 1024, f); while(p) { /* eat all white spaces */ while(*p && (*p == ' ' || *p == '\t' || *p == '\r' || *p == '\n')) @@ -728,7 +728,7 @@ int ds_load_list(char *lfile) LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); next_line: - p = fgets(line, 256, f); + p = fgets(line, 1024, f); } if(reindex_dests(ds_lists[*next_idx]) != 0) {

1 0

[kamailio/kamailio] dispatcher: Increase line buffer size (#1180)
by Stefan Mititelu 04 Jul '17

04 Jul '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Depending on how many custom attributes one has set in the dispatcher file, some of them might be ignored due to the 256 read line buffer size. Increase the line buffer size. Probably adding a modparam for that would be a better approach ?! but I want to avoid any dynamic alloc/free(for now). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1180 -- Commit Summary -- * dispatcher: Increase line buffer size -- File Changes -- M src/modules/dispatcher/dispatch.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1180.patch https://github.com/kamailio/kamailio/pull/1180.diff -- 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/pull/1180

2 1

git:master:1391db0f: dispatcher: Increase line buffer size
by Stefan Mititelu 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 1391db0f349956795b8cf6936657fb974ec9b65f URL: https://github.com/kamailio/kamailio/commit/1391db0f349956795b8cf6936657fb9… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Committer: Stefan Mititelu <stefan.mititelu(a)onem.com> Date: 2017-07-04T13:06:26+03:00 dispatcher: Increase line buffer size --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/1391db0f349956795b8cf6936657fb9… Patch: https://github.com/kamailio/kamailio/commit/1391db0f349956795b8cf6936657fb9… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 38a6213de1..b970c94b44 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -623,7 +623,7 @@ int reindex_dests(ds_set_t *node) /*! \brief load groups of destinations from file */ int ds_load_list(char *lfile) { - char line[256], *p; + char line[1024], *p; FILE *f = NULL; int id, setn, flags, priority; str uri; @@ -650,7 +650,7 @@ int ds_load_list(char *lfile) *next_idx = (*crt_idx + 1) % 2; ds_avl_destroy(&ds_lists[*next_idx]); - p = fgets(line, 256, f); + p = fgets(line, 1024, f); while(p) { /* eat all white spaces */ while(*p && (*p == ' ' || *p == '\t' || *p == '\r' || *p == '\n')) @@ -728,7 +728,7 @@ int ds_load_list(char *lfile) LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); next_line: - p = fgets(line, 256, f); + p = fgets(line, 1024, f); } if(reindex_dests(ds_lists[*next_idx]) != 0) {

1 0

git:master:ceaafc67: rls: reset vars to avoid double free in case of error
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: ceaafc67dae4f7e7424c8706ccea90c30eed45b6 URL: https://github.com/kamailio/kamailio/commit/ceaafc67dae4f7e7424c8706ccea90c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T12:29:08+02:00 rls: reset vars to avoid double free in case of error --- Modified: src/modules/rls/rls_db.c --- Diff: https://github.com/kamailio/kamailio/commit/ceaafc67dae4f7e7424c8706ccea90c… Patch: https://github.com/kamailio/kamailio/commit/ceaafc67dae4f7e7424c8706ccea90c… --- diff --git a/src/modules/rls/rls_db.c b/src/modules/rls/rls_db.c index f7c03efcb8..35618675c2 100644 --- a/src/modules/rls/rls_db.c +++ b/src/modules/rls/rls_db.c @@ -228,9 +228,11 @@ int delete_expired_subs_rlsdb( void ) } pkg_free(rlsubs_did.s); + rlsubs_did.s = NULL; } rls_dbf.free_result(rls_db, result); + result = NULL; if (rls_dbf.end_transaction) {

1 0

git:master:97ac3b91: presence: reset vars to avoid double free in case of error
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 97ac3b910dc955058fa4c08ad22ac01a4f31fe74 URL: https://github.com/kamailio/kamailio/commit/97ac3b910dc955058fa4c08ad22ac01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T12:26:41+02:00 presence: reset vars to avoid double free in case of error --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/97ac3b910dc955058fa4c08ad22ac01… Patch: https://github.com/kamailio/kamailio/commit/97ac3b910dc955058fa4c08ad22ac01… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 9755c4f0e9..e3246e2133 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1148,9 +1148,12 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, if(rules_doc->s) pkg_free(rules_doc->s); pkg_free(rules_doc); + rules_doc = NULL; } - if(pres_uri.s) + if(pres_uri.s) { pkg_free(pres_uri.s); + pres_uri.s = NULL; + } if (pa_dbf.end_transaction) { @@ -1189,7 +1192,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if(pres_uri.s) { pkg_free(pres_uri.s); - pres_uri.s = NULL; } if (pa_dbf.abort_transaction) {

1 0

git:master:9a6182fa: avp: return in case of error in avp select
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 9a6182fa8b535bc19c43e905d6b6a110b0e830d2 URL: https://github.com/kamailio/kamailio/commit/9a6182fa8b535bc19c43e905d6b6a11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T12:17:54+02:00 avp: return in case of error in avp select --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/9a6182fa8b535bc19c43e905d6b6a11… Patch: https://github.com/kamailio/kamailio/commit/9a6182fa8b535bc19c43e905d6b6a11… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index 40640dfc40..47c775facb 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1596,7 +1596,7 @@ static int select_attr_fixup(str* res, select_t* s, struct sip_msg* msg) if (! msg) { /* fixup call */ str attr_name; - + if (s->params[SEL_PARAM_IDX].type != SEL_PARAM_STR) { ERR("attribute name expected.\n"); return -1; @@ -1619,6 +1619,7 @@ static int select_attr_fixup(str* res, select_t* s, struct sip_msg* msg) if (parse_avp_ident(&attr_name, avp_ident) < 0) { ERR("failed to parse attribute name: `%.*s'.\n", STR_FMT(&attr_name)); pkg_free(avp_ident); + return -1; } s->params[SEL_PARAM_IDX].v.p = avp_ident; s->params[SEL_PARAM_IDX].type = SEL_PARAM_PTR;

1 0

git:master:56d1d317: mtree: access values before safety checks of variables
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 56d1d317e4bac7130586541fed75be670ea0f9ce URL: https://github.com/kamailio/kamailio/commit/56d1d317e4bac7130586541fed75be6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T12:00:47+02:00 mtree: access values before safety checks of variables --- Modified: src/modules/mtree/mtree.c Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56d1d317e4bac7130586541fed75be6… Patch: https://github.com/kamailio/kamailio/commit/56d1d317e4bac7130586541fed75be6… --- diff --git a/src/modules/mtree/mtree.c b/src/modules/mtree/mtree.c index 433c6b4c50..c4de10c763 100644 --- a/src/modules/mtree/mtree.c +++ b/src/modules/mtree/mtree.c @@ -985,12 +985,13 @@ int mt_rpc_add_tvalues(rpc_t* rpc, void* ctx, m_tree_t *pt, str *tomatch) mt_node_t *itn; mt_is_t *tvalues; void *vstruct = NULL; - str prefix = *tomatch; + str prefix = STR_NULL; if (pt == NULL || tomatch == NULL || tomatch->s == NULL) { LM_ERR("bad parameters\n"); return -1; } + prefix = *tomatch; l = 0; itn = pt->head; @@ -1051,7 +1052,7 @@ int mt_rpc_match_prefix(rpc_t* rpc, void* ctx, m_tree_t *it, is_t *tvalue; mt_dw_t *dw; int tprefix_len = 0; - str prefix = *tomatch; + str prefix = STR_NULL; void *vstruct = NULL; #define MT_MAX_DST_LIST 64 @@ -1063,6 +1064,7 @@ int mt_rpc_match_prefix(rpc_t* rpc, void* ctx, m_tree_t *it, LM_ERR("bad parameters\n"); return -1; } + prefix = *tomatch; if (rpc->add(ctx, "S", &it->tname) < 0) { rpc->fault(ctx, 500, "Internal error adding tname"); diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 9808018840..4ce2786afb 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -764,16 +764,20 @@ static int mt_load_db_trees() { /* check for NULL values ?!?! */ tname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); - tname.len = strlen(tname.s); - tprefix.s = (char*)(RES_ROWS(db_res)[i].values[1].val.string_val); - tprefix.len = strlen(tprefix.s); - tvalue.s = (char*)(RES_ROWS(db_res)[i].values[2].val.string_val); + + if(tprefix.s==NULL || tvalue.s==NULL || tname.s==NULL) + { + LM_ERR("Error - null fields in db\n"); + continue; + } + + tname.len = strlen(tname.s); + tprefix.len = strlen(tprefix.s); tvalue.len = strlen(tvalue.s); - if(tprefix.s==NULL || tvalue.s==NULL || tname.s==NULL || - tprefix.len<=0 || tvalue.len<=0 || tname.len<=0) + if(tname.len<=0 || tprefix.len<=0 || tvalue.len<=0) { LM_ERR("Error - bad values in db\n"); continue;

1 0

git:master:22aa9043: xcap_server: reset server_name variable after free
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 22aa9043f179f4de8e90fc5946a7afb28060b6f6 URL: https://github.com/kamailio/kamailio/commit/22aa9043f179f4de8e90fc5946a7afb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T12:17:36+02:00 xcap_server: reset server_name variable after free - avoid re-use in the loop --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/22aa9043f179f4de8e90fc5946a7afb… Patch: https://github.com/kamailio/kamailio/commit/22aa9043f179f4de8e90fc5946a7afb… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 02b713a745..86f7816dd7 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -893,7 +893,7 @@ static int xcaps_get_directory(struct sip_msg *msg, str *user, str *domain, str qvals[n_qcols].nul = 0; qvals[n_qcols].val.str_val = *user; n_qcols++; - + qcols[n_qcols] = &str_domain_col; qvals[n_qcols].type = DB1_STR; qvals[n_qcols].nul = 0; @@ -904,7 +904,7 @@ static int xcaps_get_directory(struct sip_msg *msg, str *user, str *domain, str rcols[doc_uri_col = n_rcols++] = &str_doc_uri_col; rcols[etag_col = n_rcols++] = &str_etag_col; - if (xcaps_dbf.use_table(xcaps_db, &xcaps_db_table) < 0) + if (xcaps_dbf.use_table(xcaps_db, &xcaps_db_table) < 0) { LM_ERR("in use_table-[table]= %.*s\n", xcaps_db_table.len, xcaps_db_table.s); @@ -1015,7 +1015,7 @@ static int xcaps_get_directory(struct sip_msg *msg, str *user, str *domain, str { directory->len += snprintf(directory->s + directory->len, xcaps_buf.len - directory->len, - "%.*s", server_name.len, server_name.s); + "%.*s", server_name.len, server_name.s); } else { @@ -1023,8 +1023,10 @@ static int xcaps_get_directory(struct sip_msg *msg, str *user, str *domain, str server_name.len = ip_addr2sbuf(&msg->rcv.dst_ip, server_name.s, IP6_MAX_STR_SIZE); directory->len += snprintf(directory->s + directory->len, xcaps_buf.len - directory->len, - "%.*s:%d", server_name.len, server_name.s, msg->rcv.dst_port); + "%.*s:%d", server_name.len, server_name.s, msg->rcv.dst_port); pkg_free(server_name.s); + server_name.s = 0; + server_name.len = 0; } }

1 0

git:master:e9cfb2bf: dispatcher: log messages for hashing auth username
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: e9cfb2bf5012cdbde36559f615b58e3a556bfc2d URL: https://github.com/kamailio/kamailio/commit/e9cfb2bf5012cdbde36559f615b58e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T11:52:53+02:00 dispatcher: log messages for hashing auth username --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e9cfb2bf5012cdbde36559f615b58e3… Patch: https://github.com/kamailio/kamailio/commit/e9cfb2bf5012cdbde36559f615b58e3… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 38a6213de1..155be57ca5 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1214,12 +1214,16 @@ int ds_hash_authusername(struct sip_msg *msg, unsigned int *hash) LM_ERR("bad parameters\n"); return -1; } + *hash = 0; if(parse_headers(msg, HDR_PROXYAUTH_F, 0) == -1) { LM_ERR("error parsing headers!\n"); return -1; } - if(msg->proxy_auth && !msg->proxy_auth->parsed) - parse_credentials(msg->proxy_auth); + if(msg->proxy_auth && !msg->proxy_auth->parsed) { + if(parse_credentials(msg->proxy_auth)!=0) { + LM_DBG("no parsing for proxy-auth header\n"); + } + } if(msg->proxy_auth && msg->proxy_auth->parsed) { h = msg->proxy_auth; } @@ -1228,8 +1232,11 @@ int ds_hash_authusername(struct sip_msg *msg, unsigned int *hash) LM_ERR("error parsing headers!\n"); return -1; } - if(msg->authorization && !msg->authorization->parsed) - parse_credentials(msg->authorization); + if(msg->authorization && !msg->authorization->parsed) { + if(parse_credentials(msg->authorization)!=0) { + LM_DBG("no parsing for auth header\n"); + } + } if(msg->authorization && msg->authorization->parsed) { h = msg->authorization; }

1 0

[kamailio/kamailio] Cfg reset (#1178)
by hdikme 04 Jul '17

04 Jul '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  kamcmd cfg.reset "group_name", cfg.reset has been created in order to reset all the variables of the referred group to be set to their initial values (default). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1178 -- Commit Summary -- * cfg_rpc: rpc_reset() function has been created * Merge branch 'master' of https://github.com/kamailio/kamailio into cfg_reset * README file has been re-created. * Merge branch 'master' of https://github.com/kamailio/kamailio into cfg_reset -- File Changes -- M src/core/cfg/cfg_ctx.c (68) M src/core/cfg/cfg_ctx.h (3) M src/modules/cfg_rpc/README (118) M src/modules/cfg_rpc/cfg_rpc.c (55) M src/modules/cfg_rpc/doc/rpc.xml (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1178.patch https://github.com/kamailio/kamailio/pull/1178.diff -- 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/pull/1178

1 2

git:master:b8ab9fcc: dialog: lookup kemi engine for event route execution
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: b8ab9fcccd442e9e9ac887a7dc16b690213a6e28 URL: https://github.com/kamailio/kamailio/commit/b8ab9fcccd442e9e9ac887a7dc16b69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T11:11:41+02:00 dialog: lookup kemi engine for event route execution --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/b8ab9fcccd442e9e9ac887a7dc16b69… Patch: https://github.com/kamailio/kamailio/commit/b8ab9fcccd442e9e9ac887a7dc16b69… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index eb5d41ceac..c4218be50a 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1550,6 +1550,7 @@ void dlg_ontimeout(struct dlg_tl *tl) if(dlg->toroute>0) { run_top_route(main_rt.rlist[dlg->toroute], fmsg, 0); } else { + keng = sr_kemi_eng_get(); if(keng!=NULL) { evname.s = "dialog:timeout"; evname.len = sizeof("dialog:timeout") - 1; @@ -1703,22 +1704,28 @@ int dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate) if(dlg_event_callback.s==NULL || dlg_event_callback.len<=0) { if(nstate==DLG_STATE_CONFIRMED_NA) { rt = dlg_event_rt[DLG_EVENTRT_START]; + } else if(nstate==DLG_STATE_DELETED) { + if(ostate==DLG_STATE_CONFIRMED || ostate==DLG_STATE_CONFIRMED_NA) { + rt = dlg_event_rt[DLG_EVENTRT_END]; + } else if(ostate==DLG_STATE_UNCONFIRMED || ostate==DLG_STATE_EARLY) { + rt = dlg_event_rt[DLG_EVENTRT_FAILED]; + } + } + if(rt==-1 || event_rt.rlist[rt]==NULL) + return 0; + } else { + if(nstate==DLG_STATE_CONFIRMED_NA) { evname.s = "dialog:start"; evname.len = sizeof("dialog:start") - 1; } else if(nstate==DLG_STATE_DELETED) { if(ostate==DLG_STATE_CONFIRMED || ostate==DLG_STATE_CONFIRMED_NA) { - rt = dlg_event_rt[DLG_EVENTRT_END]; evname.s = "dialog:end"; evname.len = sizeof("dialog:end") - 1; } else if(ostate==DLG_STATE_UNCONFIRMED || ostate==DLG_STATE_EARLY) { evname.s = "dialog:failed"; evname.len = sizeof("dialog:failed") - 1; - rt = dlg_event_rt[DLG_EVENTRT_FAILED]; } } - if(rt==-1 || event_rt.rlist[rt]==NULL) - return 0; - } else { keng = sr_kemi_eng_get(); if(keng==NULL) { LM_DBG("event callback (%s) set, but no cfg engine\n", diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c index e58dbad83d..3576f68036 100644 --- a/src/modules/dialog/dlg_profile.c +++ b/src/modules/dialog/dlg_profile.c @@ -594,8 +594,14 @@ int set_dlg_profile(struct sip_msg *msg, str *value, struct dlg_profile_table *p linker->hash_linker.value.len = value->len; } sruid_next_safe(&_dlg_profile_sruid); - strcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s); - linker->hash_linker.puid_len = _dlg_profile_sruid.uid.len; + if(_dlg_profile_sruid.uid.len<SRUID_SIZE) { + strcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s); + linker->hash_linker.puid_len = _dlg_profile_sruid.uid.len; + } else { + LM_ERR("sruid size is too large\n"); + shm_free(linker); + goto error; + } if (dlg!=NULL) { /* add linker directly to the dialog and profile */

1 0

git:master:609297d6: dialog: safety checks and free of profiles in case of errors
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 609297d62a08d1d75550c2f5e7f7fd19b98fd104 URL: https://github.com/kamailio/kamailio/commit/609297d62a08d1d75550c2f5e7f7fd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:59:10+02:00 dialog: safety checks and free of profiles in case of errors - free partial list of profiles in dlg_set_timeout_by_profile() when no more memory --- Modified: src/modules/dialog/dlg_cseq.c Modified: src/modules/dialog/dlg_profile.c Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/609297d62a08d1d75550c2f5e7f7fd1… Patch: https://github.com/kamailio/kamailio/commit/609297d62a08d1d75550c2f5e7f7fd1…

1 0

git:master:2ab0adee: tmx: missing break in t_cancel_branches(others)
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 2ab0adee57aa82487adf7d3776835eca071afa27 URL: https://github.com/kamailio/kamailio/commit/2ab0adee57aa82487adf7d3776835ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:08:04+02:00 tmx: missing break in t_cancel_branches(others) --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2ab0adee57aa82487adf7d3776835ec… Patch: https://github.com/kamailio/kamailio/commit/2ab0adee57aa82487adf7d3776835ec… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 19a8962813..9c5f8b1042 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -322,15 +322,18 @@ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) init_cancel_info(&cancel_data); switch(n) { case 1: - /* prepare cancel for every branch except idx */ + /* prepare cancel for every branch except idx (others) */ _tmx_tmb.prepare_to_cancel(t, &cancel_data.cancel_bitmap, 1<<idx); + break; case 2: + /* prepare cancel for current branch (idx) */ if(msg->first_line.u.reply.statuscode>=200) break; cancel_data.cancel_bitmap = 1<<idx; break; default: + /* prepare cancel for all branches */ if (msg->first_line.u.reply.statuscode>=200) /* prepare cancel for every branch except idx */ _tmx_tmb.prepare_to_cancel(t,

1 0

git:master:6118d832: core: msg translator - reworked error handling to free allocated buffers
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 6118d832d3ba0efb96820915520af3c8a9bf29de URL: https://github.com/kamailio/kamailio/commit/6118d832d3ba0efb96820915520af3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:00:45+02:00 core: msg translator - reworked error handling to free allocated buffers --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/6118d832d3ba0efb96820915520af3c… Patch: https://github.com/kamailio/kamailio/commit/6118d832d3ba0efb96820915520af3c… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 618a6ba2e7..1a20d0d005 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2033,7 +2033,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, } if (via_insert_param==0) goto error02; /* free received_buf */ if (insert_new_lump_after(via_insert_param, received_buf, received_len, - HDR_VIA_T) ==0 ) goto error02; /* free received_buf */ + HDR_VIA_T) ==0 ) { + goto error02; /* free received_buf */ + } + received_buf = NULL; } /* if rport needs to be updated, delete it if present and add it's value */ if (rport_len){ @@ -2048,9 +2051,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, } if (via_insert_param==0) goto error03; /* free rport_buf */ if (insert_new_lump_after(via_insert_param, rport_buf, rport_len, - HDR_VIA_T) ==0 ) + HDR_VIA_T) ==0 ) { goto error03; /* free rport_buf */ - + } + rport_buf = NULL; } after_update_via1: @@ -2073,25 +2077,26 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, (if present & parsed), after the local via or after in front of the first via if we don't add a local via*/ if (msg->route){ - path_anchor=anchor_lump(msg, msg->route->name.s-buf, 0, + path_anchor=anchor_lump(msg, msg->route->name.s-buf, 0, HDR_ROUTE_T); }else if (likely(via_anchor)){ path_anchor=via_anchor; }else if (likely(msg->via1)){ - path_anchor=anchor_lump(msg, msg->via1->hdr.s-buf, 0, + path_anchor=anchor_lump(msg, msg->via1->hdr.s-buf, 0, HDR_ROUTE_T); }else{ /* if no via1 (theoretically possible for non-sip messages, e.g. http xmlrpc) */ - path_anchor=anchor_lump(msg, msg->headers->name.s-buf, 0, + path_anchor=anchor_lump(msg, msg->headers->name.s-buf, 0, HDR_ROUTE_T); } if (unlikely(path_anchor==0)) goto error05; if (unlikely((path_lump=insert_new_lump_after(path_anchor, path_buf.s, - path_buf.len, - HDR_ROUTE_T))==0)) + path_buf.len, HDR_ROUTE_T))==0)) { goto error05; + } + path_buf.s = NULL; } /* compute new msg len and fix overlapping zones*/ new_len=len+body_delta+lumps_len(msg, msg->add_rm, send_info)+via_len; @@ -2100,7 +2105,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, #endif udp_mtu=cfg_get(core, core_cfg, udp_mtu); di.proto=PROTO_NONE; - if (unlikely((send_info->proto==PROTO_UDP) && udp_mtu && + if (unlikely((send_info->proto==PROTO_UDP) && udp_mtu && (flags & FL_MTU_FB_MASK) && (new_len>udp_mtu) && (!(mode&BUILD_NO_LOCAL_VIA)))){ @@ -2127,7 +2132,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, di.proto=PROTO_SCTP; } #endif /* USE_SCTP */ - + if (di.proto!=PROTO_NONE){ new_len-=via_len; if(likely(line_buf)) pkg_free(line_buf); @@ -2144,8 +2149,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, /* add first via, as an anchor for second via*/ if(likely(line_buf)) { if ((via_lump=insert_new_lump_before(via_anchor, line_buf, via_len, - HDR_VIA_T))==0) + HDR_VIA_T))==0) { goto error04; + } + line_buf = 0; } if (msg->new_uri.s){ uri_len=msg->new_uri.len; @@ -2182,7 +2189,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, new_buf[new_len]=0; /* update the send_info if udp_mtu affected */ - if (di.proto!=PROTO_NONE) { + if (di.proto!=PROTO_NONE) { send_info->proto=di.proto; send_info->send_sock=di.send_sock; } @@ -2199,13 +2206,14 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, error01: error02: - if (received_buf) pkg_free(received_buf); error03: - if (rport_buf) pkg_free(rport_buf); error04: - if (line_buf) pkg_free(line_buf); error05: + if (received_buf) pkg_free(received_buf); + if (rport_buf) pkg_free(rport_buf); if (path_buf.s) pkg_free(path_buf.s); + if (line_buf) pkg_free(line_buf); + error00: *returned_len=0; return 0;

1 0

git:master:98a6ef19: core: free locl link structures not linked to listen sockets
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 98a6ef19bcfe14b7150183a9bec98854f5c0063b URL: https://github.com/kamailio/kamailio/commit/98a6ef19bcfe14b7150183a9bec9885… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:00:45+02:00 core: free locl link structures not linked to listen sockets --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/98a6ef19bcfe14b7150183a9bec9885… Patch: https://github.com/kamailio/kamailio/commit/98a6ef19bcfe14b7150183a9bec9885… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 8344c950f2..1544ec4cbd 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -886,8 +886,8 @@ static int nl_bound_sock(void) struct sockaddr_nl la; sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); - if(sock <= 0){ - LM_ERR("could not create NETLINK sock to get interface list"); + if(sock < 0){ + LM_ERR("could not create NETLINK sock to get interface list\n"); goto error; } @@ -1077,7 +1077,7 @@ static int build_iface_list(void) entry->next = 0; entry->family = families[i]; entry->ifa_flags = ifi->ifa_flags; - is_link_local = 0; + is_link_local = 0; for(;RTA_OK(rtap, rtl);rtap=RTA_NEXT(rtap,rtl)){ switch(rtap->rta_type){ @@ -1110,7 +1110,10 @@ static int build_iface_list(void) break; } } - if(is_link_local) continue; /* link local addresses are not bindable */ + if(is_link_local) { + pkg_free(entry); + continue; /* link local addresses are not bindable */ + } if(strlen(ifaces[index].name)==0) strncpy(ifaces[index].name, name, MAX_IF_LEN);

1 0

git:master:0aa7571a: core: proxy - free in case of errors making proxy only from ip
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 0aa7571afe5c25bfffaf865595181470ac78f4d2 URL: https://github.com/kamailio/kamailio/commit/0aa7571afe5c25bfffaf86559518147… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:00:45+02:00 core: proxy - free in case of errors making proxy only from ip --- Modified: src/core/proxy.c --- Diff: https://github.com/kamailio/kamailio/commit/0aa7571afe5c25bfffaf86559518147… Patch: https://github.com/kamailio/kamailio/commit/0aa7571afe5c25bfffaf86559518147… --- diff --git a/src/core/proxy.c b/src/core/proxy.c index 78e74da3a6..06e400b0b1 100644 --- a/src/core/proxy.c +++ b/src/core/proxy.c @@ -290,11 +290,15 @@ struct proxy_l* mk_proxy_from_ip(struct ip_addr* ip, unsigned short port, p->host.h_addrtype=ip->af; p->host.h_length=ip->len; p->host.h_addr_list=pkg_malloc(2*sizeof(char*)); - if (p->host.h_addr_list==0) goto error; + if (p->host.h_addr_list==0) { + pkg_free(p); + goto error; + } p->host.h_addr_list[1]=0; p->host.h_addr_list[0]=pkg_malloc(ip->len+1); if (p->host.h_addr_list[0]==0){ pkg_free(p->host.h_addr_list); + pkg_free(p); goto error; }

1 0

git:master:1a5662b2: core: parser uri - add missing break to avoid useless assignments
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 1a5662b212ddcbea40ca33e34bfda0459802b756 URL: https://github.com/kamailio/kamailio/commit/1a5662b212ddcbea40ca33e34bfda04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:00:45+02:00 core: parser uri - add missing break to avoid useless assignments --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/1a5662b212ddcbea40ca33e34bfda04… Patch: https://github.com/kamailio/kamailio/commit/1a5662b212ddcbea40ca33e34bfda04… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 0661ce4bfa..31d67f41f0 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -996,9 +996,11 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) if (scheme==URN_SCH){ uri->host.s=s; uri->host.len=p-s; - DBG("parsed urn scheme...\n"); + DBG("parsed urn scheme with host: %.*s\n", + uri->host.len, uri->host.s); /* this is the port, it can't be the passwd */ }else goto error_bad_port; + break; case URI_HOST_P: case URI_HOST6_END: uri->host.s=s;

1 0

git:master:126e76dc: core: mem/qm - fixed pointer expressions in qm_check() debug function
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 126e76dc035bd1320cb103c39ad52849844e7448 URL: https://github.com/kamailio/kamailio/commit/126e76dc035bd1320cb103c39ad5284… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:00:45+02:00 core: mem/qm - fixed pointer expressions in qm_check() debug function --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/126e76dc035bd1320cb103c39ad5284… Patch: https://github.com/kamailio/kamailio/commit/126e76dc035bd1320cb103c39ad5284… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 0c24ef2409..3c34c2c09f 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -728,18 +728,22 @@ void qm_check(struct qm_block* qm) abort(); }; #endif - if (f + sizeof(struct qm_frag) + f->size + sizeof(struct qm_frag_end) > qm->first_frag + qm->size) { + if ((char*)f + sizeof(struct qm_frag) + f->size + + sizeof(struct qm_frag_end) > (char*)qm->first_frag + qm->size) { LOG(L_CRIT, "BUG: qm_*: fragm. %p (address %p) " "bad size: %lu (frag end: %p > end of block: %p)\n", - f, (char*)f + sizeof(struct qm_frag) + sizeof(struct qm_frag_end), f->size, - f + sizeof(struct qm_frag) + f->size, qm->first_frag + qm->size); + f, (char*)f + sizeof(struct qm_frag), f->size, + (char*)f + sizeof(struct qm_frag) + f->size + + sizeof(struct qm_frag_end), + (char*)qm->first_frag + qm->size); qm_status(qm); abort(); } /* check struct qm_frag_end */ if (FRAG_END(f)->size != f->size) { LOG(L_CRIT, "BUG: qm_*: fragm. %p (address %p) " - "size in qm_frag and qm_frag_end does not match: frag->size=%lu, frag_end->size=%lu)\n", + "size in qm_frag and qm_frag_end does not match:" + " frag->size=%lu, frag_end->size=%lu)\n", f, (char*)f + sizeof(struct qm_frag), f->size, FRAG_END(f)->size); qm_status(qm);

1 0

git:master:52f728f7: core: cfg.y - fixed condition on case parsing
by Daniel-Constantin Mierla 04 Jul '17

04 Jul '17

Module: kamailio Branch: master Commit: 52f728f73914ab960389ff8afbf1a223f91f07e2 URL: https://github.com/kamailio/kamailio/commit/52f728f73914ab960389ff8afbf1a22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:00:45+02:00 core: cfg.y - fixed condition on case parsing --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/52f728f73914ab960389ff8afbf1a22… Patch: https://github.com/kamailio/kamailio/commit/52f728f73914ab960389ff8afbf1a22… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 59125a1659..067b0f0dee 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2389,7 +2389,7 @@ single_case: } } | DEFAULT COLON actions { - if ((($$=mk_case_stm(0, 0, $3, &i_tmp))==0) && (i_tmp=-10)){ + if ((($$=mk_case_stm(0, 0, $3, &i_tmp))==0) && (i_tmp==-10)){ YYABORT; } }

1 0

[kamailio/kamailio] pua_reginfo: use outbound proxy for PUBLISHes (#1177)
by Vasiliy Ganchev 04 Jul '17

04 Jul '17

Hi again, duplicate of [previous pull](https://github.com/kamailio/kamailio/pull/1176), as there is some mess. Hope this time is better. thanks! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1177 -- Commit Summary -- * pua_reginfo: use outbound proxy for PUBLISHes * pua_reginfo: correct docs -- File Changes -- M src/modules/pua_reginfo/doc/pua_reginfo_admin.xml (2) M src/modules/pua_reginfo/usrloc_cb.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1177.patch https://github.com/kamailio/kamailio/pull/1177.diff -- 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/pull/1177

2 3

git:master:e4f0facc: modules: readme files regenerated - pua_reginfo ... [skip ci]
by Kamailio Dev 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: e4f0facccb130599acfd0c4abbfd954a427c3d96 URL: https://github.com/kamailio/kamailio/commit/e4f0facccb130599acfd0c4abbfd954… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-03T19:01:39+02:00 modules: readme files regenerated - pua_reginfo ... [skip ci] --- Modified: src/modules/pua_reginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/e4f0facccb130599acfd0c4abbfd954… Patch: https://github.com/kamailio/kamailio/commit/e4f0facccb130599acfd0c4abbfd954… --- diff --git a/src/modules/pua_reginfo/README b/src/modules/pua_reginfo/README index 49a7fbcfed..68c9a85205 100644 --- a/src/modules/pua_reginfo/README +++ b/src/modules/pua_reginfo/README @@ -141,7 +141,8 @@ modparam("pua_reginfo", "publish_reginfo", 0) 3.3. outbound_proxy(str) - The outbound_proxy uri to be used when sending Subscribe requests. + The outbound_proxy uri to be used when sending Subscribe and Publish + requests. Default value is “NULL”.

1 0

git:master:385995c2: pua_reginfo: use outbound proxy for PUBLISH requests
by Daniel-Constantin Mierla 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: 385995c27084bdca9ebc4a472f9ab41311416f35 URL: https://github.com/kamailio/kamailio/commit/385995c27084bdca9ebc4a472f9ab41… Author: Vasiliy Ganchev <vance(a)ukr.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T18:56:52+02:00 pua_reginfo: use outbound proxy for PUBLISH requests --- Modified: src/modules/pua_reginfo/doc/pua_reginfo_admin.xml Modified: src/modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/385995c27084bdca9ebc4a472f9ab41… Patch: https://github.com/kamailio/kamailio/commit/385995c27084bdca9ebc4a472f9ab41… --- diff --git a/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml b/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml index e7b7a6e50a..9754055c33 100644 --- a/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml +++ b/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml @@ -125,7 +125,7 @@ modparam("pua_reginfo", "publish_reginfo", 0) <section> <title><varname>outbound_proxy</varname>(str)</title> <para> - The outbound_proxy uri to be used when sending Subscribe requests. + The outbound_proxy uri to be used when sending Subscribe and Publish requests. </para> <para> <emphasis> Default value is <quote>NULL</quote>. diff --git a/src/modules/pua_reginfo/usrloc_cb.c b/src/modules/pua_reginfo/usrloc_cb.c index 3e00a0eaed..f8a55480bb 100644 --- a/src/modules/pua_reginfo/usrloc_cb.c +++ b/src/modules/pua_reginfo/usrloc_cb.c @@ -323,6 +323,9 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { publ.event |= REGINFO_EVENT; publ.extra_headers= NULL; + if(outbound_proxy.s && outbound_proxy.len) + publ.outbound_proxy= &outbound_proxy; + if(pua.send_publish(&publ) < 0) { LM_ERR("Error while sending publish\n"); }

1 0

git:master:4168a6c3: Merge pull request #1175 from claudiupb/redis_enhance_debug
by GitHub 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: 4168a6c3221f95e50aa7a0769d1abecfa255fa10 URL: https://github.com/kamailio/kamailio/commit/4168a6c3221f95e50aa7a0769d1abec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-03T18:52:32+02:00 Merge pull request #1175 from claudiupb/redis_enhance_debug ndb_redis: enhance debug info related to redis replies --- Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/4168a6c3221f95e50aa7a0769d1abec… Patch: https://github.com/kamailio/kamailio/commit/4168a6c3221f95e50aa7a0769d1abec… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 9395773731..520f32364b 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -608,7 +608,7 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) goto error_exec; } } - LM_DBG("reply is [%s]",rpl->rplRedis->str); + LM_DBG_redis_reply(rpl->rplRedis); /* replies are received just retrieve them */ for (i=1;i<rsrv->piped.pending_commands;i++) @@ -625,7 +625,13 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) LM_ERR("Unable to read reply\n"); continue; } - LM_DBG("reply is [%s]",rpl->rplRedis->str); + if (rpl->rplRedis == NULL) + { + LM_ERR("Trying to read reply for command %.*s but nothing in buffer!", + rsrv->piped.commands[i].len,rsrv->piped.commands[i].s); + continue; + } + LM_DBG_redis_reply(rpl->rplRedis); } redisc_free_pipelined_cmds(rsrv); rsrv->disable.consecutive_errors = 0; @@ -1061,3 +1067,57 @@ int redis_count_err_and_disable(redisc_server_t *rsrv) } return 0; } + +void print_redis_reply(int log_level, redisReply *rpl,int offset) +{ + int i; + char padding[MAXIMUM_NESTED_KEYS + 1]; + + if(!is_printable(log_level)) + return; + + if (!rpl) + { + LM_ERR("Unexpected null reply"); + return; + } + + if (offset > MAXIMUM_NESTED_KEYS) + { + LM_ERR("Offset is too big"); + return; + } + + for (i=0;i<offset;i++) + { + padding[i]='\t'; + } + padding[offset]='\0'; + + switch (rpl->type) + { + case REDIS_REPLY_STRING: + LOG(log_level,"%sstring reply: [%s]", padding, rpl->str); + break; + case REDIS_REPLY_INTEGER: + LOG(log_level,"%sinteger reply: %lld", padding, rpl->integer); + break; + case REDIS_REPLY_ARRAY: + LOG(log_level,"%sarray reply with %d elements", padding, (int)rpl->elements); + for (i=0; i < rpl->elements; i++) + { + LOG(log_level,"%selement %d:",padding,i); + print_redis_reply(log_level,rpl->element[i],offset+1); + } + break; + case REDIS_REPLY_NIL: + LOG(log_level,"%snil reply",padding); + break; + case REDIS_REPLY_STATUS: + LOG(log_level,"%sstatus reply: %s", padding, rpl->str); + break; + case REDIS_REPLY_ERROR: + LOG(log_level,"%serror reply: %s", padding, rpl->str); + break; + } +} diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index 73cbd0b3c0..50431cbc40 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -36,6 +36,7 @@ #define MAXIMUM_PIPELINED_COMMANDS 1000 #define MAXIMUM_NESTED_KEYS 10 +#define LM_DBG_redis_reply(rpl) print_redis_reply(L_DBG,(rpl),0) int redisc_init(void); int redisc_destroy(void); @@ -97,4 +98,5 @@ int redisc_free_reply(str *name); int redisc_check_auth(redisc_server_t *rsrv, char *pass); int redis_check_server(redisc_server_t *rsrv); int redis_count_err_and_disable(redisc_server_t *rsrv); +void print_redis_reply(int log_level, redisReply *rpl,int offset); #endif

1 0

git:master:6002f2de: ndb_redis: enhance debug info related to redis replies
by Claudiu Boriga 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: 6002f2de79b1f344bf9326763d63a1f978d0ddc7 URL: https://github.com/kamailio/kamailio/commit/6002f2de79b1f344bf9326763d63a1f… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-07-03T16:22:32+03:00 ndb_redis: enhance debug info related to redis replies --- Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/6002f2de79b1f344bf9326763d63a1f… Patch: https://github.com/kamailio/kamailio/commit/6002f2de79b1f344bf9326763d63a1f… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 9395773731..520f32364b 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -608,7 +608,7 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) goto error_exec; } } - LM_DBG("reply is [%s]",rpl->rplRedis->str); + LM_DBG_redis_reply(rpl->rplRedis); /* replies are received just retrieve them */ for (i=1;i<rsrv->piped.pending_commands;i++) @@ -625,7 +625,13 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) LM_ERR("Unable to read reply\n"); continue; } - LM_DBG("reply is [%s]",rpl->rplRedis->str); + if (rpl->rplRedis == NULL) + { + LM_ERR("Trying to read reply for command %.*s but nothing in buffer!", + rsrv->piped.commands[i].len,rsrv->piped.commands[i].s); + continue; + } + LM_DBG_redis_reply(rpl->rplRedis); } redisc_free_pipelined_cmds(rsrv); rsrv->disable.consecutive_errors = 0; @@ -1061,3 +1067,57 @@ int redis_count_err_and_disable(redisc_server_t *rsrv) } return 0; } + +void print_redis_reply(int log_level, redisReply *rpl,int offset) +{ + int i; + char padding[MAXIMUM_NESTED_KEYS + 1]; + + if(!is_printable(log_level)) + return; + + if (!rpl) + { + LM_ERR("Unexpected null reply"); + return; + } + + if (offset > MAXIMUM_NESTED_KEYS) + { + LM_ERR("Offset is too big"); + return; + } + + for (i=0;i<offset;i++) + { + padding[i]='\t'; + } + padding[offset]='\0'; + + switch (rpl->type) + { + case REDIS_REPLY_STRING: + LOG(log_level,"%sstring reply: [%s]", padding, rpl->str); + break; + case REDIS_REPLY_INTEGER: + LOG(log_level,"%sinteger reply: %lld", padding, rpl->integer); + break; + case REDIS_REPLY_ARRAY: + LOG(log_level,"%sarray reply with %d elements", padding, (int)rpl->elements); + for (i=0; i < rpl->elements; i++) + { + LOG(log_level,"%selement %d:",padding,i); + print_redis_reply(log_level,rpl->element[i],offset+1); + } + break; + case REDIS_REPLY_NIL: + LOG(log_level,"%snil reply",padding); + break; + case REDIS_REPLY_STATUS: + LOG(log_level,"%sstatus reply: %s", padding, rpl->str); + break; + case REDIS_REPLY_ERROR: + LOG(log_level,"%serror reply: %s", padding, rpl->str); + break; + } +} diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index 73cbd0b3c0..50431cbc40 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -36,6 +36,7 @@ #define MAXIMUM_PIPELINED_COMMANDS 1000 #define MAXIMUM_NESTED_KEYS 10 +#define LM_DBG_redis_reply(rpl) print_redis_reply(L_DBG,(rpl),0) int redisc_init(void); int redisc_destroy(void); @@ -97,4 +98,5 @@ int redisc_free_reply(str *name); int redisc_check_auth(redisc_server_t *rsrv, char *pass); int redis_check_server(redisc_server_t *rsrv); int redis_count_err_and_disable(redisc_server_t *rsrv); +void print_redis_reply(int log_level, redisReply *rpl,int offset); #endif

1 0

[kamailio/kamailio] ndb_redis: enhance debug info related to redis replies (#1175)
by Paul Claudiu Boriga 03 Jul '17

03 Jul '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Added a way to print the redis responses when they are arrays, since the previous log message would just print (null) instead. In case a MULTI/EXEC transaction will be used to issue redis commands, the response would be an array, making the original debug message useless. With this new debug, arrays, strings, integers, and other replies such as status or error replies are logged properly. Also added an error message when a reply is expected but not received. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1175 -- Commit Summary -- * ndb_redis: enhance debug info related to redis replies -- File Changes -- M src/modules/ndb_redis/ndb_redis_mod.c (9) M src/modules/ndb_redis/redis_client.c (64) M src/modules/ndb_redis/redis_client.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1175.patch https://github.com/kamailio/kamailio/pull/1175.diff -- 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/pull/1175

2 4

tls warnings
by Juha Heinanen 03 Jul '17

03 Jul '17

I got these TLS related warnings when compiling K 5.0 on Debian Stretch. -- Juha CC (gcc) [M tls.so] tls_init.o tls_init.c: In function 'init_ssl_methods': tls_init.c:377:2: warning: 'TLSv1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_cli - 1] = TLSv1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1614:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_client_method(void)) /* TLSv1.0 */ ^ tls_init.c:378:2: warning: 'TLSv1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1613:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_server_method(void)) /* TLSv1.0 */ ^ tls_init.c:379:2: warning: 'TLSv1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1612:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_method(void)) /* TLSv1.0 */ ^ tls_init.c:382:2: warning: 'TLSv1_1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1620:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_client_method(void)) /* TLSv1.1 */ ^ tls_init.c:383:2: warning: 'TLSv1_1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1619:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_server_method(void)) /* TLSv1.1 */ ^ tls_init.c:384:2: warning: 'TLSv1_1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1618:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_method(void)) /* TLSv1.1 */ ^ tls_init.c:388:2: warning: 'TLSv1_2_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1626:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_client_method(void)) /* TLSv1.2 */ ^ tls_init.c:389:2: warning: 'TLSv1_2_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1625:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_server_method(void)) /* TLSv1.2 */ ^ tls_init.c:390:2: warning: 'TLSv1_2_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1624:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_method(void)) /* TLSv1.2 */ ^ CC (gcc) [M tls.so] tls_bio.o CC (gcc) [M tls.so] tls_locking.o tls_locking.c:98:13: warning: 'locking_f' defined but not used [-Wunused-function] static void locking_f(int mode, int n, const char* file, int line) ^~~~~~~~~ tls_locking.c:83:13: warning: 'dyn_destroy_f' defined but not used [-Wunused-function] static void dyn_destroy_f(struct CRYPTO_dynlock_value *l, ^~~~~~~~~~~~~ tls_locking.c:65:13: warning: 'dyn_lock_f' defined but not used [-Wunused-function] static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, ^~~~~~~~~~ tls_locking.c:42:37: warning: 'dyn_create_f' defined but not used [-Wunused-function] static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) ^~~~~~~~~~~~

2 2

git:master:3ce65db8: cfgutils: more log messages for locking functions
by Daniel-Constantin Mierla 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: 3ce65db8747ad7b382824f389c2b782a76dbb7a1 URL: https://github.com/kamailio/kamailio/commit/3ce65db8747ad7b382824f389c2b782… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T17:02:02+02:00 cfgutils: more log messages for locking functions - it was silent if locks set was not initialized properly which could mislead at runtime, but not showing any error message - if locks set size is too big, set it to 14 (this is used as power of 2) --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/3ce65db8747ad7b382824f389c2b782… Patch: https://github.com/kamailio/kamailio/commit/3ce65db8747ad7b382824f389c2b782… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 0b72186546..ca7bf77ae3 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -705,9 +705,15 @@ static int ki_shm_summary(sip_msg_t* msg) static int cfg_lock_helper(str *lkey, int mode) { unsigned int pos; + + if(_cfg_lock_set==NULL) { + LM_ERR("lock set not initialized (attempt to do op: %d on: %.*s)\n", + mode, lkey->len, lkey->s); + return -1; + } pos = core_case_hash(lkey, 0, _cfg_lock_size); - LM_DBG("cfg_lock mode %d on %u\n", mode, pos); + LM_DBG("cfg_lock mode %d on %u (%.*s)\n", mode, pos, lkey->len, lkey->s); if(mode==0) { /* Lock */ @@ -749,8 +755,10 @@ static int cfg_trylock(str *lkey) static int w_cfg_lock_wrapper(struct sip_msg *msg, gparam_p key, int mode) { str s; - if(fixup_get_svalue(msg, key, &s)!=0) - { + if(key==NULL) { + return -1; + } + if(fixup_get_svalue(msg, key, &s)!=0) { LM_ERR("cannot get first parameter\n"); return -1; } @@ -759,22 +767,16 @@ static int w_cfg_lock_wrapper(struct sip_msg *msg, gparam_p key, int mode) static int w_cfg_lock(struct sip_msg *msg, char *key, char *s2) { - if(_cfg_lock_set==NULL || key==NULL) - return -1; return w_cfg_lock_wrapper(msg, (gparam_p)key, 0); } static int w_cfg_unlock(struct sip_msg *msg, char *key, char *s2) { - if(_cfg_lock_set==NULL || key==NULL) - return -1; return w_cfg_lock_wrapper(msg, (gparam_p)key, 1); } static int w_cfg_trylock(struct sip_msg *msg, char *key, char *s2) { - if(_cfg_lock_set==NULL || key==NULL) - return -1; return w_cfg_lock_wrapper(msg, (gparam_p)key, 2); } @@ -856,12 +858,15 @@ static int mod_init(void) lock_dealloc(gflags_lock); return -1; } - if(_cfg_lock_size>0 && _cfg_lock_size<=10) - { + if(_cfg_lock_size>0) { + if(_cfg_lock_size>14) { + LM_WARN("lock set size too large (%d), making it 14\n", + _cfg_lock_size); + _cfg_lock_size = 14; + } _cfg_lock_size = 1<<_cfg_lock_size; _cfg_lock_set = lock_set_alloc(_cfg_lock_size); - if(_cfg_lock_set==NULL || lock_set_init(_cfg_lock_set)==NULL) - { + if(_cfg_lock_set==NULL || lock_set_init(_cfg_lock_set)==NULL) { LM_ERR("cannot initiate lock set\n"); return -1; }

1 0

[kamailio/kamailio] pua_reginfo: use outbound proxy for PUBLISHes (#1176)
by Vasiliy Ganchev 03 Jul '17

03 Jul '17

Hi, guys! Pua module provides a callback "send_publish". One of the parameters is "outbound_proxy", but pua_reginfo does not use it, even if the parameter is specified. Documentation says: "The outbound_proxy uri to be used when sending Subscribe requests." Any reason to use it only for SUBSCRIBE, and not for PUBLISH? If PR is acceptable, do I need to correct documentation for pua_reginfo module? I have studied the contributing gide, but if something is not OK - please point out,. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1176 -- Commit Summary -- * Update usrloc_cb.c -- File Changes -- M src/modules/pua_reginfo/usrloc_cb.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1176.patch https://github.com/kamailio/kamailio/pull/1176.diff -- 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/pull/1176

2 2

git:master:8eb84f76: core: parse rr - reset head in case of parse error
by Daniel-Constantin Mierla 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: 8eb84f76a6d52598bb2fd5d13b96fba4c6326b7f URL: https://github.com/kamailio/kamailio/commit/8eb84f76a6d52598bb2fd5d13b96fba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T14:58:59+02:00 core: parse rr - reset head in case of parse error - avoid acessing an invalid pointer - proper support if trying to parse into an existing rr list in a second attempt (not the case so far) --- Modified: src/core/parser/parse_rr.c --- Diff: https://github.com/kamailio/kamailio/commit/8eb84f76a6d52598bb2fd5d13b96fba… Patch: https://github.com/kamailio/kamailio/commit/8eb84f76a6d52598bb2fd5d13b96fba… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index 4fb32b0265..5740461f6c 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -55,6 +55,13 @@ static inline int do_parse_rr_body(char *buf, int len, rr_t **head) trim_leading(&s); last = 0; + if (*head) { + /* go to last rr in list */ + last = *head; + while (last->next) { + last = last->next; + } + } while(1) { /* Allocate and clear rr structure */ @@ -128,7 +135,8 @@ static inline int do_parse_rr_body(char *buf, int len, rr_t **head) error: if (r) free_rr(&r); - free_rr(head); /* Free any contacts created so far */ + free_rr(head); /* Free any rr created so far */ + *head = NULL; LM_ERR("Failed parsing rr header body [%.*s]\n", len, ZSW(buf)); return -1;

1 0

git:master:dbd52dac: core: avoid accessing freed structure in case of duplicated listen addresses
by Daniel-Constantin Mierla 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: dbd52dacae17eca5a48359c605a2d93607b7c041 URL: https://github.com/kamailio/kamailio/commit/dbd52dacae17eca5a48359c605a2d93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T14:42:03+02:00 core: avoid accessing freed structure in case of duplicated listen addresses --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/dbd52dacae17eca5a48359c605a2d93… Patch: https://github.com/kamailio/kamailio/commit/dbd52dacae17eca5a48359c605a2d93… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 62a15f4c93..8344c950f2 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1597,7 +1597,7 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) ail=ail_next; continue; } - /* 2. check if the extra addresses contain a duplicates for + /* 2. check if the extra addresses contain a duplicates for * other addresses in the same list */ for (tmp_ail=ail->next; tmp_ail;){ tmp_ail_next=tmp_ail->next; @@ -1614,6 +1614,9 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) si->port_no, si->proto); /* remove tmp_ail*/ addr_info_listrm(&si->addr_info_lst, tmp_ail); + if(ail_next==tmp_ail) { + ail_next = tmp_ail_next; + } free_addr_info(tmp_ail); } tmp_ail=tmp_ail_next;

1 0

[kamailio/kamailio] Kamailio does not set the right advertised RR (#1174)
by Sam 03 Jul '17

03 Jul '17

Using latest master commit. Running on AWS EC2 with elastic IP. If using advertised_address="ELASTICIP" the VIA headers etc get changed correctly but the record route header does not, it still uses the internal IP of the host. If I add: listen=udp:0.0.0.0:5060 advertise ELASTICIP:5060 The RR advertises the correct IP. According to the documentation here: https://www.kamailio.org/wiki/cookbooks/5.0.x/core#advertised_address It should be enough with the advertised_address parameter. Hence, seems to be a problem with the advertised_address parameter. -- 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/1174

2 2

git:master:b95e5363: enum: fixed code for country code length
by Daniel-Constantin Mierla 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: b95e536335083ee6f1f67e2007463ac7e8403ec8 URL: https://github.com/kamailio/kamailio/commit/b95e536335083ee6f1f67e2007463ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T11:53:21+02:00 enum: fixed code for country code length --- Modified: src/modules/enum/enum.c --- Diff: https://github.com/kamailio/kamailio/commit/b95e536335083ee6f1f67e2007463ac… Patch: https://github.com/kamailio/kamailio/commit/b95e536335083ee6f1f67e2007463ac… --- diff --git a/src/modules/enum/enum.c b/src/modules/enum/enum.c index c8dcdc3751..55c2245685 100644 --- a/src/modules/enum/enum.c +++ b/src/modules/enum/enum.c @@ -82,7 +82,7 @@ static int cclen(const char *number) d1 = number[0]; d2 = number[1]; - if(!isdigit((int)d2)) + if(!isdigit((int)d1) || !isdigit((int)d2)) return (0); switch(d1) { @@ -90,13 +90,13 @@ static int cclen(const char *number) case '7': return (1); case '2': - if((d2 == '0') || (d1 == '7')) + if((d2 == '0') || (d2 == '7')) return (2); break; case '3': - if((d2 >= '0') && (d1 <= '4')) + if((d2 >= '0') && (d2 <= '4')) return (2); - if((d2 == '6') || (d1 == '9')) + if((d2 == '6') || (d2 == '9')) return (2); break; case '4': @@ -104,19 +104,19 @@ static int cclen(const char *number) return (2); break; case '5': - if((d2 >= '1') && (d1 <= '8')) + if((d2 >= '1') && (d2 <= '8')) return (2); break; case '6': - if(d1 <= '6') + if(d2 <= '6') return (2); break; case '8': - if((d2 == '1') || (d1 == '2') || (d1 == '4') || (d1 == '6')) + if((d2 == '1') || (d2 == '2') || (d2 == '4') || (d2 == '6')) return (2); break; case '9': - if(d1 <= '5') + if(d2 <= '5') return (2); if(d2 == '8') return (2);

1 0

git:master:366104d2: seas: avoid double free and leak
by Daniel-Constantin Mierla 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: 366104d2f79ccfa65850cd2e3bfb5ed8be467bc2 URL: https://github.com/kamailio/kamailio/commit/366104d2f79ccfa65850cd2e3bfb5ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T11:45:26+02:00 seas: avoid double free and leak --- Modified: src/modules/seas/seas_action.c Modified: src/modules/seas/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/366104d2f79ccfa65850cd2e3bfb5ed… Patch: https://github.com/kamailio/kamailio/commit/366104d2f79ccfa65850cd2e3bfb5ed… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index 3258ffe328..3cb5513fbd 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -518,7 +518,7 @@ int ac_cancel(as_p the_as,unsigned char processor_id,unsigned int flags,char *ac if(headers.s) pkg_free(headers.s); if(body.s) - pkg_free(headers.s); + pkg_free(body.s); if(my_msg){ if(my_msg->headers) free_hdr_field_lst(my_msg->headers); diff --git a/src/modules/seas/utils.c b/src/modules/seas/utils.c index 367ba7413e..76c2c6af5e 100644 --- a/src/modules/seas/utils.c +++ b/src/modules/seas/utils.c @@ -90,6 +90,7 @@ int buffered_printer(FILE* infd) printf("PARSED:%d,last=%d,end=%d\n",k++,last,end); free_sip_msg(&msg); pkg_free(missatge); + missatge = NULL; memmove(mybuffer,&mybuffer[end],1400-end); last=1400-end; }

1 0

git:master:b3030a29: enum: free variable in case of error and safety check for returned pointer
by Daniel-Constantin Mierla 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: b3030a2965889a788093b2c372c1d7ac9441e8cc URL: https://github.com/kamailio/kamailio/commit/b3030a2965889a788093b2c372c1d7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T10:57:21+02:00 enum: free variable in case of error and safety check for returned pointer --- Modified: src/modules/enum/enum.c --- Diff: https://github.com/kamailio/kamailio/commit/b3030a2965889a788093b2c372c1d7a… Patch: https://github.com/kamailio/kamailio/commit/b3030a2965889a788093b2c372c1d7a… --- diff --git a/src/modules/enum/enum.c b/src/modules/enum/enum.c index e4cb1699ac..c8dcdc3751 100644 --- a/src/modules/enum/enum.c +++ b/src/modules/enum/enum.c @@ -405,6 +405,11 @@ int is_from_user_enum_helper(sip_msg_t *_msg, str *suffix, str *service) zp = 0; proto = PROTO_NONE; he = sip_resolvehost(&luri.host, &zp, &proto); + if(he==NULL) { + LM_ERR("failed to resolve the host\n"); + free_rdata_list(head); /*clean up*/ + return -8; + } hostent2ip_addr(&addr, he, 0); @@ -948,11 +953,13 @@ int i_enum_query_helper(sip_msg_t *_msg, str *suffix, str *service) if((ebl->apex_len > MAX_COMPONENT_SIZE) || (ebl->separator_len > MAX_COMPONENT_SIZE)) { LM_ERR("EBL strings too long\n"); + free_rdata_list(head); return -1; } if(ebl->position > 15) { LM_ERR("EBL position too large (%d)\n", ebl->position); + free_rdata_list(head); return -1; } @@ -1306,4 +1313,4 @@ int ki_enum_pv_query_suffix_service(sip_msg_t *msg, str *ve164, str *vsuffix, str *vservice) { return enum_pv_query_helper(msg, ve164, vsuffix, vservice); -} \ No newline at end of file +}

1 0

git:master:8b0a42ab: rr: use macro to get parsed From in record_route_preset()
by Daniel-Constantin Mierla 03 Jul '17

03 Jul '17

Module: kamailio Branch: master Commit: 8b0a42ab64c02a1fa253ce156442bab64a4fe3db URL: https://github.com/kamailio/kamailio/commit/8b0a42ab64c02a1fa253ce156442bab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T10:03:18+02:00 rr: use macro to get parsed From in record_route_preset() - safety check for parsed pointer --- Modified: src/modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/8b0a42ab64c02a1fa253ce156442bab… Patch: https://github.com/kamailio/kamailio/commit/8b0a42ab64c02a1fa253ce156442bab… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index df7f95553d..0d042b2d36 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -529,12 +529,12 @@ int record_route_preset(struct sip_msg* _m, str* _data) } if (append_fromtag) { - if (parse_from_header(_m) < 0) { + if (parse_from_header(_m) < 0 || get_from(_m)==NULL) { LM_ERR("From parsing failed\n"); ret = -2; goto error; } - from = (struct to_body*)_m->from->parsed; + from = get_from(_m); } l = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, HDR_RECORDROUTE_T);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev