diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 97 |
1 files changed, 76 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 0dad3c4..6064ddc 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -48,6 +48,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | private bool m_Enabled = false; | 50 | private bool m_Enabled = false; |
51 | protected string m_MessageKey = String.Empty; | ||
51 | protected List<Scene> m_Scenes = new List<Scene>(); | 52 | protected List<Scene> m_Scenes = new List<Scene>(); |
52 | protected Dictionary<UUID, UUID> m_UserRegionMap = new Dictionary<UUID, UUID>(); | 53 | protected Dictionary<UUID, UUID> m_UserRegionMap = new Dictionary<UUID, UUID>(); |
53 | 54 | ||
@@ -67,14 +68,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
67 | public virtual void Initialise(IConfigSource config) | 68 | public virtual void Initialise(IConfigSource config) |
68 | { | 69 | { |
69 | IConfig cnf = config.Configs["Messaging"]; | 70 | IConfig cnf = config.Configs["Messaging"]; |
70 | if (cnf != null && cnf.GetString( | 71 | if (cnf != null) |
71 | "MessageTransferModule", "MessageTransferModule") != | ||
72 | "MessageTransferModule") | ||
73 | { | 72 | { |
74 | m_log.Debug("[MESSAGE TRANSFER]: Disabled by configuration"); | 73 | if (cnf.GetString("MessageTransferModule", |
75 | return; | 74 | "MessageTransferModule") != "MessageTransferModule") |
76 | } | 75 | { |
76 | return; | ||
77 | } | ||
77 | 78 | ||
79 | m_MessageKey = cnf.GetString("MessageKey", String.Empty); | ||
80 | } | ||
81 | m_log.Debug("[MESSAGE TRANSFER]: Module enabled"); | ||
78 | m_Enabled = true; | 82 | m_Enabled = true; |
79 | } | 83 | } |
80 | 84 | ||
@@ -244,6 +248,19 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
244 | && requestData.ContainsKey("position_z") && requestData.ContainsKey("region_id") | 248 | && requestData.ContainsKey("position_z") && requestData.ContainsKey("region_id") |
245 | && requestData.ContainsKey("binary_bucket")) | 249 | && requestData.ContainsKey("binary_bucket")) |
246 | { | 250 | { |
251 | if (m_MessageKey != String.Empty) | ||
252 | { | ||
253 | XmlRpcResponse error_resp = new XmlRpcResponse(); | ||
254 | Hashtable error_respdata = new Hashtable(); | ||
255 | error_respdata["success"] = "FALSE"; | ||
256 | error_resp.Value = error_respdata; | ||
257 | |||
258 | if (!requestData.Contains("message_key")) | ||
259 | return error_resp; | ||
260 | if (m_MessageKey != (string)requestData["message_key"]) | ||
261 | return error_resp; | ||
262 | } | ||
263 | |||
247 | // Do the easy way of validating the UUIDs | 264 | // Do the easy way of validating the UUIDs |
248 | UUID.TryParse((string)requestData["from_agent_id"], out fromAgentID); | 265 | UUID.TryParse((string)requestData["from_agent_id"], out fromAgentID); |
249 | UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); | 266 | UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); |
@@ -420,24 +437,37 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
420 | return resp; | 437 | return resp; |
421 | } | 438 | } |
422 | 439 | ||
423 | /// <summary> | 440 | private delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result); |
424 | /// delegate for sending a grid instant message asynchronously | ||
425 | /// </summary> | ||
426 | public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID); | ||
427 | 441 | ||
428 | protected virtual void GridInstantMessageCompleted(IAsyncResult iar) | 442 | private class GIM { |
429 | { | 443 | public GridInstantMessage im; |
430 | GridInstantMessageDelegate icon = | 444 | public MessageResultNotification result; |
431 | (GridInstantMessageDelegate)iar.AsyncState; | 445 | }; |
432 | icon.EndInvoke(iar); | ||
433 | } | ||
434 | 446 | ||
447 | private Queue<GIM> pendingInstantMessages = new Queue<GIM>(); | ||
448 | private int numInstantMessageThreads = 0; | ||
435 | 449 | ||
436 | protected virtual void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result) | 450 | private void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result) |
437 | { | 451 | { |
438 | GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsync; | 452 | lock (pendingInstantMessages) { |
453 | if (numInstantMessageThreads >= 4) { | ||
454 | GIM gim = new GIM(); | ||
455 | gim.im = im; | ||
456 | gim.result = result; | ||
457 | pendingInstantMessages.Enqueue(gim); | ||
458 | } else { | ||
459 | ++ numInstantMessageThreads; | ||
460 | //m_log.DebugFormat("[SendGridInstantMessageViaXMLRPC]: ++numInstantMessageThreads={0}", numInstantMessageThreads); | ||
461 | GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsyncMain; | ||
462 | d.BeginInvoke(im, result, GridInstantMessageCompleted, d); | ||
463 | } | ||
464 | } | ||
465 | } | ||
439 | 466 | ||
440 | d.BeginInvoke(im, result, UUID.Zero, GridInstantMessageCompleted, d); | 467 | private void GridInstantMessageCompleted(IAsyncResult iar) |
468 | { | ||
469 | GridInstantMessageDelegate d = (GridInstantMessageDelegate)iar.AsyncState; | ||
470 | d.EndInvoke(iar); | ||
441 | } | 471 | } |
442 | 472 | ||
443 | /// <summary> | 473 | /// <summary> |
@@ -452,8 +482,31 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
452 | /// Pass in 0 the first time this method is called. It will be called recursively with the last | 482 | /// Pass in 0 the first time this method is called. It will be called recursively with the last |
453 | /// regionhandle tried | 483 | /// regionhandle tried |
454 | /// </param> | 484 | /// </param> |
455 | protected virtual void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID) | 485 | private void SendGridInstantMessageViaXMLRPCAsyncMain(GridInstantMessage im, MessageResultNotification result) |
456 | { | 486 | { |
487 | GIM gim; | ||
488 | do { | ||
489 | try { | ||
490 | SendGridInstantMessageViaXMLRPCAsync(im, result, UUID.Zero); | ||
491 | } catch (Exception e) { | ||
492 | m_log.Error("[SendGridInstantMessageViaXMLRPC]: exception " + e.Message); | ||
493 | } | ||
494 | lock (pendingInstantMessages) { | ||
495 | if (pendingInstantMessages.Count > 0) { | ||
496 | gim = pendingInstantMessages.Dequeue(); | ||
497 | im = gim.im; | ||
498 | result = gim.result; | ||
499 | } else { | ||
500 | gim = null; | ||
501 | -- numInstantMessageThreads; | ||
502 | //m_log.DebugFormat("[SendGridInstantMessageViaXMLRPC]: --numInstantMessageThreads={0}", numInstantMessageThreads); | ||
503 | } | ||
504 | } | ||
505 | } while (gim != null); | ||
506 | } | ||
507 | private void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID) | ||
508 | { | ||
509 | |||
457 | UUID toAgentID = new UUID(im.toAgentID); | 510 | UUID toAgentID = new UUID(im.toAgentID); |
458 | 511 | ||
459 | PresenceInfo upd = null; | 512 | PresenceInfo upd = null; |
@@ -520,7 +573,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
520 | 573 | ||
521 | if (upd != null) | 574 | if (upd != null) |
522 | { | 575 | { |
523 | GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, | 576 | GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(UUID.Zero, |
524 | upd.RegionID); | 577 | upd.RegionID); |
525 | if (reginfo != null) | 578 | if (reginfo != null) |
526 | { | 579 | { |
@@ -669,6 +722,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
669 | gim["position_z"] = msg.Position.Z.ToString(); | 722 | gim["position_z"] = msg.Position.Z.ToString(); |
670 | gim["region_id"] = msg.RegionID.ToString(); | 723 | gim["region_id"] = msg.RegionID.ToString(); |
671 | gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None); | 724 | gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None); |
725 | if (m_MessageKey != String.Empty) | ||
726 | gim["message_key"] = m_MessageKey; | ||
672 | return gim; | 727 | return gim; |
673 | } | 728 | } |
674 | 729 | ||