sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:5.0:43a9739b: htable: release pkg memory before returning

by Luis Azedo

Module: kamailio Branch: 5.0 Commit: 43a9739b4457c09068fc36d3c4990f4c97682754 URL: https://github.com/kamailio/kamailio/commit/43a9739b4457c09068fc36d3c4990f4… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-02T14:22:03+01:00 htable: release pkg memory before returning resets 'first' when esize == 0 (cherry picked from commit 2d771f563d19fccad0a28e56a5d99de571ef5da6) --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/43a9739b4457c09068fc36d3c4990f4… Patch: https://github.com/kamailio/kamailio/commit/43a9739b4457c09068fc36d3c4990f4… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 36cceb4fb9..522811da58 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -48,17 +48,17 @@ int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, return -1; } htc = ht_cell_pkg_copy(hpv->ht, &htname, _htc_local); + if(_htc_local!=htc) + { + ht_cell_pkg_free(_htc_local); + _htc_local=htc; + } if(htc==NULL) { if(hpv->ht->flags==PV_VAL_INT) return pv_get_sintval(msg, param, res, hpv->ht->initval.n); return pv_get_null(msg, param, res); } - if(_htc_local!=htc) - { - ht_cell_pkg_free(_htc_local); - _htc_local=htc; - } if(htc->flags&AVP_VAL_STR) return pv_get_strval(msg, param, res, &htc->value.s); @@ -326,15 +326,15 @@ int pv_get_ht_add(struct sip_msg *msg, pv_param_t *param, return -1; } htc = ht_cell_value_add(hpv->ht, &htname, val, 1, _htc_local); - if(htc==NULL) - { - return pv_get_null(msg, param, res); - } if(_htc_local!=htc) { ht_cell_pkg_free(_htc_local); _htc_local=htc; } + if(htc==NULL) + { + return pv_get_null(msg, param, res); + } if(htc->flags&AVP_VAL_STR) return pv_get_null(msg, param, res);

6 years, 11 months

git:4.4:b4cb6535: htable: release pkg memory before returning

by Luis Azedo

Module: kamailio Branch: 4.4 Commit: b4cb65354de5ee0384926780594412deba358def URL: https://github.com/kamailio/kamailio/commit/b4cb65354de5ee0384926780594412d… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-02T14:21:33+01:00 htable: release pkg memory before returning resets 'first' when esize == 0 (cherry picked from commit 2d771f563d19fccad0a28e56a5d99de571ef5da6) --- Modified: modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/b4cb65354de5ee0384926780594412d… Patch: https://github.com/kamailio/kamailio/commit/b4cb65354de5ee0384926780594412d… --- diff --git a/modules/htable/ht_var.c b/modules/htable/ht_var.c index 36cceb4fb9..522811da58 100644 --- a/modules/htable/ht_var.c +++ b/modules/htable/ht_var.c @@ -48,17 +48,17 @@ int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, return -1; } htc = ht_cell_pkg_copy(hpv->ht, &htname, _htc_local); + if(_htc_local!=htc) + { + ht_cell_pkg_free(_htc_local); + _htc_local=htc; + } if(htc==NULL) { if(hpv->ht->flags==PV_VAL_INT) return pv_get_sintval(msg, param, res, hpv->ht->initval.n); return pv_get_null(msg, param, res); } - if(_htc_local!=htc) - { - ht_cell_pkg_free(_htc_local); - _htc_local=htc; - } if(htc->flags&AVP_VAL_STR) return pv_get_strval(msg, param, res, &htc->value.s); @@ -326,15 +326,15 @@ int pv_get_ht_add(struct sip_msg *msg, pv_param_t *param, return -1; } htc = ht_cell_value_add(hpv->ht, &htname, val, 1, _htc_local); - if(htc==NULL) - { - return pv_get_null(msg, param, res); - } if(_htc_local!=htc) { ht_cell_pkg_free(_htc_local); _htc_local=htc; } + if(htc==NULL) + { + return pv_get_null(msg, param, res); + } if(htc->flags&AVP_VAL_STR) return pv_get_null(msg, param, res);

