diff options
author | BlueWall | 2012-12-07 15:36:43 -0500 |
---|---|---|
committer | BlueWall | 2012-12-07 15:36:43 -0500 |
commit | 0b455d2882a51ce0841d003f12d4c35ad9edb753 (patch) | |
tree | c48c95f48786f8fe435fc5c90477ac3b7c9eaf6c /OpenSim/Services | |
parent | Merge branch 'master' into connector_plugin (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.zip opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.gz opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.bz2 opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.xz |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Services')
3 files changed, 141 insertions, 11 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 95c4f87..57f2ffa 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -314,7 +314,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
314 | 314 | ||
315 | try | 315 | try |
316 | { | 316 | { |
317 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000, false); | 317 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 30000, false); |
318 | bool success = result["success"].AsBoolean(); | 318 | bool success = result["success"].AsBoolean(); |
319 | if (result.ContainsKey("_Result")) | 319 | if (result.ContainsKey("_Result")) |
320 | { | 320 | { |
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index 0c9cfd3..e8d7cca 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs | |||
@@ -61,13 +61,13 @@ namespace OpenSim.Services.HypergridService | |||
61 | protected static IGridService m_GridService; | 61 | protected static IGridService m_GridService; |
62 | protected static IPresenceService m_PresenceService; | 62 | protected static IPresenceService m_PresenceService; |
63 | protected static IUserAgentService m_UserAgentService; | 63 | protected static IUserAgentService m_UserAgentService; |
64 | protected static IOfflineIMService m_OfflineIMService; | ||
64 | 65 | ||
65 | protected static IInstantMessageSimConnector m_IMSimConnector; | 66 | protected static IInstantMessageSimConnector m_IMSimConnector; |
66 | 67 | ||
67 | protected static Dictionary<UUID, object> m_UserLocationMap = new Dictionary<UUID, object>(); | 68 | protected static Dictionary<UUID, object> m_UserLocationMap = new Dictionary<UUID, object>(); |
68 | private static ExpiringCache<UUID, GridRegion> m_RegionCache; | 69 | private static ExpiringCache<UUID, GridRegion> m_RegionCache; |
69 | 70 | ||
70 | private static string m_RestURL; | ||
71 | private static bool m_ForwardOfflineGroupMessages; | 71 | private static bool m_ForwardOfflineGroupMessages; |
72 | private static bool m_InGatekeeper; | 72 | private static bool m_InGatekeeper; |
73 | 73 | ||
@@ -111,9 +111,14 @@ namespace OpenSim.Services.HypergridService | |||
111 | return; | 111 | return; |
112 | } | 112 | } |
113 | 113 | ||
114 | m_RestURL = cnf.GetString("OfflineMessageURL", string.Empty); | ||
115 | m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", false); | 114 | m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", false); |
116 | 115 | ||
116 | if (m_InGatekeeper) | ||
117 | { | ||
118 | string offlineIMService = cnf.GetString("OfflineIMService", string.Empty); | ||
119 | if (offlineIMService != string.Empty) | ||
120 | m_OfflineIMService = ServerUtils.LoadPlugin<IOfflineIMService>(offlineIMService, args); | ||
121 | } | ||
117 | } | 122 | } |
118 | } | 123 | } |
119 | 124 | ||
@@ -329,18 +334,28 @@ namespace OpenSim.Services.HypergridService | |||
329 | 334 | ||
330 | private bool UndeliveredMessage(GridInstantMessage im) | 335 | private bool UndeliveredMessage(GridInstantMessage im) |
331 | { | 336 | { |
332 | if (m_RestURL != string.Empty && (im.offline != 0) | 337 | if (m_OfflineIMService == null) |
333 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) | 338 | return false; |
334 | { | ||
335 | // m_log.DebugFormat("[HG IM SERVICE]: Message saved"); | ||
336 | 339 | ||
337 | return SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( | 340 | if (im.dialog != (byte)InstantMessageDialog.MessageFromObject && |
338 | "POST", m_RestURL + "/SaveMessage/", im); | 341 | im.dialog != (byte)InstantMessageDialog.MessageFromAgent && |
339 | } | 342 | im.dialog != (byte)InstantMessageDialog.GroupNotice && |
340 | else | 343 | im.dialog != (byte)InstantMessageDialog.GroupInvitation && |
344 | im.dialog != (byte)InstantMessageDialog.InventoryOffered) | ||
341 | { | 345 | { |
342 | return false; | 346 | return false; |
343 | } | 347 | } |
348 | |||
349 | if (!m_ForwardOfflineGroupMessages) | ||
350 | { | ||
351 | if (im.dialog == (byte)InstantMessageDialog.GroupNotice || | ||
352 | im.dialog == (byte)InstantMessageDialog.GroupInvitation) | ||
353 | return false; | ||
354 | } | ||
355 | |||
356 | // m_log.DebugFormat("[HG IM SERVICE]: Message saved"); | ||
357 | string reason = string.Empty; | ||
358 | return m_OfflineIMService.StoreMessage(im, out reason); | ||
344 | } | 359 | } |
345 | } | 360 | } |
346 | } \ No newline at end of file | 361 | } \ No newline at end of file |
diff --git a/OpenSim/Services/Interfaces/IOfflineIMService.cs b/OpenSim/Services/Interfaces/IOfflineIMService.cs new file mode 100644 index 0000000..2848967 --- /dev/null +++ b/OpenSim/Services/Interfaces/IOfflineIMService.cs | |||
@@ -0,0 +1,115 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | using System; | ||
28 | using System.Collections.Generic; | ||
29 | |||
30 | using OpenSim.Framework; | ||
31 | using OpenMetaverse; | ||
32 | |||
33 | namespace OpenSim.Services.Interfaces | ||
34 | { | ||
35 | public interface IOfflineIMService | ||
36 | { | ||
37 | List<GridInstantMessage> GetMessages(UUID principalID); | ||
38 | bool StoreMessage(GridInstantMessage im, out string reason); | ||
39 | } | ||
40 | |||
41 | public class OfflineIMDataUtils | ||
42 | { | ||
43 | public static GridInstantMessage GridInstantMessage(Dictionary<string, object> dict) | ||
44 | { | ||
45 | GridInstantMessage im = new GridInstantMessage(); | ||
46 | |||
47 | if (dict.ContainsKey("BinaryBucket") && dict["BinaryBucket"] != null) | ||
48 | im.binaryBucket = OpenMetaverse.Utils.HexStringToBytes(dict["BinaryBucket"].ToString(), true); | ||
49 | |||
50 | if (dict.ContainsKey("Dialog") && dict["Dialog"] != null) | ||
51 | im.dialog = byte.Parse(dict["Dialog"].ToString()); | ||
52 | |||
53 | if (dict.ContainsKey("FromAgentID") && dict["FromAgentID"] != null) | ||
54 | im.fromAgentID = new Guid(dict["FromAgentID"].ToString()); | ||
55 | |||
56 | if (dict.ContainsKey("FromAgentName") && dict["FromAgentName"] != null) | ||
57 | im.fromAgentName = dict["FromAgentName"].ToString(); | ||
58 | else | ||
59 | im.fromAgentName = string.Empty; | ||
60 | |||
61 | if (dict.ContainsKey("FromGroup") && dict["FromGroup"] != null) | ||
62 | im.fromGroup = bool.Parse(dict["FromGroup"].ToString()); | ||
63 | |||
64 | if (dict.ContainsKey("SessionID") && dict["SessionID"] != null) | ||
65 | im.imSessionID = new Guid(dict["SessionID"].ToString()); | ||
66 | |||
67 | if (dict.ContainsKey("Message") && dict["Message"] != null) | ||
68 | im.message = dict["Message"].ToString(); | ||
69 | else | ||
70 | im.message = string.Empty; | ||
71 | |||
72 | if (dict.ContainsKey("Offline") && dict["Offline"] != null) | ||
73 | im.offline = byte.Parse(dict["Offline"].ToString()); | ||
74 | |||
75 | if (dict.ContainsKey("EstateID") && dict["EstateID"] != null) | ||
76 | im.ParentEstateID = UInt32.Parse(dict["EstateID"].ToString()); | ||
77 | |||
78 | if (dict.ContainsKey("Position") && dict["Position"] != null) | ||
79 | im.Position = Vector3.Parse(dict["Position"].ToString()); | ||
80 | |||
81 | if (dict.ContainsKey("RegionID") && dict["RegionID"] != null) | ||
82 | im.RegionID = new Guid(dict["RegionID"].ToString()); | ||
83 | |||
84 | if (dict.ContainsKey("Timestamp") && dict["Timestamp"] != null) | ||
85 | im.timestamp = UInt32.Parse(dict["Timestamp"].ToString()); | ||
86 | |||
87 | if (dict.ContainsKey("ToAgentID") && dict["ToAgentID"] != null) | ||
88 | im.toAgentID = new Guid(dict["ToAgentID"].ToString()); | ||
89 | |||
90 | return im; | ||
91 | } | ||
92 | |||
93 | public static Dictionary<string, object> GridInstantMessage(GridInstantMessage im) | ||
94 | { | ||
95 | Dictionary<string, object> dict = new Dictionary<string, object>(); | ||
96 | |||
97 | dict["BinaryBucket"] = OpenMetaverse.Utils.BytesToHexString(im.binaryBucket, im.binaryBucket.Length, null); | ||
98 | dict["Dialog"] = im.dialog.ToString(); | ||
99 | dict["FromAgentID"] = im.fromAgentID.ToString(); | ||
100 | dict["FromAgentName"] = im.fromAgentName == null ? string.Empty : im.fromAgentName; | ||
101 | dict["FromGroup"] = im.fromGroup.ToString(); | ||
102 | dict["SessionID"] = im.imSessionID.ToString(); | ||
103 | dict["Message"] = im.message == null ? string.Empty : im.message; | ||
104 | dict["Offline"] = im.offline.ToString(); | ||
105 | dict["EstateID"] = im.ParentEstateID.ToString(); | ||
106 | dict["Position"] = im.Position.ToString(); | ||
107 | dict["RegionID"] = im.RegionID.ToString(); | ||
108 | dict["Timestamp"] = im.timestamp.ToString(); | ||
109 | dict["ToAgentID"] = im.toAgentID.ToString(); | ||
110 | |||
111 | return dict; | ||
112 | } | ||
113 | |||
114 | } | ||
115 | } | ||