sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:master:e21bb6af: Merge pull request #888 from linuxmaniac/vseva/dialplan_fix

by GitHub

Module: kamailio Branch: master Commit: e21bb6afd071e5833ee36fc38bd41f20dcced3fb URL: https://github.com/kamailio/kamailio/commit/e21bb6afd071e5833ee36fc38bd41f2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2016-12-15T09:27:42+01:00 Merge pull request #888 from linuxmaniac/vseva/dialplan_fix dialplan: fix avp values when using PV_IDX_ITR --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/e21bb6afd071e5833ee36fc38bd41f2… Patch: https://github.com/kamailio/kamailio/commit/e21bb6afd071e5833ee36fc38bd41f2… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index e023b75..0b16b0a 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -67,9 +67,10 @@ int dpl_dyn_printf_s(sip_msg_t *msg, const pv_elem_p elem, pv_elem_p e = NULL; pv_elem_p t = NULL; str s = STR_NULL; + str v = STR_NULL; int ret = -1; - if(elem==NULL||avp_elem==NULL||elem_prev==NULL) return -1; + if(elem==NULL||avp_elem==NULL||elem_prev==NULL||vexpr==NULL) return -1; if(str_append(&(avp_elem->text), val, &s)<0) return -1; if(pv_parse_format(&s, &e)<0) { @@ -86,10 +87,18 @@ int dpl_dyn_printf_s(sip_msg_t *msg, const pv_elem_p elem, } if(*elem_prev) (*elem_prev)->next = e; e->next = avp_elem->next; - if(pv_printf_s(msg, e, vexpr)<0){ + if(pv_printf_s(msg, e, &v)<0){ LM_ERR("cannot get avp pcre dynamic expression value\n"); goto clean; } + /* pv_printf_s uses pv_get_buffer() we do need to copy */ + vexpr->len = v.len; + vexpr->s = pkg_malloc(sizeof(char)*(v.len+1)); + if(vexpr->s==NULL) { + PKG_MEM_ERROR; + goto clean; + } + strcpy(vexpr->s, v.s); ret = 0; clean: if(s.s) pkg_free(s.s); @@ -282,7 +291,12 @@ dpl_dyn_pcre_p dpl_dynamic_pcre_list(sip_msg_t *msg, str *expr) } clean: if(elem) pv_elem_free_all(elem); - while(l) { t = l->next; pkg_free(l); l = t;} + while(l) { + t = l->next; + if(l->s.s) pkg_free(l->s.s); + pkg_free(l); + l = t; + } return re_list; }

8 years

git:master:cc2c3de5: dialplan: fix avp values when using PV_IDX_ITR

by Victor Seva

Module: kamailio Branch: master Commit: cc2c3de5e859861b59265cc5a0d41ae968a08149 URL: https://github.com/kamailio/kamailio/commit/cc2c3de5e859861b59265cc5a0d41ae… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-12-15T08:56:58+01:00 dialplan: fix avp values when using PV_IDX_ITR * previously we were using the values from pv_printf_s() but that uses pv_get_buffer() so next call can interfere with the next iteration in the list --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/cc2c3de5e859861b59265cc5a0d41ae… Patch: https://github.com/kamailio/kamailio/commit/cc2c3de5e859861b59265cc5a0d41ae… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index e023b75..0b16b0a 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -67,9 +67,10 @@ int dpl_dyn_printf_s(sip_msg_t *msg, const pv_elem_p elem, pv_elem_p e = NULL; pv_elem_p t = NULL; str s = STR_NULL; + str v = STR_NULL; int ret = -1; - if(elem==NULL||avp_elem==NULL||elem_prev==NULL) return -1; + if(elem==NULL||avp_elem==NULL||elem_prev==NULL||vexpr==NULL) return -1; if(str_append(&(avp_elem->text), val, &s)<0) return -1; if(pv_parse_format(&s, &e)<0) { @@ -86,10 +87,18 @@ int dpl_dyn_printf_s(sip_msg_t *msg, const pv_elem_p elem, } if(*elem_prev) (*elem_prev)->next = e; e->next = avp_elem->next; - if(pv_printf_s(msg, e, vexpr)<0){ + if(pv_printf_s(msg, e, &v)<0){ LM_ERR("cannot get avp pcre dynamic expression value\n"); goto clean; } + /* pv_printf_s uses pv_get_buffer() we do need to copy */ + vexpr->len = v.len; + vexpr->s = pkg_malloc(sizeof(char)*(v.len+1)); + if(vexpr->s==NULL) { + PKG_MEM_ERROR; + goto clean; + } + strcpy(vexpr->s, v.s); ret = 0; clean: if(s.s) pkg_free(s.s); @@ -282,7 +291,12 @@ dpl_dyn_pcre_p dpl_dynamic_pcre_list(sip_msg_t *msg, str *expr) } clean: if(elem) pv_elem_free_all(elem); - while(l) { t = l->next; pkg_free(l); l = t;} + while(l) { + t = l->next; + if(l->s.s) pkg_free(l->s.s); + pkg_free(l); + l = t; + } return re_list; }

8 years

[kamailio/kamailio] dialplan: fix avp values when using PV_IDX_ITR (#888)

by Victor Seva

* previously we were using the values from pv_printf_s() but that uses pv_get_buffer() so next call can interfere with the next iteration in the list You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/888 -- Commit Summary -- * dialplan: fix avp values when using PV_IDX_ITR -- File Changes -- M src/modules/dialplan/dp_repl.c (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/888.patch https://github.com/kamailio/kamailio/pull/888.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/888

8 years

[kamailio/kamailio] mi_xmlrpc compilation fails with GCC 6.2.0 (#885)

by George Diamantopoulos

Hello all, Kamailio fails to build with GCC 6.2.0. It seems boolean constants TRUE and FALSE aren't recognised by the compiler. I'm getting multiple errors like the following: ```abyss_date.c: In function ‘DateToString’: abyss_date.c:65:16: error: ‘FALSE’ undeclared (first use in this function) return FALSE; ^~~~~``` I'm attaching the complete build log. [kamailio-4.4.4-build-log.txt](https://github.com/kamailio/kamailio/files/64… -- 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/885

8 years

VERY IMPORTANT: deciding when to remove the MI code

by Daniel-Constantin Mierla

Hello, we started discussing about removing MI (so called management interface) for very long time, more or less since 2008. The RPC should remain the control interface, given its better structure for commands, parameters, etc ... MI is custom protocol using a line-oriented communication via fifo or socket file with kamailio (e.g., implemented mi_fifo and mi_datagram modules). RPC is the alternative, a more standardized concept, with better structured format. I think it's time to set a clear roadmap for doing the removal. Overall, it will be easier to maintain the code, right now being duplicated code for doing the same operation over MI or RPC, and MI shows its limitations (or complexity to deal with) for advanced needs (see the discussions about how to provide multi-line value parameters over MI). So, I want to know if there are many relying on MI directly and they still want to keep it, what would be the expected duration they need for upgrading their tools to work with RPC interface, other relevant aspects people have in favour of mi vs rpc. I am even willing to do the removal in time befire freezing the 5.0 branch. We will ensure a clean start of 5.x series. The main concern from my point of view is kamctl -- but I think we can preserve the compatibility for kamctl commands and parameters (so command line execution of kamctl will be the same), but the output might be different. That's because it should be easy to updated it to communicate with jsonrpc-s module, but then it will get json-formatted results. To summarize, two big questions to answer: a) Are you ok to remove the MI code/commands? b) If yes to a), are you ok to be done for v5.0? Not providing feedback will be considered as 'yes' for both questions, so **speak up if you want MI to be kept or delay it removal**. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

8 years

