sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:master:1bb85845: pv: initialize sbranch via function and check return value

by Stefan Mititelu

Module: kamailio Branch: master Commit: 1bb85845ded7cd4d66080a3dab2a98d28544b1ba URL: https://github.com/kamailio/kamailio/commit/1bb85845ded7cd4d66080a3dab2a98d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-04-28T08:46:37+03:00 pv: initialize sbranch via function and check return value - reported by Anthony Messina, GH#141 --- Modified: modules/pv/pv.c Modified: modules/pv/pv_branch.c Modified: modules/pv/pv_branch.h --- Diff: https://github.com/kamailio/kamailio/commit/1bb85845ded7cd4d66080a3dab2a98d… Patch: https://github.com/kamailio/kamailio/commit/1bb85845ded7cd4d66080a3dab2a98d… --- diff --git a/modules/pv/pv.c b/modules/pv/pv.c index e0897b0..11d899a 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -541,10 +541,11 @@ static int mod_init(void) return -1; } if(pv_init_rpc()!=0) - { - LM_ERR("failed to register RPC commands\n"); - return -1; - } + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + pv_init_sbranch(); return 0; } diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c index 6843b6c..e35330a 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -27,7 +27,12 @@ #include "pv_core.h" #include "pv_branch.h" -static branch_t _pv_sbranch = {0}; +static branch_t _pv_sbranch; + +void pv_init_sbranch(void) +{ + memset(&_pv_sbranch, 0, sizeof(branch_t)); +} int pv_get_branchx_helper(sip_msg_t *msg, pv_param_t *param, pv_value_t *res, int btype) @@ -46,6 +51,9 @@ int pv_get_branchx_helper(sip_msg_t *msg, pv_param_t *param, return pv_get_null(msg, param, res); } br = get_sip_branch(idx); + if(br==NULL) { + return pv_get_null(msg, param, res); + } } /* branch(count) doesn't need a valid branch, everything else does */ @@ -685,10 +693,7 @@ int sbranch_append(sip_msg_t *msg) { str uri = {0}; str duri = {0}; - int lq = 0; str path = {0}; - unsigned int fl = 0; - struct socket_info* fsocket = NULL; str ruid = {0}; str location_ua = {0}; branch_t *br; diff --git a/modules/pv/pv_branch.h b/modules/pv/pv_branch.h index a5ee569..84b7972 100644 --- a/modules/pv/pv_branch.h +++ b/modules/pv/pv_branch.h @@ -46,6 +46,7 @@ int pv_parse_nh_name(pv_spec_p sp, str *in); int sbranch_set_ruri(sip_msg_t *msg); int sbranch_append(sip_msg_t *msg); +void pv_init_sbranch(void); int sbranch_reset(void); #endif

9 years, 6 months

git:master:bf713d84: mem: TLSF compile-time selection improvement

by Stefan Mititelu

Module: kamailio Branch: master Commit: bf713d842269c1e3916038ca2f612303d55c5c4c URL: https://github.com/kamailio/kamailio/commit/bf713d842269c1e3916038ca2f61230… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-04-28T08:46:37+03:00 mem: TLSF compile-time selection improvement now use make MEMMNG=2 cfg to switch to TLSF malloc --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/bf713d842269c1e3916038ca2f61230… Patch: https://github.com/kamailio/kamailio/commit/bf713d842269c1e3916038ca2f61230… --- diff --git a/Makefile.defs b/Makefile.defs index ef419d9..313b10e 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -102,6 +102,7 @@ EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc) # 1 - q_malloc (quick malloc) +# 2 - tlsf_malloc (O(1) malloc and free) MEMMNG ?= 0 # memory debugger switcher # 0 - off (no-debug mode) @@ -501,6 +502,8 @@ data_target = $(prefix)/$(data_dir) # (not true anymore, q_malloc performs approx. the same) # -DF_MALLOC # an even faster malloc, not recommended for debugging +# -DTLSF_MALLOC=1 +# an implemetation of the "two levels segregation fit" malloc algorithm # -DDL_MALLOC # a malloc implementation based on Doug Lea's dl_malloc # -DSF_MALLOC @@ -662,6 +665,9 @@ ifeq ($(MEMDBG), 1) C_DEFS+= -DDBG_QM_MALLOC endif C_DEFS+= -DMEM_JOIN_FREE +else ifeq ($(MEMMNG), 2) +# use tlsf malloc + C_DEFS+= -DTLSF_MALLOC=1 else # use f_malloc C_DEFS+= -DF_MALLOC

9 years, 6 months

git:master:48288db2: mem: TLSF integration for pkg memory

by Stefan Mititelu

