sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
418 discussions

git:5.2:b1bb24d3: evapi: use local allocated buffer to get data parameter for event relay
by Henning Westerholt 24 Jan '20

24 Jan '20

Module: kamailio Branch: 5.2 Commit: b1bb24d3639c2869f825dd692a9b1346d1bb30b5 URL: https://github.com/kamailio/kamailio/commit/b1bb24d3639c2869f825dd692a9b134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:39:55+01:00 evapi: use local allocated buffer to get data parameter for event relay - use system malloc given that the data can be passed from jsonrpcs, which uses system malloc as well - try to grow the internall buffer as needed based on estimated size of output for the data parameter (cherry picked from commit 63334e312d60a5d6a6470b0067c29db672d08c7c) --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b1bb24d3639c2869f825dd692a9b134… Patch: https://github.com/kamailio/kamailio/commit/b1bb24d3639c2869f825dd692a9b134…

1 0

git:5.2:0b6cde56: app_sqlang: fix squirrel warning: ânArgsâ may be used uninitialized in this function
by Henning Westerholt 24 Jan '20

24 Jan '20

Module: kamailio Branch: 5.2 Commit: 0b6cde5604fcbc3756311b1ddacc4d7a230d7152 URL: https://github.com/kamailio/kamailio/commit/0b6cde5604fcbc3756311b1ddacc4d7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:33:56+01:00 app_sqlang: fix squirrel warning: ânArgsâ may be used uninitialized in this function (cherry picked from commit 7fad9c51f71854e0649fe76e273190e4b4f82438) --- Modified: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp --- Diff: https://github.com/kamailio/kamailio/commit/0b6cde5604fcbc3756311b1ddacc4d7… Patch: https://github.com/kamailio/kamailio/commit/0b6cde5604fcbc3756311b1ddacc4d7… --- diff --git a/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp b/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp index f3b8103185..fb6545f921 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp +++ b/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp @@ -625,7 +625,7 @@ static SQInteger __map_array(SQArray *dest,SQArray *src,HSQUIRRELVM v) { SQObject &closure = stack_get(v, 2); v->Push(closure); - SQInteger nArgs; + SQInteger nArgs = 0; if(sq_type(closure) == OT_CLOSURE) { nArgs = _closure(closure)->_function->_nparameters; }

1 0

git:5.2:9bdcde18: app_sqlang: imported latest squirrel interpreter
by Henning Westerholt 24 Jan '20

24 Jan '20

Module: kamailio Branch: 5.2 Commit: 9bdcde18c932d81efd4d58a810b88e42d9fcdec8 URL: https://github.com/kamailio/kamailio/commit/9bdcde18c932d81efd4d58a810b88e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:33:37+01:00 app_sqlang: imported latest squirrel interpreter (cherry picked from commit b0fc60403b539672c6a2638083e8955783c65e0b) --- Modified: src/modules/app_sqlang/squirrel/include/sqstdaux.h Modified: src/modules/app_sqlang/squirrel/include/sqstdstring.h Modified: src/modules/app_sqlang/squirrel/include/squirrel.h Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdaux.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqapi.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqfuncstate.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqfuncstate.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqobject.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp --- Diff: https://github.com/kamailio/kamailio/commit/9bdcde18c932d81efd4d58a810b88e4… Patch: https://github.com/kamailio/kamailio/commit/9bdcde18c932d81efd4d58a810b88e4…

1 0

git:5.2:e62d4bb6: Makefile.defs: version set to 5.2.6
by Henning Westerholt 24 Jan '20

24 Jan '20

Module: kamailio Branch: 5.2 Commit: e62d4bb6d5c5f759cbb4cce32921db2a6418589c URL: https://github.com/kamailio/kamailio/commit/e62d4bb6d5c5f759cbb4cce32921db2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:07:30+01:00 Makefile.defs: version set to 5.2.6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e62d4bb6d5c5f759cbb4cce32921db2… Patch: https://github.com/kamailio/kamailio/commit/e62d4bb6d5c5f759cbb4cce32921db2… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a3a07a89df..b52ae99694 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 2 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = # memory manager switcher

1 0

git:5.2:3fbd9192: pkg/kamailio: updated version to 5.2.6 in spec files
by Henning Westerholt 24 Jan '20

24 Jan '20

Module: kamailio Branch: 5.2 Commit: 3fbd91923977dcaabda119a97b7cbd0182dc1eaf URL: https://github.com/kamailio/kamailio/commit/3fbd91923977dcaabda119a97b7cbd0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:05:16+01:00 pkg/kamailio: updated version to 5.2.6 in spec files --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3fbd91923977dcaabda119a97b7cbd0… Patch: https://github.com/kamailio/kamailio/commit/3fbd91923977dcaabda119a97b7cbd0… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 67c7655ceb..6c85e1f2e2 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.2.5 +pkgver=5.2.6 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index edc93e8a4f..0a55643472 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.5 +%define ver 5.2.6 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.3:0a90aecb: core: msg translator - warning log made info for multipart body processing
by Daniel-Constantin Mierla 24 Jan '20

