aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2009-04-23 05:22:02 +0000
committerTeravus Ovares2009-04-23 05:22:02 +0000
commitdc640465a834c3ddb586d6a7850fd1805ea2e48f (patch)
treeb4bb9244a952503686880c0e7f46dc3762ee2ed3 /OpenSim/Region
parent* Adds missing IClientAPI member. (Plz be adding new members to IClientCore!) (diff)
downloadopensim-SC_OLD-dc640465a834c3ddb586d6a7850fd1805ea2e48f.zip
opensim-SC_OLD-dc640465a834c3ddb586d6a7850fd1805ea2e48f.tar.gz
opensim-SC_OLD-dc640465a834c3ddb586d6a7850fd1805ea2e48f.tar.bz2
opensim-SC_OLD-dc640465a834c3ddb586d6a7850fd1805ea2e48f.tar.xz
* Tweaking the dialstring so the sip_contact_user variable is set to the dialed user. This stops the client from complaining and might be useful later. Resolves the 'unable to parse id from mod_sofia@ip:port' message.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs11
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs5
2 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
index c131a7f..11797f6 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
153 "<user id=\"{1}\">\r\n" + 153 "<user id=\"{1}\">\r\n" +
154 "<params>\r\n" + 154 "<params>\r\n" +
155 "<param name=\"password\" value=\"{2}\" />\r\n" + 155 "<param name=\"password\" value=\"{2}\" />\r\n" +
156 "<param name=\"dial-string\" value=\"{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" + 156 "<param name=\"dial-string\" value=\"{{sip_contact_user={1}}}{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
157 "</params>\r\n" + 157 "</params>\r\n" +
158 "<variables>\r\n" + 158 "<variables>\r\n" +
159 "<variable name=\"user_context\" value=\"default\" />\r\n" + 159 "<variable name=\"user_context\" value=\"default\" />\r\n" +
@@ -190,7 +190,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
190 "<user id=\"{1}\">\r\n" + 190 "<user id=\"{1}\">\r\n" +
191 "<params>\r\n" + 191 "<params>\r\n" +
192 "<param name=\"password\" value=\"{2}\" />\r\n" + 192 "<param name=\"password\" value=\"{2}\" />\r\n" +
193 "<param name=\"dial-string\" value=\"{{presence_id=${1}@${{dialed_domain}}}}${{sofia_contact(${1}@${{dialed_domain}})}}\"/>\r\n" + 193 "<param name=\"dial-string\" value=\"{{sip_contact_user={1}}}{{presence_id=${1}@${{dialed_domain}}}}${{sofia_contact(${1}@${{dialed_domain}})}}\"/>\r\n" +
194 "</params>\r\n" + 194 "</params>\r\n" +
195 "<variables>\r\n" + 195 "<variables>\r\n" +
196 "<variable name=\"user_context\" value=\"default\" />\r\n" + 196 "<variable name=\"user_context\" value=\"default\" />\r\n" +
@@ -200,7 +200,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
200 "<user id=\"{3}\">\r\n" + 200 "<user id=\"{3}\">\r\n" +
201 "<params>\r\n" + 201 "<params>\r\n" +
202 "<param name=\"password\" value=\"{2}\" />\r\n" + 202 "<param name=\"password\" value=\"{2}\" />\r\n" +
203 "<param name=\"dial-string\" value=\"{{presence_id=${3}@${{dialed_domain}}}}${{sofia_contact(${3}@${{dialed_domain}})}}\"/>\r\n" + 203 "<param name=\"dial-string\" value=\"{{sip_contact_user={1}}}{{presence_id=${3}@${{dialed_domain}}}}${{sofia_contact(${3}@${{dialed_domain}})}}\"/>\r\n" +
204 "</params>\r\n" + 204 "</params>\r\n" +
205 "<variables>\r\n" + 205 "<variables>\r\n" +
206 "<variable name=\"user_context\" value=\"default\" />\r\n" + 206 "<variable name=\"user_context\" value=\"default\" />\r\n" +
@@ -234,7 +234,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
234 "<section name=\"directory\" description=\"User Directory\">\r\n" + 234 "<section name=\"directory\" description=\"User Directory\">\r\n" +
235 "<domain name=\"{0}\">\r\n" + 235 "<domain name=\"{0}\">\r\n" +
236 "<params>\r\n" + 236 "<params>\r\n" +
237 "<param name=\"dial-string\" value=\"{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" + 237 "<param name=\"dial-string\" value=\"{{sip_contact_user=${{dialed_user}}}}{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
238 "</params>\r\n" + 238 "</params>\r\n" +
239 "<user id=\"{1}\">\r\n" + 239 "<user id=\"{1}\">\r\n" +
240 "<variables>\r\n"+ 240 "<variables>\r\n"+
@@ -267,7 +267,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
267 "<section name=\"directory\" description=\"User Directory\">\r\n" + 267 "<section name=\"directory\" description=\"User Directory\">\r\n" +
268 "<domain name=\"{0}\">\r\n" + 268 "<domain name=\"{0}\">\r\n" +
269 "<params>\r\n" + 269 "<params>\r\n" +
270 "<param name=\"dial-string\" value=\"{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" + 270 "<param name=\"dial-string\" value=\"{{sip_contact_user=${{dialed_user}}}}{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
271 "</params>\r\n" + 271 "</params>\r\n" +
272 "<groups name=\"default\">\r\n"+ 272 "<groups name=\"default\">\r\n"+
273 "<users>\r\n"+ 273 "<users>\r\n"+
@@ -302,6 +302,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
302 302
303 return response; 303 return response;
304 } 304 }
305
305 306
306// private Hashtable HandleLoadNetworkLists(Hashtable request) 307// private Hashtable HandleLoadNetworkLists(Hashtable request)
307// { 308// {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 358f1cd..58f1b3a 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -45,6 +45,7 @@ using OpenSim.Framework.Servers;
45using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;
47using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 47using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
48using System.Text.RegularExpressions;
48 49
49namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice 50namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
50{ 51{
@@ -511,7 +512,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
511 // -> TODO Initialise(): keep track of regions via events 512 // -> TODO Initialise(): keep track of regions via events
512 // re-generate accounts for all avatars 513 // re-generate accounts for all avatars
513 // -> TODO Initialise(): keep track of avatars via events 514 // -> TODO Initialise(): keep track of avatars via events
514 m_log.DebugFormat("[FreeSwitchVoice] FreeSwitchConfigHTTPHandler return {0}",response["str_response_string"]); 515 Regex normalizeEndLines = new Regex(@"\r\n", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline);
516
517 m_log.DebugFormat("[FreeSwitchVoice] FreeSwitchConfigHTTPHandler return {0}",normalizeEndLines.Replace(((string)response["str_response_string"]), ""));
515 return response; 518 return response;
516 } 519 }
517 520