sr-dev

sr-dev@lists.kamailio.org

15 participants
45333 discussions

git:5.1:3a3dab1f: core: tcp - pass updated recv info to receive_msg() inside hep3_process_msg()
by Daniel-Constantin Mierla 20 Dec '17

20 Dec '17

Module: kamailio Branch: 5.1 Commit: 3a3dab1f62f196bb44e39fc88fb74310431358c1 URL: https://github.com/kamailio/kamailio/commit/3a3dab1f62f196bb44e39fc88fb7431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-20T19:46:14+01:00 core: tcp - pass updated recv info to receive_msg() inside hep3_process_msg() - based on GH #1379 - credits for troubleshooting and initial patch submission to Amit Zigelman <amit.zigelman(a)vonage.com> (cherry picked from commit ef28b61db70d32036ae6fdce72de7f8de94d3370) --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/3a3dab1f62f196bb44e39fc88fb7431… Patch: https://github.com/kamailio/kamailio/commit/3a3dab1f62f196bb44e39fc88fb7431… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8fb371bd9d..52935ccb78 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1336,7 +1336,7 @@ static int hep3_process_msg(char* tcpbuf, unsigned int len, return -1; } - ret = receive_msg(msg.buf, msg.len, rcv_info); + ret = receive_msg(msg.buf, msg.len, &msg.rcv); LM_DBG("running hep3-enclosed sip request route returned %d\n", ret); free_sip_msg(&msg);

1 0

git:master:ef28b61d: core: tcp - pass updated recv info to receive_msg() inside hep3_process_msg()
by Daniel-Constantin Mierla 20 Dec '17

20 Dec '17

Module: kamailio Branch: master Commit: ef28b61db70d32036ae6fdce72de7f8de94d3370 URL: https://github.com/kamailio/kamailio/commit/ef28b61db70d32036ae6fdce72de7f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-20T19:42:10+01:00 core: tcp - pass updated recv info to receive_msg() inside hep3_process_msg() - based on GH #1379 - credits for troubleshooting and initial patch submission to Amit Zigelman <amit.zigelman(a)vonage.com> --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/ef28b61db70d32036ae6fdce72de7f8… Patch: https://github.com/kamailio/kamailio/commit/ef28b61db70d32036ae6fdce72de7f8… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8fb371bd9d..52935ccb78 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1336,7 +1336,7 @@ static int hep3_process_msg(char* tcpbuf, unsigned int len, return -1; } - ret = receive_msg(msg.buf, msg.len, rcv_info); + ret = receive_msg(msg.buf, msg.len, &msg.rcv); LM_DBG("running hep3-enclosed sip request route returned %d\n", ret); free_sip_msg(&msg);

1 0

git:master:f170b300: phonenum: Makefile rules to remove cpp object file
by Daniel-Constantin Mierla 20 Dec '17

20 Dec '17

Module: kamailio Branch: master Commit: f170b300857510e91c7a78454be45b68326fc7b3 URL: https://github.com/kamailio/kamailio/commit/f170b300857510e91c7a78454be45b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-20T13:56:25+01:00 phonenum: Makefile rules to remove cpp object file --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f170b300857510e91c7a78454be45b6… Patch: https://github.com/kamailio/kamailio/commit/f170b300857510e91c7a78454be45b6… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index 4c905cec36..6394937f2b 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -23,3 +23,10 @@ cphonenumber.o: cphonenumber.cpp cphonenumber.h $(CXX) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ phonenum.so: cphonenumber.o + +modclean: + -@rm -f cphonenumber.o + +clean clean-modules: modclean + +proper realclean distclean maintainer-clean: modclean

1 0