Module: kamailio Branch: master Commit: 48288db22e64a31ba8e3d599aee56d9c4c123d93 URL: https://github.com/kamailio/kamailio/commit/48288db22e64a31ba8e3d599aee56d9… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-04-28T08:46:37+03:00 mem: TLSF integration for pkg memory --- Modified: mem/mem.c Modified: mem/mem.h --- Diff: https://github.com/kamailio/kamailio/commit/48288db22e64a31ba8e3d599aee56d9… Patch: https://github.com/kamailio/kamailio/commit/48288db22e64a31ba8e3d599aee56d9… --- diff --git a/mem/mem.c b/mem/mem.c index ac7ddc8..18fb9af 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -51,6 +51,8 @@ struct fm_block* mem_block = 0; #elif defined DL_MALLOC /* don't need this */ + #elif defined TLSF_MALLOC + tlsf_t mem_block = 0; #else struct qm_block* mem_block = 0; #endif @@ -75,6 +77,8 @@ int init_pkg_mallocs(void) mem_block=fm_malloc_init(mem_pool, pkg_mem_size, MEM_TYPE_PKG); #elif DL_MALLOC /* don't need this */ + #elif TLSF_MALLOC + mem_block = tlsf_create_with_pool(mem_pool, pkg_mem_size); #else if (mem_pool) mem_block=qm_malloc_init(mem_pool, pkg_mem_size, MEM_TYPE_PKG); diff --git a/mem/mem.h b/mem/mem.h index d90fcf4..9db8d93 100644 --- a/mem/mem.h +++ b/mem/mem.h @@ -57,6 +57,9 @@ extern struct fm_block* mem_block; # elif defined DL_MALLOC # include "dl_malloc.h" +# elif defined TLSF_MALLOC +# include "tlsf.h" + extern tlsf_t mem_block; # else # include "q_malloc.h" extern struct qm_block* mem_block; @@ -92,6 +95,10 @@ # define pkg_malloc(s) dlmalloc((s)) # define pkg_realloc(p, s) dlrealloc((p), (s)) # define pkg_free(p) dlfree((p)) +# elif defined TLSF_MALLOC +# define pkg_malloc(s) tlsf_malloc(mem_block, (s)) +# define pkg_realloc(p, s) tlsf_realloc(mem_block, (p), (s)) +# define pkg_free(p) tlsf_free(mem_block, (p)) # else # define pkg_malloc(s) qm_malloc(mem_block, (s)) # define pkg_realloc(p, s) qm_realloc(mem_block, (p), (s)) @@ -108,6 +115,11 @@ # define pkg_info(mi) 0 # define pkg_available() 0 # define pkg_sums() 0 +# elif defined TLSF_MALLOC +# define pkg_status() ((void) 0) +# define pkg_info(mi) tlsf_meminfo(mem_block, (mi)) +# define pkg_available() ((void) 0) +# define pkg_sums() ((void) 0) # else # define pkg_status() qm_status(mem_block) # define pkg_info(mi) qm_info(mem_block, mi)

9 years, 6 months

