aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-19 21:54:26 +0100
committerJustin Clark-Casey (justincc)2011-04-19 21:54:26 +0100
commit2fa210243b64bb10fbca37f89176f10efeb25f41 (patch)
treec4e69514df1fba5165d274332c42361e04249c92 /OpenSim
parentMove mesh on/off swtich from [Startup] to [Mesh] in anticipation of future co... (diff)
downloadopensim-SC_OLD-2fa210243b64bb10fbca37f89176f10efeb25f41.zip
opensim-SC_OLD-2fa210243b64bb10fbca37f89176f10efeb25f41.tar.gz
opensim-SC_OLD-2fa210243b64bb10fbca37f89176f10efeb25f41.tar.bz2
opensim-SC_OLD-2fa210243b64bb10fbca37f89176f10efeb25f41.tar.xz
Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs28
-rw-r--r--OpenSim/Services/FreeswitchService/FreeswitchService.cs29
-rw-r--r--OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs2
3 files changed, 32 insertions, 27 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 7909d8a..962b5ca 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
118 118
119 if (serviceDll == String.Empty) 119 if (serviceDll == String.Empty)
120 { 120 {
121 m_log.Error("[FreeSwitchVoice]: No LocalServiceModule named in section FreeSwitchVoice"); 121 m_log.Error("[FreeSwitchVoice]: No LocalServiceModule named in section FreeSwitchVoice. Not starting.");
122 return; 122 return;
123 } 123 }
124 124
@@ -143,8 +143,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
143 if (String.IsNullOrEmpty(m_freeSwitchRealm) || 143 if (String.IsNullOrEmpty(m_freeSwitchRealm) ||
144 String.IsNullOrEmpty(m_freeSwitchAPIPrefix)) 144 String.IsNullOrEmpty(m_freeSwitchAPIPrefix))
145 { 145 {
146 m_log.Error("[FreeSwitchVoice] plugin mis-configured"); 146 m_log.Error("[FreeSwitchVoice]: Freeswitch service mis-configured. Not starting.");
147 m_log.Info("[FreeSwitchVoice] plugin disabled: incomplete configuration");
148 return; 147 return;
149 } 148 }
150 149
@@ -172,16 +171,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
172 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_buddy.php", m_freeSwitchAPIPrefix), 171 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_buddy.php", m_freeSwitchAPIPrefix),
173 FreeSwitchSLVoiceBuddyHTTPHandler); 172 FreeSwitchSLVoiceBuddyHTTPHandler);
174 173
175 m_log.InfoFormat("[FreeSwitchVoice] using FreeSwitch server {0}", m_freeSwitchRealm); 174 m_log.InfoFormat("[FreeSwitchVoice]: using FreeSwitch server {0}", m_freeSwitchRealm);
176 175
177 m_Enabled = true; 176 m_Enabled = true;
178 177
179 m_log.Info("[FreeSwitchVoice] plugin enabled"); 178 m_log.Info("[FreeSwitchVoice]: plugin enabled");
180 } 179 }
181 catch (Exception e) 180 catch (Exception e)
182 { 181 {
183 m_log.ErrorFormat("[FreeSwitchVoice] plugin initialization failed: {0}", e.Message); 182 m_log.ErrorFormat("[FreeSwitchVoice]: plugin initialization failed: {0} {1}", e.Message, e.StackTrace);
184 m_log.DebugFormat("[FreeSwitchVoice] plugin initialization failed: {0}", e.ToString());
185 return; 183 return;
186 } 184 }
187 185
@@ -240,7 +238,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
240 { 238 {
241 if (m_Enabled) 239 if (m_Enabled)
242 { 240 {
243 m_log.Info("[FreeSwitchVoice] registering IVoiceModule with the scene"); 241 m_log.Info("[FreeSwitchVoice]: registering IVoiceModule with the scene");
244 242
245 // register the voice interface for this module, so the script engine can call us 243 // register the voice interface for this module, so the script engine can call us
246 scene.RegisterModuleInterface<IVoiceModule>(this); 244 scene.RegisterModuleInterface<IVoiceModule>(this);
@@ -302,7 +300,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
302 // </summary> 300 // </summary>
303 public void OnRegisterCaps(Scene scene, UUID agentID, Caps caps) 301 public void OnRegisterCaps(Scene scene, UUID agentID, Caps caps)
304 { 302 {
305 m_log.DebugFormat("[FreeSwitchVoice] OnRegisterCaps: agentID {0} caps {1}", agentID, caps); 303 m_log.DebugFormat(
304 "[FreeSwitchVoice]: OnRegisterCaps called with agentID {0} caps {1} in scene {2}",
305 agentID, caps, scene.RegionInfo.RegionName);
306 306
307 string capsBase = "/CAPS/" + caps.CapsObjectPath; 307 string capsBase = "/CAPS/" + caps.CapsObjectPath;
308 caps.RegisterHandler("ProvisionVoiceAccountRequest", 308 caps.RegisterHandler("ProvisionVoiceAccountRequest",
@@ -558,7 +558,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
558 558
559 public Hashtable FreeSwitchSLVoiceGetPreloginHTTPHandler(Hashtable request) 559 public Hashtable FreeSwitchSLVoiceGetPreloginHTTPHandler(Hashtable request)
560 { 560 {
561 m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceGetPreloginHTTPHandler called"); 561 m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceGetPreloginHTTPHandler called");
562 562
563 Hashtable response = new Hashtable(); 563 Hashtable response = new Hashtable();
564 response["content_type"] = "text/xml"; 564 response["content_type"] = "text/xml";
@@ -664,7 +664,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
664 664
665 public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) 665 public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request)
666 { 666 {
667 m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called"); 667 m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceSigninHTTPHandler called");
668// string requestbody = (string)request["body"]; 668// string requestbody = (string)request["body"];
669// string uri = (string)request["uri"]; 669// string uri = (string)request["uri"];
670// string contenttype = (string)request["content-type"]; 670// string contenttype = (string)request["content-type"];
@@ -795,16 +795,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
795 response["keepalive"] = false; 795 response["keepalive"] = false;
796 response["int_response_code"] = 500; 796 response["int_response_code"] = 500;
797 797
798 Hashtable requestBody = ParseRequestBody((string) request["body"]); 798 Hashtable requestBody = ParseRequestBody((string)request["body"]);
799 799
800 string section = (string) requestBody["section"]; 800 string section = (string) requestBody["section"];
801
802 m_log.DebugFormat("[FreeSwitchVoice]: Received request for config section {0}", section);
801 803
802 if (section == "directory") 804 if (section == "directory")
803 response = m_FreeswitchService.HandleDirectoryRequest(requestBody); 805 response = m_FreeswitchService.HandleDirectoryRequest(requestBody);
804 else if (section == "dialplan") 806 else if (section == "dialplan")
805 response = m_FreeswitchService.HandleDialplanRequest(requestBody); 807 response = m_FreeswitchService.HandleDialplanRequest(requestBody);
806 else 808 else
807 m_log.WarnFormat("[FreeSwitchVoice]: section was {0}", section); 809 m_log.WarnFormat("[FreeSwitchVoice]: Unknown section {0} was requested.", section);
808 810
809 return response; 811 return response;
810 } 812 }
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index fe6f5cd..1ec89da 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -50,13 +50,13 @@ namespace OpenSim.Services.FreeswitchService
50 50
51 public Hashtable HandleDialplanRequest(Hashtable request) 51 public Hashtable HandleDialplanRequest(Hashtable request)
52 { 52 {
53 m_log.DebugFormat("[FreeSwitchVoice] HandleDialplanRequest called with {0}",request.ToString()); 53 m_log.DebugFormat("[FreeSwitchVoice]: HandleDialplanRequest called with {0}",request.ToString());
54 54
55 Hashtable response = new Hashtable(); 55 Hashtable response = new Hashtable();
56 56
57 foreach (DictionaryEntry item in request) 57 foreach (DictionaryEntry item in request)
58 { 58 {
59 m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value); 59 m_log.InfoFormat("[FreeSwitchDirectory]: requestBody item {0} {1}",item.Key, item.Value);
60 } 60 }
61 61
62 string requestcontext = (string) request["Hunt-Context"]; 62 string requestcontext = (string) request["Hunt-Context"];
@@ -66,7 +66,7 @@ namespace OpenSim.Services.FreeswitchService
66 66
67 if (m_freeSwitchContext != String.Empty && m_freeSwitchContext != requestcontext) 67 if (m_freeSwitchContext != String.Empty && m_freeSwitchContext != requestcontext)
68 { 68 {
69 m_log.Debug("[FreeSwitchDirectory] returning empty as it's for another context"); 69 m_log.Debug("[FreeSwitchDirectory]: returning empty as it's for another context");
70 response["str_response_string"] = ""; 70 response["str_response_string"] = "";
71 } 71 }
72 else 72 else
@@ -116,13 +116,16 @@ namespace OpenSim.Services.FreeswitchService
116 { 116 {
117 Hashtable response = new Hashtable(); 117 Hashtable response = new Hashtable();
118 string domain = (string) request["domain"]; 118 string domain = (string) request["domain"];
119 if (domain != m_freeSwitchRealm) { 119 if (domain != m_freeSwitchRealm)
120 {
120 response["content_type"] = "text/xml"; 121 response["content_type"] = "text/xml";
121 response["keepalive"] = false; 122 response["keepalive"] = false;
122 response["int_response_code"] = 200; 123 response["int_response_code"] = 200;
123 response["str_response_string"] = ""; 124 response["str_response_string"] = "";
124 } else { 125 }
125 m_log.DebugFormat("[FreeSwitchDirectory] HandleDirectoryRequest called with {0}",request.ToString()); 126 else
127 {
128// m_log.DebugFormat("[FreeSwitchDirectory]: HandleDirectoryRequest called with {0}",request.ToString());
126 129
127 // information in the request we might be interested in 130 // information in the request we might be interested in
128 131
@@ -145,7 +148,7 @@ namespace OpenSim.Services.FreeswitchService
145 148
146 foreach (DictionaryEntry item in request) 149 foreach (DictionaryEntry item in request)
147 { 150 {
148 m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}", item.Key, item.Value); 151 m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value);
149 } 152 }
150 153
151 string eventCallingFunction = (string) request["Event-Calling-Function"]; 154 string eventCallingFunction = (string) request["Event-Calling-Function"];
@@ -173,7 +176,7 @@ namespace OpenSim.Services.FreeswitchService
173 } 176 }
174 else 177 else
175 { 178 {
176 m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod); 179 m_log.ErrorFormat("[FreeSwitchVoice]: HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod);
177 response["int_response_code"] = 404; 180 response["int_response_code"] = 404;
178 response["content_type"] = "text/xml"; 181 response["content_type"] = "text/xml";
179 response["str_response_string"] = ""; 182 response["str_response_string"] = "";
@@ -205,7 +208,7 @@ namespace OpenSim.Services.FreeswitchService
205 } 208 }
206 else 209 else
207 { 210 {
208 m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown Event-Calling-Function {0}",eventCallingFunction); 211 m_log.ErrorFormat("[FreeSwitchVoice]: HandleDirectoryRequest unknown Event-Calling-Function {0}",eventCallingFunction);
209 response["int_response_code"] = 404; 212 response["int_response_code"] = 404;
210 response["keepalive"] = false; 213 response["keepalive"] = false;
211 response["content_type"] = "text/xml"; 214 response["content_type"] = "text/xml";
@@ -217,7 +220,7 @@ namespace OpenSim.Services.FreeswitchService
217 220
218 private Hashtable HandleRegister(string Context, string Realm, Hashtable request) 221 private Hashtable HandleRegister(string Context, string Realm, Hashtable request)
219 { 222 {
220 m_log.Info("[FreeSwitchDirectory] HandleRegister called"); 223 m_log.Info("[FreeSwitchDirectory]: HandleRegister called");
221 224
222 // TODO the password we return needs to match that sent in the request, this is hard coded for now 225 // TODO the password we return needs to match that sent in the request, this is hard coded for now
223 string password = "1234"; 226 string password = "1234";
@@ -254,7 +257,7 @@ namespace OpenSim.Services.FreeswitchService
254 257
255 private Hashtable HandleInvite(string Context, string Realm, Hashtable request) 258 private Hashtable HandleInvite(string Context, string Realm, Hashtable request)
256 { 259 {
257 m_log.Info("[FreeSwitchDirectory] HandleInvite called"); 260 m_log.Info("[FreeSwitchDirectory]: HandleInvite called");
258 261
259 // TODO the password we return needs to match that sent in the request, this is hard coded for now 262 // TODO the password we return needs to match that sent in the request, this is hard coded for now
260 string password = "1234"; 263 string password = "1234";
@@ -301,7 +304,7 @@ namespace OpenSim.Services.FreeswitchService
301 304
302 private Hashtable HandleLocateUser(String Realm, Hashtable request) 305 private Hashtable HandleLocateUser(String Realm, Hashtable request)
303 { 306 {
304 m_log.Info("[FreeSwitchDirectory] HandleLocateUser called"); 307 m_log.Info("[FreeSwitchDirectory]: HandleLocateUser called");
305 308
306 // TODO the password we return needs to match that sent in the request, this is hard coded for now 309 // TODO the password we return needs to match that sent in the request, this is hard coded for now
307 string domain = (string) request["domain"]; 310 string domain = (string) request["domain"];
@@ -335,7 +338,7 @@ namespace OpenSim.Services.FreeswitchService
335 338
336 private Hashtable HandleConfigSofia(string Context, string Realm, Hashtable request) 339 private Hashtable HandleConfigSofia(string Context, string Realm, Hashtable request)
337 { 340 {
338 m_log.Info("[FreeSwitchDirectory] HandleConfigSofia called"); 341 m_log.Info("[FreeSwitchDirectory]: HandleConfigSofia called.");
339 342
340 // TODO the password we return needs to match that sent in the request, this is hard coded for now 343 // TODO the password we return needs to match that sent in the request, this is hard coded for now
341 string domain = (string) request["domain"]; 344 string domain = (string) request["domain"];
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs b/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs
index ebbb1b0..25c18b6 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Services.FreeswitchService
64 m_freeSwitchDefaultWellKnownIP = freeswitchConfig.GetString("ServerAddress", String.Empty); 64 m_freeSwitchDefaultWellKnownIP = freeswitchConfig.GetString("ServerAddress", String.Empty);
65 if (m_freeSwitchDefaultWellKnownIP == String.Empty) 65 if (m_freeSwitchDefaultWellKnownIP == String.Empty)
66 { 66 {
67 m_log.Error("[FREESWITCH]: No FreeswitchServerAddress given, can't continue"); 67 m_log.Error("[FREESWITCH]: No ServerAddress given, cannot start service.");
68 return; 68 return;
69 } 69 }
70 70