sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

by Peter Dunkley

Hello, I am trying to add an event_route to be run when a TCP connection is closed. I have added a small function to tcp_main.c to call it but I cannot work-out where to put the call. I have tried tcpconn_destroy() but that doesn't seem to work. Ideally, I need to find a single place to call this new function which has access to the tcp_connection structure for the connection that has closed. If not a single place, then as few as possible would be good. Does anyone know the TCP code well enough to advise me where to put this? Thanks, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 8 months

git:master: modules/websocket: added lots more SIP/MSRP specific statistics

by Peter Dunkley

Module: sip-router Branch: master Commit: 21fa34f61ba4d9778e6b79d978818b47d0928639 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21fa34f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Mar 30 12:21:02 2013 +0000 modules/websocket: added lots more SIP/MSRP specific statistics - also updated output of dump MI command to include sub-protocol information --- modules/websocket/ws_conn.c | 47 ++++++++++++++++++++++++++++++++++--- modules/websocket/ws_conn.h | 4 +++ modules/websocket/ws_frame.c | 40 +++++++++++++++++++++++++++++++- modules/websocket/ws_frame.h | 10 ++++++++ modules/websocket/ws_handshake.c | 20 ++++++++-------- modules/websocket/ws_handshake.h | 10 ++----- modules/websocket/ws_mod.c | 36 ++++++++++++++++++++--------- modules/websocket/ws_mod.h | 6 +++++ 8 files changed, 140 insertions(+), 33 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=21f…

11 years, 8 months

git:master: modules/websocket: added some sub-protocol related statistics

by Peter Dunkley

Module: sip-router Branch: master Commit: 63b50d3b0e3a2250effd9a1aa92b7776854364a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63b50d3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Mar 30 11:36:41 2013 +0000 modules/websocket: added some sub-protocol related statistics --- modules/websocket/ws_handshake.c | 11 ++++++++++- modules/websocket/ws_handshake.h | 2 ++ modules/websocket/ws_mod.c | 2 ++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 55dfc34..eb167e4 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -46,6 +46,8 @@ int ws_sub_protocols = DEFAULT_SUB_PROTOCOLS; stat_var *ws_failed_handshakes; stat_var *ws_successful_handshakes; +stat_var *ws_sip_handshakes; +stat_var *ws_msrp_handshakes; static str str_sip = str_init("sip"); static str str_msrp = str_init("msrp"); @@ -306,7 +308,14 @@ int ws_handle_handshake(struct sip_msg *msg) str_hdr_sec_websocket_version.len, str_hdr_sec_websocket_version.s, WS_VERSION); - ws_send_reply(msg, 400, &str_status_bad_request, &headers); + if (ws_send_reply(msg, 400, &str_status_bad_request, &headers) + == 0) + { + if (ws_sub_protocols & SUB_PROTOCOL_SIP) + update_stat(ws_sip_handshakes, 1); + else if (ws_sub_protocols & SUB_PROTOCOL_MSRP) + update_stat(ws_msrp_handshakes, 1); + } return 0; } diff --git a/modules/websocket/ws_handshake.h b/modules/websocket/ws_handshake.h index fa51eb0..94c47ab 100644 --- a/modules/websocket/ws_handshake.h +++ b/modules/websocket/ws_handshake.h @@ -38,6 +38,8 @@ extern int ws_sub_protocols; extern stat_var *ws_failed_handshakes; extern stat_var *ws_successful_handshakes; +extern stat_var *ws_sip_handshakes; +extern stat_var *ws_msrp_handshakes; int ws_handle_handshake(struct sip_msg *msg); struct mi_root *ws_mi_disable(struct mi_root *cmd, void *param); diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 7049bfd..df05c0f 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -98,6 +98,8 @@ static stat_export_t stats[] = /* ws_handshake.c */ { "ws_failed_handshakes", 0, &ws_failed_handshakes }, { "ws_successful_handshakes", 0, &ws_successful_handshakes }, + { "ws_sip_handshakes", 0, &ws_sip_handshakes }, + { "ws_msrp_handshakes", 0, &ws_msrp_handshakes }, { 0, 0, 0 } };

11 years, 8 months

git:master: stun Add clarification to the README

by Olle E. Johansson

