sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

[tracker] Comment added: sercmd after "reply too big"

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#422 - sercmd after "reply too big" User who did this - Savolainen Dmitri (sdi) ---------- It doesn't work. read(s, reply_buf, max_reply_size) returns EAGAIN error after setting socket to non-blocking mode so it is possible to use "select": <code> diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 7bb435a..8bd40cb 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -48,6 +48,7 @@ #include <sys/uio.h> /* writev */ #include <netdb.h> /* gethostbyname */ #include <time.h> /* time */ +#include <fcntl.h> #ifdef USE_READLINE #include <readline/readline.h> @@ -718,8 +719,38 @@ static int get_reply(int s, unsigned char* reply_buf, int max_reply_size, goto error; } msg_end=hdr_end+in_pkt->tlen; - if ((int)(msg_end-reply_buf)>max_reply_size) - goto error_toolong; + if ((int)(msg_end-reply_buf)>max_reply_size) { + int flags = fcntl(s, F_GETFL, 0); + fcntl(s, F_SETFL, flags | O_NONBLOCK); + /* reading the rest from the socket */ + int read_continue = 1; + while (read_continue){ + int read_ret = read(s, reply_buf, max_reply_size); + if (read_ret == 0) + read_continue = 0; + else if (read_ret<0){ + if (errno == EAGAIN){ + fd_set rfds; + struct timeval tv; + int retval; + FD_ZERO(&rfds); + FD_SET(s, &rfds); + tv.tv_sec = 1; + tv.tv_usec = 0; + retval = select(s+1, &rfds, NULL, NULL, &tv); + if (retval<=0) + read_continue = 0; + //continue; + } + else{ + //some read erro; hope for best + read_continue = 0; + } + } + } + fcntl(s, F_SETFL, flags & (~O_NONBLOCK)); + goto error_toolong; + } } }while(crt<msg_end); </code> but setting blocking read timeout is better (in my mind) <code> diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 7bb435a..486ef5d 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -718,8 +718,21 @@ static int get_reply(int s, unsigned char* reply_buf, int max_reply_size, goto error; } msg_end=hdr_end+in_pkt->tlen; - if ((int)(msg_end-reply_buf)>max_reply_size) - goto error_toolong; + if ((int)(msg_end-reply_buf)>max_reply_size){ + /* reading the rest from the socket */ + struct timeval timeout_save; + unsigned sizeoft = sizeof(timeout_save); + if ( getsockopt (s, SOL_SOCKET, SO_RCVTIMEO, &timeout_save, &sizeoft)==0 ){ + struct timeval timeout; + timeout.tv_sec = 1; + timeout.tv_usec = 0; + if (setsockopt (s, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout,sizeof(timeout))==0){ + while(read(s, reply_buf, max_reply_size)>0); + setsockopt (s, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout_save,sizeof(timeout_save)); + } + } + goto error_toolong; + } } }while(crt<msg_end); </code> The first and second works in my tests ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=422#comment1403 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 7 months

git:master: modules/tmx: added new function t_reuse_branch()

by Juha Heinanen

Module: sip-router Branch: master Commit: 575aabb238e75904ec7cad0c3a2b70dc48b0e40d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=575aabb… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Apr 20 09:53:33 2014 +0300 modules/tmx: added new function t_reuse_branch() --- modules/tmx/README | 160 ++++++++++++++++++++++++---------------- modules/tmx/doc/tmx.xml | 11 +++ modules/tmx/doc/tmx_admin.xml | 30 ++++++++ modules/tmx/tmx_mod.c | 47 ++++++++++++ 4 files changed, 184 insertions(+), 64 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=575…

10 years, 7 months

git:master: modules/sipt: refactored pseudovars to be of the form $sipt( header[.field])

by Torrey Searle

Module: sip-router Branch: master Commit: b0ab6f7083e8ab40b8158c5b2cf528efcbe14dfb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0ab6f7… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Sat Apr 19 11:16:24 2014 +0200 modules/sipt: refactored pseudovars to be of the form $sipt(header[.field]) --- modules/sipt/README | 86 ++++++++++------- modules/sipt/doc/sipt_admin.xml | 26 +++--- modules/sipt/sipt.c | 195 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 258 insertions(+), 49 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b0a…

10 years, 7 months

git:master: json|jsonrpc-c: fix detection of json-c lib

by Victor Seva