24 Jan '20

Module: kamailio Branch: 5.3 Commit: 0a90aecb5737f4001cad7bb20590823deea4390e URL: https://github.com/kamailio/kamailio/commit/0a90aecb5737f4001cad7bb20590823… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-24T10:38:49+01:00 core: msg translator - warning log made info for multipart body processing - check boundary cannot find boundary value in content-type when the request is turned into multipart body - use different return code for this case - a few realignmets for curly braces to be corherent across the respective functions (cherry picked from commit 2c7ba53b2b6cc7dd5e3c24241d23e76fb052aa50) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/0a90aecb5737f4001cad7bb20590823… Patch: https://github.com/kamailio/kamailio/commit/0a90aecb5737f4001cad7bb20590823… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 485fecac1c..2e9d9da240 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1711,16 +1711,14 @@ int get_boundary(struct sip_msg* msg, str* boundary) params.s = memchr(msg->content_type->body.s, ';', msg->content_type->body.len); - if (params.s == NULL) - { + if (params.s == NULL) { LM_INFO("Content-Type hdr has no boundary params <%.*s>\n", msg->content_type->body.len, msg->content_type->body.s); - return -1; + return -2; } params.len = msg->content_type->body.len - (params.s - msg->content_type->body.s); - if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) - { + if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) { LM_ERR("while parsing Content-Type params\n"); return -1; } @@ -1728,11 +1726,9 @@ int get_boundary(struct sip_msg* msg, str* boundary) boundary->len = 0; for (p = list; p; p = p->next) { if ((p->name.len == 8) - && (strncasecmp(p->name.s, "boundary", 8) == 0)) - { + && (strncasecmp(p->name.s, "boundary", 8) == 0)) { boundary->s = pkg_malloc(p->body.len + 2); - if (boundary->s == NULL) - { + if (boundary->s == NULL) { free_params(list); PKG_MEM_ERROR; return -1; @@ -1765,9 +1761,17 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) int t, ret, lb_size; char *pb; - if(!(msg->msg_flags&FL_BODY_MULTIPART)) return 0; - else - { + if(!(msg->msg_flags&FL_BODY_MULTIPART)) { + LM_DBG("no multi-part body\n"); + return 0; + } else { + if((t = get_boundary(msg, &ob)) != 0) { + if(t==-2) { + LM_INFO("no boundary - maybe just turning into multipart body\n"); + return -2; + } + return -1; + } buf.s = build_body(msg, (unsigned int *)&buf.len, &ret, send_info); if(ret) { LM_ERR("Can't get body\n"); @@ -1775,10 +1779,6 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) } tmp.s = buf.s; t = tmp.len = buf.len; - if(get_boundary(msg, &ob)!=0) { - if(tmp.s) pkg_free(tmp.s); - return -1; - } if(str_append(&ob, &bsuffix, &b)!=0) { LM_ERR("Can't append suffix to boundary\n"); goto error; @@ -1962,6 +1962,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, unsigned int flags; unsigned int udp_mtu; struct dest_info di; + int ret; via_insert_param=0; uri_len=0; @@ -1979,9 +1980,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, path_buf.len=0; flags=msg->msg_flags|global_req_flags; - if(check_boundaries(msg, send_info)<0){ - LM_WARN("check_boundaries error\n"); + if((ret = check_boundaries(msg, send_info)) < 0){ + LM_INFO("check boundaries negative (%d)\n", ret); } + /* Calculate message body difference and adjust Content-Length */ body_delta = lumps_len(msg, msg->body_lumps, send_info); if (adjust_clen(msg, body_delta, send_info->proto) < 0) {

1 0

git:master:2c7ba53b: core: msg translator - warning log made info for multipart body processing
by Daniel-Constantin Mierla 24 Jan '20

24 Jan '20

