summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2007-12-25 03:34:09 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2007-12-25 03:34:09 +0000
commit27f8b5bc2de6b505da6f409293c02d30efc064ed (patch)
tree3ee6e06c99c4f7ea2e1ec67233514d76e12f83f4
parentba57c36bbb41783d9d02a44517466d361c776cc6 (diff)
Change the abbreviated TON from 'A' to 'V', since 'A' is a legitimate DTMF
character. Also, fix the documentation to match the code. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_zap.c4
-rw-r--r--configs/zapata.conf.sample18
2 files changed, 11 insertions, 11 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index d3adaf3ed..2d61d8cfb 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -2562,7 +2562,7 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
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 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
case 'S':
prilocaldialplan = (PRI_TON_SUBSCRIBER << 4) | (prilocaldialplan & 0xf);
break;
- case 'A':
+ case 'V':
prilocaldialplan = (PRI_TON_ABBREVIATED << 4) | (prilocaldialplan & 0xf);
break;
case 'R':
diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample
index 5b48ff939..fac1870ff 100644
--- a/configs/zapata.conf.sample
+++ b/configs/zapata.conf.sample
@@ -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
-; N - National
; I - International
-; D - Dynamic
-; R - Redundant
+; N - National
+; 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