6 years, 11 months

git:master:2d771f56: htable: release pkg memory before returning

by lazedo

Module: kamailio Branch: master Commit: 2d771f563d19fccad0a28e56a5d99de571ef5da6 URL: https://github.com/kamailio/kamailio/commit/2d771f563d19fccad0a28e56a5d99de… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-02T14:20:12+01:00 htable: release pkg memory before returning resets 'first' when esize == 0 --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/2d771f563d19fccad0a28e56a5d99de… Patch: https://github.com/kamailio/kamailio/commit/2d771f563d19fccad0a28e56a5d99de… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 36cceb4fb9..522811da58 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -48,17 +48,17 @@ int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, return -1; } htc = ht_cell_pkg_copy(hpv->ht, &htname, _htc_local); + if(_htc_local!=htc) + { + ht_cell_pkg_free(_htc_local); + _htc_local=htc; + } if(htc==NULL) { if(hpv->ht->flags==PV_VAL_INT) return pv_get_sintval(msg, param, res, hpv->ht->initval.n); return pv_get_null(msg, param, res); } - if(_htc_local!=htc) - { - ht_cell_pkg_free(_htc_local); - _htc_local=htc; - } if(htc->flags&AVP_VAL_STR) return pv_get_strval(msg, param, res, &htc->value.s); @@ -326,15 +326,15 @@ int pv_get_ht_add(struct sip_msg *msg, pv_param_t *param, return -1; } htc = ht_cell_value_add(hpv->ht, &htname, val, 1, _htc_local); - if(htc==NULL) - { - return pv_get_null(msg, param, res); - } if(_htc_local!=htc) { ht_cell_pkg_free(_htc_local); _htc_local=htc; } + if(htc==NULL) + { + return pv_get_null(msg, param, res); + } if(htc->flags&AVP_VAL_STR) return pv_get_null(msg, param, res);

6 years, 11 months

git:master:5cc05f9b: benchmark: removed unnecessary casts to int*

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5cc05f9b47eaa829a945aa628d39d78bab7756bf URL: https://github.com/kamailio/kamailio/commit/5cc05f9b47eaa829a945aa628d39d78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-02T15:03:56+02:00 benchmark: removed unnecessary casts to int* - initialize variables to 0 in rpc commands --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/5cc05f9b47eaa829a945aa628d39d78… Patch: https://github.com/kamailio/kamailio/commit/5cc05f9b47eaa829a945aa628d39d78… --- diff --git a/src/modules/benchmark/benchmark.c b/src/modules/benchmark/benchmark.c index 6e397c3db9..61e866bf7f 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -479,8 +479,8 @@ static inline int fixup_bm_timer(void** param, int param_no) */ void bm_rpc_enable_global(rpc_t* rpc, void* ctx) { - int v1; - if(rpc->scan(ctx, "d", (int*)(&v1))<1) { + int v1=0; + if(rpc->scan(ctx, "d", &v1)<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); return; @@ -499,7 +499,7 @@ void bm_rpc_enable_timer(rpc_t* rpc, void* ctx) int v2 = 0; unsigned int id = 0; - if(rpc->scan(ctx, "sd", &p1, (int*)(&v2))<2) { + if(rpc->scan(ctx, "sd", &p1, &v2)<2) { LM_WARN("invalid parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); return; @@ -518,8 +518,8 @@ void bm_rpc_enable_timer(rpc_t* rpc, void* ctx) void bm_rpc_granularity(rpc_t* rpc, void* ctx) { - int v1; - if(rpc->scan(ctx, "d", (int*)(&v1))<1) { + int v1 = 0; + if(rpc->scan(ctx, "d", &v1)<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); return; @@ -533,8 +533,8 @@ void bm_rpc_granularity(rpc_t* rpc, void* ctx) void bm_rpc_loglevel(rpc_t* rpc, void* ctx) { - int v1; - if(rpc->scan(ctx, "d", (int*)(&v1))<1) { + int v1 = 0; + if(rpc->scan(ctx, "d", &v1)<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); return;

6 years, 11 months