Module: kamailio Branch: master Commit: 2c7ba53b2b6cc7dd5e3c24241d23e76fb052aa50 URL: https://github.com/kamailio/kamailio/commit/2c7ba53b2b6cc7dd5e3c24241d23e76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-24T10:20:09+01:00 core: msg translator - warning log made info for multipart body processing - check boundary cannot find boundary value in content-type when the request is turned into multipart body - use different return code for this case - a few realignmets for curly braces to be corherent across the respective functions --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/2c7ba53b2b6cc7dd5e3c24241d23e76… Patch: https://github.com/kamailio/kamailio/commit/2c7ba53b2b6cc7dd5e3c24241d23e76… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index bebb8255fe..2b9bde51ec 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1710,16 +1710,14 @@ int get_boundary(struct sip_msg* msg, str* boundary) params.s = memchr(msg->content_type->body.s, ';', msg->content_type->body.len); - if (params.s == NULL) - { + if (params.s == NULL) { LM_INFO("Content-Type hdr has no boundary params <%.*s>\n", msg->content_type->body.len, msg->content_type->body.s); - return -1; + return -2; } params.len = msg->content_type->body.len - (params.s - msg->content_type->body.s); - if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) - { + if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) { LM_ERR("while parsing Content-Type params\n"); return -1; } @@ -1727,11 +1725,9 @@ int get_boundary(struct sip_msg* msg, str* boundary) boundary->len = 0; for (p = list; p; p = p->next) { if ((p->name.len == 8) - && (strncasecmp(p->name.s, "boundary", 8) == 0)) - { + && (strncasecmp(p->name.s, "boundary", 8) == 0)) { boundary->s = pkg_malloc(p->body.len + 2); - if (boundary->s == NULL) - { + if (boundary->s == NULL) { free_params(list); PKG_MEM_ERROR; return -1; @@ -1764,9 +1760,17 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) int t, ret, lb_size; char *pb; - if(!(msg->msg_flags&FL_BODY_MULTIPART)) return 0; - else - { + if(!(msg->msg_flags&FL_BODY_MULTIPART)) { + LM_DBG("no multi-part body\n"); + return 0; + } else { + if((t = get_boundary(msg, &ob)) != 0) { + if(t==-2) { + LM_INFO("no boundary - maybe just turning into multipart body\n"); + return -2; + } + return -1; + } buf.s = build_body(msg, (unsigned int *)&buf.len, &ret, send_info); if(ret) { LM_ERR("Can't get body\n"); @@ -1774,10 +1778,6 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) } tmp.s = buf.s; t = tmp.len = buf.len; - if(get_boundary(msg, &ob)!=0) { - if(tmp.s) pkg_free(tmp.s); - return -1; - } if(str_append(&ob, &bsuffix, &b)!=0) { LM_ERR("Can't append suffix to boundary\n"); goto error; @@ -1961,6 +1961,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, unsigned int flags; unsigned int udp_mtu; struct dest_info di; + int ret; via_insert_param=0; uri_len=0; @@ -1978,9 +1979,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, path_buf.len=0; flags=msg->msg_flags|global_req_flags; - if(check_boundaries(msg, send_info)<0){ - LM_WARN("check_boundaries error\n"); + if((ret = check_boundaries(msg, send_info)) < 0){ + LM_INFO("check boundaries negative (%d)\n", ret); } + /* Calculate message body difference and adjust Content-Length */ body_delta = lumps_len(msg, msg->body_lumps, send_info); if (adjust_clen(msg, body_delta, send_info->proto) < 0) {

1 0

git:5.2:826f99ac: pkg/kamailio/deb: version set 5.2.6
by Victor Seva 24 Jan '20

24 Jan '20

Module: kamailio Branch: 5.2 Commit: 826f99ac4266a7f1dcb72dcf6aeb7dfff1bf686a URL: https://github.com/kamailio/kamailio/commit/826f99ac4266a7f1dcb72dcf6aeb7df… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-01-24T10:11:57+01:00 pkg/kamailio/deb: version set 5.2.6 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/826f99ac4266a7f1dcb72dcf6aeb7df… Patch: https://github.com/kamailio/kamailio/commit/826f99ac4266a7f1dcb72dcf6aeb7df…

1 0

Releasing Kamailio v5.2.6
by Henning Westerholt 24 Jan '20

24 Jan '20

Hello, after the release of Kamailio 5.3.2 it is time to also release another minor version for the branch 5.2. I plan to release Kamailio 5.2.6 next Friday, 24th January 2020, if there are no new reports of relevant issues that make us to reconsider and postpone. Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 1

git:5.3:3d7809f4: app_sqlang: fix squirrel warning: ânArgsâ may be used uninitialized in this function
by Daniel-Constantin Mierla 24 Jan '20

24 Jan '20

Module: kamailio Branch: 5.3 Commit: 3d7809f4bc87208c3fc0261bd63ea3badf644916 URL: https://github.com/kamailio/kamailio/commit/3d7809f4bc87208c3fc0261bd63ea3b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-24T08:55:32+01:00 app_sqlang: fix squirrel warning: ânArgsâ may be used uninitialized in this function (cherry picked from commit 7fad9c51f71854e0649fe76e273190e4b4f82438) --- Modified: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp --- Diff: https://github.com/kamailio/kamailio/commit/3d7809f4bc87208c3fc0261bd63ea3b… Patch: https://github.com/kamailio/kamailio/commit/3d7809f4bc87208c3fc0261bd63ea3b… --- diff --git a/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp b/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp index f3b8103185..fb6545f921 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp +++ b/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp @@ -625,7 +625,7 @@ static SQInteger __map_array(SQArray *dest,SQArray *src,HSQUIRRELVM v) { SQObject &closure = stack_get(v, 2); v->Push(closure); - SQInteger nArgs; + SQInteger nArgs = 0; if(sq_type(closure) == OT_CLOSURE) { nArgs = _closure(closure)->_function->_nparameters; }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
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 January 2020