aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorMW2007-06-14 12:27:36 +0000
committerMW2007-06-14 12:27:36 +0000
commit3aecb5437953c793212834e0e9426a4852d85458 (patch)
treea3d868c450467afee2f557ee85717d1269cf39d0 /Common
parent* Applied Prebuild fixes to Sugilite (diff)
downloadopensim-SC_OLD-3aecb5437953c793212834e0e9426a4852d85458.zip
opensim-SC_OLD-3aecb5437953c793212834e0e9426a4852d85458.tar.gz
opensim-SC_OLD-3aecb5437953c793212834e0e9426a4852d85458.tar.bz2
opensim-SC_OLD-3aecb5437953c793212834e0e9426a4852d85458.tar.xz
Deleted IGridServer interface (and classes implementing that).
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs (renamed from Common/OpenSim.Framework/Interfaces/LocalGridBase.cs)28
-rw-r--r--Common/OpenSim.Framework/Interfaces/IGridServer.cs80
-rw-r--r--Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs64
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj12
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build4
-rw-r--r--Common/OpenSim.Servers/LocalUserProfileManager.cs6
-rw-r--r--Common/OpenSim.Servers/LoginServer.cs4
7 files changed, 23 insertions, 175 deletions
diff --git a/Common/OpenSim.Framework/Interfaces/LocalGridBase.cs b/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs
index 4b5fa77..462e2c5 100644
--- a/Common/OpenSim.Framework/Interfaces/LocalGridBase.cs
+++ b/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs
@@ -26,26 +26,26 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Text; 31using System.Net;
32using System.Net.Sockets;
33using System.IO;
31using libsecondlife; 34using libsecondlife;
35using OpenSim;
32using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
33using System.Collections;
34 37
35namespace OpenSim.Framework.Interfaces 38namespace OpenSim.Framework.Interfaces
36{ 39{
37 public abstract class LocalGridBase : IGridServer 40 public class AuthenticateResponse
38 { 41 {
39 public abstract UUIDBlock RequestUUIDBlock(); 42 public bool Authorised;
40 public abstract NeighbourInfo[] RequestNeighbours(); 43 public Login LoginInfo;
41 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
42 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
43 public abstract string GetName();
44 public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
45 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
46 public abstract void AddNewSession(Login session);
47 public abstract IList RequestMapBlocks(int minX, int minY, int maxX, int maxY);
48 public abstract void Close();
49 }
50 44
45 public AuthenticateResponse()
46 {
47
48 }
49
50 }
51} 51}
diff --git a/Common/OpenSim.Framework/Interfaces/IGridServer.cs b/Common/OpenSim.Framework/Interfaces/IGridServer.cs
deleted file mode 100644
index 06bcb8a..0000000
--- a/Common/OpenSim.Framework/Interfaces/IGridServer.cs
+++ /dev/null
@@ -1,80 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
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
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
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Net;
32using System.Net.Sockets;
33using System.IO;
34using libsecondlife;
35using OpenSim;
36using OpenSim.Framework.Types;
37
38namespace OpenSim.Framework.Interfaces
39{
40 /// <summary>
41 /// Handles connection to Grid Servers.
42 /// also Sim to Sim connections?
43 /// </summary>
44
45 public interface IGridServer
46 {
47 UUIDBlock RequestUUIDBlock();
48 NeighbourInfo[] RequestNeighbours(); //should return a array of neighbouring regions
49 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
50 bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
51 string GetName();
52 bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
53 void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
54 IList RequestMapBlocks(int minX, int minY, int maxX, int maxY);
55 void Close();
56 }
57
58 public struct UUIDBlock
59 {
60 public LLUUID BlockStart;
61 public LLUUID BlockEnd;
62 }
63
64 public class AuthenticateResponse
65 {
66 public bool Authorised;
67 public Login LoginInfo;
68
69 public AuthenticateResponse()
70 {
71
72 }
73
74 }
75
76 public interface IGridPlugin
77 {
78 IGridServer GetGridServer();
79 }
80}
diff --git a/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs b/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs
deleted file mode 100644
index a5d043f..0000000
--- a/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs
+++ /dev/null
@@ -1,64 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
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
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
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using libsecondlife;
33using OpenSim.Framework.Types;
34
35namespace OpenSim.Framework.Interfaces
36{
37 public abstract class RemoteGridBase : IGridServer
38 {
39 public abstract Dictionary<uint, AgentCircuitData> agentcircuits
40 {
41 get;
42 set;
43 }
44
45 public abstract UUIDBlock RequestUUIDBlock();
46 public abstract NeighbourInfo[] RequestNeighbours();
47 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
48 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
49 public abstract string GetName();
50 public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
51 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
52 public abstract IList RequestMapBlocks(int minX, int minY, int maxX, int maxY);
53 public abstract void Close();
54 public abstract Hashtable GridData {
55 get;
56 set;
57 }
58
59 public abstract ArrayList neighbours {
60 get;
61 set;
62 }
63 }
64}
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 3c0d66e..4939b59 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -126,13 +126,13 @@
126 <Compile Include="Util.cs"> 126 <Compile Include="Util.cs">
127 <SubType>Code</SubType> 127 <SubType>Code</SubType>
128 </Compile> 128 </Compile>
129 <Compile Include="Interfaces\IAssetServer.cs"> 129 <Compile Include="Interfaces\AuthenticateResponse.cs">
130 <SubType>Code</SubType> 130 <SubType>Code</SubType>
131 </Compile> 131 </Compile>
132 <Compile Include="Interfaces\IClientAPI.cs"> 132 <Compile Include="Interfaces\IAssetServer.cs">
133 <SubType>Code</SubType> 133 <SubType>Code</SubType>
134 </Compile> 134 </Compile>
135 <Compile Include="Interfaces\IGridServer.cs"> 135 <Compile Include="Interfaces\IClientAPI.cs">
136 <SubType>Code</SubType> 136 <SubType>Code</SubType>
137 </Compile> 137 </Compile>
138 <Compile Include="Interfaces\ILocalStorage.cs"> 138 <Compile Include="Interfaces\ILocalStorage.cs">
@@ -144,12 +144,6 @@
144 <Compile Include="Interfaces\IWorld.cs"> 144 <Compile Include="Interfaces\IWorld.cs">
145 <SubType>Code</SubType> 145 <SubType>Code</SubType>
146 </Compile> 146 </Compile>
147 <Compile Include="Interfaces\LocalGridBase.cs">
148 <SubType>Code</SubType>
149 </Compile>
150 <Compile Include="Interfaces\RemoteGridBase.cs">
151 <SubType>Code</SubType>
152 </Compile>
153 <Compile Include="Interfaces\Config\IGenericConfig.cs"> 147 <Compile Include="Interfaces\Config\IGenericConfig.cs">
154 <SubType>Code</SubType> 148 <SubType>Code</SubType>
155 </Compile> 149 </Compile>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index c50bdec..65a58dc 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -23,14 +23,12 @@
23 <include name="UserProfileManager.cs" /> 23 <include name="UserProfileManager.cs" />
24 <include name="UserProfileManagerBase.cs" /> 24 <include name="UserProfileManagerBase.cs" />
25 <include name="Util.cs" /> 25 <include name="Util.cs" />
26 <include name="Interfaces/AuthenticateResponse.cs" />
26 <include name="Interfaces/IAssetServer.cs" /> 27 <include name="Interfaces/IAssetServer.cs" />
27 <include name="Interfaces/IClientAPI.cs" /> 28 <include name="Interfaces/IClientAPI.cs" />
28 <include name="Interfaces/IGridServer.cs" />
29 <include name="Interfaces/ILocalStorage.cs" /> 29 <include name="Interfaces/ILocalStorage.cs" />
30 <include name="Interfaces/IUserServer.cs" /> 30 <include name="Interfaces/IUserServer.cs" />
31 <include name="Interfaces/IWorld.cs" /> 31 <include name="Interfaces/IWorld.cs" />
32 <include name="Interfaces/LocalGridBase.cs" />
33 <include name="Interfaces/RemoteGridBase.cs" />
34 <include name="Interfaces/Config/IGenericConfig.cs" /> 32 <include name="Interfaces/Config/IGenericConfig.cs" />
35 <include name="Interfaces/Config/IGridConfig.cs" /> 33 <include name="Interfaces/Config/IGridConfig.cs" />
36 <include name="Interfaces/Config/IUserConfig.cs" /> 34 <include name="Interfaces/Config/IUserConfig.cs" />
diff --git a/Common/OpenSim.Servers/LocalUserProfileManager.cs b/Common/OpenSim.Servers/LocalUserProfileManager.cs
index 4f327a7..773de5a 100644
--- a/Common/OpenSim.Servers/LocalUserProfileManager.cs
+++ b/Common/OpenSim.Servers/LocalUserProfileManager.cs
@@ -41,16 +41,16 @@ namespace OpenSim.UserServer
41{ 41{
42 public class LocalUserProfileManager : UserProfileManager 42 public class LocalUserProfileManager : UserProfileManager
43 { 43 {
44 private IGridServer m_gridServer; 44 // private IGridServer m_gridServer;
45 private int m_port; 45 private int m_port;
46 private string m_ipAddr; 46 private string m_ipAddr;
47 private uint regionX; 47 private uint regionX;
48 private uint regionY; 48 private uint regionY;
49 private AddNewSessionHandler AddSession; 49 private AddNewSessionHandler AddSession;
50 50
51 public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr , uint regX, uint regY) 51 public LocalUserProfileManager( int simPort, string ipAddr , uint regX, uint regY)
52 { 52 {
53 m_gridServer = gridServer; 53
54 m_port = simPort; 54 m_port = simPort;
55 m_ipAddr = ipAddr; 55 m_ipAddr = ipAddr;
56 regionX = regX; 56 regionX = regX;
diff --git a/Common/OpenSim.Servers/LoginServer.cs b/Common/OpenSim.Servers/LoginServer.cs
index c63eb28..1243147 100644
--- a/Common/OpenSim.Servers/LoginServer.cs
+++ b/Common/OpenSim.Servers/LoginServer.cs
@@ -53,7 +53,7 @@ namespace OpenSim.UserServer
53 /// </summary> 53 /// </summary>
54 public class LoginServer : LoginService, IUserServer 54 public class LoginServer : LoginService, IUserServer
55 { 55 {
56 private IGridServer m_gridServer; 56 //private IGridServer m_gridServer;
57 public IPAddress clientAddress = IPAddress.Loopback; 57 public IPAddress clientAddress = IPAddress.Loopback;
58 public IPAddress remoteAddress = IPAddress.Any; 58 public IPAddress remoteAddress = IPAddress.Any;
59 private int NumClients; 59 private int NumClients;
@@ -96,7 +96,7 @@ namespace OpenSim.UserServer
96 96
97 this._mpasswd = EncodePassword("testpass"); 97 this._mpasswd = EncodePassword("testpass");
98 98
99 userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr, regionX, regionY); 99 userManager = new LocalUserProfileManager( m_simPort, m_simAddr, regionX, regionY);
100 //userManager.InitUserProfiles(); 100 //userManager.InitUserProfiles();
101 userManager.SetKeys("", "", "", "Welcome to OpenSim"); 101 userManager.SetKeys("", "", "", "Welcome to OpenSim");
102 } 102 }