From: Brian West <brian@freeswitch.org>
Date: Sat, 19 Jan 2008 19:08:33 +0000 (+0000)
Subject: tweak this dialplan
X-Git-Tag: v1.0-rc1~609
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9fed760a494b42e5ad5efd1d9fc9d9c84b08b7;p=thirdparty%2Ffreeswitch.git

tweak this dialplan

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7299 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index e19a9edcac..ffc7563469 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -260,20 +260,13 @@
     </extension>
 
     <extension name="hold_music">
-      <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never">
+      <condition field="destination_number" expression="^9999$"/>
+      <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$">
 	<action application="answer"/>
 	<action application="execute_extension" data="is_secure XML default"/>
-      </condition>
-      <condition field="destination_number" expression="^9999$">
-	<action application="answer"/>
 	<action application="playback" data="$${moh_uri}"/>
-      </condition>
-    </extension>
-
-    <extension name="is_secure">
-      <condition field="${sip_secure_media_confirmed}" expression="^true$" break="never">
-	<action application="sleep" data="1000"/>
-	<action application="gentones" data="${bong-ring}"/>
+	<anti-action application="answer"/>
+	<anti-action application="playback" data="$${moh_uri}"/>
       </condition>
     </extension>
 
@@ -281,9 +274,16 @@
 
     <extension name="enum">
       <condition field="destination_number" expression="^(.*)$">
-	<action application="answer"/>
 	<action application="transfer" data="$1 enum"/>
       </condition>
     </extension>
+
+    <extension name="is_secure">
+      <condition field="${sip_secure_media_confirmed}" expression="^true$" break="never">
+	<action application="sleep" data="1000"/>
+	<action application="gentones" data="${bong-ring}"/>
+      </condition>
+    </extension>
+
   </context>
 </include>