diff options
author | gareth | 2007-03-24 18:29:35 +0000 |
---|---|---|
committer | gareth | 2007-03-24 18:29:35 +0000 |
commit | d9dcc6fa8b6b17efbca60d959bcf18d6dc9934ae (patch) | |
tree | 0adf01ec5d043006fcea3c1d9db0cb02c159cb93 /OGS/gridserver | |
parent | Brought in the OGS user server into the main trunk (in a rather messy way) (diff) | |
download | opensim-SC-d9dcc6fa8b6b17efbca60d959bcf18d6dc9934ae.zip opensim-SC-d9dcc6fa8b6b17efbca60d959bcf18d6dc9934ae.tar.gz opensim-SC-d9dcc6fa8b6b17efbca60d959bcf18d6dc9934ae.tar.bz2 opensim-SC-d9dcc6fa8b6b17efbca60d959bcf18d6dc9934ae.tar.xz |
Moved gridserver into main trunk (but no prebuild yet)
Diffstat (limited to 'OGS/gridserver')
-rw-r--r-- | OGS/gridserver/default.build | 64 | ||||
-rw-r--r-- | OGS/gridserver/src/ConsoleCmds.cs | 57 | ||||
-rw-r--r-- | OGS/gridserver/src/GridHttp.cs | 166 | ||||
-rw-r--r-- | OGS/gridserver/src/Main.cs | 94 | ||||
-rw-r--r-- | OGS/gridserver/src/OGS-GridServer.csproj | 63 | ||||
-rw-r--r-- | OGS/gridserver/src/Properties/AssemblyInfo.cs | 33 | ||||
-rw-r--r-- | OGS/gridserver/src/SimProfiles.cs | 114 |
7 files changed, 0 insertions, 591 deletions
diff --git a/OGS/gridserver/default.build b/OGS/gridserver/default.build deleted file mode 100644 index b113b83..0000000 --- a/OGS/gridserver/default.build +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <project name="GridServer" default="build" basedir="./"> | ||
3 | <property name="debug" value="true" overwrite="false" /> | ||
4 | <target name="clean" description="remove all generated files"> | ||
5 | <delete> | ||
6 | <fileset failonempty="false"> | ||
7 | <include name="bin/*.dll" /> | ||
8 | <include name="bin/*.exe" /> | ||
9 | <include name="bin/*.mdb" /> | ||
10 | </fileset> | ||
11 | </delete> | ||
12 | </target> | ||
13 | |||
14 | <target name="svnupdate" description="updates to latest SVN"> | ||
15 | <exec program="svn"> | ||
16 | <arg value="update" /> | ||
17 | </exec> | ||
18 | </target> | ||
19 | |||
20 | <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> | ||
21 | |||
22 | </target> | ||
23 | |||
24 | <target name="build" description="compiles the source code"> | ||
25 | |||
26 | <loadfile file="../VERSION" property="svnver"/> | ||
27 | <asminfo output="src/AssemblyInfo.cs" language="CSharp"> | ||
28 | <imports> | ||
29 | <import namespace="System" /> | ||
30 | <import namespace="System.Reflection" /> | ||
31 | <import namespace="System.Runtime.InteropServices" /> | ||
32 | </imports> | ||
33 | <attributes> | ||
34 | <attribute type="ComVisibleAttribute" value="false" /> | ||
35 | <attribute type="CLSCompliantAttribute" value="false" /> | ||
36 | <attribute type="AssemblyVersionAttribute" value="${svnver}" /> | ||
37 | <attribute type="AssemblyTitleAttribute" value="ogs-GridServer" /> | ||
38 | <attribute type="AssemblyDescriptionAttribute" value="The core OGS Grid Server" /> | ||
39 | <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/> | ||
40 | </attributes> | ||
41 | </asminfo> | ||
42 | |||
43 | <csc target="exe" output="bin/GridServer.exe" debug="${debug}" verbose="true" warninglevel="4"> | ||
44 | <references failonempty="true"> | ||
45 | <include name="System" /> | ||
46 | <include name="System.Xml" /> | ||
47 | <include name="../common/bin/ServerConsole.dll" /> | ||
48 | <include name="../common/bin/libsecondlife.dll" /> | ||
49 | </references> | ||
50 | <sources> | ||
51 | <include name="../common/src/VersionInfo.cs" /> | ||
52 | <include name="../common/src/OGS-Console.cs" /> | ||
53 | <include name="../common/src/Util.cs" /> | ||
54 | <include name="src/*.cs" /> | ||
55 | </sources> | ||
56 | </csc> | ||
57 | |||
58 | <copy todir="bin/"> | ||
59 | <fileset basedir="../common/bin"> | ||
60 | <include name="*.*" /> | ||
61 | </fileset> | ||
62 | </copy> | ||
63 | </target> | ||
64 | </project> | ||
diff --git a/OGS/gridserver/src/ConsoleCmds.cs b/OGS/gridserver/src/ConsoleCmds.cs deleted file mode 100644 index 82a2279..0000000 --- a/OGS/gridserver/src/ConsoleCmds.cs +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenSim project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Text; | ||
32 | using ServerConsole; | ||
33 | |||
34 | namespace OpenGridServices | ||
35 | { | ||
36 | |||
37 | public class GridConsole : conscmd_callback { | ||
38 | public GridConsole() { } | ||
39 | |||
40 | public override void RunCmd(string cmd, string[] cmdparams) { | ||
41 | switch(cmd) { | ||
42 | case "help": | ||
43 | ServerConsole.MainConsole.Instance.WriteLine("shutdown - shutdown the grid (USE CAUTION!)" | ||
44 | ); | ||
45 | break; | ||
46 | |||
47 | case "shutdown": | ||
48 | ServerConsole.MainConsole.Instance.Close(); | ||
49 | Environment.Exit(0); | ||
50 | break; | ||
51 | } | ||
52 | } | ||
53 | |||
54 | public override void Show(string ShowWhat) { | ||
55 | } | ||
56 | } | ||
57 | } | ||
diff --git a/OGS/gridserver/src/GridHttp.cs b/OGS/gridserver/src/GridHttp.cs deleted file mode 100644 index 496a3bc..0000000 --- a/OGS/gridserver/src/GridHttp.cs +++ /dev/null | |||
@@ -1,166 +0,0 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenGrid project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Text; | ||
32 | using Nwc.XmlRpc; | ||
33 | using System.Threading; | ||
34 | using System.Text.RegularExpressions; | ||
35 | using System.Net; | ||
36 | using System.IO; | ||
37 | using System.Collections; | ||
38 | using System.Collections.Generic; | ||
39 | using libsecondlife; | ||
40 | using ServerConsole; | ||
41 | using OpenSim.Framework.Sims; | ||
42 | |||
43 | namespace OpenGridServices | ||
44 | { | ||
45 | public class GridHTTPServer { | ||
46 | public Thread HTTPD; | ||
47 | public HttpListener Listener; | ||
48 | |||
49 | public GridHTTPServer() { | ||
50 | ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server"); | ||
51 | HTTPD = new Thread(new ThreadStart(StartHTTP)); | ||
52 | HTTPD.Start(); | ||
53 | } | ||
54 | |||
55 | public void StartHTTP() { | ||
56 | ServerConsole.MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK"); | ||
57 | Listener = new HttpListener(); | ||
58 | |||
59 | Listener.Prefixes.Add("http://+:8001/gridserver/"); | ||
60 | Listener.Start(); | ||
61 | |||
62 | HttpListenerContext context; | ||
63 | while(true) { | ||
64 | context = Listener.GetContext(); | ||
65 | ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); | ||
66 | } | ||
67 | } | ||
68 | |||
69 | static string ParseXMLRPC(string requestBody) { | ||
70 | try{ | ||
71 | XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody); | ||
72 | |||
73 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
74 | switch(request.MethodName) { | ||
75 | case "get_sim_info": | ||
76 | ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]); | ||
77 | SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle); | ||
78 | string RecvKey=""; | ||
79 | string caller=(string)requestData["caller"]; | ||
80 | switch(caller) { | ||
81 | case "userserver": | ||
82 | RecvKey=OpenGrid_Main.thegrid.UserRecvKey; | ||
83 | break; | ||
84 | case "assetserver": | ||
85 | RecvKey=OpenGrid_Main.thegrid.AssetRecvKey; | ||
86 | break; | ||
87 | } | ||
88 | if((TheSim!=null) && (string)requestData["authkey"]==RecvKey) { | ||
89 | XmlRpcResponse SimInfoResp = new XmlRpcResponse(); | ||
90 | Hashtable SimInfoData = new Hashtable(); | ||
91 | SimInfoData["UUID"]=TheSim.UUID.ToString(); | ||
92 | SimInfoData["regionhandle"]=TheSim.regionhandle.ToString(); | ||
93 | SimInfoData["regionname"]=TheSim.regionname; | ||
94 | SimInfoData["sim_ip"]=TheSim.sim_ip; | ||
95 | SimInfoData["sim_port"]=TheSim.sim_port.ToString(); | ||
96 | SimInfoData["caps_url"]=TheSim.caps_url; | ||
97 | SimInfoData["RegionLocX"]=TheSim.RegionLocX.ToString(); | ||
98 | SimInfoData["RegionLocY"]=TheSim.RegionLocY.ToString(); | ||
99 | SimInfoData["sendkey"]=TheSim.sendkey; | ||
100 | SimInfoData["recvkey"]=TheSim.recvkey; | ||
101 | SimInfoResp.Value=SimInfoData; | ||
102 | return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(SimInfoResp),"utf-16","utf-8")); | ||
103 | } else { | ||
104 | XmlRpcResponse SimErrorResp = new XmlRpcResponse(); | ||
105 | Hashtable SimErrorData = new Hashtable(); | ||
106 | SimErrorData["error"]="sim not found"; | ||
107 | SimErrorResp.Value=SimErrorData; | ||
108 | return(XmlRpcResponseSerializer.Singleton.Serialize(SimErrorResp)); | ||
109 | } | ||
110 | break; | ||
111 | } | ||
112 | } catch(Exception e) { | ||
113 | Console.WriteLine(e.ToString()); | ||
114 | } | ||
115 | return ""; | ||
116 | } | ||
117 | |||
118 | static string ParseREST(string requestBody, string requestURL) { | ||
119 | return ""; | ||
120 | } | ||
121 | |||
122 | |||
123 | static void HandleRequest(Object stateinfo) { | ||
124 | HttpListenerContext context=(HttpListenerContext)stateinfo; | ||
125 | |||
126 | HttpListenerRequest request = context.Request; | ||
127 | HttpListenerResponse response = context.Response; | ||
128 | |||
129 | response.KeepAlive=false; | ||
130 | response.SendChunked=false; | ||
131 | |||
132 | System.IO.Stream body = request.InputStream; | ||
133 | System.Text.Encoding encoding = System.Text.Encoding.UTF8; | ||
134 | System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); | ||
135 | |||
136 | string requestBody = reader.ReadToEnd(); | ||
137 | body.Close(); | ||
138 | reader.Close(); | ||
139 | |||
140 | string responseString=""; | ||
141 | switch(request.ContentType) { | ||
142 | case "text/xml": | ||
143 | // must be XML-RPC, so pass to the XML-RPC parser | ||
144 | |||
145 | responseString=ParseXMLRPC(requestBody); | ||
146 | response.AddHeader("Content-type","text/xml"); | ||
147 | break; | ||
148 | |||
149 | case null: | ||
150 | // must be REST or invalid crap, so pass to the REST parser | ||
151 | responseString=ParseREST(request.Url.OriginalString,requestBody); | ||
152 | break; | ||
153 | } | ||
154 | |||
155 | |||
156 | byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); | ||
157 | System.IO.Stream output = response.OutputStream; | ||
158 | response.SendChunked=false; | ||
159 | response.ContentLength64=buffer.Length; | ||
160 | output.Write(buffer,0,buffer.Length); | ||
161 | output.Close(); | ||
162 | } | ||
163 | } | ||
164 | |||
165 | |||
166 | } | ||
diff --git a/OGS/gridserver/src/Main.cs b/OGS/gridserver/src/Main.cs deleted file mode 100644 index d29a1ae..0000000 --- a/OGS/gridserver/src/Main.cs +++ /dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenSim project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Text; | ||
32 | using libsecondlife; | ||
33 | using ServerConsole; | ||
34 | |||
35 | namespace OpenGridServices | ||
36 | { | ||
37 | /// <summary> | ||
38 | /// </summary> | ||
39 | public class OpenGrid_Main | ||
40 | { | ||
41 | |||
42 | public static OpenGrid_Main thegrid; | ||
43 | public string GridOwner; | ||
44 | public string DefaultStartupMsg; | ||
45 | public string DefaultAssetServer; | ||
46 | public string AssetSendKey; | ||
47 | public string AssetRecvKey; | ||
48 | public string DefaultUserServer; | ||
49 | public string UserSendKey; | ||
50 | public string UserRecvKey; | ||
51 | |||
52 | public GridHTTPServer _httpd; | ||
53 | public SimProfileManager _regionmanager; | ||
54 | |||
55 | [STAThread] | ||
56 | public static void Main( string[] args ) | ||
57 | { | ||
58 | Console.WriteLine("OpenGrid " + VersionInfo.Version + "\n"); | ||
59 | Console.WriteLine("Starting...\n"); | ||
60 | ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenGrid", new GridConsole()); | ||
61 | |||
62 | thegrid = new OpenGrid_Main(); | ||
63 | thegrid.Startup(); | ||
64 | |||
65 | ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n"); | ||
66 | |||
67 | while(true) { | ||
68 | ServerConsole.MainConsole.Instance.MainConsolePrompt(); | ||
69 | } | ||
70 | } | ||
71 | |||
72 | public void Startup() { | ||
73 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings"); | ||
74 | |||
75 | this.GridOwner=ServerConsole.MainConsole.Instance.CmdPrompt("Grid owner [OGS development team]: ","OGS development team"); | ||
76 | this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!]: ","Welcome to OGS!"); | ||
77 | |||
78 | this.DefaultAssetServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default asset server [no default]: "); | ||
79 | this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to asset server: "); | ||
80 | this.AssetRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from asset server: "); | ||
81 | |||
82 | this.DefaultUserServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default user server [no default]: "); | ||
83 | this.UserSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to user server: "); | ||
84 | this.UserRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from user server: "); | ||
85 | |||
86 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process"); | ||
87 | _httpd = new GridHTTPServer(); | ||
88 | |||
89 | this._regionmanager=new SimProfileManager(); | ||
90 | _regionmanager.CreateNewProfile("OpenSim Test", "http://there-is-no-caps.com", "4.78.190.75", 9000, 997, 996, this.UserSendKey, this.UserRecvKey); | ||
91 | |||
92 | } | ||
93 | } | ||
94 | } | ||
diff --git a/OGS/gridserver/src/OGS-GridServer.csproj b/OGS/gridserver/src/OGS-GridServer.csproj deleted file mode 100644 index b957d40..0000000 --- a/OGS/gridserver/src/OGS-GridServer.csproj +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ProductVersion>8.0.50727</ProductVersion> | ||
6 | <SchemaVersion>2.0</SchemaVersion> | ||
7 | <ProjectGuid>{FE50A574-C8ED-433B-95F0-213A5EED2AB2}</ProjectGuid> | ||
8 | <OutputType>Exe</OutputType> | ||
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | ||
10 | <RootNamespace>OGS_GridServer</RootNamespace> | ||
11 | <AssemblyName>OGS-GridServer</AssemblyName> | ||
12 | </PropertyGroup> | ||
13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
14 | <DebugSymbols>true</DebugSymbols> | ||
15 | <DebugType>full</DebugType> | ||
16 | <Optimize>false</Optimize> | ||
17 | <OutputPath>bin\Debug\</OutputPath> | ||
18 | <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
19 | <ErrorReport>prompt</ErrorReport> | ||
20 | <WarningLevel>4</WarningLevel> | ||
21 | </PropertyGroup> | ||
22 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
23 | <DebugType>pdbonly</DebugType> | ||
24 | <Optimize>true</Optimize> | ||
25 | <OutputPath>bin\Release\</OutputPath> | ||
26 | <DefineConstants>TRACE</DefineConstants> | ||
27 | <ErrorReport>prompt</ErrorReport> | ||
28 | <WarningLevel>4</WarningLevel> | ||
29 | </PropertyGroup> | ||
30 | <ItemGroup> | ||
31 | <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
32 | <SpecificVersion>False</SpecificVersion> | ||
33 | <HintPath>..\..\common\bin\libsecondlife.dll</HintPath> | ||
34 | </Reference> | ||
35 | <Reference Include="System" /> | ||
36 | <Reference Include="System.Data" /> | ||
37 | <Reference Include="System.Xml" /> | ||
38 | </ItemGroup> | ||
39 | <ItemGroup> | ||
40 | <Compile Include="..\..\common\src\OGS-Console.cs"> | ||
41 | <Link>OGS-Console.cs</Link> | ||
42 | </Compile> | ||
43 | <Compile Include="..\..\common\VersionInfo\VersionInfo.cs"> | ||
44 | <Link>VersionInfo.cs</Link> | ||
45 | </Compile> | ||
46 | <Compile Include="ConsoleCmds.cs" /> | ||
47 | <Compile Include="GridHttp.cs" /> | ||
48 | <Compile Include="Main.cs" /> | ||
49 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
50 | <Compile Include="SimProfiles.cs" /> | ||
51 | </ItemGroup> | ||
52 | <ItemGroup> | ||
53 | <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj"> | ||
54 | <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project> | ||
55 | <Name>OpenSim.Framework</Name> | ||
56 | </ProjectReference> | ||
57 | <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj"> | ||
58 | <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project> | ||
59 | <Name>ServerConsole</Name> | ||
60 | </ProjectReference> | ||
61 | </ItemGroup> | ||
62 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
63 | </Project> \ No newline at end of file | ||
diff --git a/OGS/gridserver/src/Properties/AssemblyInfo.cs b/OGS/gridserver/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 8471e6b..0000000 --- a/OGS/gridserver/src/Properties/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | using System.Reflection; | ||
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // General Information about an assembly is controlled through the following | ||
6 | // set of attributes. Change these attribute values to modify the information | ||
7 | // associated with an assembly. | ||
8 | [assembly: AssemblyTitle("OGS-GridServer")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("")] | ||
12 | [assembly: AssemblyProduct("OGS-GridServer")] | ||
13 | [assembly: AssemblyCopyright("Copyright © 2007")] | ||
14 | [assembly: AssemblyTrademark("")] | ||
15 | [assembly: AssemblyCulture("")] | ||
16 | |||
17 | // Setting ComVisible to false makes the types in this assembly not visible | ||
18 | // to COM components. If you need to access a type in this assembly from | ||
19 | // COM, set the ComVisible attribute to true on that type. | ||
20 | [assembly: ComVisible(false)] | ||
21 | |||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
23 | [assembly: Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")] | ||
24 | |||
25 | // Version information for an assembly consists of the following four values: | ||
26 | // | ||
27 | // Major Version | ||
28 | // Minor Version | ||
29 | // Build Number | ||
30 | // Revision | ||
31 | // | ||
32 | [assembly: AssemblyVersion("1.0.0.0")] | ||
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
diff --git a/OGS/gridserver/src/SimProfiles.cs b/OGS/gridserver/src/SimProfiles.cs deleted file mode 100644 index 6db8331..0000000 --- a/OGS/gridserver/src/SimProfiles.cs +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenGrid project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Text; | ||
32 | using System.Collections; | ||
33 | using System.Collections.Generic; | ||
34 | using libsecondlife; | ||
35 | using ServerConsole; | ||
36 | using OpenSim.Framework.Utilities; | ||
37 | using OpenSim.Framework.Sims; | ||
38 | |||
39 | namespace OpenGridServices | ||
40 | { | ||
41 | /// <summary> | ||
42 | /// </summary> | ||
43 | public class SimProfileManager { | ||
44 | |||
45 | public Dictionary<LLUUID, SimProfileBase> SimProfiles = new Dictionary<LLUUID, SimProfileBase>(); | ||
46 | |||
47 | public SimProfileManager() { | ||
48 | } | ||
49 | |||
50 | public void InitSimProfiles() { | ||
51 | // TODO: need to load from database | ||
52 | } | ||
53 | |||
54 | public SimProfileBase GetProfileByHandle(ulong reqhandle) { | ||
55 | foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) { | ||
56 | if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID]; | ||
57 | } | ||
58 | return null; | ||
59 | } | ||
60 | |||
61 | public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID) { | ||
62 | return SimProfiles[ProfileLLUUID]; | ||
63 | } | ||
64 | |||
65 | public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) { | ||
66 | SimProfileBase TheSim=GetProfileByHandle(regionhandle); | ||
67 | if(TheSim != null) | ||
68 | if(TheSim.recvkey==simrecvkey) { | ||
69 | return true; | ||
70 | } else { | ||
71 | return false; | ||
72 | } else return false; | ||
73 | |||
74 | } | ||
75 | |||
76 | public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) { | ||
77 | SimProfileBase newprofile = new SimProfileBase(); | ||
78 | newprofile.regionname=regionname; | ||
79 | newprofile.sim_ip=sim_ip; | ||
80 | newprofile.sim_port=sim_port; | ||
81 | newprofile.RegionLocX=RegionLocX; | ||
82 | newprofile.RegionLocY=RegionLocY; | ||
83 | newprofile.caps_url="http://" + sim_ip + ":9000/"; | ||
84 | newprofile.sendkey=sendkey; | ||
85 | newprofile.recvkey=recvkey; | ||
86 | newprofile.regionhandle=Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); | ||
87 | newprofile.UUID=LLUUID.Random(); | ||
88 | this.SimProfiles.Add(newprofile.UUID,newprofile); | ||
89 | return newprofile; | ||
90 | } | ||
91 | |||
92 | } | ||
93 | |||
94 | /* is in OpenSim.Framework | ||
95 | public class SimProfileBase { | ||
96 | public LLUUID UUID; | ||
97 | public ulong regionhandle; | ||
98 | public string regionname; | ||
99 | public string sim_ip; | ||
100 | public uint sim_port; | ||
101 | public string caps_url; | ||
102 | public uint RegionLocX; | ||
103 | public uint RegionLocY; | ||
104 | public string sendkey; | ||
105 | public string recvkey; | ||
106 | |||
107 | |||
108 | public SimProfileBase() { | ||
109 | } | ||
110 | |||
111 | |||
112 | }*/ | ||
113 | |||
114 | } | ||