git:master:407e3e43: Merge pull request #1146 from kamailio/vhernando

by GitHub

Module: kamailio Branch: master Commit: 407e3e435bf22809553e0466e2d59dd6f51c26ab URL: https://github.com/kamailio/kamailio/commit/407e3e435bf22809553e0466e2d59dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-02T15:01:26+02:00 Merge pull request #1146 from kamailio/vhernando benchmark: b/f avoid undefined bytes when int and long int sizes mismâ¦ --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/407e3e435bf22809553e0466e2d59dd… Patch: https://github.com/kamailio/kamailio/commit/407e3e435bf22809553e0466e2d59dd… --- diff --git a/src/modules/benchmark/benchmark.c b/src/modules/benchmark/benchmark.c index d40469b695..6e397c3db9 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -479,7 +479,7 @@ static inline int fixup_bm_timer(void** param, int param_no) */ void bm_rpc_enable_global(rpc_t* rpc, void* ctx) { - long int v1; + int v1; if(rpc->scan(ctx, "d", (int*)(&v1))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -496,7 +496,7 @@ void bm_rpc_enable_global(rpc_t* rpc, void* ctx) void bm_rpc_enable_timer(rpc_t* rpc, void* ctx) { char *p1 = NULL; - long int v2 = 0; + int v2 = 0; unsigned int id = 0; if(rpc->scan(ctx, "sd", &p1, (int*)(&v2))<2) { @@ -518,7 +518,7 @@ void bm_rpc_enable_timer(rpc_t* rpc, void* ctx) void bm_rpc_granularity(rpc_t* rpc, void* ctx) { - long int v1; + int v1; if(rpc->scan(ctx, "d", (int*)(&v1))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -533,7 +533,7 @@ void bm_rpc_granularity(rpc_t* rpc, void* ctx) void bm_rpc_loglevel(rpc_t* rpc, void* ctx) { - long int v1; + int v1; if(rpc->scan(ctx, "d", (int*)(&v1))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters");

6 years, 11 months

git:master:6fe4146f: benchmark: b/f avoid undefined bytes when int and long int sizes mismatch.

by Vicente Hernando

Module: kamailio Branch: master Commit: 6fe4146fad49a6525faed599cc4681e43b7d7910 URL: https://github.com/kamailio/kamailio/commit/6fe4146fad49a6525faed599cc4681e… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2017-06-02T14:20:24+02:00 benchmark: b/f avoid undefined bytes when int and long int sizes mismatch. --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/6fe4146fad49a6525faed599cc4681e… Patch: https://github.com/kamailio/kamailio/commit/6fe4146fad49a6525faed599cc4681e… --- diff --git a/src/modules/benchmark/benchmark.c b/src/modules/benchmark/benchmark.c index d40469b695..6e397c3db9 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -479,7 +479,7 @@ static inline int fixup_bm_timer(void** param, int param_no) */ void bm_rpc_enable_global(rpc_t* rpc, void* ctx) { - long int v1; + int v1; if(rpc->scan(ctx, "d", (int*)(&v1))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -496,7 +496,7 @@ void bm_rpc_enable_global(rpc_t* rpc, void* ctx) void bm_rpc_enable_timer(rpc_t* rpc, void* ctx) { char *p1 = NULL; - long int v2 = 0; + int v2 = 0; unsigned int id = 0; if(rpc->scan(ctx, "sd", &p1, (int*)(&v2))<2) { @@ -518,7 +518,7 @@ void bm_rpc_enable_timer(rpc_t* rpc, void* ctx) void bm_rpc_granularity(rpc_t* rpc, void* ctx) { - long int v1; + int v1; if(rpc->scan(ctx, "d", (int*)(&v1))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -533,7 +533,7 @@ void bm_rpc_granularity(rpc_t* rpc, void* ctx) void bm_rpc_loglevel(rpc_t* rpc, void* ctx) { - long int v1; + int v1; if(rpc->scan(ctx, "d", (int*)(&v1))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters");

6 years, 11 months

