[sr-dev] git:master: modules/outbound: updated to reflect STUN being in a module now

[Peter Dunkley]

Module: sip-router
Branch: master
Commit: e090a714728950b40cf09956137db4ce93d08960
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e090a714728950b40cf09956137db4ce93d08960

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at 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;
 }