Author: brian Date: Fri Oct 10 20:59:45 2008 New Revision: 9951 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/features.xml freeswitch/trunk/conf/dialplan/public.xml Log: polish up configs more Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Oct 10 20:59:45 2008 @@ -79,9 +79,7 @@ <action application="set" data="use_profile=${cond(${acl($${local_ip_v4} rfc1918)} == true ? nat : default)}"/> <anti-action application="set" data="use_profile=${cond(${acl(${network_addr} rfc1918)} == true ? nat : default)}"/> </condition> - <!-- This will setup some variables if the user isn't authenticated. - numbering_plan is required for the demo to function properly. - --> + <!-- This will setup some variables if the user isn't authenticated. --> <condition field="${numbering_plan}" expression="^$" break="never"> <action application="set_user" data="default@${domain_name}"/> </condition> @@ -147,7 +145,7 @@ </extension> <extension name="call_return"> - <condition field="destination_number" expression="^\*69$|^869$"> + <condition field="destination_number" expression="^\*69$|^869$|^lcr$"> <action application="transfer" data="${db(select/${domain_name}-call_return/${caller_id_number})}"/> </condition> </extension> @@ -228,7 +226,6 @@ <anti-action application="db" data="insert/${domain_name}-last_dial/${called_party_callgroup}/${uuid}"/> <anti-action application="bridge" data="user/${dialed_extension}@${domain_name}"/> <anti-action application="answer"/> - <!--<anti-action application="send_display" data="Voicemail for ${dialed_extension}"/>--> <anti-action application="sleep" data="1000"/> <anti-action application="voicemail" data="default ${domain_name} ${dialed_extension}"/> </condition> @@ -264,7 +261,6 @@ <extension name="nb_conferences"> <condition field="destination_number" expression="^(30\d{2})$"> <action application="answer"/> - <!--<action application="send_display" data="8k Conference $1"/>--> <action application="conference" data="$1-${domain_name}@default"/> </condition> </extension> @@ -272,7 +268,6 @@ <extension name="wb_conferences"> <condition field="destination_number" expression="^(31\d{2})$"> <action application="answer"/> - <!--<action application="send_display" data="16k Conference $1"/>--> <action application="conference" data="$1-${domain_name}@wideband"/> </condition> </extension> @@ -280,7 +275,6 @@ <extension name="uwb_conferences"> <condition field="destination_number" expression="^(32\d{2})$"> <action application="answer"/> - <!--<action application="send_display" data="32k Conference $1"/>--> <action application="conference" data="$1-${domain_name}@ultrawideband"/> </condition> </extension> @@ -330,7 +324,6 @@ <extension name="rtp_multicast_page"> <condition field="destination_number" expression="^pagegroup$|^7243"> <action application="answer"/> - <!--<action application="send_display" data="Multicast Page"/>--> <action application="esf_page_group"/> </condition> </extension> @@ -506,7 +499,6 @@ <extension name="delay_echo"> <condition field="destination_number" expression="^9995$"> <action application="answer"/> - <!--<action application="send_display" data="Delay Echo Test (5 sec)"/>--> <action application="delay_echo" data="5000"/> </condition> </extension> @@ -514,7 +506,6 @@ <extension name="echo"> <condition field="destination_number" expression="^9996$"> <action application="answer"/> - <!--<action application="send_display" data="Echo Test"/>--> <action application="echo"/> </condition> </extension> @@ -522,7 +513,6 @@ <extension name="milliwatt"> <condition field="destination_number" expression="^9997$"> <action application="answer"/> - <!--<action application="send_display" data="Milliwatt Test"/>--> <action application="playback" data="tone_stream://%(10000,0,1004);loops=-1"/> </condition> </extension> @@ -546,7 +536,6 @@ <action application="execute_extension" data="is_secure XML features"/> <action application="playback" data="$${hold_music}"/> <anti-action application="answer"/> - <!--<anti-action application="send_display" data="Insecure Music On Hold"/>--> <anti-action application="playback" data="$${hold_music}"/> </condition> </extension> Modified: freeswitch/trunk/conf/dialplan/features.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/features.xml (original) +++ freeswitch/trunk/conf/dialplan/features.xml Fri Oct 10 20:59:45 2008 @@ -7,7 +7,6 @@ <condition field="destination_number" expression="^dx$"> <action application="answer"/> <action application="read" data="11 11 'tone_stream://%(10000,0,350,440)' digits 5000 #"/> - <!--<action application="transfer" data="-bleg ${digits}"/>--> <action application="execute_extension" data="is_transfer XML features"/> </condition> </extension> @@ -16,11 +15,10 @@ <condition field="destination_number" expression="^is_transfer$"/> <condition field="${digits}" expression="^(\d+)$"> <action application="transfer" data="-bleg ${digits} XML default"/> - <anti-action application="eval" data="w00t"/> + <anti-action application="eval" data="cancel transfer"/> </condition> </extension> - <!-- Used to transfer both legs into a conference --> <extension name="cf"> <condition field="destination_number" expression="^cf$"> @@ -44,7 +42,6 @@ <condition field="${sip_via_protocol}" expression="tls"/> <condition field="${sip_secure_media_confirmed}" expression="^true$"> <action application="sleep" data="1000"/> - <!--<action application="send_display" data="Secure Music On Hold "/>--> <action application="playback" data="misc/call_secured.wav"/> <anti-action application="eval" data="not_secure"/> </condition> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Fri Oct 10 20:59:45 2008 @@ -19,7 +19,6 @@ <action application="deflect" data="${destination_number}"/> </condition> </extension> - <!-- Tag anything pass thru here as an outside_call so you can make sure not to create any routing loops based on the conditions that it came from @@ -31,6 +30,12 @@ </condition> </extension> + <extension name="call_debug" continue="true"> + <condition field="${call_debug}" expression="^true$" break="never"> + <action application="info"/> + </condition> + </extension> + <!-- Try to get domain_name from the sip_req_params variable --> <extension name="set_domain" continue="true"> <condition field="${domain_name}" expression="^$"/> @@ -42,12 +47,6 @@ </condition> </extension> - <extension name="call_debug" continue="true"> - <condition field="${call_debug}" expression="^true$" break="never"> - <action application="info"/> - </condition> - </extension> - <extension name="public_extensions"> <condition field="destination_number" expression="^(10[01][0-9])$"> <action application="transfer" data="$1 XML default"/> @@ -58,7 +57,6 @@ You can place files in the public directory to get included. --> <X-PRE-PROCESS cmd="include" data="public/*.xml"/> - <!-- If you have made it this far lets challenge the caller and if they authenticate lets try what they dialed in the default context. (commented out by default)