sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
411 discussions

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: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: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: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

← Newer
1
...
33
34
35
36
37
38
39
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017