aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorJeff Ames2009-06-14 21:37:50 +0000
committerJeff Ames2009-06-14 21:37:50 +0000
commit8d0eb3307fe665aed35209184ff4736e7c6170c4 (patch)
treebd9e4f24df736715ad9fe48f69f3c2421c68195e /OpenSim/Server
parentRenamed Region/CoreModules/ServiceConnectors to Region/CoreModules/ServiceCon... (diff)
downloadopensim-SC-8d0eb3307fe665aed35209184ff4736e7c6170c4.zip
opensim-SC-8d0eb3307fe665aed35209184ff4736e7c6170c4.tar.gz
opensim-SC-8d0eb3307fe665aed35209184ff4736e7c6170c4.tar.bz2
opensim-SC-8d0eb3307fe665aed35209184ff4736e7c6170c4.tar.xz
Update svn properties.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Base/Utils.cs194
-rw-r--r--OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs406
-rw-r--r--OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs136
3 files changed, 368 insertions, 368 deletions
diff --git a/OpenSim/Server/Handlers/Base/Utils.cs b/OpenSim/Server/Handlers/Base/Utils.cs
index f1610ff..92372a0 100644
--- a/OpenSim/Server/Handlers/Base/Utils.cs
+++ b/OpenSim/Server/Handlers/Base/Utils.cs
@@ -1,97 +1,97 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the 12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products 13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 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 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 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 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Net; 30using System.Net;
31 31
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Servers.HttpServer; 33using OpenSim.Framework.Servers.HttpServer;
34using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
35using OpenMetaverse; 35using OpenMetaverse;
36 36
37namespace OpenSim.Server.Handlers.Base 37namespace OpenSim.Server.Handlers.Base
38{ 38{
39 public class RestHandlerUtils 39 public class RestHandlerUtils
40 { 40 {
41 /// <summary> 41 /// <summary>
42 /// Extract the param from an uri. 42 /// Extract the param from an uri.
43 /// </summary> 43 /// </summary>
44 /// <param name="uri">Something like this: /uuid/ or /uuid/handle/release</param> 44 /// <param name="uri">Something like this: /uuid/ or /uuid/handle/release</param>
45 /// <param name="uri">uuid on uuid field</param> 45 /// <param name="uri">uuid on uuid field</param>
46 /// <param name="action">optional action</param> 46 /// <param name="action">optional action</param>
47 public static bool GetParams(string path, out UUID uuid, out ulong regionHandle, out string action) 47 public static bool GetParams(string path, out UUID uuid, out ulong regionHandle, out string action)
48 { 48 {
49 uuid = UUID.Zero; 49 uuid = UUID.Zero;
50 action = ""; 50 action = "";
51 regionHandle = 0; 51 regionHandle = 0;
52 52
53 path = path.Trim(new char[] { '/' }); 53 path = path.Trim(new char[] { '/' });
54 string[] parts = path.Split('/'); 54 string[] parts = path.Split('/');
55 if (parts.Length <= 1) 55 if (parts.Length <= 1)
56 { 56 {
57 return false; 57 return false;
58 } 58 }
59 else 59 else
60 { 60 {
61 if (!UUID.TryParse(parts[0], out uuid)) 61 if (!UUID.TryParse(parts[0], out uuid))
62 return false; 62 return false;
63 63
64 if (parts.Length >= 2) 64 if (parts.Length >= 2)
65 UInt64.TryParse(parts[1], out regionHandle); 65 UInt64.TryParse(parts[1], out regionHandle);
66 if (parts.Length >= 3) 66 if (parts.Length >= 3)
67 action = parts[2]; 67 action = parts[2];
68 68
69 return true; 69 return true;
70 } 70 }
71 } 71 }
72 72
73 public static bool GetAuthentication(OSHttpRequest httpRequest, out string authority, out string authKey) 73 public static bool GetAuthentication(OSHttpRequest httpRequest, out string authority, out string authKey)
74 { 74 {
75 authority = string.Empty; 75 authority = string.Empty;
76 authKey = string.Empty; 76 authKey = string.Empty;
77 77
78 Uri authUri; 78 Uri authUri;
79 79
80 string auth = httpRequest.Headers["authentication"]; 80 string auth = httpRequest.Headers["authentication"];
81 // Authentication keys look like this: 81 // Authentication keys look like this:
82 // http://orgrid.org:8002/<uuid> 82 // http://orgrid.org:8002/<uuid>
83 if ((auth != null) && (!string.Empty.Equals(auth)) && auth != "None") 83 if ((auth != null) && (!string.Empty.Equals(auth)) && auth != "None")
84 { 84 {
85 if (Uri.TryCreate(auth, UriKind.Absolute, out authUri)) 85 if (Uri.TryCreate(auth, UriKind.Absolute, out authUri))
86 { 86 {
87 authority = authUri.Authority; 87 authority = authUri.Authority;
88 authKey = authUri.PathAndQuery.Trim('/'); 88 authKey = authUri.PathAndQuery.Trim('/');
89 return true; 89 return true;
90 } 90 }
91 } 91 }
92 92
93 return false; 93 return false;
94 } 94 }
95 95
96 } 96 }
97} 97}
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
index 6336f4f..83fa995 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
@@ -1,203 +1,203 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the 12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products 13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 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 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 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 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using System.Net; 31using System.Net;
32using System.Text; 32using System.Text;
33 33
34using OpenSim.Server.Base; 34using OpenSim.Server.Base;
35using OpenSim.Server.Handlers.Base; 35using OpenSim.Server.Handlers.Base;
36using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Servers.HttpServer; 38using OpenSim.Framework.Servers.HttpServer;
39 39
40using OpenMetaverse; 40using OpenMetaverse;
41using OpenMetaverse.StructuredData; 41using OpenMetaverse.StructuredData;
42using Nini.Config; 42using Nini.Config;
43using log4net; 43using log4net;
44 44
45 45
46namespace OpenSim.Server.Handlers.Neighbour 46namespace OpenSim.Server.Handlers.Neighbour
47{ 47{
48 public class NeighbourGetHandler : BaseStreamHandler 48 public class NeighbourGetHandler : BaseStreamHandler
49 { 49 {
50 // TODO: unused: private ISimulationService m_SimulationService; 50 // TODO: unused: private ISimulationService m_SimulationService;
51 // TODO: unused: private IAuthenticationService m_AuthenticationService; 51 // TODO: unused: private IAuthenticationService m_AuthenticationService;
52 52
53 public NeighbourGetHandler(INeighbourService service, IAuthenticationService authentication) : 53 public NeighbourGetHandler(INeighbourService service, IAuthenticationService authentication) :
54 base("GET", "/region") 54 base("GET", "/region")
55 { 55 {
56 // TODO: unused: m_SimulationService = service; 56 // TODO: unused: m_SimulationService = service;
57 // TODO: unused: m_AuthenticationService = authentication; 57 // TODO: unused: m_AuthenticationService = authentication;
58 } 58 }
59 59
60 public override byte[] Handle(string path, Stream request, 60 public override byte[] Handle(string path, Stream request,
61 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 61 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
62 { 62 {
63 // Not implemented yet 63 // Not implemented yet
64 Console.WriteLine("--- Get region --- " + path); 64 Console.WriteLine("--- Get region --- " + path);
65 httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; 65 httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
66 return new byte[] { }; 66 return new byte[] { };
67 } 67 }
68 } 68 }
69 69
70 public class NeighbourPostHandler : BaseStreamHandler 70 public class NeighbourPostHandler : BaseStreamHandler
71 { 71 {
72 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 72 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
73 private INeighbourService m_NeighbourService; 73 private INeighbourService m_NeighbourService;
74 private IAuthenticationService m_AuthenticationService; 74 private IAuthenticationService m_AuthenticationService;
75 // TODO: unused: private bool m_AllowForeignGuests; 75 // TODO: unused: private bool m_AllowForeignGuests;
76 76
77 public NeighbourPostHandler(INeighbourService service, IAuthenticationService authentication) : 77 public NeighbourPostHandler(INeighbourService service, IAuthenticationService authentication) :
78 base("POST", "/region") 78 base("POST", "/region")
79 { 79 {
80 m_NeighbourService = service; 80 m_NeighbourService = service;
81 m_AuthenticationService = authentication; 81 m_AuthenticationService = authentication;
82 // TODO: unused: m_AllowForeignGuests = foreignGuests; 82 // TODO: unused: m_AllowForeignGuests = foreignGuests;
83 } 83 }
84 84
85 public override byte[] Handle(string path, Stream request, 85 public override byte[] Handle(string path, Stream request,
86 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 86 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
87 { 87 {
88 byte[] result = new byte[0]; 88 byte[] result = new byte[0];
89 89
90 UUID regionID; 90 UUID regionID;
91 string action; 91 string action;
92 ulong regionHandle; 92 ulong regionHandle;
93 if (RestHandlerUtils.GetParams(path, out regionID, out regionHandle, out action)) 93 if (RestHandlerUtils.GetParams(path, out regionID, out regionHandle, out action))
94 { 94 {
95 m_log.InfoFormat("[RegionPostHandler]: Invalid parameters for neighbour message {0}", path); 95 m_log.InfoFormat("[RegionPostHandler]: Invalid parameters for neighbour message {0}", path);
96 httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; 96 httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
97 httpResponse.StatusDescription = "Invalid parameters for neighbour message " + path; 97 httpResponse.StatusDescription = "Invalid parameters for neighbour message " + path;
98 98
99 return result; 99 return result;
100 } 100 }
101 101
102 if (m_AuthenticationService != null) 102 if (m_AuthenticationService != null)
103 { 103 {
104 // Authentication 104 // Authentication
105 string authority = string.Empty; 105 string authority = string.Empty;
106 string authToken = string.Empty; 106 string authToken = string.Empty;
107 if (!RestHandlerUtils.GetAuthentication(httpRequest, out authority, out authToken)) 107 if (!RestHandlerUtils.GetAuthentication(httpRequest, out authority, out authToken))
108 { 108 {
109 m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path); 109 m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path);
110 httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized; 110 httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized;
111 return result; 111 return result;
112 } 112 }
113 if (!m_AuthenticationService.VerifyUserKey(regionID, authToken)) 113 if (!m_AuthenticationService.VerifyUserKey(regionID, authToken))
114 { 114 {
115 m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path); 115 m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path);
116 httpResponse.StatusCode = (int)HttpStatusCode.Forbidden; 116 httpResponse.StatusCode = (int)HttpStatusCode.Forbidden;
117 return result; 117 return result;
118 } 118 }
119 m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID); 119 m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID);
120 } 120 }
121 121
122 OSDMap args = Util.GetOSDMap(request, (int)httpRequest.ContentLength); 122 OSDMap args = Util.GetOSDMap(request, (int)httpRequest.ContentLength);
123 if (args == null) 123 if (args == null)
124 { 124 {
125 httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; 125 httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
126 httpResponse.StatusDescription = "Unable to retrieve data"; 126 httpResponse.StatusDescription = "Unable to retrieve data";
127 m_log.DebugFormat("[RegionPostHandler]: Unable to retrieve data for post {0}", path); 127 m_log.DebugFormat("[RegionPostHandler]: Unable to retrieve data for post {0}", path);
128 return result; 128 return result;
129 } 129 }
130 130
131 // retrieve the regionhandle 131 // retrieve the regionhandle
132 ulong regionhandle = 0; 132 ulong regionhandle = 0;
133 if (args["destination_handle"] != null) 133 if (args["destination_handle"] != null)
134 UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle); 134 UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle);
135 135
136 RegionInfo aRegion = new RegionInfo(); 136 RegionInfo aRegion = new RegionInfo();
137 try 137 try
138 { 138 {
139 aRegion.UnpackRegionInfoData(args); 139 aRegion.UnpackRegionInfoData(args);
140 } 140 }
141 catch (Exception ex) 141 catch (Exception ex)
142 { 142 {
143 m_log.InfoFormat("[RegionPostHandler]: exception on unpacking region info {0}", ex.Message); 143 m_log.InfoFormat("[RegionPostHandler]: exception on unpacking region info {0}", ex.Message);
144 httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; 144 httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
145 httpResponse.StatusDescription = "Problems with data deserialization"; 145 httpResponse.StatusDescription = "Problems with data deserialization";
146 return result; 146 return result;
147 } 147 }
148 148
149 // Finally! 149 // Finally!
150 bool success = m_NeighbourService.HelloNeighbour(regionhandle, aRegion); 150 bool success = m_NeighbourService.HelloNeighbour(regionhandle, aRegion);
151 151
152 OSDMap resp = new OSDMap(1); 152 OSDMap resp = new OSDMap(1);
153 153
154 resp["success"] = OSD.FromBoolean(success); 154 resp["success"] = OSD.FromBoolean(success);
155 155
156 httpResponse.StatusCode = (int)HttpStatusCode.OK; 156 httpResponse.StatusCode = (int)HttpStatusCode.OK;
157 157
158 return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); 158 return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
159 } 159 }
160 } 160 }
161 161
162 public class NeighbourPutHandler : BaseStreamHandler 162 public class NeighbourPutHandler : BaseStreamHandler
163 { 163 {
164 // TODO: unused: private ISimulationService m_SimulationService; 164 // TODO: unused: private ISimulationService m_SimulationService;
165 // TODO: unused: private IAuthenticationService m_AuthenticationService; 165 // TODO: unused: private IAuthenticationService m_AuthenticationService;
166 166
167 public NeighbourPutHandler(INeighbourService service, IAuthenticationService authentication) : 167 public NeighbourPutHandler(INeighbourService service, IAuthenticationService authentication) :
168 base("PUT", "/region") 168 base("PUT", "/region")
169 { 169 {
170 // TODO: unused: m_SimulationService = service; 170 // TODO: unused: m_SimulationService = service;
171 // TODO: unused: m_AuthenticationService = authentication; 171 // TODO: unused: m_AuthenticationService = authentication;
172 } 172 }
173 173
174 public override byte[] Handle(string path, Stream request, 174 public override byte[] Handle(string path, Stream request,
175 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 175 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
176 { 176 {
177 // Not implemented yet 177 // Not implemented yet
178 httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; 178 httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
179 return new byte[] { }; 179 return new byte[] { };
180 } 180 }
181 } 181 }
182 182
183 public class NeighbourDeleteHandler : BaseStreamHandler 183 public class NeighbourDeleteHandler : BaseStreamHandler
184 { 184 {
185 // TODO: unused: private ISimulationService m_SimulationService; 185 // TODO: unused: private ISimulationService m_SimulationService;
186 // TODO: unused: private IAuthenticationService m_AuthenticationService; 186 // TODO: unused: private IAuthenticationService m_AuthenticationService;
187 187
188 public NeighbourDeleteHandler(INeighbourService service, IAuthenticationService authentication) : 188 public NeighbourDeleteHandler(INeighbourService service, IAuthenticationService authentication) :
189 base("DELETE", "/region") 189 base("DELETE", "/region")
190 { 190 {
191 // TODO: unused: m_SimulationService = service; 191 // TODO: unused: m_SimulationService = service;
192 // TODO: unused: m_AuthenticationService = authentication; 192 // TODO: unused: m_AuthenticationService = authentication;
193 } 193 }
194 194
195 public override byte[] Handle(string path, Stream request, 195 public override byte[] Handle(string path, Stream request,
196 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 196 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
197 { 197 {
198 // Not implemented yet 198 // Not implemented yet
199 httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; 199 httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
200 return new byte[] { }; 200 return new byte[] { };
201 } 201 }
202 } 202 }
203} 203}
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
index a708b37..b3a91cf 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
@@ -1,68 +1,68 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the 12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products 13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 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 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 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 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Server.Base; 33using OpenSim.Server.Base;
34using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Servers.HttpServer; 36using OpenSim.Framework.Servers.HttpServer;
37using OpenSim.Server.Handlers.Base; 37using OpenSim.Server.Handlers.Base;
38 38
39namespace OpenSim.Server.Handlers.Neighbour 39namespace OpenSim.Server.Handlers.Neighbour
40{ 40{
41 public class NeighbourServiceInConnector : ServiceConnector 41 public class NeighbourServiceInConnector : ServiceConnector
42 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 private INeighbourService m_NeighbourService; 45 private INeighbourService m_NeighbourService;
46 private IAuthenticationService m_AuthenticationService = null; 46 private IAuthenticationService m_AuthenticationService = null;
47 47
48 public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) : 48 public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) :
49 base(source, server) 49 base(source, server)
50 { 50 {
51 51
52 m_NeighbourService = nService; 52 m_NeighbourService = nService;
53 if (m_NeighbourService == null) 53 if (m_NeighbourService == null)
54 { 54 {
55 m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided"); 55 m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided");
56 return; 56 return;
57 } 57 }
58 58
59 //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false); 59 //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false);
60 //if (authentication) 60 //if (authentication)
61 // m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>(); 61 // m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>();
62 62
63 63
64 server.AddStreamHandler(new NeighbourPostHandler(m_NeighbourService, m_AuthenticationService)); 64 server.AddStreamHandler(new NeighbourPostHandler(m_NeighbourService, m_AuthenticationService));
65 server.AddStreamHandler(new NeighbourGetHandler(m_NeighbourService, m_AuthenticationService)); 65 server.AddStreamHandler(new NeighbourGetHandler(m_NeighbourService, m_AuthenticationService));
66 } 66 }
67 } 67 }
68} 68}
generated by cgit v1.1 at 2024-12-14 02:32:09 +0000