[asterisk-commits] murf: trunk r43740 - in /trunk: ./
configs/extensions.ael.sample
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Sep 26 19:46:50 MST 2006
Author: murf
Date: Tue Sep 26 21:46:50 2006
New Revision: 43740
URL: http://svn.digium.com/view/asterisk?rev=43740&view=rev
Log:
Merged revisions 43739 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43739 | murf | 2006-09-26 20:32:47 -0600 (Tue, 26 Sep 2006) | 1 line
This change to extensions.ael was to fix bug 8031; the install scripts are causing it to be copied to /etc/asterisk/extensions.ael, and because it is a fairly direct conversion of the original extensions.conf, the macro and context names clash with the existing extensions.conf. So, I put an ael- in front of all macros and contexts, and checked every goto and macro call. Also, this file compiles under aelparse.
........
Modified:
trunk/ (props changed)
trunk/configs/extensions.ael.sample
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Sep 26 21:46:50 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489,43492,43518,43524,43553,43564,43616,43640,43642,43650,43674,43676,43695,43697,43700,43707,43710
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489,43492,43518,43524,43553,43564,43616,43640,43642,43650,43674,43676,43695,43697,43700,43707,43710,43739
Modified: trunk/configs/extensions.ael.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/extensions.ael.sample?rev=43740&r1=43739&r2=43740&view=diff
==============================================================================
--- trunk/configs/extensions.ael.sample (original)
+++ trunk/configs/extensions.ael.sample Tue Sep 26 21:46:50 2006
@@ -93,7 +93,7 @@
//
// includes {
// daytime|9:00-17:00|mon-fri|*|*;
-// };
+// };
//
// ignorepat can be used to instruct drivers to not cancel dialtone upon
// receipt of a particular pattern. The most commonly used example is
@@ -109,15 +109,15 @@
// Sample entries for extensions.conf
//
//
-context dundi-e164-canonical {
+context ael-dundi-e164-canonical {
//
// List canonical entries here
//
- // 12564286000 => &std-exten(6000,IAX2/foo);
+ // 12564286000 => &ael-std-exten(6000,IAX2/foo);
// _125642860XX => Dial(IAX2/otherbox/${EXTEN:7});
};
-context dundi-e164-customers {
+context ael-dundi-e164-customers {
//
// If you are an ITSP or Reseller, list your customers here.
//
@@ -125,7 +125,7 @@
//_12564286001 => Dial(IAX2/customer2);
};
-context dundi-e164-via-pstn {
+context ael-dundi-e164-via-pstn {
//
// If you are freely delivering calls to the PSTN, list them here
//
@@ -133,19 +133,19 @@
//_1256325XXXX => Dial(Zap/g2/${EXTEN:7}); // Ditto for 256-325
};
-context dundi-e164-local {
+context ael-dundi-e164-local {
//
// Context to put your dundi IAX2 or SIP user in for
// full access
//
includes {
- dundi-e164-canonical;
- dundi-e164-customers;
- dundi-e164-via-pstn;
- };
-};
-
-context dundi-e164-switch {
+ ael-dundi-e164-canonical;
+ ael-dundi-e164-customers;
+ ael-dundi-e164-via-pstn;
+ };
+};
+
+context ael-dundi-e164-switch {
//
// Just a wrapper for the switch
//
@@ -155,14 +155,14 @@
};
};
-context dundi-e164-lookup {
+context ael-dundi-e164-lookup {
//
// Locally to lookup, try looking for a local E.164 solution
// then try DUNDi if we don't have one.
//
includes {
- dundi-e164-local;
- dundi-e164-switch;
+ ael-dundi-e164-local;
+ ael-dundi-e164-switch;
};
//
};
@@ -171,7 +171,7 @@
// DUNDi can also be implemented as a Macro instead of using
// the Local channel driver.
//
-macro dundi-e164(exten) {
+macro ael-dundi-e164(exten) {
//
// ARG1 is the extension to Dial
//
@@ -184,7 +184,7 @@
// there are exceptions. For more information, and to sign
// up, please go to www.gnophone.com or www.iaxtel.com
//
-context iaxtel700 {
+context ael-iaxtel700 {
_91700XXXXXXX => Dial(IAX2/${IAXINFO}@iaxtel.com/${EXTEN:1}@iaxtel);
};
@@ -194,39 +194,39 @@
// allowed (e.g. both A -> B and B -> A), and the switched server needs
// to be on-line or else dialing can be severly delayed.
//
-context iaxprovider {
+context ael-iaxprovider {
switches {
// IAX2/user:[key]@myserver/mycontext;
};
};
-context trunkint {
+context ael-trunkint {
//
// International long distance through trunk
//
includes {
- dundi-e164-lookup;
+ ael-dundi-e164-lookup;
};
_9011. => {
- &dundi-e164(${EXTEN:4});
+ &ael-dundi-e164(${EXTEN:4});
Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
};
};
-context trunkld {
+context ael-trunkld {
//
// Long distance context accessed through trunk
//
includes {
- dundi-e164-lookup;
+ ael-dundi-e164-lookup;
};
_91NXXNXXXXXX => {
- &dundi-e164(${EXTEN:1});
+ &ael-dundi-e164(${EXTEN:1});
Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
};
};
-context trunklocal {
+context ael-trunklocal {
//
// Local seven-digit dialing accessed through trunk interface
//
@@ -235,7 +235,7 @@
};
};
-context trunktollfree {
+context ael-trunktollfree {
//
// Long distance context accessed through trunk interface
//
@@ -246,40 +246,40 @@
_91866NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
};
-context international {
+context ael-international {
//
// Master context for international long distance
//
ignorepat => 9;
includes {
- longdistance;
- trunkint;
- };
-};
-
-context longdistance {
+ ael-longdistance;
+ ael-trunkint;
+ };
+};
+
+context ael-longdistance {
//
// Master context for long distance
//
ignorepat => 9;
includes {
- local;
- trunkld;
- };
-};
-
-context local {
+ ael-local;
+ ael-trunkld;
+ };
+};
+
+context ael-local {
//
// Master context for local, toll-free, and iaxtel calls only
//
ignorepat => 9;
includes {
- default;
- parkedcalls;
- trunklocal;
- iaxtel700;
- trunktollfree;
- iaxprovider;
+ ael-default;
+ ael-parkedcalls;
+ ael-trunklocal;
+ ael-iaxtel700;
+ ael-trunktollfree;
+ ael-iaxprovider;
};
};
@@ -305,7 +305,7 @@
// eswitch => IAX2/context@${CURSERVER}
-macro std-exten-ael( ext , dev ) {
+macro ael-std-exten-ael( ext , dev ) {
Dial(${dev}/${ext},20);
switch(${DIALSTATUS}) {
case BUSY:
@@ -343,7 +343,7 @@
goto s|restart;
};
1000 => {
- goto default|s|1;
+ goto ael-default|s|1;
};
500 => {
Playback(demo-abouttotry);
@@ -357,7 +357,7 @@
Playback(demo-echodone);
goto s|instructions;
};
- _1234 => &std-exten-ael(${EXTEN}, "IAX2");
+ _1234 => &ael-std-exten-ael(${EXTEN}, "IAX2");
8500 => {
VoicemailMain();
goto s|instructions;
@@ -377,14 +377,14 @@
// and then uncomment the one here.
//
-// context default {
+context ael-default {
// By default we include the demo. In a production system, you
// probably don't want to have the demo there.
-// includes {
-// ael-demo;
-// };
+ includes {
+ ael-demo;
+ };
//
// Extensions like the two below can be used for FWD, Nikotel, sipgate etc.
// Note that you must have a [sipprovider] section in sip.conf whereas
@@ -444,4 +444,4 @@
// 'show application <command>' will show details of how you
// use that particular application in this file, the dial plan.
//
-// };
+}
More information about the asterisk-commits
mailing list