git:master:7fd28b94: matrix: added matrix.reload rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7fd28b94fb530daef9b89e569c94a5207d86d9fa URL: https://github.com/kamailio/kamailio/commit/7fd28b94fb530daef9b89e569c94a52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-13T12:59:15+01:00 matrix: added matrix.reload rpc command --- Modified: src/modules/matrix/matrix.c --- Diff: https://github.com/kamailio/kamailio/commit/7fd28b94fb530daef9b89e569c94a52… Patch: https://github.com/kamailio/kamailio/commit/7fd28b94fb530daef9b89e569c94a52…

8 years

git:master:d82ab50f: Makefile: clean and tags target for the root folder

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d82ab50f97057483ce7ccb524f66d32f2fb4c858 URL: https://github.com/kamailio/kamailio/commit/d82ab50f97057483ce7ccb524f66d32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-13T12:48:07+01:00 Makefile: clean and tags target for the root folder --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d82ab50f97057483ce7ccb524f66d32… Patch: https://github.com/kamailio/kamailio/commit/d82ab50f97057483ce7ccb524f66d32… --- diff --git a/Makefile b/Makefile index ca371a9..f0df1b6 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,8 @@ SMODPARAM=modules=$(smodules) endif endif +MKTAGS?=ctags + # forward all named targets %: $(MAKE) -C $(KSR_DIR) $@ $(SMODPARAM) @@ -32,3 +34,16 @@ default: .PHONY: install install: $(MAKE) -C $(KSR_DIR) $@ $(SMODPARAM) + +.PHONY: TAGS +.PHONY: tags +TAGS tags: + $(MKTAGS) --exclude="misc/*" --exclude="test/*" -R . + +# clean everything generated - shortcut on maintainer-clean +.PHONY: pure +clean pure distclean: + @rm -f .*.swp tags TAGS + $(MAKE) -C $(KSR_DIR) $@ + +#

8 years

git:master:94b17b32: modules: readme files regenerated - modules ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 94b17b3249d87d8a8b52d299b10b1b0337191758 URL: https://github.com/kamailio/kamailio/commit/94b17b3249d87d8a8b52d299b10b1b0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-13T10:16:12+01:00 modules: readme files regenerated - modules ... --- Modified: src/modules/cplc/README Modified: src/modules/janssonrpcc/README --- Diff: https://github.com/kamailio/kamailio/commit/94b17b3249d87d8a8b52d299b10b1b0… Patch: https://github.com/kamailio/kamailio/commit/94b17b3249d87d8a8b52d299b10b1b0…

8 years

git:master:c737e94c: modules: readme files regenerated - modules ...

by Kamailio Dev

Module: kamailio Branch: master Commit: c737e94c5ec98b7ea25a53f50a57b98b43266b6f URL: https://github.com/kamailio/kamailio/commit/c737e94c5ec98b7ea25a53f50a57b98… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-13T10:01:15+01:00 modules: readme files regenerated - modules ... --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/c737e94c5ec98b7ea25a53f50a57b98… Patch: https://github.com/kamailio/kamailio/commit/c737e94c5ec98b7ea25a53f50a57b98…

8 years

git:master:09d97d9e: pkg/kamailio/deb: remove obsolete purple module from packages

by Victor Seva

Module: kamailio Branch: master Commit: 09d97d9e94cd8ee5121ec0b34f08893fcb724820 URL: https://github.com/kamailio/kamailio/commit/09d97d9e94cd8ee5121ec0b34f08893… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-12-13T10:33:53+01:00 pkg/kamailio/deb: remove obsolete purple module from packages --- Modified: pkg/kamailio/deb/debian/backports/squeeze Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/squeeze/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/09d97d9e94cd8ee5121ec0b34f08893… Patch: https://github.com/kamailio/kamailio/commit/09d97d9e94cd8ee5121ec0b34f08893…

8 years

← Newer
1
...
12
13
14
15
16
17
18
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016