sr-dev February 2017

sr-dev@lists.kamailio.org

29 participants
364 discussions

git:tmp/valgrind:557251cc: malloc_test: new function that over/underflows
by Camille Oudot 28 Feb '17

28 Feb '17

Module: kamailio Branch: tmp/valgrind Commit: 557251cc19f600a2d4c48f8537cbf2fedaa5ca8d URL: https://github.com/kamailio/kamailio/commit/557251cc19f600a2d4c48f8537cbf2f… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2017-02-28T20:30:21+01:00 malloc_test: new function that over/underflows --- Modified: src/modules/malloc_test/malloc_test.c --- Diff: https://github.com/kamailio/kamailio/commit/557251cc19f600a2d4c48f8537cbf2f… Patch: https://github.com/kamailio/kamailio/commit/557251cc19f600a2d4c48f8537cbf2f… --- diff --git a/src/modules/malloc_test/malloc_test.c b/src/modules/malloc_test/malloc_test.c index ff5eb87..9b6bd73 100644 --- a/src/modules/malloc_test/malloc_test.c +++ b/src/modules/malloc_test/malloc_test.c @@ -39,6 +39,7 @@ MODULE_VERSION static int mt_mem_alloc_f(struct sip_msg*, char*,char*); static int mt_mem_free_f(struct sip_msg*, char*,char*); +static int mt_pkg_overflow_f(struct sip_msg*, char*,char*); static int mod_init(void); static void mod_destroy(void); @@ -48,6 +49,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONSEND_ROUTE}, {"mt_mem_free", mt_mem_free_f, 1, fixup_var_int_1, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONSEND_ROUTE}, + {"mt_pkg_overflow", mt_pkg_overflow_f, 0, 0, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONSEND_ROUTE}, {0, 0, 0, 0, 0} }; @@ -672,6 +675,25 @@ static int mt_mem_free_f(struct sip_msg* msg, char* sz, char* foo) return (freed==0)?1:freed; } +static int mt_pkg_overflow_f(struct sip_msg* msg, char *p1,char *p2) { + int i; + unsigned long *a; + + a = pkg_malloc(1024 * sizeof(unsigned long)); + + if (!a) { + LM_ERR("no more pkg\n"); + return -1; + } + + *(a - 1) = 0xdeadbeef; + *(a + 1024) = 0xdeadc0de; + for (i = 0 ; i < 1024; i++) { + a[i] = (long)i; + } + + return 1; +} /* RPC exports: */

1 0

git:tmp/valgrind:62c9ac49: mem: more valgrind instrumentation
by Camille Oudot 28 Feb '17

28 Feb '17

Module: kamailio Branch: tmp/valgrind Commit: 62c9ac4947495164aec43299d11a1bfdc6f98c5a URL: https://github.com/kamailio/kamailio/commit/62c9ac4947495164aec43299d11a1bf… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2017-02-28T20:29:54+01:00 mem: more valgrind instrumentation (continuing work on #949) - use memcheck only on pkg memory - use memcheck "red zones" to detect buffer over/underflows --- Modified: src/core/mem/q_malloc.c Modified: src/core/mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/62c9ac4947495164aec43299d11a1bf… Patch: https://github.com/kamailio/kamailio/commit/62c9ac4947495164aec43299d11a1bf…

1 0

git:master:7ecd9dfb: Makefile: make tar updated to skip obsolete folder
by Daniel-Constantin Mierla 28 Feb '17

28 Feb '17

