sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

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

Kamailio v5.0.5 Released
by Daniel-Constantin Mierla 19 Dec '17

19 Dec '17

Hello, Kamailio SIP Server v5.0.5 stable release is out. This is a maintenance release of the previous stable branch, 5.0, that includes fixes since the release of v5.0.4. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.0.x. Deployments running previous v5.0.x versions are strongly recommended to be upgraded to v5.0.5 or v5.1.0. For more details about version 5.0.5 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2017/12/kamailio-v5-0-5-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the latest stable branch is 5.1, at this moment with its latest release v5.1.0. See more details about it at: * https://www.kamailio.org/w/kamailio-v5-1-0-release-notes/ Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

git:5.0:3106be78: ChangeLog: new content updated for v5.0.5
by Daniel-Constantin Mierla 19 Dec '17

19 Dec '17

Module: kamailio Branch: 5.0 Commit: 3106be783d494166896926e46bae4d4382a3b7a7 URL: https://github.com/kamailio/kamailio/commit/3106be783d494166896926e46bae4d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-19T12:33:57+01:00 ChangeLog: new content updated for v5.0.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/3106be783d494166896926e46bae4d4… Patch: https://github.com/kamailio/kamailio/commit/3106be783d494166896926e46bae4d4…

1 0

git:5.0:e5badb49: Makefile.defs: version set to 5.0.5
by Daniel-Constantin Mierla 19 Dec '17

19 Dec '17

Module: kamailio Branch: 5.0 Commit: e5badb49311edc1d3dbbaf66061f46b8ef47a462 URL: https://github.com/kamailio/kamailio/commit/e5badb49311edc1d3dbbaf66061f46b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-19T12:28:25+01:00 Makefile.defs: version set to 5.0.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e5badb49311edc1d3dbbaf66061f46b… Patch: https://github.com/kamailio/kamailio/commit/e5badb49311edc1d3dbbaf66061f46b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index ddafd4488e..933fd687ac 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 0 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 0

git:master:db0b73b0: snmpstats: clang format the code
by Daniel-Constantin Mierla 19 Dec '17

19 Dec '17

Module: kamailio Branch: master Commit: db0b73b0c69014aa0dee41a78d07800812c10746 URL: https://github.com/kamailio/kamailio/commit/db0b73b0c69014aa0dee41a78d07800… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-19T12:04:29+01:00 snmpstats: clang format the code --- Modified: src/modules/snmpstats/alarm_checks.c Modified: src/modules/snmpstats/alarm_checks.h Modified: src/modules/snmpstats/hashTable.c Modified: src/modules/snmpstats/hashTable.h Modified: src/modules/snmpstats/interprocess_buffer.c Modified: src/modules/snmpstats/interprocess_buffer.h Modified: src/modules/snmpstats/kamailioNet.c Modified: src/modules/snmpstats/kamailioNetConfig.c Modified: src/modules/snmpstats/kamailioNetConfig.h Modified: src/modules/snmpstats/kamailioServer.c Modified: src/modules/snmpstats/kamailioServer.h Modified: src/modules/snmpstats/snmpMIBNotifications.c Modified: src/modules/snmpstats/snmpMIBNotifications.h Modified: src/modules/snmpstats/snmpObjects.c Modified: src/modules/snmpstats/snmpObjects.h Modified: src/modules/snmpstats/snmpSIPCommonObjects.c Modified: src/modules/snmpstats/snmpSIPCommonObjects.h Modified: src/modules/snmpstats/snmpSIPContactTable.c Modified: src/modules/snmpstats/snmpSIPContactTable.h Modified: src/modules/snmpstats/snmpSIPMethodSupportedTable.c Modified: src/modules/snmpstats/snmpSIPMethodSupportedTable.h Modified: src/modules/snmpstats/snmpSIPPortTable.c Modified: src/modules/snmpstats/snmpSIPPortTable.h Modified: src/modules/snmpstats/snmpSIPRegUserLookupTable.c Modified: src/modules/snmpstats/snmpSIPRegUserLookupTable.h Modified: src/modules/snmpstats/snmpSIPRegUserTable.c Modified: src/modules/snmpstats/snmpSIPRegUserTable.h Modified: src/modules/snmpstats/snmpSIPServerObjects.c Modified: src/modules/snmpstats/snmpSIPServerObjects.h Modified: src/modules/snmpstats/snmpSIPStatusCodesTable.c Modified: src/modules/snmpstats/snmpSIPStatusCodesTable.h Modified: src/modules/snmpstats/snmp_statistics.c Modified: src/modules/snmpstats/snmp_statistics.h Modified: src/modules/snmpstats/snmpstats.c Modified: src/modules/snmpstats/snmpstats.h Modified: src/modules/snmpstats/snmpstats_globals.h Modified: src/modules/snmpstats/sub_agent.c Modified: src/modules/snmpstats/sub_agent.h Modified: src/modules/snmpstats/utilities.c Modified: src/modules/snmpstats/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/db0b73b0c69014aa0dee41a78d07800… Patch: https://github.com/kamailio/kamailio/commit/db0b73b0c69014aa0dee41a78d07800…

1 0

git:master:8bc890f5: snmpstats: keep sockets list pointer global
by Daniel-Constantin Mierla 19 Dec '17

19 Dec '17

Module: kamailio Branch: master Commit: 8bc890f595005090479cad1670b4360817f307af URL: https://github.com/kamailio/kamailio/commit/8bc890f595005090479cad1670b4360… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-19T11:20:30+01:00 snmpstats: keep sockets list pointer global - they are allocated and content could be referenced at runtime, thus no free - free allocated variables in case of errors --- Modified: src/modules/snmpstats/snmpSIPMethodSupportedTable.c Modified: src/modules/snmpstats/snmpSIPPortTable.c --- Diff: https://github.com/kamailio/kamailio/commit/8bc890f595005090479cad1670b4360… Patch: https://github.com/kamailio/kamailio/commit/8bc890f595005090479cad1670b4360…

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