[kamailio/kamailio] http_client module error to post the hdr part into http_client_query (#1364)
by Surendra Tiwari 20 Dec '17

20 Dec '17

### Description There is problem with http_client module they don't have the 4 paramterized export function.  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` 5.0.2 ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1364

3 4

[kamailio/kamailio] app_squirrel fails to build on arm64 (#1372)
by Victor Seva 20 Dec '17

20 Dec '17

>From 5.1.0 Debian official build https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=arm64&ver=5.1.… ``` gcc -fPIC -DPIC -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.1.0"' -DARCH='"aarch64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 7.2.0"' -D__CPU_aarch64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='"/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DNOSMP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DKAMAILIO_MOD_INTERFACE -I./squirrel/include -DMOD_NAME='"app_sqlang"' -c app_sqlang_mod.c -o app_sqlang_mod.o -MMD -MP /usr/bin/make --no-print-directory -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" sq64 gcc -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c sqapi.cpp sqbaselib.cpp sqfuncstate.cpp sqdebug.cpp sqlexer.cpp sqobject.cpp sqcompiler.cpp sqstate.cpp sqtable.cpp sqmem.cpp sqvm.cpp sqclass.cpp -I../include -I. -Iinclude -fPIC gcc: error: unrecognized command line option '-m64' Makefile:50: recipe for target 'sq64' failed make[4]: *** [sq64] Error 1 Makefile:23: recipe for target 'libsquirrel.a' failed make[3]: *** [libsquirrel.a] Error 2 ``` -- 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/1372

2 5

git:5.1:f4be0308: app_sqlang: set architecture flags for squirrel interpreter
by Daniel-Constantin Mierla 20 Dec '17

20 Dec '17

Module: kamailio Branch: 5.1 Commit: f4be0308407d5539de0f3926f5325c272d7561ac URL: https://github.com/kamailio/kamailio/commit/f4be0308407d5539de0f3926f5325c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-20T13:01:37+01:00 app_sqlang: set architecture flags for squirrel interpreter - reported by GH #1372 (cherry picked from commit 38dc4dc10e63cb6c94d2cca30bae2a669114404a) --- Modified: src/modules/app_sqlang/Makefile Modified: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Modified: src/modules/app_sqlang/squirrel/squirrel/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f4be0308407d5539de0f3926f5325c2… Patch: https://github.com/kamailio/kamailio/commit/f4be0308407d5539de0f3926f5325c2… --- diff --git a/src/modules/app_sqlang/Makefile b/src/modules/app_sqlang/Makefile index 153f414884..a6f48bc05c 100644 --- a/src/modules/app_sqlang/Makefile +++ b/src/modules/app_sqlang/Makefile @@ -11,20 +11,41 @@ DEFS+=-DKAMAILIO_MOD_INTERFACE -I./squirrel/include LIBS += -L. -lsquirrel -lsqstdlib -lstdc++ MKSQLANG= +SQMARCH64= SQLANGARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') ifeq ($(SQLANGARCHBSZ),64b) MKSQLANG=sq64 endif +ifeq ($(ARCH), x86_64) + SQMARCH64=-m64 +endif + +ifeq ($(ARCH), sparc64) + SQMARCH64=-m64 +endif + +ifeq ($(ARCH), arm6) + SQMARCH64="-march=armv6" +endif + +ifeq ($(ARCH), aarch64) + SQMARCH64= +endif + +ifeq ($(ARCH), mips64) + SQMARCH64=-mips64 +endif + include ../../Makefile.modules libsquirrel.a: - $(MAKE) -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/squirrel SQMARCH64="$(SQMARCH64)" CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" $(MKSQLANG) libsqstdlib.a: - $(MAKE) -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/sqstdlib SQMARCH64="$(SQMARCH64)" CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsqstdlib.a" $(MKSQLANG) app_sqlang.so: libsquirrel.a libsqstdlib.a diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile index 2595d3fed8..6746d144f9 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile +++ b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile @@ -5,6 +5,7 @@ OUT?= $(SQUIRREL)/lib/libsqstdlib.a INCZ?= -I$(SQUIRREL)/include -I. -Iinclude DEFS= $(CC_EXTRA_FLAGS) LIB= +SQMARCH64?= -m64 OBJS= \ sqstdblob.o \ @@ -38,6 +39,6 @@ sqprof: rm *.o sq64: - $(CC) -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 $(SQMARCH64) -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) $(AR) rc $(OUT) *.o rm *.o diff --git a/src/modules/app_sqlang/squirrel/squirrel/Makefile b/src/modules/app_sqlang/squirrel/squirrel/Makefile index 7192d50f2a..f647111c01 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/Makefile +++ b/src/modules/app_sqlang/squirrel/squirrel/Makefile @@ -5,6 +5,7 @@ OUT?= $(SQUIRREL)/lib/libsquirrel.a INCZ?= -I$(SQUIRREL)/include -I. -Iinclude DEFS= $(CC_EXTRA_FLAGS) LIB= +SQMARCH64?= -m64 OBJS= \ sqapi.o \ @@ -47,6 +48,6 @@ sqprof: rm *.o sq64: - $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 $(SQMARCH64) -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) $(AR) rc $(OUT) *.o rm *.o

1 0

git:master:e66f109c: pv: correct sbranch params appending
by Dmitri Savolainen 20 Dec '17

20 Dec '17

Module: kamailio Branch: master Commit: e66f109c0d2cf657387ee1e0745ff2d55eebcaaa URL: https://github.com/kamailio/kamailio/commit/e66f109c0d2cf657387ee1e0745ff2d… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2017-12-20T13:07:35+03:00 pv: correct sbranch params appending - some params (like dest uri) were not appended to branch due to a copy-paste typo --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/e66f109c0d2cf657387ee1e0745ff2d… Patch: https://github.com/kamailio/kamailio/commit/e66f109c0d2cf657387ee1e0745ff2d… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index 7e6911c8d2..b0668c07f8 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -730,19 +730,19 @@ int sbranch_append(sip_msg_t *msg) uri.s = br->uri; uri.len = br->len; - if(br->dst_uri_len==0) { + if(br->dst_uri_len) { duri.s = br->dst_uri; duri.len = br->dst_uri_len; } - if(br->path_len==0) { + if(br->path_len) { path.s = br->path; path.len = br->path_len; } - if(br->ruid_len==0) { + if(br->ruid_len) { ruid.s = br->ruid; ruid.len = br->ruid_len; } - if(br->location_ua_len==0) { + if(br->location_ua_len) { location_ua.s = br->location_ua; location_ua.len = br->location_ua_len; }

1 0

git:master:e101f21c: Merge pull request #1377 from snen/pv_sbranch_params_fix
by GitHub 20 Dec '17

20 Dec '17

Module: kamailio Branch: master Commit: e101f21c37238862a474c50218d11a475d121ee0 URL: https://github.com/kamailio/kamailio/commit/e101f21c37238862a474c50218d11a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-12-20T12:32:45+01:00 Merge pull request #1377 from snen/pv_sbranch_params_fix pv: correct sbranch params appending --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/e101f21c37238862a474c50218d11a4… Patch: https://github.com/kamailio/kamailio/commit/e101f21c37238862a474c50218d11a4… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index 7e6911c8d2..b0668c07f8 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -730,19 +730,19 @@ int sbranch_append(sip_msg_t *msg) uri.s = br->uri; uri.len = br->len; - if(br->dst_uri_len==0) { + if(br->dst_uri_len) { duri.s = br->dst_uri; duri.len = br->dst_uri_len; } - if(br->path_len==0) { + if(br->path_len) { path.s = br->path; path.len = br->path_len; } - if(br->ruid_len==0) { + if(br->ruid_len) { ruid.s = br->ruid; ruid.len = br->ruid_len; } - if(br->location_ua_len==0) { + if(br->location_ua_len) { location_ua.s = br->location_ua; location_ua.len = br->location_ua_len; }

1 0

[kamailio/kamailio] pv: correct sbranch params appending (#1377)
by Dmitri Savolainen 20 Dec '17

20 Dec '17

- some params (like dest uri) were not appended to branch due to a copy-paste typo   #### Pre-Submission Checklist    - [ ] 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) - [ ] 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:  - [ x] PR should be backported to stable branches - [ x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1377 -- Commit Summary -- * pv: correct sbranch params appending -- File Changes -- M src/modules/pv/pv_branch.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1377.patch https://github.com/kamailio/kamailio/pull/1377.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/1377

2 2

git:master:37f6e1e7: call_control: keep reference to allocated buffer used for params
by Daniel-Constantin Mierla 20 Dec '17

20 Dec '17

Module: kamailio Branch: master Commit: 37f6e1e7640b29263e85be9e8958ee14912e20a1 URL: https://github.com/kamailio/kamailio/commit/37f6e1e7640b29263e85be9e8958ee1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-20T09:36:54+01:00 call_control: keep reference to allocated buffer used for params --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/37f6e1e7640b29263e85be9e8958ee1… Patch: https://github.com/kamailio/kamailio/commit/37f6e1e7640b29263e85be9e8958ee1… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index 689a16d1fd..78b892087f 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -91,6 +91,7 @@ typedef struct AVP_Param { typedef struct AVP_List { pv_spec_p pv; str name; + char *orig; struct AVP_List *next; } AVP_List; @@ -261,6 +262,7 @@ cc_parse_param(void *val, AVP_List** avps) { p0 = (char*) pkg_malloc (content.len + 1); CHECK_ALLOC(p0); + memset(p0, 0, content.len + 1); p = p0; p[content.len] = '\0'; @@ -270,9 +272,11 @@ cc_parse_param(void *val, AVP_List** avps) { mp = (AVP_List*) pkg_malloc (sizeof(AVP_List)); CHECK_ALLOC(mp); + memset(mp, 0, sizeof(AVP_List)); mp->next = *avps; mp->pv = (pv_spec_p) pkg_malloc (sizeof(pv_spec_t)); CHECK_ALLOC(mp->pv); + memset(mp->pv, 0, sizeof(pv_spec_t)); for (; isspace(*p); p++); CHECK_COND(*p != '\0'); @@ -307,6 +311,12 @@ cc_parse_param(void *val, AVP_List** avps) { *avps = mp; } + if(mp==0) { + pkg_free(p0); + } else { + mp->orig = p0; + } + return 0; error:

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev