sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
254 discussions

git:master: memcached: use pkg-config if available for flags and libs in Makefile
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Module: sip-router Branch: master Commit: 9909e05d46d0cdd22227b3b8c1b1d60253a135e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9909e05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 2 16:43:12 2013 +0200 memcached: use pkg-config if available for flags and libs in Makefile --- modules/memcached/Makefile | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/memcached/Makefile b/modules/memcached/Makefile index dcd68d3..916b6c0 100644 --- a/modules/memcached/Makefile +++ b/modules/memcached/Makefile @@ -6,9 +6,19 @@ include ../../Makefile.defs auto_gen= NAME=memcached.so -DEFS+=-DKAMAILIO_MOD_INTERFACE +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +endif + +ifneq ($(BUILDER),) + DEFS += $(shell $(BUILDER) --cflags libmemcached) + LIBS += $(shell $(BUILDER) --libs libmemcached) +else + DEFS +=-I$(LOCALBASE)/include -I$(SYSBASE)/include + LIBS+=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -lmemcached +endif -DEFS +=-I$(LOCALBASE)/include -I$(SYSBASE)/include -LIBS+=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -lmemcached + +DEFS+=-DKAMAILIO_MOD_INTERFACE include ../../Makefile.modules

1 0

Recent DNS resolver changes broken WebSockets/routing on IP address?
by Peter Dunkley 02 Oct '13

02 Oct '13

Hello, I am getting the following errors with the latest code: Oct 2 10:48:00 edge00 kamailio-edge[8847]: ERROR: <core> [resolve.c:1700]: sip_hostport2su(): ERROR: sip_hostport2su: could not resolve hostname: "90.152.0.102" Oct 2 10:48:00 edge00 kamailio-edge[8847]: ERROR: tm [ut.h:337]: uri2dst2(): failed to resolve "90.152.0.102" Oct 2 10:48:00 edge00 kamailio-edge[8847]: ERROR: tm [t_fwd.c:1772]: t_forward_nonack(): ERROR: t_forward_nonack: failure to add branches Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 3

git:master: core: helper function to get source address as uri or proxy format
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Module: sip-router Branch: master Commit: 3f3c865ed04e1b0b8eb3762622662a76ce92b2e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f3c865… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 2 14:23:53 2013 +0200 core: helper function to get source address as uri or proxy format --- dset.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ dset.h | 5 +++ 2 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dset.c b/dset.c index 52521ce..6ca3c02 100644 --- a/dset.c +++ b/dset.c @@ -605,3 +605,117 @@ int rewrite_uri(struct sip_msg* _m, str* _s) return 1; } +/** + * return src ip, port and proto as a SIP uri or proxy address + * - value stored in a static buffer + * - mode=0 return uri, mode=1 return proxy address + */ +int msg_get_src_addr(sip_msg_t *msg, str *uri, int mode) +{ + static char buf[80]; + char* p; + str ip, port; + int len; + str proto; + + if (msg==NULL || uri==NULL) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + ip.s = ip_addr2a(&msg->rcv.src_ip); + ip.len = strlen(ip.s); + + port.s = int2str(msg->rcv.src_port, &port.len); + + switch(msg->rcv.proto) { + case PROTO_NONE: + case PROTO_UDP: + if(mode==0) { + proto.s = 0; /* Do not add transport parameter, UDP is default */ + proto.len = 0; + } else { + proto.s = "udp"; + proto.len = 3; + } + break; + + case PROTO_TCP: + proto.s = "tcp"; + proto.len = 3; + break; + + case PROTO_TLS: + proto.s = "tls"; + proto.len = 3; + break; + + case PROTO_SCTP: + proto.s = "sctp"; + proto.len = 4; + break; + + case PROTO_WS: + case PROTO_WSS: + proto.s = "ws"; + proto.len = 2; + break; + + default: + LM_ERR("unknown transport protocol\n"); + return -1; + } + + len = ip.len + 2*(msg->rcv.src_ip.af==AF_INET6)+ 1 + port.len; + if (mode==0) { + len += 4; + if(proto.s) { + len += TRANSPORT_PARAM_LEN; + len += proto.len; + } + } else { + len += proto.len + 1; + } + + if (len > 79) { + LM_ERR("buffer too small\n"); + return -1; + } + + p = buf; + if(mode==0) { + memcpy(p, "sip:", 4); + p += 4; + } else { + memcpy(p, proto.s, proto.len); + p += proto.len; + *p++ = ':'; + } + + if (msg->rcv.src_ip.af==AF_INET6) + *p++ = '['; + memcpy(p, ip.s, ip.len); + p += ip.len; + if (msg->rcv.src_ip.af==AF_INET6) + *p++ = ']'; + + *p++ = ':'; + + memcpy(p, port.s, port.len); + p += port.len; + + if (mode==0 && proto.s) { + memcpy(p, TRANSPORT_PARAM, TRANSPORT_PARAM_LEN); + p += TRANSPORT_PARAM_LEN; + + memcpy(p, proto.s, proto.len); + p += proto.len; + } + + uri->s = buf; + uri->len = len; + uri->s[uri->len] = '\0'; + + return 0; +} + diff --git a/dset.h b/dset.h index dc15eba..c811cdb 100644 --- a/dset.h +++ b/dset.h @@ -170,6 +170,11 @@ void set_ruri_q(qvalue_t q); /*! \brief + * Get src ip, port and proto as SIP uri or proxy address + */ +int msg_get_src_addr(sip_msg_t *msg, str *uri, int mode); + +/*! \brief * Get the q value of the Request-URI */ qvalue_t get_ruri_q(void);

1 0

git:master: core: skip dns srv for websocket after check if domain is ip
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Module: sip-router Branch: master Commit: 5db86a941a909c17a0f9ee1b04febbe4c60033bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5db86a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 2 14:15:18 2013 +0200 core: skip dns srv for websocket after check if domain is ip - reported by Peter Dunkley --- dns_cache.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 2d7278c..949aab6 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2670,10 +2670,6 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, }else{ srv_proto=PROTO_UDP; } - if(srv_proto==PROTO_WS || srv_proto==PROTO_WS) { - /* no srv records for web sockets */ - return 0; - } /* try SRV if no port specified (draft-ietf-sip-srv-06) */ if ((port)&&(*port==0)){ *port=(srv_proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; /* just in case we @@ -2690,6 +2686,11 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, return ip_addr2he(name,ip); } + if(srv_proto==PROTO_WS || srv_proto==PROTO_WS) { + /* no srv records for web sockets */ + return 0; + } + switch(srv_proto){ case PROTO_NONE: /* no proto specified, use udp */ if (proto)

1 0

git:master: modules/auth_ephemeral: Added MI commands for shared secret management
by Peter Dunkley 02 Oct '13

02 Oct '13

Module: sip-router Branch: master Commit: fd9fcd75c222b73a2b70793e5d79c7494f757a1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd9fcd7… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Wed Oct 2 01:30:37 2013 +0100 modules/auth_ephemeral: Added MI commands for shared secret management - Can add, remove, and display shared secrets with MI commands - This means you can add/revoke secrets without a restart --- modules/auth_ephemeral/README | 74 ++++++ modules/auth_ephemeral/autheph_mod.c | 257 +++++++++++++++++++- modules/auth_ephemeral/autheph_mod.h | 6 + modules/auth_ephemeral/authorize.c | 11 +- .../auth_ephemeral/doc/auth_ephemeral_admin.xml | 68 +++++ 5 files changed, 405 insertions(+), 11 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=fd9…

5 7

git:master: xcap_server: Fix memory allocation check bug in xcap_misc
by Hugh Waite 02 Oct '13

02 Oct '13

Module: sip-router Branch: master Commit: 49720ce99e72ded34c67a9ee4d17a9cedaf0a0f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49720ce… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Oct 2 10:04:35 2013 +0100 xcap_server: Fix memory allocation check bug in xcap_misc - Would cause crash if out of package memory --- modules/xcap_server/xcap_misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/xcap_server/xcap_misc.c b/modules/xcap_server/xcap_misc.c index d947e7c..7ca891e 100644 --- a/modules/xcap_server/xcap_misc.c +++ b/modules/xcap_server/xcap_misc.c @@ -586,7 +586,7 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) goto error; } outbuf->s = (char*)pkg_malloc(size+1); - if(size<=0) + if(outbuf->s==NULL) { LM_ERR("no pkg for output\n"); xmlFree(xmem);

1 0

git:4.0: xcap_server: Fix memory allocation check bug in xcap_misc
by Hugh Waite 02 Oct '13

02 Oct '13

Module: sip-router Branch: 4.0 Commit: cbe6d2dc199e552576501a74b3cafbceeb048385 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbe6d2d… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Oct 2 10:04:35 2013 +0100 xcap_server: Fix memory allocation check bug in xcap_misc - Would cause crash if out of package memory (cherry picked from commit 165a351d18fd0f1639087c8eb5d9294e46a6e2b7) --- modules/xcap_server/xcap_misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/xcap_server/xcap_misc.c b/modules/xcap_server/xcap_misc.c index d947e7c..7ca891e 100644 --- a/modules/xcap_server/xcap_misc.c +++ b/modules/xcap_server/xcap_misc.c @@ -586,7 +586,7 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) goto error; } outbuf->s = (char*)pkg_malloc(size+1); - if(size<=0) + if(outbuf->s==NULL) { LM_ERR("no pkg for output\n"); xmlFree(xmem);

1 0

patch to add --log-level option to media-proxy-ng-daemon
by Juha Heinanen 02 Oct '13

02 Oct '13

the enclosed patch adds --log-level option to media-proxy-ng-daemon. i don't know if mediaproxy-ng has its own mailing list where i should have posted this. let me know if the patch is accepted or reason for rejection. -- juha

2 3

git:4.0: mi_rpc: compatibility with libxmlrpc-c3 library on wheezy
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Module: sip-router Branch: 4.0 Commit: 3a927389f2667fa3e453f30604b5448ca99f4d77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a92738… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 26 12:59:59 2013 +0200 mi_rpc: compatibility with libxmlrpc-c3 library on wheezy - patch by Muhammad Shahzad (cherry picked from commit baa4fccc2870df102a66089d6e9b6ca1ff47fc25) --- modules/mi_xmlrpc/abyss_data.h | 17 +++++++++++++++++ modules/mi_xmlrpc/abyss_http.c | 4 ++-- modules/mi_xmlrpc/abyss_xmlrpc_server.c | 3 ++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/modules/mi_xmlrpc/abyss_data.h b/modules/mi_xmlrpc/abyss_data.h index c8a874c..511c480 100644 --- a/modules/mi_xmlrpc/abyss_data.h +++ b/modules/mi_xmlrpc/abyss_data.h @@ -3,6 +3,23 @@ #include "abyss_thread.h" +#ifndef XMLRPC_OLD_VERSION +#define MAX_CONN 16 +typedef struct +{ + void *data; + int size; + int staticid; +} TBuffer; + +typedef struct +{ + TBuffer buffer; + int size; +} TString; + +#endif + /********************************************************************* ** List *********************************************************************/ diff --git a/modules/mi_xmlrpc/abyss_http.c b/modules/mi_xmlrpc/abyss_http.c index c8b7593..ca9b736 100644 --- a/modules/mi_xmlrpc/abyss_http.c +++ b/modules/mi_xmlrpc/abyss_http.c @@ -544,12 +544,12 @@ RequestRead(TSession * const sessionP) { } - +#ifdef XMLRPC_OLD_VERSION char *RequestHeaderValue(TSession *r,char *name) { return (TableFind(&r->request_headers,name)); } - +#endif abyss_bool diff --git a/modules/mi_xmlrpc/abyss_xmlrpc_server.c b/modules/mi_xmlrpc/abyss_xmlrpc_server.c index f2ecab1..55aabf6 100644 --- a/modules/mi_xmlrpc/abyss_xmlrpc_server.c +++ b/modules/mi_xmlrpc/abyss_xmlrpc_server.c @@ -941,8 +941,9 @@ uriPathParm(const xmlrpc_server_abyss_parms * const parmsP, } - +#ifdef XMLRPC_OLD_VERSION static xmlrpc_server_shutdown_fn shutdownAbyss; +#endif static void shutdownAbyss(xmlrpc_env * const envP,

1 0

git:4.0: app_perl: use local buffer to print dynamic string in pv_sprintf()
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Module: sip-router Branch: 4.0 Commit: 9f3f494289ab25d2a4a35672e21d1b1c76cfbd6b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f3f494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 30 16:49:26 2013 +0200 app_perl: use local buffer to print dynamic string in pv_sprintf() - avoid pkg malloc for temporary need - fix leak in case of fmt parse error, discovered on a report by Dragos Oancea (cherry picked from commit 1c3e761fbd087ee578ce305d89f6b8ee4e9ab79d) --- modules/app_perl/kamailioxs.xs | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/modules/app_perl/kamailioxs.xs b/modules/app_perl/kamailioxs.xs index 4947ab6..823c4fc 100644 --- a/modules/app_perl/kamailioxs.xs +++ b/modules/app_perl/kamailioxs.xs @@ -362,15 +362,11 @@ static inline int rewrite_ruri(struct sip_msg* _m, char* _s) */ char *pv_sprintf(struct sip_msg *m, char *fmt) { int buf_size = 4096; + char out[4096]; pv_elem_t *model; str s; - char *out = (char *)pkg_malloc(buf_size); char *ret = NULL; - if (!out) { - LM_ERR("pv_sprintf: Memory exhausted!\n"); - return NULL; - } s.s = fmt; s.len = strlen(s.s); if(pv_parse_format(&s, &model) < 0) { @@ -386,7 +382,6 @@ char *pv_sprintf(struct sip_msg *m, char *fmt) { } pv_elem_free_all(model); - pkg_free(out); return ret; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2013