Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed a nasty OSD->JSON bug that was producing invalid JSON for empty arrays or dictionaries

Browse Source 
* Several fixes in OpenMetaverse.Http.CapsServer and OpenMetaverse.Http.EventQueueServer (this is the first time they've been tested)
[Simian]
* Initial capabilities and EventQueue support (appears to be working)
* HyperGrid is almost working
* More cleanup with how agents are removed from the scene

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2427 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2009-02-04 23:00:33 +00:00
parent 875aa0b6e8
commit 808b681b83
17 changed files with 689 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Programs/Simian/Extensions/CapsManager.cs
View File

@@ -13,7 +13,6 @@ namespace Simian.Extensions
{
Simian server;
CapsServer capsServer;
Dictionary<UUID, EventQueueServer> eventQueues = new Dictionary<UUID, EventQueueServer>();
public CapsManager()
{
@@ -22,47 +21,45 @@ namespace Simian.Extensions
public void Start(Simian server)
{
this.server = server;
capsServer = new CapsServer(server.HttpServer, @"^/caps/");
capsServer = new CapsServer(server.HttpServer, @"^/caps/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$");
capsServer.Start();
}
public void Stop()
{
lock (eventQueues)
{
foreach (EventQueueServer eventQueue in eventQueues.Values)
eventQueue.Stop();
}
capsServer.Stop();
}
public UUID CreateCapability(HttpServer.HttpRequestCallback localHandler, bool clientCertRequired)
public Uri CreateCapability(CapsRequestCallback localHandler, bool clientCertRequired, object state)
{
return capsServer.CreateCapability(localHandler, clientCertRequired);
UUID capID = capsServer.CreateCapability(localHandler, clientCertRequired, state);
return new Uri(
(server.SSL ? "https://" : "http://") +
server.HostName +
(server.HttpPort == 80 ? String.Empty : ":" + server.HttpPort) +
"/caps/" + capID.ToString());
}
public UUID CreateCapability(Uri remoteHandler, bool clientCertRequired)
public Uri CreateCapability(Uri remoteHandler, bool clientCertRequired)
{
return capsServer.CreateCapability(remoteHandler, clientCertRequired);
UUID capID = capsServer.CreateCapability(remoteHandler, clientCertRequired);
return new Uri(
(server.SSL ? "https://" : "http://") +
server.HostName +
(server.HttpPort == 80 ? String.Empty : ":" + server.HttpPort) +
"/caps/" + capID.ToString());
}
public bool RemoveCapability(UUID capID)
public bool RemoveCapability(Uri cap)
{
return capsServer.RemoveCapability(capID);
}
string path = cap.PathAndQuery.TrimEnd('/');
UUID capID;
public void SendEvent(Agent agent, string name, OSDMap body)
{
EventQueueServer eventQueue;
if (eventQueues.TryGetValue(agent.Avatar.ID, out eventQueue))
{
eventQueue.SendEvent(name, body);
}
// Parse the capability UUID out of the URI
if (UUID.TryParse(path.Substring(path.Length - 36), out capID))
return capsServer.RemoveCapability(capID);
else
{
Logger.Log(String.Format("Cannot send the event {0} to agent {1} {2}, no event queue for that avatar",
name, agent.FirstName, agent.LastName), Helpers.LogLevel.Warning);
}
return false;
}
}
}