[svn-commits] lmadsen: trunk r252534 - in /trunk: ./ configs/extensions.ael.sample

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Mon Mar 15 15:52:32 2010
New Revision: 252534

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=252534
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/configs/extensions.ael.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configs/extensions.ael.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/extensions.ael.sample?view=diff&rev=252534&r1=252533&r2=252534
==============================================================================
--- trunk/configs/extensions.ael.sample (original)
+++ trunk/configs/extensions.ael.sample Mon Mar 15 15:52:32 2010
@@ -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
-	//
-	// 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
+	OUTBOUND-TRUNK="Zap/g2";		// Trunk interface
+	//
+	// 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 @@
 	// 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 at provider
 };
 
@@ -210,7 +218,7 @@
 	};
 	_9011. => {
 		&ael-dundi-e164(${EXTEN:4});
-		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 	};
 };
 
@@ -223,7 +231,7 @@
 	};
 	_91NXXNXXXXXX => {
 		&ael-dundi-e164(${EXTEN:1});
-		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 	};
 };
 
@@ -232,7 +240,7 @@
 	// Local seven-digit dialing accessed through trunk interface
 	//
 	_9NXXXXXX => {
-		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 	};
 };
 
@@ -241,10 +249,10 @@
 	// 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 {