Merged revisions 252534 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r252534 | lmadsen | 2010-03-15 15:52:32 -0500 (Mon, 15 Mar 2010) | 15 lines
  
  Merged revisions 252533 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r252533 | lmadsen | 2010-03-15 15:48:56 -0500 (Mon, 15 Mar 2010) | 7 lines
    
    Update extensions.ael file to not overlap extensions.conf.
    Updated the extensions.ael file so the global variables don't overlap
    those that we have in extensions.conf (sample files). This way unexpected
    things won't happed hopefully if both pbx_ael and res_config are loaded.
    
    (closes issue #17035)
    Reported by: pprindeville
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@252535 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 19 insertions, 11 deletions

diff --git a/configs/extensions.ael.sample b/configs/extensions.ael.sample
index 21680a4db..25bce30d5 100644
--- a/configs/extensions.ael.sample
+++ b/configs/extensions.ael.sample
@@ -18,16 +18,24 @@
 // function: ${ENV(VARIABLE)}
 //
 
+// NOTE! NOTE! NOTE!
+// Asterisk by default will load both extensions.conf and extensions.ael files.
+// Upon loading these files the dialplans generated from both with be merged,
+// so you must make sure that you don't have any overlapping contexts or global
+// variables. If you do, then unexpected behavior may result when the data is
+// merged.
+// NOTE! NOTE! NOTE!
+
 globals {
 	CONSOLE="Console/dsp"; 		// Console interface for demo
 	//CONSOLE=DAHDI/1
 	//CONSOLE=Phone/phone0
 	IAXINFO=guest;				// IAXtel username/password
 	//IAXINFO="myuser:mypass";
-	TRUNK="DAHDI/G2";					// Trunk interface
+	OUTBOUND-TRUNK="Zap/g2";		// Trunk interface
 	//
-	// Note the 'G2' in the TRUNK variable above. It specifies which group (defined
-	// in dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use in
+	// Note the 'g2' in the OUTBOUND-TRUNK variable above. It specifies which group (defined
+	// in chan_dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use in
 	// the specified group. The four possible options are:
 	//
 	// g: select the lowest-numbered non-busy DAHDI channel
@@ -39,7 +47,7 @@ globals {
 	// R: use a round-robin search, starting at the next lowest channel than last
 	//    time (aka. descending rotary hunt group).
 	//
-	TRUNKMSD=1;					// MSD digits to strip (usually 1 or 0)
+	OUTBOUND-TRUNKMSD=1;					// MSD digits to strip (usually 1 or 0)
 	//TRUNK=IAX2/user:pass@provider
 };
 
@@ -210,7 +218,7 @@ context ael-trunkint {
 	};
 	_9011. => {
 		&ael-dundi-e164(${EXTEN:4});
-		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 	};
 };
 
@@ -223,7 +231,7 @@ context ael-trunkld {
 	};
 	_91NXXNXXXXXX => {
 		&ael-dundi-e164(${EXTEN:1});
-		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 	};
 };
 
@@ -232,7 +240,7 @@ context ael-trunklocal {
 	// Local seven-digit dialing accessed through trunk interface
 	//
 	_9NXXXXXX => {
-		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 	};
 };
 
@@ -241,10 +249,10 @@ context ael-trunktollfree {
 	// Long distance context accessed through trunk interface
 	//
 	
-	_91800NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
-	_91888NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
-	_91877NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
-	_91866NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+	_91800NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+	_91888NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+	_91877NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+	_91866NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 };
 
 context ael-international {