update

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

diff --git a/conf/autoload_configs/acl.conf.xml b/conf/autoload_configs/acl.conf.xml
index 701191dc532b97b09bd61141f6c697ea7b9d7acf..c6afa68c5bb59ebb1dc85de0d54ea4bed6db4662 100644 (file)
--- a/conf/autoload_configs/acl.conf.xml
+++ b/conf/autoload_configs/acl.conf.xml
@@ -1,5 +1,10 @@
 <configuration name="acl.conf" description="Network Lists">
   <network-lists>
+    <list name="dl-candidates" default="allow">
+      <node type="deny" cidr="10.0.0.0/8"/>
+      <node type="deny" cidr="172.16.0.0/12"/>
+      <node type="deny" cidr="192.168.0.0/16"/>
+    </list>
     <list name="rfc1918" default="deny">
       <node type="allow" cidr="10.0.0.0/8"/>
       <node type="allow" cidr="172.16.0.0/12"/>

diff --git a/conf/jingle_profiles/client.xml b/conf/jingle_profiles/client.xml
index 66a7beda9a8467bbebe9d9db3121c5217835b5b2..f2137ffa6f1bdd2f7fd90d819dc2915c15d306da 100644 (file)
--- a/conf/jingle_profiles/client.xml
+++ b/conf/jingle_profiles/client.xml
@@ -25,5 +25,6 @@
     <!-- <param name="vad" value="out"/> -->
     <param name="vad" value="both"/>
     <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
+    <!--<param name="candidate-acl" value="dl-candidates"/>-->
   </x-profile>
 </include>

diff --git a/conf/jingle_profiles/server.xml b/conf/jingle_profiles/server.xml
index f3703857a95c37de801402ab279c0172ada20eda..1a85155d4ebf3ad17a8e526a280975633d6a9e89 100644 (file)
--- a/conf/jingle_profiles/server.xml
+++ b/conf/jingle_profiles/server.xml
@@ -15,5 +15,6 @@
     <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
     <!--If you have ODBC support and a working dsn you can use it instead of SQLite-->
     <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
+    <!--<param name="candidate-acl" value="dl-candidates"/>-->
   </x-profile>
 </include>