Module: kamailio Branch: master Commit: 7ecd9dfb37b3b4a9770265c7a846d3224be98d84 URL: https://github.com/kamailio/kamailio/commit/7ecd9dfb37b3b4a9770265c7a846d32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-28T11:46:09+01:00 Makefile: make tar updated to skip obsolete folder - paths updated to run with src folder --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/7ecd9dfb37b3b4a9770265c7a846d32… Patch: https://github.com/kamailio/kamailio/commit/7ecd9dfb37b3b4a9770265c7a846d32… --- diff --git a/src/Makefile b/src/Makefile index 21892e0..bbf5f8d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -558,17 +558,19 @@ makefile_vars makefile-vars: dist: tar tar: makefile_vars $(auto_gen_keep) - $(TAR) -C .. \ - --exclude=$(notdir $(CURDIR))/test* \ - --exclude=$(notdir $(CURDIR))/tmp* \ - --exclude=$(notdir $(CURDIR))/debian \ - --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME) \ - --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME)-* \ - --exclude=$(notdir $(CURDIR))/$(MAIN_NAME)_tls* \ + $(TAR) -C ../.. \ + --exclude=$(notdir $(realpath $(shell pwd)/..))/test* \ + --exclude=$(notdir $(realpath $(shell pwd)/..))/tmp* \ + --exclude=$(notdir $(realpath $(shell pwd)/..))/debian \ + --exclude=$(notdir $(realpath $(shell pwd)/..))/debian/$(MAIN_NAME) \ + --exclude=$(notdir $(realpath $(shell pwd)/..))/debian/$(MAIN_NAME)-* \ + --exclude=$(notdir $(realpath $(shell pwd)/..))/$(MAIN_NAME)_tls* \ + --exclude=$(notdir $(realpath $(shell pwd)/..))/misc/obsolete \ --exclude=.git* \ --exclude=CVS* \ --exclude=.svn* \ --exclude=.cvsignore \ + --exclude=tags \ --exclude=librpath.lst \ --exclude=libiname.lst \ --exclude=makecfg.lst \ @@ -577,7 +579,8 @@ tar: makefile_vars $(auto_gen_keep) --exclude=*.[do] \ --exclude=*.so \ --exclude=*.il \ - --exclude=$(notdir $(CURDIR))/$(MAIN_NAME) \ + --exclude=$(notdir $(realpath $(shell pwd)/..))/$(MAIN_NAME) \ + --exclude=$(notdir $(realpath $(shell pwd)/..))/src/$(MAIN_NAME) \ --exclude=*.gz \ --exclude=*.bz2 \ --exclude=*.tar \ @@ -586,15 +589,15 @@ tar: makefile_vars $(auto_gen_keep) --exclude=*.swp \ --exclude=*.swo \ ${tar_extra_args} \ - -cf - $(notdir $(CURDIR)) | \ - (mkdir -p tmp/_tar1; mkdir -p tmp/_tar2 ; \ - cd tmp/_tar1; $(TAR) -xf - ) && \ - mv tmp/_tar1/$(notdir $(CURDIR)) \ - tmp/_tar2/"$(NAME)-$(RELEASE)" && \ - (cd tmp/_tar2 && $(TAR) \ + -cf - $(notdir $(realpath $(shell pwd)/..)) | \ + (mkdir -p ../tmp/_tar1; mkdir -p ../tmp/_tar2 ; \ + cd ../tmp/_tar1; $(TAR) -xf - ) && \ + mv ../tmp/_tar1/$(notdir $(realpath $(shell pwd)/..)) \ + ../tmp/_tar2/"$(NAME)-$(RELEASE)" && \ + (cd ../tmp/_tar2 && $(TAR) \ -zcf ../../"$(tar_name)".tar.gz \ "$(NAME)-$(RELEASE)" ) ; \ - rm -rf tmp/_tar1; rm -rf tmp/_tar2 + rm -rf ../tmp/_tar1; rm -rf ../tmp/_tar2; rm -rf ../tmp # binary dist. tar.gz .PHONY: bin

1 0

git:master:e2e0f182: http_client: removed libxml2 dependency from Makefile
by Daniel-Constantin Mierla 27 Feb '17

27 Feb '17

Module: kamailio Branch: master Commit: e2e0f182075cf79d8d5e582433f5a2d9ecf715a7 URL: https://github.com/kamailio/kamailio/commit/e2e0f182075cf79d8d5e582433f5a2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-27T23:09:35+01:00 http_client: removed libxml2 dependency from Makefile - apparently a copy&paste leftover when pkg-config was introduced --- Modified: src/modules/http_client/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/e2e0f182075cf79d8d5e582433f5a2d… Patch: https://github.com/kamailio/kamailio/commit/e2e0f182075cf79d8d5e582433f5a2d… --- diff --git a/src/modules/http_client/Makefile b/src/modules/http_client/Makefile index 5117852..460e146 100644 --- a/src/modules/http_client/Makefile +++ b/src/modules/http_client/Makefile @@ -18,15 +18,6 @@ CURL_BUILDER=$(shell \ fi) endif -ifneq ($(XML2CFG),) - DEFS += $(shell $(XML2CFG) --cflags ) - LIBS += $(shell $(XML2CFG) --libs) -else - DEFS+=-I$(LOCALBASE)/include/libxml2 \ - -I$(LOCALBASE)/include - LIBS+=-L$(LOCALBASE)/lib -lxml2 -endif - ifneq ($(CURL_BUILDER),) DEFS += $(shell $(CURL_BUILDER) --cflags ) LIBS += $(shell $(CURL_BUILDER) --libs)

1 0

git:master:618825d4: examples: kemi - declared vars for branch flags in js script
by GitHub 27 Feb '17

27 Feb '17

Module: kamailio Branch: master Commit: 618825d42992010a76275b0c1623f48831475193 URL: https://github.com/kamailio/kamailio/commit/618825d42992010a76275b0c1623f48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-02-27T21:03:43+01:00 examples: kemi - declared vars for branch flags in js script --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js --- Diff: https://github.com/kamailio/kamailio/commit/618825d42992010a76275b0c1623f48… Patch: https://github.com/kamailio/kamailio/commit/618825d42992010a76275b0c1623f48… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index f5ea8d1..03cbef1 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -10,8 +10,8 @@ var FLT_ACCMISSED=2 var FLT_ACCFAILED=3 var FLT_NATS=5 -FLB_NATB=6 -FLB_NATSIPPING=7 +var FLB_NATB=6 +var FLB_NATSIPPING=7 // SIP request routing // equivalent of request_route{}

1 0

Kamailio v5.0.0 Released - new major version is out
by Daniel-Constantin Mierla 27 Feb '17

27 Feb '17