Module: sip-router Branch: master Commit: c290e58b7f50bdd7f9d691c4890baf1c9f74cb0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c290e58… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat Apr 19 11:06:48 2014 +0200 json|jsonrpc-c: fix detection of json-c lib --- modules/json/Makefile | 2 +- modules/jsonrpc-c/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/json/Makefile b/modules/json/Makefile index fad2e00..2ee06ef 100644 --- a/modules/json/Makefile +++ b/modules/json/Makefile @@ -14,7 +14,7 @@ BUILDER = $(shell which pkg-config) ifeq ($(BUILDER),) JSONC=$(shell ls $(SYSBASE)/include/lib/libjson*.so $(LOCALBASE)/lib/libjson*.so 2>/dev/null | grep json-c) else - JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c.so) + JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c) endif ifneq ($(JSONC),) diff --git a/modules/jsonrpc-c/Makefile b/modules/jsonrpc-c/Makefile index e170597..171eb27 100644 --- a/modules/jsonrpc-c/Makefile +++ b/modules/jsonrpc-c/Makefile @@ -14,7 +14,7 @@ BUILDER = $(shell which pkg-config) ifeq ($(BUILDER),) JSONC=$(shell ls $(SYSBASE)/include/lib/libjson*.so $(LOCALBASE)/lib/libjson*.so 2>/dev/null | grep json-c) else - JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c.so) + JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c) endif ifneq ($(JSONC),)

10 years, 7 months

New commits on branch master

by Daniel-Constantin Mierla

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c624684… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:35:57 2014 +0200 usrloc: fixed c&p error for variable name in ul_rpc_add() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37b0bea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:35:00 2014 +0200 tmx: check if t is null or undefined for returning branch index URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=458b803… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:34:23 2014 +0200 tls: test if conection is still active for peer verification URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=110882e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:32:17 2014 +0200 textops: use local variable to copute the offset in buffer for hdr ops helper function - when a prefix was given (e.g., append_uri_hf()), it could have led to usage of invalid value URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48c4283… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:31:23 2014 +0200 rr: coherent check for optional user part of advertised rr URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4dd1387… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:30:02 2014 +0200 registrar: test returned value for socket when socket flag is set and xavp is used to hold it URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf6cb8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:28:56 2014 +0200 pv: return error if shm is not initialized when $shv() is used URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6cf593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:27:54 2014 +0200 msilo: check to be sure len is positive before trying to copy string URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6626f9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:26:53 2014 +0200 mqueue: use static var to return pointer to dynamic queue name URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53f67e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:25:21 2014 +0200 dialplan: fixed typo in define for guarding .h file - init local variable to avoid warning URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69d67c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:24:16 2014 +0200 dialog: detect the param value type for setting by routing block URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ccd1593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:22:52 2014 +0200 ctl: free allocated pointer in case of error URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1feccd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:21:50 2014 +0200 parser/contact: cleaned log messages and safety check for invalid iterator call URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58acede… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:21:09 2014 +0200 core: safety check for finding select final node URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fcc6dbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 19 00:20:19 2014 +0200 core: print rdata pointer and wrap null condition around it in dbg message URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7251ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 18 19:01:22 2014 +0200 uac: safe initialization of vars and debug message for uac_replace_to() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2513a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 18 18:51:33 2014 +0200 textops: init s field of uri str structure for proper evaluation - otherwise can get uninitialized to last if block of get_uri_and_skip_until_params() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0186bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 18 18:38:53 2014 +0200 textopsx: init local variable to avoid testing invalid value URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf7b6c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 18 18:11:38 2014 +0200 core: added some safety checks for cfg framework pointers - avoid dereferencing null in corner cases

10 years, 7 months

git:master: pkg/kamailio/deb: use libjson-c-dev when possible.

by Victor Seva

Module: sip-router Branch: master Commit: 118d3051bd1c84ba725c719dd6d86e8335d9c274 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=118d305… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Apr 18 22:15:31 2014 +0200 pkg/kamailio/deb: use libjson-c-dev when possible. --- pkg/kamailio/deb/debian/backports/precise | 3 +++ pkg/kamailio/deb/debian/backports/squeeze | 3 +++ pkg/kamailio/deb/debian/backports/wheezy | 3 +++ pkg/kamailio/deb/debian/control | 2 +- pkg/kamailio/deb/jessie/control | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index c2ece7e..6cf914a 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -24,6 +24,9 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' ${DIST}/control sed -i -e '/FREERADIUS/d' ${DIST}/rules +# use old json +sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/squeeze b/pkg/kamailio/deb/debian/backports/squeeze index d589dda..b037d57 100755 --- a/pkg/kamailio/deb/debian/backports/squeeze +++ b/pkg/kamailio/deb/debian/backports/squeeze @@ -69,6 +69,9 @@ sed -i -e 's/db-util/db4.8-util/' ${DIST}/control sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' ${DIST}/control sed -i -e '/FREERADIUS/d' ${DIST}/rules +# use old json +sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index df43929..ccd1b9d 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -30,6 +30,9 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' ${DIST}/control sed -i -e '/FREERADIUS/d' ${DIST}/rules +# use old json +sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 5ec86e5..820213b 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -19,7 +19,7 @@ Build-Depends: bison, libgcj12-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), - libjson0-dev, + libjson-c-dev, libldap2-dev, liblua5.1-0-dev, libmemcached-dev, diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index 35eaf4f..476122e 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -19,7 +19,7 @@ Build-Depends: bison, libgcj12-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), - libjson0-dev, + libjson-c-dev, libldap2-dev, liblua5.1-0-dev, libmemcached-dev,