[kamailio/kamailio] benchmark: b/f avoid undefined bytes when int and long int sizes mism… (#1146)

by vhernando

…atch. void bm_rpc_enable_global(rpc_t* rpc, void* ctx) { long int v1; if(rpc->scan(ctx, "d", (int*)(&v1))<1) { rpc->scan does not fill all the bytes of v1 if long int and int sizes differ, then checks like this usually fail: if ((v1 < -1) || (v1 > 1)) { rpc->fault(ctx, 500, "Invalid Parameter Value"); return; } You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1146 -- Commit Summary -- * benchmark: b/f avoid undefined bytes when int and long int sizes mismatch. -- File Changes -- M src/modules/benchmark/benchmark.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1146.patch https://github.com/kamailio/kamailio/pull/1146.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/1146

6 years, 11 months

git:master:7b5c62e5: tm: more functions exported to kemi interface

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7b5c62e5988517e3e38082493056e6512aff08e7 URL: https://github.com/kamailio/kamailio/commit/7b5c62e5988517e3e38082493056e65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-02T14:54:31+02:00 tm: more functions exported to kemi interface --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/tm.c Modified: src/modules/tm/tm_load.c --- Diff: https://github.com/kamailio/kamailio/commit/7b5c62e5988517e3e38082493056e65… Patch: https://github.com/kamailio/kamailio/commit/7b5c62e5988517e3e38082493056e65…

6 years, 11 months

git:5.0:6c777c27: src/Makefile: fix make deb rules

by Victor Seva

Module: kamailio Branch: 5.0 Commit: 6c777c277e90e8e17196a1172fabd90b17b7cd63 URL: https://github.com/kamailio/kamailio/commit/6c777c277e90e8e17196a1172fabd90… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-06-02T11:46:39+02:00 src/Makefile: fix make deb rules * dpkg-buildpackage needs to be executed from the root of the project * don't sign any file (cherry picked from commit d0bfefd0f03962b61162eeb65fe01e8dff91674f) --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/6c777c277e90e8e17196a1172fabd90… Patch: https://github.com/kamailio/kamailio/commit/6c777c277e90e8e17196a1172fabd90… --- diff --git a/src/Makefile b/src/Makefile index bbf5f8db8a..2bbbdc3c89 100644 --- a/src/Makefile +++ b/src/Makefile @@ -609,25 +609,27 @@ bin: .PHONY: deb deb: - -@if [ -d debian ]; then \ - dpkg-buildpackage -rfakeroot -tc; \ + (cd ..; \ + if [ -d debian ]; then \ + dpkg-buildpackage -rfakeroot -tc --no-sign; \ rm debian; \ else \ - ln -s ../pkg/$(MAIN_NAME)/deb/debian debian; \ - dpkg-buildpackage -rfakeroot -tc; \ + ln -s pkg/$(MAIN_NAME)/deb/debian debian; \ + dpkg-buildpackage -rfakeroot -tc --no-sign; \ rm debian; \ - fi + fi) .PHONY: deb-stable deb-stable: - -@if [ -d debian ]; then \ - dpkg-buildpackage -rfakeroot -tc; \ + (cd ..; \ + if [ -d debian ]; then \ + dpkg-buildpackage -rfakeroot -tc --no-sign; \ rm debian; \ else \ - ln -s ../pkg/$(MAIN_NAME)/deb/jessie debian; \ - dpkg-buildpackage -rfakeroot -tc; \ + ln -s pkg/$(MAIN_NAME)/deb/jessie debian; \ + dpkg-buildpackage -rfakeroot -tc --no-sign; \ rm debian; \ - fi + fi) .PHONY: sunpkg sunpkg:

6 years, 11 months

[kamailio/kamailio] Kamailio is not passing bye to client side. (#1145)

by rahmanafzal

Dear, kamailio running with rtp proxy not passing bye to UA side as calls disconnected from B- leg but still running at A-leg side client. attached trace for your reference. Why kamailio not passing the bye to A side. Please guide ! Regards, Rahman Afzal [SIP Trace.txt](https://github.com/kamailio/kamailio/files/1047251/SIP.Trace.txt) -- 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/1145

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017