sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:master: modules/rr: updated because outbound:decode_flow_token() arguments changed
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: dc1e11b5d03ec033ba7fee421f57d56fa223fddb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc1e11b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 23:12:18 2013 +0000 modules/rr: updated because outbound:decode_flow_token() arguments changed --- modules/rr/loose.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/rr/loose.c b/modules/rr/loose.c index 268522c..a989b0a 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -504,13 +504,13 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, str *dst_uri) { int ret; - struct receive_info rcv; + struct receive_info *rcv = NULL; struct socket_info *si; if (!rr_obb.decode_flow_token) return 0; - ret = rr_obb.decode_flow_token(&rcv, flow_token); + ret = rr_obb.decode_flow_token(_m, rcv, flow_token); if (ret == -2) { LM_DBG("no flow token found - outbound not in use\n"); @@ -518,13 +518,13 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, } else if (ret == -1) { LM_ERR("failed to decode flow token\n"); return -1; - } else if (!ip_addr_cmp(&rcv.src_ip, &_m->rcv.src_ip) - || rcv.src_port != _m->rcv.src_port) { + } else if (!ip_addr_cmp(&rcv->src_ip, &_m->rcv.src_ip) + || rcv->src_port != _m->rcv.src_port) { LM_DBG("\"incoming\" request found. Using flow-token for" "routing\n"); /* First, force the local socket */ - si = find_si(&rcv.dst_ip, rcv.dst_port, rcv.proto); + si = find_si(&rcv->dst_ip, rcv->dst_port, rcv->proto); if (si) set_force_socket(_m, si); else { @@ -539,16 +539,16 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, dst_uri->len += snprintf(dst_uri->s + dst_uri->len, MAX_ROUTE_URI_LEN - dst_uri->len, "sip:%s", - rcv.src_ip.af == AF_INET6 ? "[" : ""); - dst_uri->len += ip_addr2sbuf(&rcv.src_ip, + rcv->src_ip.af == AF_INET6 ? "[" : ""); + dst_uri->len += ip_addr2sbuf(&rcv->src_ip, dst_uri->s + dst_uri->len, MAX_ROUTE_URI_LEN - dst_uri->len); dst_uri->len += snprintf(dst_uri->s + dst_uri->len, MAX_ROUTE_URI_LEN - dst_uri->len, "%s:%d;transport=%s", - rcv.src_ip.af == AF_INET6 ? "]" : "", - rcv.src_port, - get_proto_name(rcv.proto)); + rcv->src_ip.af == AF_INET6 ? "]" : "", + rcv->src_port, + get_proto_name(rcv->proto)); } return 1;

1 0

git:master: modules/outbound: updated edge proxy example to use STUN module
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: 030d591a1e80b32d88b606bf0bc0d8ed80ad3b31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=030d591… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 22:32:13 2013 +0000 modules/outbound: updated edge proxy example to use STUN module --- modules/outbound/README | 1 + modules/outbound/doc/outbound_admin.xml | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/outbound/README b/modules/outbound/README index e90fd62..c6b52dc 100644 --- a/modules/outbound/README +++ b/modules/outbound/README @@ -130,6 +130,7 @@ loadmodule "mi_rpc.so" loadmodule "mi_fifo.so" loadmodule "textops.so" loadmodule "siputils.so" +loadmodule "stun.so" # ----------------- setting module-specific parameters --------------- diff --git a/modules/outbound/doc/outbound_admin.xml b/modules/outbound/doc/outbound_admin.xml index 47bb578..027c4d2 100644 --- a/modules/outbound/doc/outbound_admin.xml +++ b/modules/outbound/doc/outbound_admin.xml @@ -87,6 +87,7 @@ loadmodule "mi_rpc.so" loadmodule "mi_fifo.so" loadmodule "textops.so" loadmodule "siputils.so" +loadmodule "stun.so" # ----------------- setting module-specific parameters ---------------

1 0

git:master: modules/stun: removed unnecessary include
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: 2857eb4b2de20c18ac31212c5336092f08184309 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2857eb4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 22:28:00 2013 +0000 modules/stun: removed unnecessary include --- modules/stun/stun_mod.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/stun/stun_mod.c b/modules/stun/stun_mod.c index ec46053..5797de6 100644 --- a/modules/stun/stun_mod.c +++ b/modules/stun/stun_mod.c @@ -24,7 +24,6 @@ #include "../../dprint.h" #include "../../events.h" #include "../../ip_addr.h" -#include "../../locking.h" #include "../../sr_module.h" #include "kam_stun.h"

1 0

Possible enhancement for 4.1.0: STUN as a module
by Peter Dunkley 29 Mar '13

29 Mar '13

Hello, To use Kamailio as an outbound edge proxy you have to compile in STUN support (which in turn makes the Kamailio core dependent on OpenSSL). It'd be good if the STUN code could be moved into a module (similar to TLS) for the next major release. This might also be a good route to take for some other things optionally compiled into core with "exotic" dependencies like SCTP. Regards, Peter

2 4

git:master: pkg/kamailio/(centos|fedora): Updated . spec to build new stun module
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: c264ea399e17a87a59282b654bdbdebea2841e34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c264ea3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 21:49:56 2013 +0000 pkg/kamailio/(centos|fedora): Updated .spec to build new stun module - Also updated rel to dev1 --- pkg/kamailio/fedora/17/kamailio.spec | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 0cf4442..5c53ef7 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 4.1.0 -%define rel dev0%{dist} +%define rel dev1%{dist} @@ -27,7 +27,7 @@ Conflicts: kamailio-dialplan < %ver, kamailio-lcr < %ver Conflicts: kamailio-xmlops < %ver, kamailio-cdp < %ver Conflicts: kamailio-websocket < %ver, kamailio-xhttp-pi < %ver Conflicts: kamailio-outbound < %ver, kamailio-ims < %ver -Conflicts: kamailio-auth-identity < %ver +Conflicts: kamailio-auth-identity < %ver, kamailio-stun < %ver %if 0%{?fedora} Conflicts: kamailio-radius < %ver, kamailio-carrierroute < %ver Conflicts: kamailio-redis < %ver, kamailio-json < %ver @@ -323,6 +323,17 @@ RFC 5626, "Managing Client-Initiated Connections in the Session Initiation Protocol (SIP)" support for Kamailio. +%package stun +Summary: Limited STUN (RFC 5389) support for Kamailio. +Group: System Environment/Daemons +Requires: openssl, kamailio = %ver, kamailio-stun = %ver +BuildRequires: openssl-devel + +%description stun +Limited RFC 5389, "Session Traversal Utilities for NAT (STUN)" support for +Kamailio. + + %if 0%{?fedora} %package radius Summary: Radius AAA API for Kamailio. @@ -394,7 +405,7 @@ Max Mind GeoIP real-time query support for Kamailio. %build make FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=$RPM_BUILD_ROOT\ basedir=$RPM_BUILD_ROOT cfg_target=/%{_sysconfdir}/kamailio/\ - modules_dirs="modules" SCTP=1 STUN=1 + modules_dirs="modules" SCTP=1 make %if 0%{?fedora} make every-module skip_modules="db_cassandra iptrtpproxy db_oracle memcached \ @@ -402,14 +413,14 @@ make every-module skip_modules="db_cassandra iptrtpproxy db_oracle memcached \ group_include="kstandard kmysql kpostgres kcpl kxml kradius kunixodbc \ kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils kpurple \ ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson kredis \ - kmono kims koutbound" + kmono kims koutbound kstun" %else make every-module skip_modules="db_cassandra iptrtpproxy db_oracle memcached \ mi_xmlrpc osp" \ group_include="kstandard kmysql kpostgres kcpl kxml kunixodbc \ kperl ksnmpstats kxmpp kberkeley kldap kutils kpurple \ ktls kwebsocket kpresence klua kpython ksqlite \ - kims koutbound" + kims koutbound kstun" %endif make utils @@ -425,7 +436,7 @@ make install-modules-all skip_modules="db_cassandra iptrtpproxy db_oracle \ group_include="kstandard kmysql kpostgres kcpl kxml kradius kunixodbc \ kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils kpurple \ ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson kredis \ - kmono kims koutbound" + kmono kims koutbound kstun" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \ @@ -440,7 +451,7 @@ make install-modules-all skip_modules="db_cassandra iptrtpproxy db_oracle \ group_include="kstandard kmysql kpostgres kcpl kxml kunixodbc \ kperl ksnmpstats kxmpp kberkeley kldap kutils kpurple \ ktls kwebsocket kpresence klua kpython ksqlite \ - kims koutbound" + kims koutbound kstun" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ @@ -1042,6 +1053,12 @@ fi %{_libdir}/kamailio/modules/outbound.so +%files stun +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.stun +%{_libdir}/kamailio/modules/stun.so + + %if 0%{?fedora} %files radius %defattr(-,root,root) @@ -1090,6 +1107,9 @@ fi %changelog +* Fri Mar 29 2013 Peter Dunkley <peter(a)dunkley.me.uk> + - Added stun module to .spec + - Updated rel to dev1 * Wed Mar 27 2013 Peter Dunkley <peter(a)dunkley.me.uk> - Added cnxcc module to .spec * Thu Mar 7 2013 Peter Dunkley <peter(a)dunkley.me.uk>

1 0

git:master: core: removed STUN from core
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: c573aa70bba657ba58202c4125d354439478adb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c573aa7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 21:47:57 2013 +0000 core: removed STUN from core - Added hooks so that STUN messages can be passed to a module - Removed STUN configuration file parameters --- Makefile.defs | 11 --------- cfg.lex | 9 -------- cfg.y | 16 -------------- events.c | 13 +++++++++++ events.h | 4 ++- globals.h | 6 ----- main.c | 9 -------- stun.c | 46 +++++++++++++++++++++++++++++++++++++++++ stun.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tcp_read.c | 44 +++++++++++++------------------------- udp_server.c | 44 +++++++++++++++------------------------ ver_defs.h | 8 +------ 12 files changed, 159 insertions(+), 115 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c57…

1 0

git:master: core: Updated modules list in Makefile.groups to include stun
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: c22230bddf3aeebdae9062d3c5c4c37ce59f8a96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c22230b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 21:49:07 2013 +0000 core: Updated modules list in Makefile.groups to include stun --- Makefile.groups | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index c113982..8349e1c 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -95,6 +95,9 @@ mod_list_outbound=outbound # - modules depending on unistring library mod_list_websocket=websocket +# - modules depending on openssl library +mod_list_stun=stun + # - modules related to SIMPLE presence extensions mod_list_presence=presence presence_conference presence_dialoginfo \ presence_mwi presence_profile presence_reginfo \ @@ -165,7 +168,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_cassandra) $(mod_list_oracle) \ $(mod_list_iptrtpproxy) $(mod_list_mi_xmlrpc) \ $(mod_list_outbound) $(mod_list_osp) \ - $(mod_list_java) ) + $(mod_list_java) $(mod_list_stun)) @@ -314,6 +317,9 @@ module_group_koutbound=$(mod_list_outbound) # pkg java module module_group_kjava=$(mod_list_java) +# pkg stun module +module_group_kstun=$(mod_list_stun) + # list of static modules # static_modules:=

1 0

git:master: core: removed ser_stun.[ch] from core
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: 55510ba22e248ea774e7c04b0132c9c5af858d15 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55510ba… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 21:46:20 2013 +0000 core: removed ser_stun.[ch] from core - STUN now in a module --- ser_stun.c | 1025 ------------------------------------------------------------ ser_stun.h | 186 ----------- 2 files changed, 0 insertions(+), 1211 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=555…

1 0

git:master: modules/stun: STUN module
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: 4afa7a1f9dfc61679db11a5e76e3d3de10be1391 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4afa7a1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 21:44:48 2013 +0000 modules/stun: STUN module - Based on ser_stun.[ch] - No longer a compile time option in Kamailio core --- modules/stun/Makefile | 37 ++ modules/stun/kam_stun.c | 972 +++++++++++++++++++++++++++++++++++++++++++++++ modules/stun/kam_stun.h | 145 +++++++ modules/stun/stun_mod.c | 67 ++++ 4 files changed, 1221 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4af…

1 0

git:master: modules/stun: Module documentation for STUN
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: 02718defd1785fe5b94255077a9945354ee6cc19 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02718de… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 21:45:45 2013 +0000 modules/stun: Module documentation for STUN --- modules/stun/README | 71 +++++++++++++++++++++++++++++++++++++++ modules/stun/doc/Makefile | 4 ++ modules/stun/doc/stun.xml | 37 ++++++++++++++++++++ modules/stun/doc/stun_admin.xml | 67 ++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 0 deletions(-) diff --git a/modules/stun/README b/modules/stun/README new file mode 100644 index 0000000..5d223fe --- /dev/null +++ b/modules/stun/README @@ -0,0 +1,71 @@ +STUN Module + +Peter Dunkley + + Crocodile RCS Ltd + + Copyright © 2012 Crocodile RCS Ltd + + Copyright © 2001-2003 FhG Fokus + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Parameters + 4. Functions + 5. MI Commands + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Parameters + 4. Functions + 5. MI Commands + +1. Overview + + This module provides limited STUN server (RFC 5389) support for + Kamailio. + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + The following modules must be loaded before this module: + * None + +2.2. External Libraries or Applications + + The following libraries must be installed before running Kamailio with + this module loaded: + * OpenSSL. + +3. Parameters + + None + +4. Functions + + None + +5. MI Commands + + None diff --git a/modules/stun/doc/Makefile b/modules/stun/doc/Makefile new file mode 100644 index 0000000..51ff7d1 --- /dev/null +++ b/modules/stun/doc/Makefile @@ -0,0 +1,4 @@ +docs = stun.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/stun/doc/stun.xml b/modules/stun/doc/stun.xml new file mode 100644 index 0000000..2cb9584 --- /dev/null +++ b/modules/stun/doc/stun.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<book xmlns:xi="http://www.w3.org/2001/XInclude"> + <bookinfo> + <title>STUN Module</title> + <productname class="trade">&kamailioname;</productname> + <authorgroup> + <author> + <firstname>Peter</firstname> + <surname>Dunkley</surname> + <affiliation><orgname>Crocodile RCS Ltd</orgname></affiliation> + <address> + <email>peter.dunkley(a)crocodile-rcs.com</email> + </address> + </author> + </authorgroup> + <copyright> + <year>2012</year> + <holder>Crocodile RCS Ltd</holder> + </copyright> + <copyright> + <year>2001-2003</year> + <holder>FhG Fokus</holder> + </copyright> + </bookinfo> + <toc></toc> + + <xi:include href="stun_admin.xml"/> +</book> diff --git a/modules/stun/doc/stun_admin.xml b/modules/stun/doc/stun_admin.xml new file mode 100644 index 0000000..5aa9bd5 --- /dev/null +++ b/modules/stun/doc/stun_admin.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + + +<chapter> + + <title>&adminguide;</title> + + <section> + <title>Overview</title> + <para>This module provides limited STUN server (RFC 5389) support for + &kamailio;.</para> + </section> + + <section> + <title>Dependencies</title> + <section> + <title>&kamailio; Modules</title> + <para> + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para><emphasis>None</emphasis></para> + </listitem> + </itemizedlist> + </para> + </section> + + <section> + <title>External Libraries or Applications</title> + <para> + The following libraries must be installed before running + &kamailio; with this module loaded: + <itemizedlist> + <listitem> + <para><emphasis>OpenSSL</emphasis>.</para> + </listitem> + </itemizedlist> + </para> + </section> + </section> + + + <section> + <title>Parameters</title> + <para><emphasis>None</emphasis></para> + </section> + + <section> + <title>Functions</title> + <para><emphasis>None</emphasis></para> + </section> + + <section> + <title>MI Commands</title> + <para><emphasis>None</emphasis></para> + </section> + +</chapter> +

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013