From 04e29c1bacbc1e2df980ae15896a847ce7535da2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 16 Jan 2010 21:42:44 -0800
Subject: Beginning of rewriting HG. Compiles, and runs, but HG functions not
restored yet.
---
OpenSim/Services/Interfaces/IGatekeeperService.cs | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 OpenSim/Services/Interfaces/IGatekeeperService.cs
(limited to 'OpenSim/Services/Interfaces/IGatekeeperService.cs')
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
new file mode 100644
index 0000000..c4d1cbf
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+ public interface IGatekeeperService
+ {
+ bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason);
+ GridRegion GetHyperlinkRegion(UUID regionID);
+ }
+}
--
cgit v1.1
From 724b1d152b816c3ddaa6624b1b182e6cae28863c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 17 Jan 2010 08:42:08 -0800
Subject: Copyright notices.
---
OpenSim/Services/Interfaces/IGatekeeperService.cs | 29 ++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Services/Interfaces/IGatekeeperService.cs')
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
index c4d1cbf..9904e20 100644
--- a/OpenSim/Services/Interfaces/IGatekeeperService.cs
+++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
using System.Collections.Generic;
using OpenMetaverse;
--
cgit v1.1
From b2e6ec9e12ad07eb08496ebe8ca0476b793017d5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 17 Jan 2010 18:04:55 -0800
Subject: Agent gets there through the Gatekeeper, but still a few quirks to
fix.
---
OpenSim/Services/Interfaces/IGatekeeperService.cs | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'OpenSim/Services/Interfaces/IGatekeeperService.cs')
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
index 9904e20..5e21804 100644
--- a/OpenSim/Services/Interfaces/IGatekeeperService.cs
+++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs
@@ -28,6 +28,7 @@
using System;
using System.Collections.Generic;
+using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Services.Interfaces
@@ -36,5 +37,11 @@ namespace OpenSim.Services.Interfaces
{
bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason);
GridRegion GetHyperlinkRegion(UUID regionID);
+
+ bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
+ bool UpdateAgent(GridRegion destination, AgentData agent);
+ void ReleaseAgent(UUID regionID, UUID agentID);
+
+ bool LoginAttachment(GridRegion destination, ISceneObject sog);
}
}
--
cgit v1.1
From b5fcb5e872ec138ff7138906bffae193b6dae1a6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 17 Jan 2010 20:10:42 -0800
Subject: HG teleports through gatekeeper are working.
---
OpenSim/Services/Interfaces/IGatekeeperService.cs | 4 ----
1 file changed, 4 deletions(-)
(limited to 'OpenSim/Services/Interfaces/IGatekeeperService.cs')
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
index 5e21804..d41df75 100644
--- a/OpenSim/Services/Interfaces/IGatekeeperService.cs
+++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs
@@ -39,9 +39,5 @@ namespace OpenSim.Services.Interfaces
GridRegion GetHyperlinkRegion(UUID regionID);
bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
- bool UpdateAgent(GridRegion destination, AgentData agent);
- void ReleaseAgent(UUID regionID, UUID agentID);
-
- bool LoginAttachment(GridRegion destination, ISceneObject sog);
}
}
--
cgit v1.1
From fd64823466ee667d0d827f95d3001ec8675512b2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 18 Jan 2010 10:37:11 -0800
Subject: * Added missing GatekeeperServiceConnector * Added basic machinery
for teleporting users home. Untested.
---
OpenSim/Services/Interfaces/IGatekeeperService.cs | 3 +++
1 file changed, 3 insertions(+)
(limited to 'OpenSim/Services/Interfaces/IGatekeeperService.cs')
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
index d41df75..59e0f82 100644
--- a/OpenSim/Services/Interfaces/IGatekeeperService.cs
+++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs
@@ -39,5 +39,8 @@ namespace OpenSim.Services.Interfaces
GridRegion GetHyperlinkRegion(UUID regionID);
bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
+
+ GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
+
}
}
--
cgit v1.1
From 3d536944153d4931cf891d6a788a47484f3e6f4d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 18 Jan 2010 16:34:23 -0800
Subject: Go Home works. With security!!
---
OpenSim/Services/Interfaces/IGatekeeperService.cs | 11 +++++++++++
1 file changed, 11 insertions(+)
(limited to 'OpenSim/Services/Interfaces/IGatekeeperService.cs')
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
index 59e0f82..5b5c9d1 100644
--- a/OpenSim/Services/Interfaces/IGatekeeperService.cs
+++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs
@@ -26,6 +26,7 @@
*/
using System;
+using System.Net;
using System.Collections.Generic;
using OpenSim.Framework;
@@ -43,4 +44,14 @@ namespace OpenSim.Services.Interfaces
GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
}
+
+ ///
+ /// HG1.5 only
+ ///
+ public interface IHomeUsersSecurityService
+ {
+ void SetEndPoint(UUID sessionID, IPEndPoint ep);
+ IPEndPoint GetEndPoint(UUID sessionID);
+ void RemoveEndPoint(UUID sessionID);
+ }
}
--
cgit v1.1
From 7c00469cd210cfdda3dd835867469159d4c8b9d9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 27 Jan 2010 08:00:29 -0800
Subject: Added ExternalName config on Gatekeeper.
---
OpenSim/Services/Interfaces/IGatekeeperService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Services/Interfaces/IGatekeeperService.cs')
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
index 5b5c9d1..f8eb817 100644
--- a/OpenSim/Services/Interfaces/IGatekeeperService.cs
+++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Services.Interfaces
{
public interface IGatekeeperService
{
- bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason);
+ bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason);
GridRegion GetHyperlinkRegion(UUID regionID);
bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
--
cgit v1.1
From 00f7d622cbc2c2e61d2efaacd8275da3f9821d8b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 28 Jan 2010 19:19:42 -0800
Subject: HG 1.5 is in place. Tested in standalone only.
---
OpenSim/Services/Interfaces/IGatekeeperService.cs | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Services/Interfaces/IGatekeeperService.cs')
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
index f8eb817..ca7b9b3 100644
--- a/OpenSim/Services/Interfaces/IGatekeeperService.cs
+++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs
@@ -41,17 +41,19 @@ namespace OpenSim.Services.Interfaces
bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
- GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
-
}
///
/// HG1.5 only
///
- public interface IHomeUsersSecurityService
+ public interface IUserAgentService
{
- void SetEndPoint(UUID sessionID, IPEndPoint ep);
- IPEndPoint GetEndPoint(UUID sessionID);
- void RemoveEndPoint(UUID sessionID);
+ bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, out string reason);
+ void LogoutAgent(UUID userID, UUID sessionID);
+ GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
+
+ bool AgentIsComingHome(UUID sessionID, string thisGridExternalName);
+ bool VerifyAgent(UUID sessionID, string token);
+ bool VerifyClient(UUID sessionID, string token);
}
}
--
cgit v1.1