diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 6b7ee691ee..2253652838 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -721,6 +721,21 @@ namespace OpenSim.Framework
return sb.ToString();
}
+ // helper for services responses.
+ // they send identical messages, but each own chars case
+ public static byte[] sucessResultSuccess = osUTF8.GetASCIIBytes("Success");
+
+ public static byte[] ResultFailureMessageStart = osUTF8.GetASCIIBytes("Failure");
+ public static byte[] ResultFailureMessageEnd = osUTF8.GetASCIIBytes("");
+ public static byte[] ResultFailureMessage(string message)
+ {
+ osUTF8 res = new osUTF8(ResultFailureMessageStart.Length + ResultFailureMessageEnd.Length + message.Length);
+ res.Append(ResultFailureMessageStart);
+ res.Append(message);
+ res.Append(ResultFailureMessageEnd);
+ return res.ToArray();
+ }
+
public static byte[] DocToBytes(XmlDocument doc)
{
using (MemoryStream ms = new MemoryStream())
diff --git a/OpenSim/Server/Handlers/Base/ServerConnector.cs b/OpenSim/Server/Handlers/Base/ServerConnector.cs
index 0a4df549b3..f5ad533359 100644
--- a/OpenSim/Server/Handlers/Base/ServerConnector.cs
+++ b/OpenSim/Server/Handlers/Base/ServerConnector.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Server.Handlers.Base
{
public virtual string ConfigURL
{
- get { return String.Empty; }
+ get { return string.Empty; }
}
public virtual string ConfigName
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index 291d385431..51f78e89dc 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Net;
-using System.Xml;
using Nini.Config;
using log4net;
@@ -60,19 +59,18 @@ namespace OpenSim.Server.Handlers.MapImage
{
IConfig serverConfig = config.Configs[m_ConfigName];
if (serverConfig == null)
- throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
+ throw new Exception(string.Format("No section {0} in config file", m_ConfigName));
- string mapService = serverConfig.GetString("LocalServiceModule",
- String.Empty);
+ string mapService = serverConfig.GetString("LocalServiceModule", string.Empty);
- if (mapService == String.Empty)
+ if (string.IsNullOrWhiteSpace(mapService))
throw new Exception("No LocalServiceModule in config file");
- Object[] args = new Object[] { config };
+ object[] args = new object[] { config };
m_MapService = ServerUtils.LoadPlugin(mapService, args);
- string gridService = serverConfig.GetString("GridService", String.Empty);
- if (gridService != string.Empty)
+ string gridService = serverConfig.GetString("GridService", string.Empty);
+ if (!string.IsNullOrWhiteSpace(gridService))
m_GridService = ServerUtils.LoadPlugin(gridService, args);
if (m_GridService != null)
@@ -82,12 +80,11 @@ namespace OpenSim.Server.Handlers.MapImage
bool proxy = serverConfig.GetBoolean("HasProxy", false);
IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName);
- server.AddStreamHandler(new MapServerPostHandler(m_MapService, m_GridService, proxy, auth));
-
+ server.AddSimpleStreamHandler(new MapServerPostHandler(m_MapService, m_GridService, proxy, auth));
}
}
- class MapServerPostHandler : BaseStreamHandler
+ class MapServerPostHandler : SimpleStreamHandler
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IMapImageService m_MapService;
@@ -95,32 +92,36 @@ namespace OpenSim.Server.Handlers.MapImage
bool m_Proxy;
public MapServerPostHandler(IMapImageService service, IGridService grid, bool proxy, IServiceAuth auth) :
- base("POST", "/map", auth)
+ base("/map", auth)
{
m_MapService = service;
m_GridService = grid;
m_Proxy = proxy;
}
- protected override byte[] ProcessRequest(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+ protected override void ProcessRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
-// m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path);
+ //m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path);
string body;
- using(StreamReader sr = new StreamReader(requestData))
+ using(StreamReader sr = new StreamReader(httpRequest.InputStream))
body = sr.ReadToEnd();
body = body.Trim();
+ httpRequest.InputStream.Dispose();
+
try
{
Dictionary request = ServerUtils.ParseQueryString(body);
+ httpResponse.StatusCode = (int)HttpStatusCode.OK;
if (!request.ContainsKey("X") || !request.ContainsKey("Y") || !request.ContainsKey("DATA"))
{
- httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
- return FailureResult("Bad request.");
+ httpResponse.RawBuffer = Util.ResultFailureMessage("Bad request.");
+ return;
}
+
int x = 0, y = 0;
-// UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+ //UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
UUID scopeID = UUID.Zero;
Int32.TryParse(request["X"].ToString(), out x);
Int32.TryParse(request["Y"].ToString(), out y);
@@ -129,10 +130,9 @@ namespace OpenSim.Server.Handlers.MapImage
m_log.DebugFormat("[MAP ADD SERVER CONNECTOR]: Received map data for region at {0}-{1}", x, y);
-// string type = "image/jpeg";
-//
-// if (request.ContainsKey("TYPE"))
-// type = request["TYPE"].ToString();
+ //string type = "image/jpeg";
+ //if (request.ContainsKey("TYPE"))
+ // type = request["TYPE"].ToString();
if (m_GridService != null)
{
@@ -143,84 +143,32 @@ namespace OpenSim.Server.Handlers.MapImage
if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString())
{
m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be trying to impersonate region in IP {1}", ipAddr, r.ExternalEndPoint.Address);
- return FailureResult("IP address of caller does not match IP address of registered region");
+ httpResponse.RawBuffer = Util.ResultFailureMessage("IP address of caller does not match IP address of registered region");
}
}
else
{
m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}",
ipAddr, x, y);
- return FailureResult("Region not found at given coordinates");
+ httpResponse.RawBuffer = Util.ResultFailureMessage("Region not found at given coordinates");
}
}
byte[] data = Convert.FromBase64String(request["DATA"].ToString());
- string reason = string.Empty;
-
- bool result = m_MapService.AddMapTile((int)x, (int)y, data, scopeID, out reason);
-
+ bool result = m_MapService.AddMapTile(x, y, data, scopeID, out string reason);
if (result)
- return SuccessResult();
+ httpResponse.RawBuffer = Util.sucessResultSuccess;
else
- return FailureResult(reason);
-
+ httpResponse.RawBuffer = Util.ResultFailureMessage(reason);
+ return;
}
catch (Exception e)
{
m_log.ErrorFormat("[MAP SERVICE IMAGE HANDLER]: Exception {0} {1}", e.Message, e.StackTrace);
}
- return FailureResult("Unexpected server error");
- }
-
- private byte[] SuccessResult()
- {
- XmlDocument doc = new XmlDocument();
-
- XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
- "", "");
-
- doc.AppendChild(xmlnode);
-
- XmlElement rootElement = doc.CreateElement("", "ServerResponse",
- "");
-
- doc.AppendChild(rootElement);
-
- XmlElement result = doc.CreateElement("", "Result", "");
- result.AppendChild(doc.CreateTextNode("Success"));
-
- rootElement.AppendChild(result);
-
- return Util.DocToBytes(doc);
- }
-
- private byte[] FailureResult(string msg)
- {
- XmlDocument doc = new XmlDocument();
-
- XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
- "", "");
-
- doc.AppendChild(xmlnode);
-
- XmlElement rootElement = doc.CreateElement("", "ServerResponse",
- "");
-
- doc.AppendChild(rootElement);
-
- XmlElement result = doc.CreateElement("", "Result", "");
- result.AppendChild(doc.CreateTextNode("Failure"));
-
- rootElement.AppendChild(result);
-
- XmlElement message = doc.CreateElement("", "Message", "");
- message.AppendChild(doc.CreateTextNode(msg));
-
- rootElement.AppendChild(message);
-
- return Util.DocToBytes(doc);
+ httpResponse.RawBuffer = Util.ResultFailureMessage("Unexpected server error");
}
}
}
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
index 017927a759..516fabfad8 100644
--- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
@@ -44,8 +44,7 @@ namespace OpenSim.Server.Handlers.MapImage
{
public class MapGetServiceConnector : ServiceConnector
{
-// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+ //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IMapImageService m_MapService;
private string m_ConfigName = "MapImageService";
@@ -57,13 +56,12 @@ namespace OpenSim.Server.Handlers.MapImage
if (serverConfig == null)
throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
- string gridService = serverConfig.GetString("LocalServiceModule",
- String.Empty);
+ string gridService = serverConfig.GetString("LocalServiceModule", string.Empty);
- if (gridService == String.Empty)
+ if (string.IsNullOrWhiteSpace(gridService))
throw new Exception("No LocalServiceModule in config file");
- Object[] args = new Object[] { config };
+ object[] args = new object[] { config };
m_MapService = ServerUtils.LoadPlugin(gridService, args);
server.AddStreamHandler(new MapServerGetHandler(m_MapService));
@@ -72,9 +70,9 @@ namespace OpenSim.Server.Handlers.MapImage
class MapServerGetHandler : BaseStreamHandler
{
- public static ManualResetEvent ev = new ManualResetEvent(true);
+ public static readonly object ev = new object();
-// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IMapImageService m_MapService;
@@ -86,21 +84,23 @@ namespace OpenSim.Server.Handlers.MapImage
protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
- ev.WaitOne();
- lock (ev)
+ if(!Monitor.TryEnter(ev, 5000))
{
- ev.Reset();
+ httpResponse.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
+ httpResponse.AddHeader("Retry-After", "10");
+ return new byte[0];
}
byte[] result = new byte[0];
string format = string.Empty;
-// UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+ //UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
UUID scopeID = UUID.Zero;
// This will be map/tilefile.ext, but on multitenancy it will be
// map/scope/teilefile.ext
- string[] bits = path.Trim('/').Split(new char[] {'/'});
+ path = path.Trim('/');
+ string[] bits = path.Split(new char[] {'/'});
if (bits.Length > 2)
{
try
@@ -112,8 +112,17 @@ namespace OpenSim.Server.Handlers.MapImage
return new byte[9];
}
path = bits[2];
+ path = path.Trim('/');
}
- result = m_MapService.GetMapTile(path.Trim('/'), scopeID, out format);
+
+ if(path.Length == 0)
+ {
+ httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
+ httpResponse.ContentType = "text/plain";
+ return new byte[0];
+ }
+
+ result = m_MapService.GetMapTile(path, scopeID, out format);
if (result.Length > 0)
{
httpResponse.StatusCode = (int)HttpStatusCode.OK;
@@ -128,13 +137,9 @@ namespace OpenSim.Server.Handlers.MapImage
httpResponse.ContentType = "text/plain";
}
- lock (ev)
- {
- ev.Set();
- }
+ Monitor.Exit(ev);
return result;
}
-
}
}
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 30d3e411c1..89e1fedefd 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -240,24 +240,24 @@ namespace OpenSim.Services.MapImageService
public byte[] GetMapTile(string fileName, UUID scopeID, out string format)
{
//m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName);
-
- format = ".jpg";
string fullName = Path.Combine(m_TilesStoragePath, scopeID.ToString());
fullName = Path.Combine(fullName, fileName);
- if (File.Exists(fullName))
+ try
{
format = Path.GetExtension(fileName).ToLower();
//m_log.DebugFormat("[MAP IMAGE SERVICE]: Found file {0}, extension {1}", fileName, format);
return File.ReadAllBytes(fullName);
}
- else if (m_WaterBytes != null)
+ catch
{
- return (byte[])m_WaterBytes.Clone();
- }
- else
- {
- //m_log.DebugFormat("[MAP IMAGE SERVICE]: unable to get file {0}", fileName);
- return new byte[0];
+ format = ".jpg";
+ if (m_WaterBytes != null)
+ return (byte[])m_WaterBytes.Clone();
+ else
+ {
+ //m_log.DebugFormat("[MAP IMAGE SERVICE]: unable to get file {0}", fileName);
+ return new byte[0];
+ }
}
}