[svn-commits] branch north/chan_skinny-fixup r34342 - in /team/north/chan_skinny-fixup: cha...

[svn-commits at lists.digium.com]

Author: north
Date: Thu Jun 15 16:34:46 2006
New Revision: 34342

URL: http://svn.digium.com/view/asterisk?rev=34342&view=rev
Log:
Config cleanups.

Deprecate 'port' config option, and replace it with 'bindport'.
'port' was too ambiguous

Modified:
    team/north/chan_skinny-fixup/channels/chan_skinny.c
    team/north/chan_skinny-fixup/configs/skinny.conf.sample

Modified: team/north/chan_skinny-fixup/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/chan_skinny.c?rev=34342&r1=34341&r2=34342&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/chan_skinny.c (original)
+++ team/north/chan_skinny-fixup/channels/chan_skinny.c Thu Jun 15 16:34:46 2006
@@ -4052,9 +4052,9 @@
 			} else {
 				memcpy(&bindaddr.sin_addr, hp->h_addr, sizeof(bindaddr.sin_addr));
 			}
-		} else if (!strcasecmp(v->name, "keepAlive")) {
+		} else if (!strcasecmp(v->name, "keepalive")) {
 			keep_alive = atoi(v->value);
-		} else if (!strcasecmp(v->name, "dateFormat")) {
+		} else if (!strcasecmp(v->name, "dateformat")) {
 			ast_copy_string(date_format, v->value, sizeof(date_format));
 		} else if (!strcasecmp(v->name, "allow")) {
 			format = ast_getformatbyname(v->value);
@@ -4070,11 +4070,14 @@
 			} else {
 				capability &= ~format;
 			}
-		} else if (!strcasecmp(v->name, "port")) {
+		} else if (!strcasecmp(v->name, "bindport") || !strcasecmp(v->name, "port")) {
 			if (sscanf(v->value, "%d", &ourport) == 1) {
 				bindaddr.sin_port = htons(ourport);
 			} else {
-				ast_log(LOG_WARNING, "Invalid port number '%s' at line %d of %s\n", v->value, v->lineno, config);
+				ast_log(LOG_WARNING, "Invalid bindport '%s' at line %d of %s\n", v->value, v->lineno, config);
+			}
+			if (!strcasecmp(v->name, "port")) { /*! \todo Remove 'port' option after 1.4 */
+				ast_log(LOG_WARNING, "Option 'port' at line %d of %s has been deprecated.  Please use 'bindport' instead.", v->lineno, config);
 			}
 		}
 		v = v->next;

Modified: team/north/chan_skinny-fixup/configs/skinny.conf.sample
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/configs/skinny.conf.sample?rev=34342&r1=34341&r2=34342&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/configs/skinny.conf.sample (original)
+++ team/north/chan_skinny-fixup/configs/skinny.conf.sample Thu Jun 15 16:34:46 2006
@@ -2,10 +2,10 @@
 ; Skinny Configuration for Asterisk
 ;
 [general]
-port=2000		; Port to bind to, default tcp/2000
 bindaddr=0.0.0.0	; Address to bind to
-dateFormat=M-D-Y	; M,D,Y in any order (5 chars max)
-keepAlive=120
+bindport=2000		; Port to bind to, default tcp/2000
+dateformat=M-D-Y	; M,D,Y in any order (5 chars max)
+keepalive=120
 
 ;allow=all
 ;disallow=
@@ -41,9 +41,6 @@
 ; Typical config for 12SP+
 ;[florian]
 ;device=SEP00D0BA847E6B
-;model=12SP		; Specific model of device, for button templates
-			; Valid models: 12SP, 30VIP, 7910, 7920,
-			; 7935, 7940, 7960, 7970 (so far)
 ;version=P002G204	; Thanks critch
 ;context=did
 ;line => 120		; Dial(Skinny/120 at florian)
@@ -51,24 +48,24 @@
 
 ; Typical config for a 7910
 ;[duba]			; Device name
-;model=7910		; Device model
 ;device=SEP0007EB463101	; Offical identifier
 ;version=P002F202	; Firmware version identifier
 ;host=192.168.1.144
 ;permit=192.168.0/24	; Optional, used for authentication
-;nat=0
+;nat=yes
 ;callerid="George W. Bush" <202-456-1414>
 ;mailbox=500
-;callwaiting=1
-;transfer=1
-;threewaycalling=1
+;callwaiting=yes
+;transfer=yes
+;threewaycalling=yes
 ;context=default
 ;line => 500		; Dial(Skinny/500 at duba)
+
 
 ; Typical config for a 7940 with dual 7914s
 ;[support]
 ;device=SEP0007EB463121
-;nat=0
+;nat=yes
 ;callerid="Customer Support" <810-234-1212>
 ;mailbox=100
 ;context=inbound