Kamailio v5.0.0 is out – it comes with 6 new modules and a consistent set of improvements touching more than 50 existing modules. You can read detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-0-0-release-notes/ Many thanks to all developers and community members that made possible this release. A consistent effort was directed to restructuring the source code tree to meet more modern patterns; introducing the KEMI framework that allows writing SIP routing blocks in other embedded interpreters such as Lua, JavaScript or Python; removal of obsoleted MI control mechanism, being replaced by RPC. Enjoy Kamailio v5.0.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference 2017 - http://www.kamailioworld.com

1 0

git:5.0:b07c9d6b: ChangeLog: content updated for v5.0.0
by Daniel-Constantin Mierla 27 Feb '17

27 Feb '17

Module: kamailio Branch: 5.0 Commit: b07c9d6b4f46ab2e7666e148c646bf3e72b3a2fc URL: https://github.com/kamailio/kamailio/commit/b07c9d6b4f46ab2e7666e148c646bf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-27T14:41:45+01:00 ChangeLog: content updated for v5.0.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/b07c9d6b4f46ab2e7666e148c646bf3… Patch: https://github.com/kamailio/kamailio/commit/b07c9d6b4f46ab2e7666e148c646bf3…

1 0

git:5.0:8924916a: Makefile.defs: version set to 5.0.0
by Daniel-Constantin Mierla 27 Feb '17

27 Feb '17

Module: kamailio Branch: 5.0 Commit: 8924916a0295053ea2f86d10de44b68da4259157 URL: https://github.com/kamailio/kamailio/commit/8924916a0295053ea2f86d10de44b68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-27T14:32:00+01:00 Makefile.defs: version set to 5.0.0 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8924916a0295053ea2f86d10de44b68… Patch: https://github.com/kamailio/kamailio/commit/8924916a0295053ea2f86d10de44b68… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 8ce7e0a..b64e4bd 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.0:78897770: pkg/rpm: version set to 5.0.0 in spec files
by Daniel-Constantin Mierla 27 Feb '17

27 Feb '17

Module: kamailio Branch: 5.0 Commit: 78897770f3ce940052f339533b60cc428409d6e1 URL: https://github.com/kamailio/kamailio/commit/78897770f3ce940052f339533b60cc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-27T14:11:20+01:00 pkg/rpm: version set to 5.0.0 in spec files --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/78897770f3ce940052f339533b60cc4… Patch: https://github.com/kamailio/kamailio/commit/78897770f3ce940052f339533b60cc4… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 217a63d..439bf22 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.2.0 +%define ver 5.0.0 %define rel dev0.0%{dist} diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 2fb08a0..c33952c 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.1.0 +%define ver 5.0.0 %define rel dev7.2%{dist} diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index e787ecd..e5a48dd 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.0 +%define ver 5.0.0 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index df65630..d027c46 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.0 +%define ver 5.0.0 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 6350bb9..2ef5631 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 1.2.0 +%define ver 5.0.0 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index d231a86..e0ba2d2 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.2.0 +%define ver 5.0.0 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index a00cada..31ec997 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 1.2.0 +%define ver 5.0.0 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:5.0:04e8f5e7: carrierroute: enclosed unused functions in ifdefs
by Daniel-Constantin Mierla 27 Feb '17

27 Feb '17

Module: kamailio Branch: 5.0 Commit: 04e8f5e732dbfd13f6e321d384134998443b739c URL: https://github.com/kamailio/kamailio/commit/04e8f5e732dbfd13f6e321d38413499… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-27T14:07:13+01:00 carrierroute: enclosed unused functions in ifdefs - they were used by mi commands and may be needed when re-introducing the equivalent in rpc commands - reported by GH #1010 (cherry picked from commit c62409bdd317f61df0e7cc16fbb8aa9ccebcefb5) --- Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/04e8f5e732dbfd13f6e321d38413499… Patch: https://github.com/kamailio/kamailio/commit/04e8f5e732dbfd13f6e321d38413499… --- diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index 8789c9b..8ae0123 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -41,6 +41,7 @@ #include "cr_rule.h" +#ifdef MI_REMOVED /** * Defines the option set for the different fifo commands * Every line is for a command, @@ -54,6 +55,7 @@ static unsigned int opt_settings[5][3] = { {O_HOST|O_DOMAIN|O_PREFIX, O_PROB|O_NEW_TARGET, O_R_PREFIX|O_R_SUFFIX|O_H_INDEX}, {O_HOST|O_DOMAIN|O_PREFIX, O_PROB, O_R_PREFIX|O_R_SUFFIX|O_NEW_TARGET|O_H_INDEX} }; +#endif int fifo_err; @@ -456,6 +458,7 @@ static int dump_tree_recursor (struct mi_node* msg, struct dtrie_node_t *node, c } #endif +#ifdef MI_REMOVED /** * parses the command line argument for options * @@ -606,8 +609,10 @@ static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]) { } return 0; } +#endif +#ifdef MI_REMOVED /** * loads the config data into shared memory (but doesn't really * share it), updates the routing data and writes it to the config @@ -729,6 +734,7 @@ static int update_route_data(fifo_opt_t * opts) { clear_route_data(rd); return -1; } +#endif /**

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2017