* Initial framework support for multiple simulators. Currently only the first region config is loaded, but the framework is there
* Big reorganization of config and data files
* Started renaming extensions that handle LLUDP packets to start with the LL prefix. Work in progress
* Initial SSL support

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2482 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2009-03-12 23:02:42 +00:00
parent 627e0dbef7
commit 70fe1f8f2a
101 changed files with 3083 additions and 1746 deletions

View File

@@ -7,7 +7,7 @@ using OpenMetaverse;
using OpenMetaverse.Http;
using OpenMetaverse.StructuredData;
namespace Simian.Extensions
namespace Simian
{
public class CapsManager : IExtension<Simian>, ICapabilitiesProvider
{
@@ -18,11 +18,12 @@ namespace Simian.Extensions
{
}
public void Start(Simian server)
public bool Start(Simian server)
{
this.server = server;
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();
return true;
}
public void Stop()
@@ -34,21 +35,13 @@ namespace Simian.Extensions
public Uri CreateCapability(CapsRequestCallback localHandler, bool clientCertRequired, object state)
{
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());
return new Uri(server.HttpUri, "/caps/" + capID.ToString());
}
public Uri CreateCapability(Uri remoteHandler, bool 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());
return new Uri(server.HttpUri, "/caps/" + capID.ToString());
}
public bool RemoveCapability(Uri cap)