10 years, 7 months

git:master: json|jsonrpc-c: use new naming json-c lib if available

by Victor Seva

Module: sip-router Branch: master Commit: 679833f9f098e1ebc5e2b66978a5535af557924c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=679833f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Apr 18 22:07:47 2014 +0200 json|jsonrpc-c: use new naming json-c lib if available --- modules/json/Makefile | 19 +++++++++++++++---- modules/jsonrpc-c/Makefile | 19 +++++++++++++++---- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/modules/json/Makefile b/modules/json/Makefile index cf14a08..fad2e00 100644 --- a/modules/json/Makefile +++ b/modules/json/Makefile @@ -8,15 +8,26 @@ include ../../Makefile.defs auto_gen= NAME=json.so LIBS= +JLIB=json BUILDER = $(shell which pkg-config) ifeq ($(BUILDER),) - DEFS+=-I/usr/include/json -I$(LOCALBASE)/include/json \ + JSONC=$(shell ls $(SYSBASE)/include/lib/libjson*.so $(LOCALBASE)/lib/libjson*.so 2>/dev/null | grep json-c) +else + JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c.so) +endif + +ifneq ($(JSONC),) + JLIB=json-c +endif + +ifeq ($(BUILDER),) + DEFS+=-I/usr/include/$(JLIB) -I$(LOCALBASE)/include/$(JLIB) \ -I$(LOCALBASE)/include - LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljson + LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -l$(JLIB) else - DEFS+= $(shell pkg-config --cflags json) - LIBS+= $(shell pkg-config --libs json) + DEFS+= $(shell pkg-config --cflags $(JLIB)) + LIBS+= $(shell pkg-config --libs $(JLIB)) endif DEFS+=-DKAMAILIO_MOD_INTERFACE diff --git a/modules/jsonrpc-c/Makefile b/modules/jsonrpc-c/Makefile index fdb0024..e170597 100644 --- a/modules/jsonrpc-c/Makefile +++ b/modules/jsonrpc-c/Makefile @@ -8,15 +8,26 @@ include ../../Makefile.defs auto_gen= NAME=jsonrpc-c.so LIBS=-lm +JLIB=json BUILDER = $(shell which pkg-config) ifeq ($(BUILDER),) - DEFS+=-I/usr/include/json -I$(LOCALBASE)/include/json \ + JSONC=$(shell ls $(SYSBASE)/include/lib/libjson*.so $(LOCALBASE)/lib/libjson*.so 2>/dev/null | grep json-c) +else + JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c.so) +endif + +ifneq ($(JSONC),) + JLIB=json-c +endif + +ifeq ($(BUILDER),) + DEFS+=-I/usr/include/$(JLIB) -I$(LOCALBASE)/include/$(JLIB) \ -I$(LOCALBASE)/include - LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -levent -ljson + LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -levent -l$(JLIB) else - DEFS+= $(shell pkg-config --cflags json) - LIBS+= $(shell pkg-config --libs json) + DEFS+= $(shell pkg-config --cflags $(JLIB)) + LIBS+= $(shell pkg-config --libs $(JLIB)) DEFS+= $(shell pkg-config --cflags libevent) LIBS+= $(shell pkg-config --libs libevent) endif

10 years, 7 months

[tracker] Comment added: json-c is dropping json compatibility

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#421 - json-c is dropping json compatibility User who did this - Daniel-Constantin Mierla (miconda) ---------- OK. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=421#comment1402 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 7 months

[tracker] Comment added: json-c is dropping json compatibility (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#421 - json-c is dropping json compatibility User who did this - Víctor Seva (linuxmaniac) ---------- OK. This seems to work. ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=421#comment1401 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 7 months

[tracker] Comment added: json-c is dropping json compatibility

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#421 - json-c is dropping json compatibility User who did this - Daniel-Constantin Mierla (miconda) ---------- Try both, if one name doesn't return values, try with the other one. iirc, app_lua has some logic to detect various versions. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=421#comment1400 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 7 months

← Newer
1
...
14
15
16
17
18
19
20
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014