sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
318 discussions

sl_send_reply vs t_reply in async route
by Matthew Williams 07 May '13

07 May '13

GIven a route[] that might be called either directly from the request route (transaction does not exist) or asynchronously (transaction exists), a way is needed to rationally choose between sl_send_reply and t_reply. At the moment, I am using an intermediate async route and setting $var(async) = 1 and then testing that when a reply needs to be sent. It seems there could be a more elegant solution. One thought I had is a new tm function that will choose between t_reply and sl_send_reply depending on whether a transaction has been created. Any other ideas? Or am I missing an obvious solution? -- Matthew Williams Flowroute LLC *Important Notice: * This message is intended only for the person or entity to which it is addressed. The information provided is confidential. Accordingly, any review, retransmission, dissemination or other use of this information by, or disclosure of it to, anyone other than the intended recipient could have significant adverse effects and is prohibited. Opinions, conclusions and other information in this message that do not relate to official business of my company shall be understood as neither given nor endorsed by it.

2 2

fork_process in jsonrpc-c module
by Matthew Williams 07 May '13

07 May '13

We have been using PROC_NOCHILDINIT as the rank when forking the jsonrpc response handling process. Naturally, this does not initialize the acc module. Of the ranks defined in sr_module.h, which would be appropriate here? Switching to PROC_RPC fixes the issue, but I believe that that rank is really intended for RPC server processes. Thanks in advance for any input. -- Matthew Williams Flowroute LLC * * *Important Notice: * This message is intended only for the person or entity to which it is addressed. The information provided is confidential. Accordingly, any review, retransmission, dissemination or other use of this information by, or disclosure of it to, anyone other than the intended recipient could have significant adverse effects and is prohibited. Opinions, conclusions and other information in this message that do not relate to official business of my company shall be understood as neither given nor endorsed by it.

2 3

git:mgw/json: jsonrpc-c: overhaul of jsonrpc-c module
by Matthew Williams 07 May '13

07 May '13

Module: sip-router Branch: mgw/json Commit: fb2c0e167262e9408d5b83241d4ee5c35a99c0e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb2c0e1… Author: Matthew Williams <mgwilliams(a)gmail.com> Committer: Matthew Williams <mgwilliams(a)gmail.com> Date: Tue May 7 10:51:11 2013 -0700 jsonrpc-c: overhaul of jsonrpc-c module --- modules/jsonrpc-c/Makefile | 11 +- modules/jsonrpc-c/README | 314 +++++-- modules/jsonrpc-c/TODO | 1 - modules/jsonrpc-c/doc/jsonrpc-c.xml | 37 +- modules/jsonrpc-c/doc/jsonrpc-c_admin.xml | 324 ++++++- modules/jsonrpc-c/jsonrpc.c | 174 ---- modules/jsonrpc-c/jsonrpc.h | 127 +++- modules/jsonrpc-c/jsonrpc_connect.c | 319 +++++++ modules/jsonrpc-c/jsonrpc_connect.h | 51 + modules/jsonrpc-c/jsonrpc_funcs.c | 266 ++++++ modules/jsonrpc-c/jsonrpc_funcs.h | 64 ++ modules/jsonrpc-c/jsonrpc_global.c | 31 + modules/jsonrpc-c/jsonrpc_io.c | 1085 ++++++++++++++-------- modules/jsonrpc-c/jsonrpc_io.h | 76 ++- modules/jsonrpc-c/jsonrpc_mod.c | 301 +++++-- modules/jsonrpc-c/jsonrpc_request.c | 369 ++++++-- modules/jsonrpc-c/jsonrpc_request.h | 46 +- modules/jsonrpc-c/jsonrpc_server.c | 613 ++++++++++++ modules/jsonrpc-c/jsonrpc_server.h | 132 +++ modules/jsonrpc-c/jsonrpc_srv.c | 316 +++++++ modules/jsonrpc-c/jsonrpc_srv.h | 55 ++ modules/jsonrpc-c/netstring.c | 379 +++++--- modules/jsonrpc-c/netstring.h | 36 +- modules/jsonrpc-c/test/mem-test.sh | 4 + modules/jsonrpc-c/test/run-tests.sh | 4 + modules/jsonrpc-c/test/test.cfg | 94 ++ modules/jsonrpc-c/unit_tests/.gitignore | 1 + modules/jsonrpc-c/unit_tests/Makefile | 11 + modules/jsonrpc-c/unit_tests/netstring.c | 351 +++++++ modules/jsonrpc-c/unit_tests/seatest/license.txt | 19 + modules/jsonrpc-c/unit_tests/seatest/seatest.c | 248 +++++ modules/jsonrpc-c/unit_tests/seatest/seatest.h | 74 ++ modules/jsonrpc-c/unit_tests/test.h | 48 + 33 files changed, 4957 insertions(+), 1024 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=fb2…

