From d170ee25db815dc70bed7bf51108fb66cb5211c4 Mon Sep 17 00:00:00 2001
From: Karl Anderson <bitbashing@gmail.com>
Date: Wed, 4 May 2011 10:12:18 -0700
Subject: [PATCH] tweaks to the commit

---
 freeswitch.xml                  | 38 +++++++++++++++++++++++++++------
 sip_profiles/sipinterface_1.xml | 12 ++++++-----
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/freeswitch.xml b/freeswitch.xml
index 720124a..7211c21 100644
--- a/freeswitch.xml
+++ b/freeswitch.xml
@@ -1,14 +1,40 @@
 <?xml version="1.0"?>
 <document type="freeswitch/xml">
-    <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2200,400,450)"/>
-    <X-PRE-PROCESS cmd="set" data="us-ring=%(2000,4000,440.0,480.0)"/>
-    <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500,3500,440.0,0.0)"/>
-    <X-PRE-PROCESS cmd="set" data="rs-ring=%(1000,4000,425.0,0.0)"/>
-    <X-PRE-PROCESS cmd="set" data="ru-ring=%(800,3200,425,0)"/>
+    <X-PRE-PROCESS cmd="set" data="be-ring=%(1000,3000,425)"/>
+    <X-PRE-PROCESS cmd="set" data="ca-ring=%(2000,4000,440,480)"/>
+    <X-PRE-PROCESS cmd="set" data="cn-ring=%(1000,4000,450)"/>
+    <X-PRE-PROCESS cmd="set" data="cy-ring=%(1500,3000,425)"/>
+    <X-PRE-PROCESS cmd="set" data="cz-ring=%(1000,4000,425)"/>
+    <X-PRE-PROCESS cmd="set" data="de-ring=%(1000,4000,425)"/>
+    <X-PRE-PROCESS cmd="set" data="dk-ring=%(1000,4000,425)"/>
+    <X-PRE-PROCESS cmd="set" data="dz-ring=%(1500,3500,425)"/>
+    <X-PRE-PROCESS cmd="set" data="eg-ring=%(2000,1000,475,375)"/>
+    <X-PRE-PROCESS cmd="set" data="fi-ring=%(1000,4000,425)"/>
+    <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500,3500,440)"/>
+    <X-PRE-PROCESS cmd="set" data="hk-ring=%(400,200,440,480);%(400,3000,440,480)"/>
+    <X-PRE-PROCESS cmd="set" data="hu-ring=%(1250,3750,425)"/>
+    <X-PRE-PROCESS cmd="set" data="il-ring=%(1000,3000,400)"/>
+    <X-PRE-PROCESS cmd="set" data="in-ring=%(400,200,425,375);%(400,2000,425,375)"/>
+    <X-PRE-PROCESS cmd="set" data="jp-ring=%(1000,2000,420,380)"/>
+    <X-PRE-PROCESS cmd="set" data="ko-ring=%(1000,2000,440,480)"/>
+    <X-PRE-PROCESS cmd="set" data="pk-ring=%(1000,2000,400)"/>
+    <X-PRE-PROCESS cmd="set" data="pl-ring=%(1000,4000,425)"/>
+    <X-PRE-PROCESS cmd="set" data="ro-ring=%(1850,4150,475,425)"/>
+    <X-PRE-PROCESS cmd="set" data="rs-ring=%(1000,4000,425)"/>
+    <X-PRE-PROCESS cmd="set" data="ru-ring=%(800,3200,425)"/>
+    <X-PRE-PROCESS cmd="set" data="sa-ring=%(1200,4600,425)"/>
+    <X-PRE-PROCESS cmd="set" data="tr-ring=%(2000,4000,450)"/>
+    <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2000,400,450)"/>
+    <X-PRE-PROCESS cmd="set" data="us-ring=%(2000,4000,440,480)"/>
     <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>
-    <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://default"/>
     <X-PRE-PROCESS cmd="set" data="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/>
 
+    <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://default"/>
+    <X-PRE-PROCESS cmd="set" data="ignore_display_updates=true"/>
+    <X-PRE-PROCESS cmd="set" data="recordings_dir=/tmp/"/>
+
+    <X-PRE-PROCESS cmd="set" data="codecs=G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
+
     <section name="configuration" description="Various Configuration">
         <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/>
     </section>
diff --git a/sip_profiles/sipinterface_1.xml b/sip_profiles/sipinterface_1.xml
index 46bab36..69f9870 100644
--- a/sip_profiles/sipinterface_1.xml
+++ b/sip_profiles/sipinterface_1.xml
@@ -5,7 +5,7 @@
         <settings>
             <!-- ACL -->
             <param name="auth-calls" value="true"/>
-            <param name="apply-nat-acl" value="rfc1918"/>
+            <param name="apply-nat-acl" value="rfc1918.auto"/>
             <param name="apply-inbound-acl" value="trusted"/>
             <param name="apply-proxy-acl" value="authoritative"/>
             <param name="local-network-acl" value="localnet.auto"/>
@@ -44,7 +44,7 @@
             <!--<param name="outbound-proxy" value="127.0.0.1"/>-->
             <!--<param name="sip-domain" value="sip.2600hz.com"/>-->
             <!--<param name="contact-user" value="sip.2600hz.com"/>-->
-            <param name="user-agent-string" value="sip.2600hz.com"/>
+            <param name="user-agent-string" value="http://www.2600hz.com"/>
             <param name="enable-100rel" value="false"/>
             <param name="max-proceeding" value="1000"/>
             <!--<param name="max-calls" value="250"/>-->
@@ -65,11 +65,11 @@
             <param name="ext-rtp-ip" value="auto"/>
             <param name="rtp-timer-name" value="soft"/>
             <param name="rtp-autoflush-during-bridge" value="true"/>
-            <!--<param name="rtp-rewrite-timestamps" value="true"/>-->
+            <param name="rtp-rewrite-timestamps" value="true"/>
             <!--<param name="disable-rtp-auto-adjust" value="true"/>-->
             <!--<param name="rtp-autofix-timing" value="false"/>-->
             <!--<param name="auto-rtp-bugs" data="clear"/>-->
-            <param name="inbound-bypass-media" value="true"/>
+            <!--<param name="inbound-bypass-media" value="true"/>-->
             <!--<param name="media-option" value="resume-media-on-hold"/>-->
             <!--<param name="media-option" value="bypass-media-after-att-xfer"/>-->
             <!--<param name="rtp-timeout-sec" value="true"/>-->
@@ -101,7 +101,9 @@
 
 
             <!-- Codecs -->
-            <param name="codec-prefs" value="G729,PCMU"/>
+            <!--<param name="codec-prefs" value="$${codecs}"/>-->
+            <param name="inbound-codec-prefs" value="$${codecs}"/>
+            <param name="outbound-codec-prefs" value="$${codecs}"/>
             <param name="inbound-codec-negotiation" value="generous"/>
             <param name="inbound-late-negotiation" value="true"/>
             <!--<param name="bitpacking" value="aal2"/> -->