sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
402 discussions

git:master: tm: wrap around expression adjusting length for To/From headers
by Daniel-Constantin Mierla 26 Apr '13

26 Apr '13

Module: sip-router Branch: master Commit: aefea5477dc7878d5e818628e04ddcb088fd2858 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aefea54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 26 19:55:43 2013 +0200 tm: wrap around expression adjusting length for To/From headers - applies for local requests --- modules/tm/t_msgbuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index 2beb918..c947d38 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1399,7 +1399,7 @@ static inline char* print_to(char* w, dlg_t* dialog, struct cell* t) { t->to.s = w; t->to.len = TO_LEN + dialog->rem_uri.len + CRLF_LEN - + (dialog->rem_uri.s[0]!='<')?2:0; + + ((dialog->rem_uri.s[0]!='<')?2:0); memapp(w, TO, TO_LEN); if(dialog->rem_uri.s[0]!='<') memapp(w, "<", 1); @@ -1424,7 +1424,7 @@ static inline char* print_from(char* w, dlg_t* dialog, struct cell* t) { t->from.s = w; t->from.len = FROM_LEN + dialog->loc_uri.len + CRLF_LEN - + (dialog->loc_uri.s[0]!='<')?2:0; + + ((dialog->loc_uri.s[0]!='<')?2:0); memapp(w, FROM, FROM_LEN); if(dialog->loc_uri.s[0]!='<') memapp(w, "<", 1);

1 0

git:master: tm: fixed name of the target uri used for From header
by Daniel-Constantin Mierla 26 Apr '13

26 Apr '13

Module: sip-router Branch: master Commit: ff890a4eee1888ed3e1e080a18bd72124ab99690 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff890a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 26 19:00:36 2013 +0200 tm: fixed name of the target uri used for From header - effect of previous commit --- modules/tm/t_msgbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index b36020a..2beb918 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1424,7 +1424,7 @@ static inline char* print_from(char* w, dlg_t* dialog, struct cell* t) { t->from.s = w; t->from.len = FROM_LEN + dialog->loc_uri.len + CRLF_LEN - + (dialog->rem_uri.s[0]!='<')?2:0; + + (dialog->loc_uri.s[0]!='<')?2:0; memapp(w, FROM, FROM_LEN); if(dialog->loc_uri.s[0]!='<') memapp(w, "<", 1);

1 0

git:master: dispatcher: proper localization of To uri for keepalives
by Daniel-Constantin Mierla 26 Apr '13

26 Apr '13

Module: sip-router Branch: master Commit: f22dcd559c739dd99275cd2444cf481d458d2fab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f22dcd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 26 18:32:55 2013 +0200 dispatcher: proper localization of To uri for keepalives - it was affected by introduction of <> around the URI in To header - reported by Peter Dunkley --- modules/dispatcher/dispatch.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index cc8b7bf..0f6e8b0 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -2352,10 +2352,10 @@ static void ds_options_callback( struct cell *t, int type, * cast it to an int. */ group = (int)(long)(*ps->param); /* The SIP-URI is taken from the Transaction. - * Remove the "To: " (s+4) and the trailing new-line (s - 4 (To: ) - * - 2 (\r\n)). */ - uri.s = t->to.s + 4; - uri.len = t->to.len - 6; + * Remove the "To: <" (s+5) and the trailing >+new-line (s - 5 (To: <) + * - 3 (>\r\n)). */ + uri.s = t->to.s + 5; + uri.len = t->to.len - 8; LM_DBG("OPTIONS-Request was finished with code %d (to %.*s, group %d)\n", ps->code, uri.len, uri.s, group); /* ps->code contains the result-code of the request.

1 0

git:master: tm: adjust size of the hooks to From/ To headers for local genrated requests
by Daniel-Constantin Mierla 26 Apr '13

26 Apr '13

Module: sip-router Branch: master Commit: 57ed79b9d45c29d37c405c3fa582c1d1011a2315 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57ed79b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 26 18:24:01 2013 +0200 tm: adjust size of the hooks to From/To headers for local genrated requests - take in cosideration <> if it is the case --- modules/tm/t_msgbuilder.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index b5ff309..b36020a 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1398,7 +1398,8 @@ static inline char* print_request_uri(char* w, str* method, dlg_t* dialog, struc static inline char* print_to(char* w, dlg_t* dialog, struct cell* t) { t->to.s = w; - t->to.len = TO_LEN + dialog->rem_uri.len + CRLF_LEN; + t->to.len = TO_LEN + dialog->rem_uri.len + CRLF_LEN + + (dialog->rem_uri.s[0]!='<')?2:0; memapp(w, TO, TO_LEN); if(dialog->rem_uri.s[0]!='<') memapp(w, "<", 1); @@ -1422,7 +1423,8 @@ static inline char* print_to(char* w, dlg_t* dialog, struct cell* t) static inline char* print_from(char* w, dlg_t* dialog, struct cell* t) { t->from.s = w; - t->from.len = FROM_LEN + dialog->loc_uri.len + CRLF_LEN; + t->from.len = FROM_LEN + dialog->loc_uri.len + CRLF_LEN + + (dialog->rem_uri.s[0]!='<')?2:0; memapp(w, FROM, FROM_LEN); if(dialog->loc_uri.s[0]!='<') memapp(w, "<", 1);

1 0

git:master: modules/siptrace: Support for ws: and wss: ( fake protocols as per tls:)
by Peter Dunkley 26 Apr '13

26 Apr '13

Module: sip-router Branch: master Commit: 2e1ade7c66217280455136fb85aeb3a8e8e6917d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e1ade7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 26 15:29:47 2013 +0100 modules/siptrace: Support for ws: and wss: (fake protocols as per tls:) --- modules/siptrace/siptrace.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index c333e76..094be8b 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1700,6 +1700,8 @@ static int pipport2su (char *pipport, union sockaddr_union *tmp_su, unsigned int if(strncmp(pipport, "udp:",4) == 0) *proto = IPPROTO_UDP; else if(strncmp(pipport, "tcp:",4) == 0) *proto = IPPROTO_TCP; else if(strncmp(pipport, "tls:",4) == 0) *proto = IPPROTO_IDP; /* fake proto type */ + else if(strncmp(pipport, "ws:",3) == 0) *proto = IPPROTO_IDP; /* fake proto type */ + else if(strncmp(pipport, "wss:",4) == 0) *proto = IPPROTO_IDP; /* fake proto type */ #ifdef USE_SCTP else if(strncmp(pipport, "sctp:",5) == 0) cutlen = 5, *proto = IPPROTO_SCTP; #endif

1 0

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media
by Richard Good 26 Apr '13

26 Apr '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: c9b550a59fa2e952ad582895694f660cfedeccd2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9b550a… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Apr 26 14:21:13 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

1 0

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support
by Richard Good 26 Apr '13

26 Apr '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: eb8a792036fe364fd9be26ac67e9c1af0049d5f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb8a792… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Apr 26 11:57:36 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support ---

1 0

dnssec gethostbyname2 not compiling on Solaris 11
by Richard Good 26 Apr '13

26 Apr '13

Hi I've just updated to the latest master and get this error when compiling on Solaris 11 with gcc version 4.5.2: LD (gcc) [kamailio] kamailio Undefined first referenced symbol in file gethostbyname2 dns_func.o ld: fatal: symbol referencing errors. No output written to kamailio collect2: ld returned 1 exit status gmake: *** [kamailio] Error 1 In Makefile.defs Solaris does not define HAVE_GETHOSTBYNAME2. I fixed this by putting #ifdef HAVE_GETHOSTBYNAME2 around all gethostbyname2 in: dns_func.c dns_func.h modules/dnssec/dnssec_func.c modules/dnssec/dnssec_func.h modules/dnssec/dnssec_mod.c I see Marius Zbihlei<http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=search;s=Marius…>has done lots of work on the dnssec module. Marius: please can you have a look at this. Regards Richard. This email is subject to the disclaimer of Smile Communications at http://www.smilecoms.com/disclaimer

2 2

git:master: core: fixed compilation on Solaris, due to missing gethostbyname2
by Marius Zbihlei 26 Apr '13

26 Apr '13

Module: sip-router Branch: master Commit: 5b96c7e6ec3cfd8354a6a257a87144196d57fec3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b96c7e… Author: Marius Zbihlei <mariuszbi(a)gmail.com> Committer: Marius Zbihlei <mariuszbi(a)gmail.com> Date: Fri Apr 26 09:56:26 2013 +0100 core: fixed compilation on Solaris, due to missing gethostbyname2 TODO: provide a wrapper over dnssec for getipnode...() for Solaris --- dns_func.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dns_func.c b/dns_func.c index e744688..da2ce7b 100644 --- a/dns_func.c +++ b/dns_func.c @@ -38,7 +38,11 @@ struct dns_func_t dns_func = { res_init, res_search, gethostbyname, +#ifdef HAVE_GETHOSTBYNAME2 gethostbyname2 +#else + NULL +#endif };

1 0

git:master: snmpstats: fix cross-compilation
by Ovidiu Sas 25 Apr '13

25 Apr '13

Module: sip-router Branch: master Commit: 5e96920289cbf448ac684d8cb1333d75f65a729a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e96920… 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 --- 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

2 4

← Newer
1
2
3
4
5
6
7
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013