diff options
Renamed Region/CoreModules/ServiceConnectors to Region/CoreModules/ServiceConnectorsOut. No functional changes.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectors/Neighbour')
2 files changed, 0 insertions, 283 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs deleted file mode 100644 index cfebba3..0000000 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs +++ /dev/null | |||
@@ -1,135 +0,0 @@ | |||
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 | |||
28 | using log4net; | ||
29 | using Nini.Config; | ||
30 | using System; | ||
31 | using System.Collections.Generic; | ||
32 | using System.Reflection; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Server.Base; | ||
35 | using OpenSim.Region.Framework.Interfaces; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenSim.Services.Interfaces; | ||
38 | |||
39 | namespace OpenSim.Region.CoreModules.ServiceConnectors.Neighbour | ||
40 | { | ||
41 | public class LocalNeighbourServicesConnector : | ||
42 | ISharedRegionModule, INeighbourService | ||
43 | { | ||
44 | private static readonly ILog m_log = | ||
45 | LogManager.GetLogger( | ||
46 | MethodBase.GetCurrentMethod().DeclaringType); | ||
47 | |||
48 | private List<Scene> m_Scenes = new List<Scene>(); | ||
49 | |||
50 | private bool m_Enabled = false; | ||
51 | |||
52 | public LocalNeighbourServicesConnector() | ||
53 | { | ||
54 | } | ||
55 | |||
56 | public LocalNeighbourServicesConnector(List<Scene> scenes) | ||
57 | { | ||
58 | m_Scenes = scenes; | ||
59 | } | ||
60 | |||
61 | #region ISharedRegionModule | ||
62 | |||
63 | public string Name | ||
64 | { | ||
65 | get { return "LocalNeighbourServicesConnector"; } | ||
66 | } | ||
67 | |||
68 | public void Initialise(IConfigSource source) | ||
69 | { | ||
70 | IConfig moduleConfig = source.Configs["Modules"]; | ||
71 | if (moduleConfig != null) | ||
72 | { | ||
73 | string name = moduleConfig.GetString("NeighbourServices", this.Name); | ||
74 | if (name == Name) | ||
75 | { | ||
76 | // m_Enabled rules whether this module registers as INeighbourService or not | ||
77 | m_Enabled = true; | ||
78 | m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled"); | ||
79 | } | ||
80 | } | ||
81 | } | ||
82 | |||
83 | public void Close() | ||
84 | { | ||
85 | } | ||
86 | |||
87 | public void AddRegion(Scene scene) | ||
88 | { | ||
89 | m_Scenes.Add(scene); | ||
90 | |||
91 | if (!m_Enabled) | ||
92 | return; | ||
93 | |||
94 | scene.RegisterModuleInterface<INeighbourService>(this); | ||
95 | } | ||
96 | |||
97 | public void RegionLoaded(Scene scene) | ||
98 | { | ||
99 | m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled for region " + scene.RegionInfo.RegionName); | ||
100 | } | ||
101 | |||
102 | public void PostInitialise() | ||
103 | { | ||
104 | } | ||
105 | |||
106 | public void RemoveRegion(Scene scene) | ||
107 | { | ||
108 | // Always remove | ||
109 | if (m_Scenes.Contains(scene)) | ||
110 | m_Scenes.Remove(scene); | ||
111 | } | ||
112 | |||
113 | #endregion ISharedRegionModule | ||
114 | |||
115 | #region INeighbourService | ||
116 | |||
117 | public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) | ||
118 | { | ||
119 | m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}", | ||
120 | thisRegion.RegionName, regionHandle, m_Scenes.Count); | ||
121 | foreach (Scene s in m_Scenes) | ||
122 | { | ||
123 | if (s.RegionInfo.RegionHandle == regionHandle) | ||
124 | { | ||
125 | m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour"); | ||
126 | return s.IncomingHelloNeighbour(thisRegion); | ||
127 | } | ||
128 | } | ||
129 | m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle); | ||
130 | return false; | ||
131 | } | ||
132 | |||
133 | #endregion INeighbourService | ||
134 | } | ||
135 | } | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs deleted file mode 100644 index 8ea4ca7..0000000 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs +++ /dev/null | |||
@@ -1,148 +0,0 @@ | |||
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 | |||
28 | using log4net; | ||
29 | using System; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Reflection; | ||
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Services.Connectors; | ||
35 | using OpenSim.Region.Framework.Interfaces; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenSim.Services.Interfaces; | ||
38 | using OpenSim.Server.Base; | ||
39 | |||
40 | namespace OpenSim.Region.CoreModules.ServiceConnectors.Neighbour | ||
41 | { | ||
42 | public class RemoteNeighbourServicesConnector : | ||
43 | NeighbourServicesConnector, ISharedRegionModule, INeighbourService | ||
44 | { | ||
45 | private static readonly ILog m_log = | ||
46 | LogManager.GetLogger( | ||
47 | MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | |||
49 | private bool m_Enabled = false; | ||
50 | private LocalNeighbourServicesConnector m_LocalService; | ||
51 | private string serviceDll; | ||
52 | private List<Scene> m_Scenes = new List<Scene>(); | ||
53 | |||
54 | public string Name | ||
55 | { | ||
56 | get { return "RemoteNeighbourServicesConnector"; } | ||
57 | } | ||
58 | |||
59 | public void Initialise(IConfigSource source) | ||
60 | { | ||
61 | IConfig moduleConfig = source.Configs["Modules"]; | ||
62 | if (moduleConfig != null) | ||
63 | { | ||
64 | string name = moduleConfig.GetString("NeighbourServices"); | ||
65 | if (name == Name) | ||
66 | { | ||
67 | m_LocalService = new LocalNeighbourServicesConnector(); | ||
68 | |||
69 | //IConfig neighbourConfig = source.Configs["NeighbourService"]; | ||
70 | //if (neighbourConfig == null) | ||
71 | //{ | ||
72 | // m_log.Error("[NEIGHBOUR CONNECTOR]: NeighbourService missing from OpenSim.ini"); | ||
73 | // return; | ||
74 | //} | ||
75 | //serviceDll = neighbourConfig.GetString("LocalServiceModule", String.Empty); | ||
76 | //if (serviceDll == String.Empty) | ||
77 | //{ | ||
78 | // m_log.Error("[NEIGHBOUR CONNECTOR]: No LocalServiceModule named in section NeighbourService"); | ||
79 | // return; | ||
80 | //} | ||
81 | |||
82 | m_Enabled = true; | ||
83 | |||
84 | m_log.Info("[NEIGHBOUR CONNECTOR]: Remote Neighbour connector enabled"); | ||
85 | } | ||
86 | } | ||
87 | } | ||
88 | |||
89 | public void PostInitialise() | ||
90 | { | ||
91 | //if (m_Enabled) | ||
92 | //{ | ||
93 | // Object[] args = new Object[] { m_Scenes }; | ||
94 | // m_LocalService = | ||
95 | // ServerUtils.LoadPlugin<INeighbourService>(serviceDll, | ||
96 | // args); | ||
97 | |||
98 | // if (m_LocalService == null) | ||
99 | // { | ||
100 | // m_log.Error("[NEIGHBOUR CONNECTOR]: Can't load neighbour service"); | ||
101 | // Unregister(); | ||
102 | // return; | ||
103 | // } | ||
104 | //} | ||
105 | } | ||
106 | |||
107 | public void Close() | ||
108 | { | ||
109 | } | ||
110 | |||
111 | public void AddRegion(Scene scene) | ||
112 | { | ||
113 | if (!m_Enabled) | ||
114 | return; | ||
115 | |||
116 | m_MapService = scene.CommsManager.GridService; | ||
117 | m_LocalService.AddRegion(scene); | ||
118 | scene.RegisterModuleInterface<INeighbourService>(this); | ||
119 | } | ||
120 | |||
121 | public void RemoveRegion(Scene scene) | ||
122 | { | ||
123 | if (m_Enabled && m_Scenes.Contains(scene)) | ||
124 | m_LocalService.RemoveRegion(scene); | ||
125 | } | ||
126 | |||
127 | public void RegionLoaded(Scene scene) | ||
128 | { | ||
129 | if (!m_Enabled) | ||
130 | return; | ||
131 | |||
132 | m_log.InfoFormat("[NEIGHBOUR CONNECTOR]: Enabled remote neighbours for region {0}", scene.RegionInfo.RegionName); | ||
133 | |||
134 | } | ||
135 | |||
136 | #region INeighbourService | ||
137 | |||
138 | public override bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) | ||
139 | { | ||
140 | if (m_LocalService.HelloNeighbour(regionHandle, thisRegion)) | ||
141 | return true; | ||
142 | |||
143 | return base.HelloNeighbour(regionHandle, thisRegion); | ||
144 | } | ||
145 | |||
146 | #endregion INeighbourService | ||
147 | } | ||
148 | } | ||