Module: sip-router Branch: master Commit: e2bd2192b5ddc33d0e8fd486467842d9cceda131 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2bd219… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Mar 30 09:10:02 2013 +0100 stun Add clarification to the README And a big thank you to Peter Dunkley and Crocodile RCS for doing the work involved in making this a module, instead of a compile time options. Modules are cool. And easier to handle by pre-compiled distributions/packages. --- modules/stun/README | 7 ++++--- modules/stun/doc/stun_admin.xml | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/stun/README b/modules/stun/README index 5d223fe..e887ff6 100644 --- a/modules/stun/README +++ b/modules/stun/README @@ -4,9 +4,9 @@ Peter Dunkley Crocodile RCS Ltd - Copyright © 2012 Crocodile RCS Ltd + Copyright � 2012 Crocodile RCS Ltd - Copyright © 2001-2003 FhG Fokus + Copyright � 2001-2003 FhG Fokus __________________________________________________________________ Table of Contents @@ -40,7 +40,8 @@ Chapter 1. Admin Guide 1. Overview This module provides limited STUN server (RFC 5389) support for - Kamailio. + Kamailio. It's built for providing STUN support in the SIP signalling + channel, not being a standalone STUN/TURN server. 2. Dependencies diff --git a/modules/stun/doc/stun_admin.xml b/modules/stun/doc/stun_admin.xml index 5aa9bd5..d08194c 100644 --- a/modules/stun/doc/stun_admin.xml +++ b/modules/stun/doc/stun_admin.xml @@ -16,7 +16,8 @@ <section> <title>Overview</title> <para>This module provides limited STUN server (RFC 5389) support for - &kamailio;.</para> + &kamailio;. It's built for providing STUN support in the SIP signalling + channel, not being a standalone STUN/TURN server.</para> </section> <section>

11 years, 8 months

git:mariuszbihlei/dnssec: modules/ dnssec New dnssec resolver module based on libval

by Marius Zbihlei

Module: sip-router Branch: mariuszbihlei/dnssec Commit: 75ade496d319ac16df0b00ca578c1cc9b866010a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=75ade49… Author: Marius Zbihlei <mariuszbi(a)gmai.com> Committer: Marius Zbihlei <mariuszbi(a)gmai.com> Date: Sat Mar 30 10:56:18 2013 +0000 modules/dnssec New dnssec resolver module based on libval To use, simply load the module It will overide the system resolvers (i.e. gethostbyname, res_search) with libval's provided wrappers that support DNSSEC. Further functionality will be added. --- modules/dnssec/Makefile | 17 +++++ modules/dnssec/README | 71 +++++++++++++++++++ modules/dnssec/dnssec_func.c | 89 ++++++++++++++++++++++++ modules/dnssec/dnssec_func.h | 12 +++ modules/dnssec/dnssec_mod.c | 127 +++++++++++++++++++++++++++++++++++ modules/dnssec/doc/Makefile | 3 + modules/dnssec/doc/dnssec.xml | 33 +++++++++ modules/dnssec/doc/dnssec_admin.xml | 72 ++++++++++++++++++++ 8 files changed, 424 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=75a…

11 years, 8 months

git:mariuszbihlei/dnssec: modules/dnssec Added copyright notices

by Marius Zbihlei

Module: sip-router Branch: mariuszbihlei/dnssec Commit: f88dd6d7197af1e4bf5a9e24cdf9ac8975ae2345 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f88dd6d… Author: Marius Zbihlei <mariuszbi(a)gmai.com> Committer: Marius Zbihlei <mariuszbi(a)gmai.com> Date: Sat Mar 30 11:19:24 2013 +0000 modules/dnssec Added copyright notices Also forgot a memset.. --- modules/dnssec/dnssec_func.c | 27 +++++++++++++++++++++++++++ modules/dnssec/dnssec_func.h | 28 ++++++++++++++++++++++++++++ modules/dnssec/dnssec_mod.c | 1 + 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/modules/dnssec/dnssec_func.c b/modules/dnssec/dnssec_func.c index 0ae5e90..94fdc3f 100644 --- a/modules/dnssec/dnssec_func.c +++ b/modules/dnssec/dnssec_func.c @@ -1,3 +1,30 @@ +/* + * $Id$ + * + * DNSSEC module + * + * Copyright (C) 2013 mariuszbi(a)gmail.com + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * History: + * -------- + * 2013-03 initial implementation + */ #include "validator/validator-config.h" #include <validator/validator.h> diff --git a/modules/dnssec/dnssec_func.h b/modules/dnssec/dnssec_func.h index 363fe2f..25a7e7d 100644 --- a/modules/dnssec/dnssec_func.h +++ b/modules/dnssec/dnssec_func.h @@ -1,3 +1,31 @@ +/* + * $Id$ + * + * DNSSEC module + * + * Copyright (C) 2013 mariuszbi(a)gmail.com + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * History: + * -------- + * 2013-03 initial implementation + */ + #ifndef DNSSEC_FUNC_H #define DNSSEC_FUNC_H diff --git a/modules/dnssec/dnssec_mod.c b/modules/dnssec/dnssec_mod.c index e5654b0..55d4266 100644 --- a/modules/dnssec/dnssec_mod.c +++ b/modules/dnssec/dnssec_mod.c @@ -90,6 +90,7 @@ struct module_exports exports= { static void load_dns(void) { struct dns_func_t *f = pkg_malloc(sizeof(struct dns_func_t)); + memset(f, 0, sizeof(struct dns_func_t)); f->sr_res_init = dnssec_res_init; f->sr_gethostbyname = dnssec_gethostbyname; f->sr_gethostbyname2 = dnssec_gethostbyname2;

