[asterisk-commits] oej: trunk r128525 - in /trunk: channels/chan_sip.c configs/sip.conf.sample

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Jul  6 15:19:04 2008
New Revision: 128525

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128525
Log:
- Adding alias "udpbindaddr" for the UDP port to comply with "tcpbindaddr" and "tlsbindaddr".
  Note: I don't think we can start properly without UDP port open, that needs to be tested.

- Removing "bindport" from configuration example, not needed to mention this any more

I suggest we deprecate "bindaddr" and "bindport" in trunk (for 1.6.1)

Modified:
    trunk/channels/chan_sip.c
    trunk/configs/sip.conf.sample

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=128525&r1=128524&r2=128525
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sun Jul  6 15:19:04 2008
@@ -21147,7 +21147,7 @@
 			if (ast_parse_arg(v->value, PARSE_INADDR, &stunaddr))
 				ast_log(LOG_WARNING, "Invalid STUN server address: %s\n", v->value);
 			externexpire = time(NULL);
-		} else if (!strcasecmp(v->name, "bindaddr")) {
+		} else if (!strcasecmp(v->name, "bindaddr") || !strcasecmp(v->name, "udpbindaddr")) {
 			if (ast_parse_arg(v->value, PARSE_INADDR, &bindaddr))
 				ast_log(LOG_WARNING, "Invalid address: %s\n", v->value);
 		} else if (!strcasecmp(v->name, "localnet")) {

Modified: trunk/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=128525&r1=128524&r2=128525
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Sun Jul  6 15:19:04 2008
@@ -75,11 +75,8 @@
 				; asterisk.conf, it defaults to that system name
 				; Realms MUST be globally unique according to RFC 3261
 				; Set this to your host name or domain name
-bindport=5060			; UDP Port to bind to (SIP standard port for unencrypted UDP 
-				; and TCP sessions is 5060)
-				; bindport is the local UDP port that Asterisk will listen on
-bindaddr=0.0.0.0		; IP address to bind UDP listen socket to (0.0.0.0 binds to all)
-				; You can specify port here too, like 123.123.123.123:5080
+udpbindaddr=0.0.0.0		; IP address to bind UDP listen socket to (0.0.0.0 binds to all)
+                                ; Optionally add a port number, 192.168.1.1:5062 (default is port 5060)
 
 ;
 ; Note that the TCP and TLS support for chan_sip is currently considered