OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Sep-2006 13:06:47
Branch: HEAD Handle: 2006091712064700
Modified files:
openpkg-src/asterisk asterisk.txt
Log:
simplify dialplan by using Asterisk 1.2 'label' feature
Summary:
Revision Changes Path
1.12 +21 -30 openpkg-src/asterisk/asterisk.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
============================================================================
$ cvs diff -u -r1.11 -r1.12 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 17 Sep 2006 09:36:11 -0000 1.11
+++ openpkg-src/asterisk/asterisk.txt 17 Sep 2006 11:06:47 -0000 1.12
@@ -265,29 +265,20 @@
; internal service <conference> #7<n>
exten = conference,1,Goto(70,1)
+exten = _7[0-9],1,Set(confno=${EXTEN:1})
+exten = _7[0-9],n,Goto(7,enter)
exten = 7,1,Set(TIMEOUT(digit)=3)
-exten = 7,2,Set(TIMEOUT(response)=6)
-exten = 7,3,Read(number,conf-getconfno,3)
-exten = 7,n,GotoIf($[${number} >= 0 & ${number} <= 9]?7-ok,1)
+exten = 7,n,Set(TIMEOUT(response)=6)
+exten = 7,n(repeat),Read(confno,conf-getconfno,3)
+exten = 7,n,GotoIf($[${confno} >= 0 & ${confno} <= 9]?enter)
exten = 7,n,Playback(conf-invalid)
-exten = 7,n,Goto(7,3)
-exten = 7-ok,1,Playback(conf-placeintoconf)
-exten = 7-ok,n,SayNumber(${number})
-exten = 7-ok,n,Set(SPYGROUP=conference-${number})
-;exten = 7-ok,n,MeetMe(${number},cps)
-exten = 7-ok,n,Conference(conference-${number}/M)
-exten = 7-ok,n,Playback(vm-goodbye)
-exten = 7-ok,n,Hangup
-exten = _7[0-9],1,Set(TIMEOUT(digit)=3)
-exten = _7[0-9],n,Playback(conf-placeintoconf)
-exten = _7[0-9],n,SayNumber(${EXTEN:1})
-exten = _7[0-9],n,Set(SPYGROUP=conference-${EXTEN:1})
-;exten = _7[0-9],n,MeetMe(${EXTEN:1},cps)
-exten = _7[0-9],n,Conference(conference-${EXTEN:1}/M)
-exten = _7[0-9],n,Playback(vm-goodbye)
-exten = _7[0-9],n,Hangup
-exten = _7X.,1,Playback(conf-invalid)
-exten = _7X.,n,Hangup
+exten = 7,n,Goto(repeat)
+exten = 7,n(enter),Playback(conf-placeintoconf)
+exten = 7,n,SayNumber(${confno})
+exten = 7,n,Set(SPYGROUP=conference-${confno})
+exten = 7,n,MeetMe(${confno},cpsr)
+exten = 7,n,Playback(vm-goodbye)
+exten = 7,n,Hangup
; internal service <voicemail> #80/#*<n>
exten = voicemail,1,Goto(80,1)
@@ -308,17 +299,17 @@
exten = reload,1,Goto(82,1)
exten = 82,1,Answer
exten = 82,n,Read(pin,conf-getpin,4)
-exten = 82,n,GotoIf($[${pin} = 1234]?82-ok,1)
+exten = 82,n,GotoIf($[${pin} = 1234]?ok)
exten = 82,n,Playback(conf-invalidpin)
exten = 82,n,Hangup
-exten = 82-ok,1,Playback(beep)
-exten = 82-ok,n,Wait(1)
-exten = 82-ok,n,Playback(beep)
-exten = 82-ok,n,Wait(1)
-exten = 82-ok,n,Playback(beep)
-exten = 82-ok,n,Wait(1)
-exten = 82-ok,n,System(@l_prefix@/sbin/asterisk -rx reload)
-exten = 82-ok,n,Hangup
+exten = 82,n(ok),Playback(beep)
+exten = 82,n,Wait(1)
+exten = 82,n,Playback(beep)
+exten = 82,n,Wait(1)
+exten = 82,n,Playback(beep)
+exten = 82,n,Wait(1)
+exten = 82,n,System(@l_prefix@/sbin/asterisk -rx reload)
+exten = 82,n,Hangup
; internal outgoing SIP call (part 1/2)
; (notice sort-order trickery!)
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