11 years, 8 months

git:mariuszbihlei/dnssec: core: refactored DNS primitives and removed DNSSEC support from core

by Marius Zbihlei

Module: sip-router Branch: mariuszbihlei/dnssec Commit: 0d279eb512ac6740fe1da6e96f7580303f09c025 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d279eb… Author: Marius Zbihlei <mariuszbi(a)gmai.com> Committer: Marius Zbihlei <mariuszbi(a)gmai.com> Date: Sat Mar 30 10:44:39 2013 +0000 core: refactored DNS primitives and removed DNSSEC support from core The library functions can now be easily overwritten by modules(dnssec) to allow enhanced resolving capabilities --- Makefile.defs | 4 ---- dns_func.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ dns_func.h | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ resolve.c | 21 ++------------------- resolve.h | 26 ++++---------------------- 5 files changed, 112 insertions(+), 45 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 2c7917e..25b30d1 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1759,10 +1759,6 @@ ifeq ($(OS), linux) LIBS+=-lpthread endif endif - ifneq (,$(findstring -DUSE_DNSSEC, $(C_DEFS))) - LIBS+=-lval-threads -lcrypto -lsres -lpthread -$(info "using libval for DNSSEC validation") - endif # check for >= 2.5.44 ifeq ($(shell [ $(OSREL_N) -ge 2005044 ] && echo has_epoll), has_epoll) diff --git a/dns_func.c b/dns_func.c new file mode 100644 index 0000000..6eedf0d --- /dev/null +++ b/dns_func.c @@ -0,0 +1,51 @@ + +/* + * $Id$ + * + * Copyright (C) 2013 mariuszbi(a)gmail.com + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * DNS wrappers + */ +/* + * History: + * -------- + * 2013-03 initial version (marius) +*/ + +#include "dns_func.h" + + +#include <resolv.h> +#include <sys/types.h> +#include <netdb.h> + +struct hostent; + +struct dns_func_t dns_func = { + res_init, + res_search, + gethostbyname, + gethostbyname2 +}; + + +void load_dnsfunc(struct dns_func_t *d) { + dns_func.sr_res_init = d->sr_res_init; + dns_func.sr_res_search = d->sr_res_search; + dns_func.sr_gethostbyname = d->sr_gethostbyname; + dns_func.sr_gethostbyname2 = d->sr_gethostbyname2; +} + diff --git a/dns_func.h b/dns_func.h new file mode 100644 index 0000000..623c3b8 --- /dev/null +++ b/dns_func.h @@ -0,0 +1,55 @@ +/* + * $Id$ + * + * Copyright (C) 2013 mariuszbi(a)gmail.com + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * DNS Wrapper functions + */ +/* + * History: + * -------- + * 2013-03 initial version (marius) +*/ + +#ifndef DNS_FUNC_H +#define DNS_FUNC_H + +#include <sys/socket.h> + +struct hostent; + +typedef int (*res_init_t)(void); +typedef int (*res_search_t)(const char*, int, int, unsigned char*, int); +typedef struct hostent* (*gethostbyname_t)(const char*); +typedef struct hostent* (*gethostbyname2_t)(const char*, int); + +struct dns_func_t { + res_init_t sr_res_init; + res_search_t sr_res_search; + gethostbyname_t sr_gethostbyname; + gethostbyname2_t sr_gethostbyname2; +}; + +/* + * initiate structure with system values + */ +//extern struct dns_func_t dns_func; + +extern +void load_dnsfunc(struct dns_func_t *d); + + +#endif diff --git a/resolve.c b/resolve.c index 0a77ed7..c77a3a2 100644 --- a/resolve.c +++ b/resolve.c @@ -153,7 +153,7 @@ error: */ static int _resolv_init(void) { - res_init(); + dns_func.sr_res_init(); #ifdef HAVE_RESOLV_RES if (cfg_get(core, core_cfg, dns_retr_time)>0) _res.retrans=cfg_get(core, core_cfg, dns_retr_time); @@ -714,10 +714,6 @@ struct rdata* get_record(char* name, int type, int flags) struct rdata* fullname_rd; char c; -#ifdef USE_DNSSEC - val_status_t val_status; -#endif - name_len=strlen(name); for (i = 0; i < name_len; i++) { @@ -738,20 +734,7 @@ struct rdata* get_record(char* name, int type, int flags) } fullname_rd=0; -#ifndef USE_DNSSEC - size=res_search(name, C_IN, type, buff.buff, sizeof(buff)); -#else - size=val_res_query((val_context_t *) NULL, - (char *) name, - (int) C_IN, - (int) type, - (unsigned char *) buff.buff, - (int) sizeof(buff), - &val_status); - if(!val_istrusted(val_status)){ - LOG(L_INFO, "INFO: got not trusted record when resolving %s\n",name); - } -#endif + size=dns_func.sr_res_search(name, C_IN, type, buff.buff, sizeof(buff)); if (unlikely(size<0)) { DBG("get_record: lookup(%s, %d) failed\n", name, type); diff --git a/resolve.h b/resolve.h index 3ff5e23..96db053 100644 --- a/resolve.h +++ b/resolve.h @@ -48,6 +48,7 @@ #include <arpa/nameser.h> #include <resolv.h> #include "counters.h" +#include "dns_func.h" #ifdef __OS_darwin #include <arpa/nameser_compat.h> @@ -58,9 +59,6 @@ #include "dns_wrappers.h" #endif -#ifdef USE_DNSSEC -#include <validator/validator.h> -#endif /* define RESOLVE_DBG for debugging info (very noisy) */ #define RESOLVE_DBG @@ -90,6 +88,7 @@ struct dns_counters_h { }; extern struct dns_counters_h dns_cnts_h; +extern struct dns_func_t dns_func; /* query union*/ union dns_query{ @@ -404,9 +403,6 @@ static inline struct hostent* _resolvehost(char* name) #endif #endif #ifdef DNS_IP_HACK -#ifdef USE_DNSSEC - val_status_t val_status; -#endif struct ip_addr* ip; str s; @@ -437,14 +433,7 @@ static inline struct hostent* _resolvehost(char* name) #endif #endif /* ipv4 */ -#ifndef USE_DNSSEC - he=gethostbyname(name); -#else - he=val_gethostbyname( (val_context_t *) 0, name, &val_status); - if(!val_istrusted(val_status)){ - LOG(L_INFO, "INFO: got not trusted record when resolving %s\n",name); - } -#endif + he=dns_func.sr_gethostbyname(name); #ifdef USE_IPV6 if(he==0 && cfg_get(core, core_cfg, dns_try_ipv6)){ @@ -453,14 +442,7 @@ skip_ipv4: #endif /*try ipv6*/ #ifdef HAVE_GETHOSTBYNAME2 - #ifndef USE_DNSSEC - he=gethostbyname2(name, AF_INET6); - #else - he=val_gethostbyname2((val_context_t*)0, name, AF_INET6, &val_status); - if(!val_istrusted(val_status)){ - LOG(L_INFO, "INFO: got not trusted record when resolving %s\n",name); - } - #endif //!USE_DNSSEC + he=dns_func.sr_gethostbyname2(name, AF_INET6); #elif defined HAVE_GETIPNODEBYNAME /* on solaris 8 getipnodebyname has a memory leak, * after some time calls to it will fail with err=3

