}

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

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index f8c827dd52228d9cf6b5f7998f14ba1dc54116ed..e7791135d428e3ec55bc5db4c71f2c2fac0edd8b 100644 (file)
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -105,7 +105,7 @@
        <anti-action application="set" data="continue_on_fail=true"/>
        <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/>
        <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/>
-       <anti-action application="bridge" data="sofia/$${domain}/${dialed_ext}"/>
+       <anti-action application="bridge" data="USER/${dialed_ext}@$${domain}"/>
        <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/>
       </condition>
     </extension>

diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index cd1f12242475b999aa59770ff010a94b88c07271..96e1737a5fffa17f5f854d5de3d3564f1478e473 100644 (file)
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -1,6 +1,10 @@
 <include>
   <!--the domain or ip (the right hand side of the @ in the addr-->
   <domain name="$${domain}">
+    <params>
+      <param name="dial-string" value="sofia/${dialed_domain}/${dialed_user}"/>
+    </params>
+
     <X-PRE-PROCESS cmd="include" data="default/*.xml"/>
   </domain>
 </include>

diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index 5ada6c4373c16f006d895549d5229648a19894d5..05f35e5962b3c6242076e4ed3d76e67c972eeeea 100644 (file)
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -5,7 +5,6 @@
       <param name="vm-password" value="1234"/>
       <!--<param name="vm-mailto" value="me@mydomain.com"/>-->
       <!--<param name="vm-email-all-messages" value="true"/>-->
-      <param name="dial-string" value="sofia/${use_profile}/888@conference.freeswitch.org"/>
     </params>
     <variables>
       <variable name="user_context" value="default"/>