[svn-commits] tilghman: trunk r94772 - in /trunk: channels/ configs/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Dec 24 21:34:09 2007
New Revision: 94772

URL: http://svn.digium.com/view/asterisk?view=rev&rev=94772
Log:
Change the abbreviated TON from 'A' to 'V', since 'A' is a legitimate DTMF
character.  Also, fix the documentation to match the code.

Modified:
    trunk/channels/chan_zap.c
    trunk/configs/zapata.conf.sample

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=94772&r1=94771&r2=94772
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Mon Dec 24 21:34:09 2007
@@ -2562,7 +2562,7 @@
 			case 'S':
 				pridialplan = (PRI_TON_SUBSCRIBER << 4) | (pridialplan & 0xf);
 				break;
-			case 'A':
+			case 'V':
 				pridialplan = (PRI_TON_ABBREVIATED << 4) | (pridialplan & 0xf);
 				break;
 			case 'R':
@@ -2632,7 +2632,7 @@
 				case 'S':
 					prilocaldialplan = (PRI_TON_SUBSCRIBER << 4) | (prilocaldialplan & 0xf);
 					break;
-				case 'A':
+				case 'V':
 					prilocaldialplan = (PRI_TON_ABBREVIATED << 4) | (prilocaldialplan & 0xf);
 					break;
 				case 'R':

Modified: trunk/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/zapata.conf.sample?view=diff&rev=94772&r1=94771&r2=94772
==============================================================================
--- trunk/configs/zapata.conf.sample (original)
+++ trunk/configs/zapata.conf.sample Mon Dec 24 21:34:09 2007
@@ -99,22 +99,22 @@
 ; pridialplan may be also set at dialtime, by prefixing the dialled number with
 ; one of the following letters:
 ; U - Unknown
-; P - Private
-; L - Local
+; I - International
 ; N - National
-; I - International
-; D - Dynamic
-; R - Redundant
+; L - Local (Net Specific)
+; S - Subscriber
+; V - Abbreviated
+; R - Reserved (should probably never be used but is included for completeness)
 ;
 ; Additionally, you may also set the following NPI bits (also by prefixing the
 ; dialled string with one of the following letters):
 ; u - Unknown
-; e - E.163/E.164
-; x - X.121
-; f - F.69
+; e - E.163/E.164 (ISDN/telephony)
+; x - X.121 (Data)
+; f - F.69 (Telex)
 ; n - National
 ; p - Private
-; r - Reserved
+; r - Reserved (should probably never be used but is included for completeness)
 ;
 ; You may also set the prilocaldialplan in the same way, but by prefixing the
 ; Caller*ID Number, rather than the dialled number.  Please note that telcos