11 years, 8 months

git:master: Set lucid version to 4.0.0

by Jon Bonilla

Module: sip-router Branch: master Commit: 243da7b8a96db33090fd6e2e5d84f4dcd47652b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=243da7b… Author: Jon Bonilla <jbonilla(a)sipwise.com> Committer: Jon Bonilla <jbonilla(a)sipwise.com> Date: Sat Mar 30 11:46:00 2013 +0100 Set lucid version to 4.0.0 --- pkg/kamailio/deb/lucid/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/lucid/changelog b/pkg/kamailio/deb/lucid/changelog index 9a51bfb..0ecda02 100644 --- a/pkg/kamailio/deb/lucid/changelog +++ b/pkg/kamailio/deb/lucid/changelog @@ -1,3 +1,9 @@ +kamailio (4.0.0) unstable; urgency=low + + * update to 4.0.0 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 11 Mar 2013 10:40:30 +0100 + kamailio (3.4.0~dev0) unstable; urgency=low * update version to 3.4.0~dev0

11 years, 8 months

git:4.0: Set lucid version to 4.0.0

by Jon Bonilla

Module: sip-router Branch: 4.0 Commit: 1d009c3dad2352784b48ec821732e4cca1078497 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d009c3… Author: Jon Bonilla <jbonilla(a)sipwise.com> Committer: Jon Bonilla <jbonilla(a)sipwise.com> Date: Sat Mar 30 11:45:12 2013 +0100 Set lucid version to 4.0.0 --- pkg/kamailio/deb/lucid/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/lucid/changelog b/pkg/kamailio/deb/lucid/changelog index 9a51bfb..0ecda02 100644 --- a/pkg/kamailio/deb/lucid/changelog +++ b/pkg/kamailio/deb/lucid/changelog @@ -1,3 +1,9 @@ +kamailio (4.0.0) unstable; urgency=low + + * update to 4.0.0 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 11 Mar 2013 10:40:30 +0100 + kamailio (3.4.0~dev0) unstable; urgency=low * update version to 3.4.0~dev0

