From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Wed, 14 May 2008 14:22:04 +0000 (+0000)
Subject: musta took a wrong toin at albakoyke
X-Git-Tag: v1.0-rc6~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6df5e203390aa60d61c07aeb42f79f575ca7183;p=thirdparty%2Ffreeswitch.git

musta took a wrong toin at albakoyke

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

diff --git a/conf/autoload_configs/conference.conf.xml b/conf/autoload_configs/conference.conf.xml
index 4a11ba8cd5..d70e50a5bd 100644
--- a/conf/autoload_configs/conference.conf.xml
+++ b/conf/autoload_configs/conference.conf.xml
@@ -83,6 +83,7 @@
       <param name="pin-sound" value="conference/conf-pin.wav"/>
       <!-- File to play to when the pin is invalid -->
       <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+      <param name="comfort-noise-level" value="1400"/>
       <!-- Conference pin -->
       <!--<param name="pin" value="12345"/>-->
       <!-- Default Caller ID Name for outbound calls -->
diff --git a/conf/autoload_configs/modules.conf.xml b/conf/autoload_configs/modules.conf.xml
index 8140b04ce7..90a83dd1b7 100644
--- a/conf/autoload_configs/modules.conf.xml
+++ b/conf/autoload_configs/modules.conf.xml
@@ -11,7 +11,7 @@
     <load module="mod_enum"/>
 
     <!-- XML Interfaces -->
-    <!-- <load module="mod_xml_rpc"/> -->
+    <load module="mod_xml_rpc"/>
     <!-- <load module="mod_xml_curl"/> -->
     <!-- <load module="mod_xml_cdr"/> -->
 
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 26429ef403..4793afa7b4 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -2726,6 +2726,8 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 	tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip);
 	tech_pvt->remote_port = network_port;
 
+	channel = tech_pvt->channel = switch_core_session_get_channel(session);
+
 	if (sip->sip_contact && sip->sip_contact->m_url) {
 		char tmp[35] = "";
 		tech_pvt->record_route = switch_core_session_sprintf(session, "sip:%s@%s:%d", 
@@ -2741,7 +2743,6 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 		tech_pvt->key = switch_core_session_strdup(session, key);
 	}
 
-	channel = tech_pvt->channel = switch_core_session_get_channel(session);
 	
 	if (is_auth) {
 		switch_channel_set_variable(channel, "sip_authorized", "true");