1 0

git:mgw/json: json: overhaul of json module
by Matthew Williams 07 May '13

07 May '13

Module: sip-router Branch: mgw/json Commit: 3fed6e8fcc1a8179316cf498490c3de21a4bb704 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3fed6e8… Author: Matthew Williams <mgwilliams(a)gmail.com> Committer: Matthew Williams <mgwilliams(a)gmail.com> Date: Tue May 7 10:47:19 2013 -0700 json: overhaul of json module --- modules/json/Makefile | 1 - modules/json/README | 149 +++++++++++++--- modules/json/doc/json_admin.xml | 120 ++++++++++++-- modules/json/json.c | 72 ++++++++ modules/json/json.h | 36 ++++ modules/json/json_funcs.c | 358 ++++++++++++++++++++++++++------------- modules/json/json_funcs.h | 8 +- modules/json/json_mod.c | 149 ++++++++++------ modules/json/json_path.c | 324 +++++++++++++++++++++++++++-------- modules/json/json_path.h | 1 + modules/json/test/json-test.cfg | 226 ------------------------ modules/json/test/run-tests.sh | 4 - 12 files changed, 928 insertions(+), 520 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3fe…

1 0

git:mgw/json: Merge remote-tracking branch 'origin/4.0' into mgw/json
by Matthew Williams 07 May '13

07 May '13

Module: sip-router Branch: mgw/json Commit: af812b82619e60f744e3aecdb6b07783fb732e4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af812b8… Author: Matthew Williams <mgwilliams(a)gmail.com> Committer: Matthew Williams <mgwilliams(a)gmail.com> Date: Tue May 7 09:55:11 2013 -0700 Merge remote-tracking branch 'origin/4.0' into mgw/json ---

1 0

git:master: core: get rid of deferencing type-punned warning in deb wheezy
by Daniel-Constantin Mierla 07 May '13

07 May '13

Module: sip-router Branch: master Commit: 81d3eebd51089686949ab22da60166d4f3a460a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81d3eeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 7 19:15:36 2013 +0200 core: get rid of deferencing type-punned warning in deb wheezy - reported by Victor Seva --- cfg/cfg_struct.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index c2e6520..13c3c23 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -1035,6 +1035,7 @@ static int apply_add_var_list(cfg_block_t *block, cfg_group_t *group) unsigned int group_id; cfg_add_var_t *add_var; cfg_group_inst_t *new_array, *ginst; + cfg_group_meta_t *gm; /* count the number of group instances */ for ( add_var = group->add_var, num = 0, group_id = 0; @@ -1088,8 +1089,9 @@ static int apply_add_var_list(cfg_block_t *block, cfg_group_t *group) } #endif - CFG_GROUP_META(block, group)->num = num; - CFG_GROUP_META(block, group)->array = new_array; + gm = CFG_GROUP_META(block, group); + gm->num = num; + gm->array = new_array; return 0; error:

1 0

git:4.0: snmpstats: fix cross-compilation
by Ovidiu Sas 07 May '13

07 May '13

Module: sip-router Branch: 4.0 Commit: 55f7def6b4ed889a27a19164faa0dd7f854fa983 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55f7def… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Apr 25 14:50:41 2013 -0400 snmpstats: fix cross-compilation (cherry picked from commit 5e96920289cbf448ac684d8cb1333d75f65a729a) --- modules/snmpstats/Makefile | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/snmpstats/Makefile b/modules/snmpstats/Makefile index 2d4af2a..2fd7f6c 100644 --- a/modules/snmpstats/Makefile +++ b/modules/snmpstats/Makefile @@ -3,8 +3,13 @@ # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs +auto_gen= +NAME=snmpstats.so +ifeq ($(CROSS_COMPILE),) BUILDER = $(shell which net-snmp-config) +endif + ifeq ($(BUILDER),) DEFS +=-I$(LOCALBASE)/include BUILDAGENTLIBS =-L$(LOCALBASE)/lib -lnetsnmpmibs -lnetsnmpagent \ @@ -29,12 +34,8 @@ BUILDAGENTLIBS += -Wl,-E -Wl,-rpath,/usr/lib/perl5/5.8.8/i386-linux-thread-multi -lrpmdb -lrpm endif -CFLAGS+= -auto_gen= -NAME=snmpstats.so LIBS=$(BUILDAGENTLIBS) - DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib

1 0

git:4.0: snmpstats fix typo in Makefile.
by Ovidiu Sas 07 May '13

07 May '13

Module: sip-router Branch: 4.0 Commit: 70ab195f753956a3f891d992787a76c2c4ff643b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70ab195… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sat Apr 6 22:04:51 2013 +0200 snmpstats fix typo in Makefile. (cherry picked from commit bddf66407ef7521f3d1f1e941b4c1e104e59d1ef) --- modules/snmpstats/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/snmpstats/Makefile b/modules/snmpstats/Makefile index 0086ef1..2d4af2a 100644 --- a/modules/snmpstats/Makefile +++ b/modules/snmpstats/Makefile @@ -15,7 +15,7 @@ else INSTALLMIBDIR = $(cfg-prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs endif -ifeq($(EMBEDDED_PERL),1) +ifeq ($(EMBEDDED_PERL),1) # # Enable this part if you compile on Centos 5 or another system that has a # packaged snmpd with embedded perl and libwrap support

1 0

git:4.0: snmpstats Add disabled section in Makefile for compilation on Centos systems
by Ovidiu Sas 07 May '13

07 May '13

Module: sip-router Branch: 4.0 Commit: f86be5e0aa282dc58680f28d01161437901fa2c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f86be5e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sat Apr 6 22:02:48 2013 +0200 snmpstats Add disabled section in Makefile for compilation on Centos systems Net-SNMP and snmpd can be built with embedded perl and libwrap support. If that's the case on your system you need to enable the EMBEDDED_PERL section in the Makefile. Maybe this could be enabled automatically. (cherry picked from commit 7bbf8fece2cc93c5b1ddd2c3dcc12e8a920dd54d) --- modules/snmpstats/Makefile | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules/snmpstats/Makefile b/modules/snmpstats/Makefile index f518ba6..0086ef1 100644 --- a/modules/snmpstats/Makefile +++ b/modules/snmpstats/Makefile @@ -15,6 +15,20 @@ else INSTALLMIBDIR = $(cfg-prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs endif +ifeq($(EMBEDDED_PERL),1) +# +# Enable this part if you compile on Centos 5 or another system that has a +# packaged snmpd with embedded perl and libwrap support +# +BUILDAGENTLIBS += -Wl,-E -Wl,-rpath,/usr/lib/perl5/5.8.8/i386-linux-thread-multi/CORE \ + -L/usr/local/lib /usr/lib/perl5/5.8.8/i386-linux-thread-multi/auto/DynaLoader/DynaLoader.a \ + -L/usr/lib/perl5/5.8.8/i386-linux-thread-multi/CORE \ + -lperl -lresolv -lnsl -ldl -lm -lcrypt -lutil -lpthread -lc \ + -lwrap \ + -lsensors \ + -lrpmdb -lrpm +endif + CFLAGS+= auto_gen= NAME=snmpstats.so

1 0

git:4.0: kamailio/utils/sercmd: remove unused but set variable
by Ovidiu Sas 07 May '13

07 May '13

Module: sip-router Branch: 4.0 Commit: f92eee8eecab6d0fa505011b20a57dea242fa982 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f92eee8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:16:27 2013 -0400 kamailio/utils/sercmd: remove unused but set variable (cherry picked from commit 67609608aa4306de9a34a28a3a31880ad0d17e8e) --- utils/sercmd/sercmd.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 55ed3d4..90dfcb7 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -2159,14 +2159,12 @@ int main(int argc, char** argv) struct binrpc_cmd cmd; struct id_list* sock_id; char* format; - int interactive; char* line; char* l; quit=0; format=0; line=0; - interactive=0; s=-1; sock_name=0; sock_type=UNIXS_SOCK; @@ -2273,7 +2271,6 @@ int main(int argc, char** argv) sock_id=0; if (optind>=argc){ - interactive=1; /*fprintf(stderr, "ERROR: no command specified\n"); goto error; */ }else{

1 0

← Newer
1
...
24
25
26
27
28
29
30
31
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013