[kamailio] Added implementation for force_send_interface to also support IPv6. (#142)

by smititelu

Only IPv4 was supported before. Added socket support for IPv6 (link locals included). Also updated documentation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/142 -- Commit Summary -- * Added implementation for force_send_interface to also support IPv6. Thus, data can be exchanged with rtpproxy over IPv4 and IPv6. * Updated documentation for IPv6 force_send_interface. -- File Changes -- M modules/rtpengine/doc/rtpengine_admin.xml (7) M modules/rtpengine/rtpengine.c (188) -- Patch Links -- https://github.com/kamailio/kamailio/pull/142.patch https://github.com/kamailio/kamailio/pull/142.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/142

9 years, 6 months

git:master:c0fd507e: Merge pull request #147 from mslehto/patch-1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c0fd507e5bf4a588acdfd71064f15b5a79418cd5 URL: https://github.com/kamailio/kamailio/commit/c0fd507e5bf4a588acdfd71064f15b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-05T21:20:56+02:00 Merge pull request #147 from mslehto/patch-1 pua_mi: document missing mi_pua_publish MI input parameter "id" --- Modified: modules/pua_mi/mi_func.c --- Diff: https://github.com/kamailio/kamailio/commit/c0fd507e5bf4a588acdfd71064f15b5… Patch: https://github.com/kamailio/kamailio/commit/c0fd507e5bf4a588acdfd71064f15b5… --- diff --git a/modules/pua_mi/mi_func.c b/modules/pua_mi/mi_func.c index a107c4d..f92c9ff 100644 --- a/modules/pua_mi/mi_func.c +++ b/modules/pua_mi/mi_func.c @@ -41,7 +41,9 @@ * <expires> * <event package> * <content_type> - body type if body of a type different from default - * event content-type or . + * event content-type or . + * <id> - id for a series of related PUBLISHes to the same + * presentity-uri or . * <ETag> - ETag that publish should match or . if no ETag * <outbound_proxy> - outbound proxy or . * <extra_headers> - extra headers to be added to the request or .

9 years, 6 months

git:master:201dc5b6: pua_mi: document missing mi_pua_publish parameter "id"

by Mikko Lehto

Module: kamailio Branch: master Commit: 201dc5b600d8516368a54c70af6f02c3ea06353b URL: https://github.com/kamailio/kamailio/commit/201dc5b600d8516368a54c70af6f02c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-05-05T21:54:22+03:00 pua_mi: document missing mi_pua_publish parameter "id" --- Modified: modules/pua_mi/mi_func.c --- Diff: https://github.com/kamailio/kamailio/commit/201dc5b600d8516368a54c70af6f02c… Patch: https://github.com/kamailio/kamailio/commit/201dc5b600d8516368a54c70af6f02c… --- diff --git a/modules/pua_mi/mi_func.c b/modules/pua_mi/mi_func.c index a107c4d..f92c9ff 100644 --- a/modules/pua_mi/mi_func.c +++ b/modules/pua_mi/mi_func.c @@ -41,7 +41,9 @@ * <expires> * <event package> * <content_type> - body type if body of a type different from default - * event content-type or . + * event content-type or . + * <id> - id for a series of related PUBLISHes to the same + * presentity-uri or . * <ETag> - ETag that publish should match or . if no ETag * <outbound_proxy> - outbound proxy or . * <extra_headers> - extra headers to be added to the request or .

9 years, 6 months

[kamailio] pua_mi: document missing mi_pua_publish MI input parameter "id" (#147)

by Mikko Lehto

mslehto wants to merge 1 commit into kamailio:master from mslehto:patch-1: You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/147 -- Commit Summary -- * pua_mi: document missing mi_pua_publish parameter "id" -- File Changes -- M modules/pua_mi/mi_func.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/147.patch https://github.com/kamailio/kamailio/pull/147.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/147

9 years, 6 months

acc, dialog: dialog duration for timed-out dialogs change

by Lucian Balaceanu

Hi, I would like to propose a patch in which the dialog duration displayed in the cdrs is: /0 -> timed-out not acknowledged dialogs duration from creation to timeout -> timed-out acknowledged dialogs / I am still testing the solution for the master branch while tests pass on a previous version. Any comments on the code? (I am not particularly proud of the string defines in the dlg_cb.h, but am unsure where to include some const variable accessible to both acc and dialog to pass as calback param for dialog expiration) Thank you, Lucian Balaceanu

9 years, 6 months

git:master:b47c4f0d: pkg/kamailio/deb: update version to 4.3.0-pre1

by Victor Seva

Module: kamailio Branch: master Commit: b47c4f0d71281f32d7efe90c1f8dd381c6aa3742 URL: https://github.com/kamailio/kamailio/commit/b47c4f0d71281f32d7efe90c1f8dd38… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-05T10:53:25+02:00 pkg/kamailio/deb: update version to 4.3.0-pre1 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b47c4f0d71281f32d7efe90c1f8dd38… Patch: https://github.com/kamailio/kamailio/commit/b47c4f0d71281f32d7efe90c1f8dd38… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 3b0778f..c876f88 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre1) unstable; urgency=medium + + * update version to 4.3.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 05 May 2015 10:52:12 +0200 + kamailio (4.3.0-pre0) unstable; urgency=medium * update version to 4.3.0-pre0 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 3b0778f..c876f88 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre1) unstable; urgency=medium + + * update version to 4.3.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 05 May 2015 10:52:12 +0200 + kamailio (4.3.0-pre0) unstable; urgency=medium * update version to 4.3.0-pre0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 3b0778f..c876f88 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre1) unstable; urgency=medium + + * update version to 4.3.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 05 May 2015 10:52:12 +0200 + kamailio (4.3.0-pre0) unstable; urgency=medium * update version to 4.3.0-pre0 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 3b0778f..c876f88 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre1) unstable; urgency=medium + + * update version to 4.3.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 05 May 2015 10:52:12 +0200 + kamailio (4.3.0-pre0) unstable; urgency=medium * update version to 4.3.0-pre0 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 3b0778f..c876f88 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre1) unstable; urgency=medium + + * update version to 4.3.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 05 May 2015 10:52:12 +0200 + kamailio (4.3.0-pre0) unstable; urgency=medium * update version to 4.3.0-pre0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 3b0778f..c876f88 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre1) unstable; urgency=medium + + * update version to 4.3.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 05 May 2015 10:52:12 +0200 + kamailio (4.3.0-pre0) unstable; urgency=medium * update version to 4.3.0-pre0

9 years, 6 months

git:master:8d7bef26: Makefile.defs: version set to 4.3.0-pre1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8d7bef26cb4a774fe2f55628cab0d2bcfc868fa1 URL: https://github.com/kamailio/kamailio/commit/8d7bef26cb4a774fe2f55628cab0d2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-05T10:19:31+02:00 Makefile.defs: version set to 4.3.0-pre1 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8d7bef26cb4a774fe2f55628cab0d2b… Patch: https://github.com/kamailio/kamailio/commit/8d7bef26cb4a774fe2f55628cab0d2b… --- diff --git a/Makefile.defs b/Makefile.defs index 313b10e..3890668 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -97,7 +97,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015