11 years, 8 months

git:master: modules/outbound: updated to reflect STUN being in a module now

by Peter Dunkley

Module: sip-router Branch: master Commit: e090a714728950b40cf09956137db4ce93d08960 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e090a71… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 21:49:29 2013 +0000 modules/outbound: updated to reflect STUN being in a module now --- modules/outbound/README | 20 +++++++------------- modules/outbound/doc/outbound_admin.xml | 11 ++--------- modules/outbound/ob_mod.c | 9 --------- 3 files changed, 9 insertions(+), 31 deletions(-) diff --git a/modules/outbound/README b/modules/outbound/README index 3a8c558..e90fd62 100644 --- a/modules/outbound/README +++ b/modules/outbound/README @@ -30,10 +30,9 @@ Peter Dunkley List of Examples - 1.1. Compiling Kamailio with STUN support - 1.2. Edge Proxy Configuration - 1.3. Registrar Configuration - 1.4. Set force_outbound_flag parameter + 1.1. Edge Proxy Configuration + 1.2. Registrar Configuration + 1.3. Set force_outbound_flag parameter Chapter 1. Admin Guide @@ -70,12 +69,7 @@ Chapter 1. Admin Guide 1.1. Edge Proxy Keep-Alives (STUN) Outbound Edge Proxies MUST support STUN NAT keep-alives on their SIP - UDP ports. Kamailio supports this as a compile-time option that is - disabled by default. - - Example 1.1. Compiling Kamailio with STUN support -make FLAVOUR=kamailio cfg STUN=1 -make all + UDP ports. Kamailio supports this though the “stun” module. 1.2. Flow Timer @@ -98,7 +92,7 @@ make all the Registrar flow timer interval and a little less than the “tcp_connection_lifetime”. - Example 1.2. Edge Proxy Configuration + Example 1.1. Edge Proxy Configuration #!KAMAILIO # # Edge proxy configuration @@ -265,7 +259,7 @@ failure_route[FAIL_OUTBOUND]{ } } - Example 1.3. Registrar Configuration + Example 1.2. Registrar Configuration ... loadmodule "tm.so" ... @@ -353,7 +347,7 @@ failure_route[FAIL_OUTBOUND] { Default value is -1. - Example 1.4. Set force_outbound_flag parameter + Example 1.3. Set force_outbound_flag parameter ... modparam("outbound", "force_outbound_flag", 1) ... diff --git a/modules/outbound/doc/outbound_admin.xml b/modules/outbound/doc/outbound_admin.xml index 2582caa..47bb578 100644 --- a/modules/outbound/doc/outbound_admin.xml +++ b/modules/outbound/doc/outbound_admin.xml @@ -22,15 +22,8 @@ <section> <title>Edge Proxy Keep-Alives (STUN)</title> <para>Outbound Edge Proxies MUST support STUN NAT keep-alives - on their SIP UDP ports. &kamailio; supports this as a - compile-time option that is disabled by default.</para> - <example> - <title>Compiling &kamailio; with STUN support</title> - <programlisting><![CDATA[ -make FLAVOUR=kamailio cfg STUN=1 -make all -]]></programlisting> - </example> + on their SIP UDP ports. &kamailio; supports this though the + <quote>stun</quote> module.</para> </section> <section> <title>Flow Timer</title> diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 3f76433..04b1dfa 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -98,15 +98,6 @@ static int mod_init(void) "random bytes\n", ob_key.len); } -#ifndef USE_STUN - LM_WARN("STUN support not built-in. UDP keep-alive not supported.\n"); -#else - if (stun_allow_stun != 1) - { - LM_WARN("STUN disabled. UDP keep-alive not supported.\n"); - } -#endif - return 0; }

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013