aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ogs
diff options
context:
space:
mode:
authorgareth2007-03-22 10:11:15 +0000
committergareth2007-03-22 10:11:15 +0000
commit7daa3955bc3a1918e40962851f9e8d38597a245e (patch)
treebee3e1372a7eed0c1b220a8a49f7bee7d29a6b91 /ogs
parentLoad XML for neighbourinfo from grid (diff)
downloadopensim-SC_OLD-7daa3955bc3a1918e40962851f9e8d38597a245e.zip
opensim-SC_OLD-7daa3955bc3a1918e40962851f9e8d38597a245e.tar.gz
opensim-SC_OLD-7daa3955bc3a1918e40962851f9e8d38597a245e.tar.bz2
opensim-SC_OLD-7daa3955bc3a1918e40962851f9e8d38597a245e.tar.xz
brought zircon branch into trunk
Diffstat (limited to 'ogs')
-rw-r--r--ogs/OGS-UserServer.sln32
-rw-r--r--ogs/ServerConsole/Properties/AssemblyInfo.cs33
-rw-r--r--ogs/ServerConsole/ServerConsole.cs98
-rw-r--r--ogs/ServerConsole/ServerConsole.csproj49
-rw-r--r--ogs/ServerConsole/default.build48
-rw-r--r--ogs/assetserver/assets/00000000000000005005000000000005/databin291 -> 0 bytes
-rw-r--r--ogs/assetserver/assets/00000000000000007007000000000006/databin153 -> 0 bytes
-rw-r--r--ogs/assetserver/assets/00000000000000007009000000000008/databin570 -> 0 bytes
-rw-r--r--ogs/assetserver/assets/66c41e3938f9f75a024e585989bfab73/data105
-rw-r--r--ogs/assetserver/assets/e0ee49b5a4184df8d3c9a65361fe7f49/data52
-rw-r--r--ogs/common/VersionInfo/VersionInfo.cs37
-rwxr-xr-xogs/common/bin/libsecondlife.dllbin2338816 -> 0 bytes
-rw-r--r--ogs/common/src/OGS-Console.cs181
-rw-r--r--ogs/common/src/Util.cs87
-rw-r--r--ogs/common/src/VersionInfo.cs.template37
-rw-r--r--ogs/genvers.sh9
-rw-r--r--ogs/gridserver/default.build64
-rw-r--r--ogs/gridserver/src/ConsoleCmds.cs57
-rw-r--r--ogs/gridserver/src/GridHttp.cs165
-rw-r--r--ogs/gridserver/src/Main.cs94
-rw-r--r--ogs/gridserver/src/OGS-GridServer.csproj69
-rw-r--r--ogs/gridserver/src/Properties/AssemblyInfo.cs33
-rw-r--r--ogs/gridserver/src/SimProfiles.cs111
-rw-r--r--ogs/ogs.build38
-rw-r--r--ogs/userserver/default.build63
-rw-r--r--ogs/userserver/src/ConsoleCmds.cs57
-rw-r--r--ogs/userserver/src/Main.cs114
-rw-r--r--ogs/userserver/src/OGS-UserServer.csproj68
-rw-r--r--ogs/userserver/src/OGS-UserServer.csproj.user16
-rw-r--r--ogs/userserver/src/Properties/AssemblyInfo.cs33
-rw-r--r--ogs/userserver/src/UserHttp.cs287
-rw-r--r--ogs/userserver/src/UserProfiles.cs223
-rw-r--r--ogs/userserver/src/Util.cs87
33 files changed, 0 insertions, 2347 deletions
diff --git a/ogs/OGS-UserServer.sln b/ogs/OGS-UserServer.sln
deleted file mode 100644
index 6c98af1..0000000
--- a/ogs/OGS-UserServer.sln
+++ /dev/null
@@ -1,32 +0,0 @@
1
2Microsoft Visual Studio Solution File, Format Version 9.00
3# Visual C# Express 2005
4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-UserServer", "userserver\src\OGS-UserServer.csproj", "{D45B6E48-5668-478D-B9CB-6D46E665FACF}"
5EndProject
6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerConsole", "ServerConsole\ServerConsole.csproj", "{7667E6E2-F227-41A2-B1B2-315613E1BAFC}"
7EndProject
8Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-GridServer", "gridserver\src\OGS-GridServer.csproj", "{FE50A574-C8ED-433B-95F0-213A5EED2AB2}"
9EndProject
10Global
11 GlobalSection(SolutionConfigurationPlatforms) = preSolution
12 Debug|Any CPU = Debug|Any CPU
13 Release|Any CPU = Release|Any CPU
14 EndGlobalSection
15 GlobalSection(ProjectConfigurationPlatforms) = postSolution
16 {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17 {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
18 {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
19 {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.Build.0 = Release|Any CPU
20 {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21 {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
22 {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
23 {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.Build.0 = Release|Any CPU
24 {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25 {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
26 {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
27 {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.Build.0 = Release|Any CPU
28 EndGlobalSection
29 GlobalSection(SolutionProperties) = preSolution
30 HideSolutionNode = FALSE
31 EndGlobalSection
32EndGlobal
diff --git a/ogs/ServerConsole/Properties/AssemblyInfo.cs b/ogs/ServerConsole/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0028e2a..0000000
--- a/ogs/ServerConsole/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using 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("ServerConsole")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("")]
12[assembly: AssemblyProduct("ServerConsole")]
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("c4d85def-4c2e-449d-bf4a-449b8cf03736")]
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/ServerConsole/ServerConsole.cs b/ogs/ServerConsole/ServerConsole.cs
deleted file mode 100644
index d50a7e2..0000000
--- a/ogs/ServerConsole/ServerConsole.cs
+++ /dev/null
@@ -1,98 +0,0 @@
1/*
2* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*
26*/
27using System;
28
29namespace ServerConsole
30{
31 public class MainConsole {
32
33 private static ConsoleBase instance;
34
35 public static ConsoleBase Instance
36 {
37 get
38 {
39 return instance;
40 }
41 set
42 {
43 instance = value;
44 }
45 }
46
47 public MainConsole()
48 {
49
50 }
51 }
52
53 public abstract class conscmd_callback {
54 public abstract void RunCmd(string cmd, string[] cmdparams);
55 public abstract void Show(string ShowWhat);
56 }
57
58 public abstract class ConsoleBase
59 {
60
61 public enum ConsoleType {
62 Local, // Use stdio
63 TCP, // Use TCP/telnet
64 SimChat // Use in-world chat (for gods)
65 }
66
67 public abstract void Close();
68
69 // You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here
70 public abstract void WriteLine(string Line) ;
71
72 public abstract string ReadLine();
73
74 public abstract int Read() ;
75
76 public abstract void Write(string Line) ;
77
78 public abstract string PasswdPrompt(string prompt);
79
80 // Displays a command prompt and waits for the user to enter a string, then returns that string
81 public abstract string CmdPrompt(string prompt) ;
82
83 // Displays a command prompt and returns a default value if the user simply presses enter
84 public abstract string CmdPrompt(string prompt, string defaultresponse);
85
86 // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
87 public abstract string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) ;
88
89 // Runs a command with a number of parameters
90 public abstract Object RunCmd(string Cmd, string[] cmdparams) ;
91
92 // Shows data about something
93 public abstract void ShowCommands(string ShowWhat) ;
94
95 // Displays a prompt to the user and then runs the command they entered
96 public abstract void MainConsolePrompt() ;
97 }
98}
diff --git a/ogs/ServerConsole/ServerConsole.csproj b/ogs/ServerConsole/ServerConsole.csproj
deleted file mode 100644
index 7f3005e..0000000
--- a/ogs/ServerConsole/ServerConsole.csproj
+++ /dev/null
@@ -1,49 +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>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</ProjectGuid>
8 <OutputType>Library</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>ServerConsole</RootNamespace>
11 <AssemblyName>ServerConsole</AssemblyName>
12 <StartupObject>
13 </StartupObject>
14 </PropertyGroup>
15 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16 <DebugSymbols>true</DebugSymbols>
17 <DebugType>full</DebugType>
18 <Optimize>false</Optimize>
19 <OutputPath>bin\Debug\</OutputPath>
20 <DefineConstants>DEBUG;TRACE</DefineConstants>
21 <ErrorReport>prompt</ErrorReport>
22 <WarningLevel>4</WarningLevel>
23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25 <DebugType>pdbonly</DebugType>
26 <Optimize>true</Optimize>
27 <OutputPath>..\common\bin\</OutputPath>
28 <DefineConstants>TRACE</DefineConstants>
29 <ErrorReport>prompt</ErrorReport>
30 <WarningLevel>4</WarningLevel>
31 </PropertyGroup>
32 <ItemGroup>
33 <Reference Include="System" />
34 <Reference Include="System.Data" />
35 <Reference Include="System.Xml" />
36 </ItemGroup>
37 <ItemGroup>
38 <Compile Include="Properties\AssemblyInfo.cs" />
39 <Compile Include="ServerConsole.cs" />
40 </ItemGroup>
41 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
42 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
43 Other similar extension points exist, see Microsoft.Common.targets.
44 <Target Name="BeforeBuild">
45 </Target>
46 <Target Name="AfterBuild">
47 </Target>
48 -->
49</Project> \ No newline at end of file
diff --git a/ogs/ServerConsole/default.build b/ogs/ServerConsole/default.build
deleted file mode 100644
index 64a4f04..0000000
--- a/ogs/ServerConsole/default.build
+++ /dev/null
@@ -1,48 +0,0 @@
1<?xml version="1.0"?>
2 <project name="ServerConsole" default="build" basedir=".">
3 <property name="debug" value="true" overwrite="false" />
4 <target name="clean" description="remove all generated files">
5 <delete file="../common/bin/ServerConsole.dll" failonerror="false" />
6 <delete file="../common/bin/ServerConsole.dll.mdb" failonerror="false" />
7 </target>
8
9 <target name="svnupdate" description="updates to latest SVN">
10 <exec program="svn">
11 <arg value="update" />
12 </exec>
13 </target>
14
15 <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
16
17 </target>
18
19 <target name="build" description="compiles the source code">
20
21 <loadfile file="../VERSION" property="svnver"/>
22 <asminfo output="AssemblyInfo.cs" language="CSharp">
23 <imports>
24 <import namespace="System" />
25 <import namespace="System.Reflection" />
26 <import namespace="System.Runtime.InteropServices" />
27 </imports>
28 <attributes>
29 <attribute type="ComVisibleAttribute" value="false" />
30 <attribute type="CLSCompliantAttribute" value="false" />
31 <attribute type="AssemblyVersionAttribute" value="${svnver}" />
32 <attribute type="AssemblyTitleAttribute" value="ogs-serverconsole" />
33 <attribute type="AssemblyDescriptionAttribute" value="The default server console" />
34 <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
35 </attributes>
36 </asminfo>
37
38 <csc target="library" output="../common/bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4">
39 <references>
40 <include name="System" />
41 <include name="System.Xml" />
42 </references>
43 <sources>
44 <include name="*.cs" />
45 </sources>
46 </csc>
47 </target>
48</project>
diff --git a/ogs/assetserver/assets/00000000000000005005000000000005/data b/ogs/assetserver/assets/00000000000000005005000000000005/data
deleted file mode 100644
index e6840e2..0000000
--- a/ogs/assetserver/assets/00000000000000005005000000000005/data
+++ /dev/null
Binary files differ
diff --git a/ogs/assetserver/assets/00000000000000007007000000000006/data b/ogs/assetserver/assets/00000000000000007007000000000006/data
deleted file mode 100644
index 5ad1fd0..0000000
--- a/ogs/assetserver/assets/00000000000000007007000000000006/data
+++ /dev/null
Binary files differ
diff --git a/ogs/assetserver/assets/00000000000000007009000000000008/data b/ogs/assetserver/assets/00000000000000007009000000000008/data
deleted file mode 100644
index cd2fd94..0000000
--- a/ogs/assetserver/assets/00000000000000007009000000000008/data
+++ /dev/null
Binary files differ
diff --git a/ogs/assetserver/assets/66c41e3938f9f75a024e585989bfab73/data b/ogs/assetserver/assets/66c41e3938f9f75a024e585989bfab73/data
deleted file mode 100644
index 920c775..0000000
--- a/ogs/assetserver/assets/66c41e3938f9f75a024e585989bfab73/data
+++ /dev/null
@@ -1,105 +0,0 @@
1LLWearable version 22
2Female Shape and Outfit 3 Shape
3Created by system from avatar's appearance.
4 permissions 0
5 {
6 base_mask 00082000
7 owner_mask 00082000
8 group_mask 00082000
9 everyone_mask 00082000
10 next_owner_mask 00082000
11 creator_id 3d924400-038e-6ad9-920b-cfbb9b40585c
12 owner_id 542ffb8e-8932-49b9-8664-58f53e442797
13 last_owner_id 3d924400-038e-6ad9-920b-cfbb9b40585c
14 group_id 00000000-0000-0000-0000-000000000000
15 }
16 sale_info 0
17 {
18 sale_type not
19 sale_price 0
20 }
21type 0
22parameters 82
231 .21
242 -.5
254 -.11
265 -.1
276 -.3
287 -.4
298 -.5
3010 .7
3111 .34
3212 -.5
3313 0
3414 .04
3515 .58
3617 .56
3718 -.26
3819 -.73
3920 -.34
4021 -.01
4122 1
4223 -.5
4324 -.63
4425 .44
4527 .05
4633 -.24
4734 -.7
4835 -.16
4936 -.2
5037 -.98
5138 -.5
5280 0
53105 .07
54155 -.22
55157 0
56185 -1
57193 .86
58196 -.74
59505 .65
60506 .12
61507 -1.5
62515 0
63517 .16
64518 .8
65629 0
66637 0
67646 .4
68647 1
69649 .36
70650 .85
71652 .49
72653 -1
73656 0
74659 .65
75662 .5
76663 0
77664 0
78665 0
79675 -.15
80676 .26
81678 .28
82682 .27
83683 -.19
84684 -.09
85685 0
86690 .45
87692 .4
88693 -0
89753 -.5
90756 -.08
91758 .24
92759 .6
93760 .11
94764 -.38
95765 -.3
96769 .42
97773 .51
98795 .16
99796 .11
100799 .36
101841 0
102842 -.82
103879 0
104880 0
105textures 0
diff --git a/ogs/assetserver/assets/e0ee49b5a4184df8d3c9a65361fe7f49/data b/ogs/assetserver/assets/e0ee49b5a4184df8d3c9a65361fe7f49/data
deleted file mode 100644
index 95cc683..0000000
--- a/ogs/assetserver/assets/e0ee49b5a4184df8d3c9a65361fe7f49/data
+++ /dev/null
@@ -1,52 +0,0 @@
1LLWearable version 22
2Sexy - Female Skin
3
4 permissions 0
5 {
6 base_mask 00086000
7 owner_mask 00086000
8 group_mask 00000000
9 everyone_mask 00000000
10 next_owner_mask 00086000
11 creator_id 3b659a92-dbf0-4301-8fdc-208d78f00d77
12 owner_id 3d924400-038e-6ad9-920b-cfbb9b40585c
13 last_owner_id 101358d5-469d-4b24-9b85-4dc3c05e635d
14 group_id 00000000-0000-0000-0000-000000000000
15 }
16 sale_info 0
17 {
18 sale_type not
19 sale_price 10
20 }
21type 1
22parameters 26
23108 0
24110 0
25111 0
26116 0
27117 1
28150 0
29162 0
30163 0
31165 0
32700 .01
33701 .5
34702 .26
35703 0
36704 0
37705 .5
38706 .6
39707 0
40708 0
41709 0
42710 0
43711 .5
44712 0
45713 .7
46714 0
47715 0
48775 0
49textures 3
500 f9261672-5058-9ef8-c0c4-48f43a0b16d4
515 b6ba53be-b5bf-9a1f-2e19-21daf998429c
526 703f6e24-a1fb-1980-acaf-6ab8a99a5bd5
diff --git a/ogs/common/VersionInfo/VersionInfo.cs b/ogs/common/VersionInfo/VersionInfo.cs
deleted file mode 100644
index 9763e62..0000000
--- a/ogs/common/VersionInfo/VersionInfo.cs
+++ /dev/null
@@ -1,37 +0,0 @@
1/*
2Copyright (c) OpenSim project, http://osgrid.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*/
26
27using System;
28
29namespace OpenGridServices
30{
31 /// <summary>
32 /// </summary>
33 public class VersionInfo
34 {
35 public static string Version = "0.1, Build 1173843165, Revision 193:206M";
36 }
37}
diff --git a/ogs/common/bin/libsecondlife.dll b/ogs/common/bin/libsecondlife.dll
deleted file mode 100755
index 89d692a..0000000
--- a/ogs/common/bin/libsecondlife.dll
+++ /dev/null
Binary files differ
diff --git a/ogs/common/src/OGS-Console.cs b/ogs/common/src/OGS-Console.cs
deleted file mode 100644
index c35c75c..0000000
--- a/ogs/common/src/OGS-Console.cs
+++ /dev/null
@@ -1,181 +0,0 @@
1/*
2* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*
26*/
27
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Threading;
32using System.IO;
33using System.Net;
34using ServerConsole;
35
36namespace OpenGridServices
37{
38 /// <summary>
39 /// Description of ServerConsole.
40 /// </summary>
41 public class MServerConsole : ConsoleBase
42 {
43
44 private ConsoleType ConsType;
45 StreamWriter Log;
46 public conscmd_callback cmdparser;
47 public string componentname;
48
49 // STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!!
50 // constype - the type of console to use (see enum ConsoleType)
51 // sparam - depending on the console type:
52 // TCP - the IP to bind to (127.0.0.1 if blank)
53 // Local - param ignored
54 // and for the iparam:
55 // TCP - the port to bind to
56 // Local - param ignored
57 // LogFile - duh
58 // componentname - which component of the OGS system? (user, asset etc)
59 // cmdparser - a reference to a conscmd_callback object
60
61 public MServerConsole(ConsoleType constype, string sparam, int iparam, string LogFile, string componentname, conscmd_callback cmdparser) {
62 ConsType = constype;
63 this.componentname = componentname;
64 this.cmdparser = cmdparser;
65 switch(constype) {
66 case ConsoleType.Local:
67 Console.WriteLine("ServerConsole.cs - creating new local console");
68 Console.WriteLine("Logs will be saved to current directory in " + LogFile);
69 Log=File.AppendText(LogFile);
70 Log.WriteLine("========================================================================");
71 Log.WriteLine(componentname + " " + VersionInfo.Version + " Started at " + DateTime.Now.ToString());
72 break;
73
74 case ConsoleType.TCP:
75 break;
76
77 default:
78 Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!");
79 break;
80 }
81 }
82
83 public override void Close() {
84 Log.WriteLine("Shutdown at " + DateTime.Now.ToString());
85 Log.Close();
86 }
87
88 // You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here
89 public override void WriteLine(string Line) {
90 Log.WriteLine(Line);
91 Console.WriteLine(Line);
92 return;
93 }
94
95 public override string ReadLine() {
96 string TempStr=Console.ReadLine();
97 Log.WriteLine(TempStr);
98 return TempStr;
99 }
100
101 public override int Read() {
102 int TempInt= Console.Read();
103 Log.Write((char)TempInt);
104 return TempInt;
105 }
106
107 public override void Write(string Line) {
108 Console.Write(Line);
109 Log.Write(Line);
110 return;
111 }
112
113
114 // Displays a prompt and waits for the user to enter a string, then returns that string
115 // Done with no echo and suitable for passwords
116 public override string PasswdPrompt(string prompt) {
117 // FIXME: Needs to be better abstracted
118 Log.WriteLine(prompt);
119 this.Write(prompt);
120 ConsoleColor oldfg=Console.ForegroundColor;
121 Console.ForegroundColor=Console.BackgroundColor;
122 string temp=Console.ReadLine();
123 Console.ForegroundColor=oldfg;
124 return temp;
125 }
126
127 // Displays a command prompt and waits for the user to enter a string, then returns that string
128 public override string CmdPrompt(string prompt) {
129 this.Write(prompt);
130 return this.ReadLine();
131 }
132
133 // Displays a command prompt and returns a default value if the user simply presses enter
134 public override string CmdPrompt(string prompt, string defaultresponse) {
135 string temp=CmdPrompt(prompt);
136 if(temp=="") {
137 return defaultresponse;
138 } else {
139 return temp;
140 }
141 }
142
143 // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
144 public override string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) {
145 bool itisdone=false;
146 string temp=CmdPrompt(prompt,defaultresponse);
147 while(itisdone==false) {
148 if((temp==OptionA) || (temp==OptionB)) {
149 itisdone=true;
150 } else {
151 this.WriteLine("Valid options are " + OptionA + " or " + OptionB);
152 temp=CmdPrompt(prompt,defaultresponse);
153 }
154 }
155 return temp;
156 }
157
158 // Runs a command with a number of parameters
159 public override Object RunCmd(string Cmd, string[] cmdparams) {
160 cmdparser.RunCmd(Cmd, cmdparams);
161 return null;
162 }
163
164 // Shows data about something
165 public override void ShowCommands(string ShowWhat) {
166 cmdparser.Show(ShowWhat);
167 }
168
169 public override void MainConsolePrompt() {
170 string[] tempstrarray;
171 string tempstr = this.CmdPrompt(this.componentname + "# ");
172 tempstrarray = tempstr.Split(' ');
173 string cmd=tempstrarray[0];
174 Array.Reverse(tempstrarray);
175 Array.Resize<string>(ref tempstrarray,tempstrarray.Length-1);
176 Array.Reverse(tempstrarray);
177 string[] cmdparams=(string[])tempstrarray;
178 RunCmd(cmd,cmdparams);
179 }
180 }
181}
diff --git a/ogs/common/src/Util.cs b/ogs/common/src/Util.cs
deleted file mode 100644
index 1efa471..0000000
--- a/ogs/common/src/Util.cs
+++ /dev/null
@@ -1,87 +0,0 @@
1/*
2Copyright (c) OpenSim project, http://osgrid.org/
3
4* Copyright (c) <year>, <copyright holder>
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
30using System;
31using System.Collections.Generic;
32using System.Threading;
33using libsecondlife;
34using libsecondlife.Packets;
35
36namespace OpenGridServices
37{
38 /// <summary>
39 /// </summary>
40 ///
41 public class Util
42 {
43 public static ulong UIntsToLong(uint X, uint Y)
44 {
45 return Helpers.UIntsToLong(X,Y);
46 }
47 public Util()
48 {
49
50 }
51 }
52
53 public class QueItem {
54 public QueItem()
55 {
56 }
57
58 public Packet Packet;
59 public bool Incoming;
60 }
61
62
63 public class BlockingQueue< T > {
64 private Queue< T > _queue = new Queue< T >();
65 private object _queueSync = new object();
66
67 public void Enqueue(T value)
68 {
69 lock(_queueSync)
70 {
71 _queue.Enqueue(value);
72 Monitor.Pulse(_queueSync);
73 }
74 }
75
76 public T Dequeue()
77 {
78 lock(_queueSync)
79 {
80 if( _queue.Count < 1)
81 Monitor.Wait(_queueSync);
82
83 return _queue.Dequeue();
84 }
85 }
86 }
87}
diff --git a/ogs/common/src/VersionInfo.cs.template b/ogs/common/src/VersionInfo.cs.template
deleted file mode 100644
index 8f73b4b..0000000
--- a/ogs/common/src/VersionInfo.cs.template
+++ /dev/null
@@ -1,37 +0,0 @@
1/*
2Copyright (c) OpenSim project, http://osgrid.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*/
26
27using System;
28
29namespace OpenGridServices
30{
31 /// <summary>
32 /// </summary>
33 public class VersionInfo
34 {
35 public static string Version = "@@VERSION";
36 }
37}
diff --git a/ogs/genvers.sh b/ogs/genvers.sh
deleted file mode 100644
index 8d8007c..0000000
--- a/ogs/genvers.sh
+++ /dev/null
@@ -1,9 +0,0 @@
1#!/bin/bash
2
3MAJOR=0
4MINOR=1
5BUILD=`date +%s`
6REVISION=`svnversion . | sed s/:// | sed s/M//`
7REALREVISION=`svnversion`
8cat common/src/VersionInfo.cs.template | sed s/@@VERSION/"$MAJOR.$MINOR, Build $BUILD, Revision $REALREVISION"/g >common/src/VersionInfo.cs
9echo -n $MAJOR.$MINOR.*.$REVISION >VERSION
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/*
2Copyright (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
30using System;
31using System.Text;
32using ServerConsole;
33
34namespace 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 833a8ac..0000000
--- a/ogs/gridserver/src/GridHttp.cs
+++ /dev/null
@@ -1,165 +0,0 @@
1/*
2Copyright (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
30using System;
31using System.Text;
32using Nwc.XmlRpc;
33using System.Threading;
34using System.Text.RegularExpressions;
35using System.Net;
36using System.IO;
37using System.Collections;
38using System.Collections.Generic;
39using libsecondlife;
40using ServerConsole;
41
42namespace OpenGridServices
43{
44 public class GridHTTPServer {
45 public Thread HTTPD;
46 public HttpListener Listener;
47
48 public GridHTTPServer() {
49 ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server");
50 HTTPD = new Thread(new ThreadStart(StartHTTP));
51 HTTPD.Start();
52 }
53
54 public void StartHTTP() {
55 ServerConsole.MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK");
56 Listener = new HttpListener();
57
58 Listener.Prefixes.Add("http://+:8001/gridserver/");
59 Listener.Start();
60
61 HttpListenerContext context;
62 while(true) {
63 context = Listener.GetContext();
64 ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
65 }
66 }
67
68 static string ParseXMLRPC(string requestBody) {
69 try{
70 XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
71
72 Hashtable requestData = (Hashtable)request.Params[0];
73 switch(request.MethodName) {
74 case "get_sim_info":
75 ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]);
76 SimProfile TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);
77 string RecvKey="";
78 string caller=(string)requestData["caller"];
79 switch(caller) {
80 case "userserver":
81 RecvKey=OpenGrid_Main.thegrid.UserRecvKey;
82 break;
83 case "assetserver":
84 RecvKey=OpenGrid_Main.thegrid.AssetRecvKey;
85 break;
86 }
87 if((TheSim!=null) && (string)requestData["authkey"]==RecvKey) {
88 XmlRpcResponse SimInfoResp = new XmlRpcResponse();
89 Hashtable SimInfoData = new Hashtable();
90 SimInfoData["UUID"]=TheSim.UUID.ToString();
91 SimInfoData["regionhandle"]=TheSim.regionhandle.ToString();
92 SimInfoData["regionname"]=TheSim.regionname;
93 SimInfoData["sim_ip"]=TheSim.sim_ip;
94 SimInfoData["sim_port"]=TheSim.sim_port.ToString();
95 SimInfoData["caps_url"]=TheSim.caps_url;
96 SimInfoData["RegionLocX"]=TheSim.RegionLocX.ToString();
97 SimInfoData["RegionLocY"]=TheSim.RegionLocY.ToString();
98 SimInfoData["sendkey"]=TheSim.sendkey;
99 SimInfoData["recvkey"]=TheSim.recvkey;
100 SimInfoResp.Value=SimInfoData;
101 return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(SimInfoResp),"utf-16","utf-8"));
102 } else {
103 XmlRpcResponse SimErrorResp = new XmlRpcResponse();
104 Hashtable SimErrorData = new Hashtable();
105 SimErrorData["error"]="sim not found";
106 SimErrorResp.Value=SimErrorData;
107 return(XmlRpcResponseSerializer.Singleton.Serialize(SimErrorResp));
108 }
109 break;
110 }
111 } catch(Exception e) {
112 Console.WriteLine(e.ToString());
113 }
114 return "";
115 }
116
117 static string ParseREST(string requestBody, string requestURL) {
118 return "";
119 }
120
121
122 static void HandleRequest(Object stateinfo) {
123 HttpListenerContext context=(HttpListenerContext)stateinfo;
124
125 HttpListenerRequest request = context.Request;
126 HttpListenerResponse response = context.Response;
127
128 response.KeepAlive=false;
129 response.SendChunked=false;
130
131 System.IO.Stream body = request.InputStream;
132 System.Text.Encoding encoding = System.Text.Encoding.UTF8;
133 System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
134
135 string requestBody = reader.ReadToEnd();
136 body.Close();
137 reader.Close();
138
139 string responseString="";
140 switch(request.ContentType) {
141 case "text/xml":
142 // must be XML-RPC, so pass to the XML-RPC parser
143
144 responseString=ParseXMLRPC(requestBody);
145 response.AddHeader("Content-type","text/xml");
146 break;
147
148 case null:
149 // must be REST or invalid crap, so pass to the REST parser
150 responseString=ParseREST(request.Url.OriginalString,requestBody);
151 break;
152 }
153
154
155 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
156 System.IO.Stream output = response.OutputStream;
157 response.SendChunked=false;
158 response.ContentLength64=buffer.Length;
159 output.Write(buffer,0,buffer.Length);
160 output.Close();
161 }
162 }
163
164
165}
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/*
2Copyright (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
30using System;
31using System.Text;
32using libsecondlife;
33using ServerConsole;
34
35namespace 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 d984e9a..0000000
--- a/ogs/gridserver/src/OGS-GridServer.csproj
+++ /dev/null
@@ -1,69 +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\src\Util.cs">
44 <Link>Util.cs</Link>
45 </Compile>
46 <Compile Include="..\..\common\VersionInfo\VersionInfo.cs">
47 <Link>VersionInfo.cs</Link>
48 </Compile>
49 <Compile Include="ConsoleCmds.cs" />
50 <Compile Include="GridHttp.cs" />
51 <Compile Include="Main.cs" />
52 <Compile Include="Properties\AssemblyInfo.cs" />
53 <Compile Include="SimProfiles.cs" />
54 </ItemGroup>
55 <ItemGroup>
56 <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">
57 <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>
58 <Name>ServerConsole</Name>
59 </ProjectReference>
60 </ItemGroup>
61 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
62 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
63 Other similar extension points exist, see Microsoft.Common.targets.
64 <Target Name="BeforeBuild">
65 </Target>
66 <Target Name="AfterBuild">
67 </Target>
68 -->
69</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 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using 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 91a92ea..0000000
--- a/ogs/gridserver/src/SimProfiles.cs
+++ /dev/null
@@ -1,111 +0,0 @@
1/*
2Copyright (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
30using System;
31using System.Text;
32using System.Collections;
33using System.Collections.Generic;
34using libsecondlife;
35using ServerConsole;
36
37namespace OpenGridServices
38{
39 /// <summary>
40 /// </summary>
41 public class SimProfileManager {
42
43 public Dictionary<LLUUID, SimProfile> SimProfiles = new Dictionary<LLUUID, SimProfile>();
44
45 public SimProfileManager() {
46 }
47
48 public void InitSimProfiles() {
49 // TODO: need to load from database
50 }
51
52 public SimProfile GetProfileByHandle(ulong reqhandle) {
53 foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) {
54 if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID];
55 }
56 return null;
57 }
58
59 public SimProfile GetProfileByLLUUID(LLUUID ProfileLLUUID) {
60 return SimProfiles[ProfileLLUUID];
61 }
62
63 public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) {
64 SimProfile TheSim=GetProfileByHandle(regionhandle);
65 if(TheSim != null)
66 if(TheSim.recvkey==simrecvkey) {
67 return true;
68 } else {
69 return false;
70 } else return false;
71
72 }
73
74 public SimProfile CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {
75 SimProfile newprofile = new SimProfile();
76 newprofile.regionname=regionname;
77 newprofile.sim_ip=sim_ip;
78 newprofile.sim_port=sim_port;
79 newprofile.RegionLocX=RegionLocX;
80 newprofile.RegionLocY=RegionLocY;
81 newprofile.caps_url="http://" + sim_ip + ":9000/";
82 newprofile.sendkey=sendkey;
83 newprofile.recvkey=recvkey;
84 newprofile.regionhandle=Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
85 newprofile.UUID=LLUUID.Random();
86 this.SimProfiles.Add(newprofile.UUID,newprofile);
87 return newprofile;
88 }
89
90 }
91
92 public class SimProfile {
93 public LLUUID UUID;
94 public ulong regionhandle;
95 public string regionname;
96 public string sim_ip;
97 public uint sim_port;
98 public string caps_url;
99 public uint RegionLocX;
100 public uint RegionLocY;
101 public string sendkey;
102 public string recvkey;
103
104
105 public SimProfile() {
106 }
107
108
109 }
110
111}
diff --git a/ogs/ogs.build b/ogs/ogs.build
deleted file mode 100644
index 303b1bf..0000000
--- a/ogs/ogs.build
+++ /dev/null
@@ -1,38 +0,0 @@
1<?xml version="1.0"?>
2 <project name="OGS" default="build" basedir=".">
3 <description>nant buildfile for OpenSim</description>
4 <property name="debug" value="true" overwrite="false" />
5 <target name="clean" description="remove all generated files">
6 <nant target="clean">
7 <buildfiles>
8 <include name="ServerConsole/default.build" />
9 <include name="gridserver/default.build" />
10 </buildfiles>
11 </nant>
12
13 </target>
14
15 <target name="svnupdate" description="updates to latest SVN">
16 <exec program="svn">
17 <arg value="update" />
18 </exec>
19 </target>
20
21 <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
22
23 </target>
24
25 <target name="build" description="compiles the source code">
26
27 <exec program="genvers.sh" />
28 <loadfile file="VERSION" property="svnver"/>
29
30 <nant>
31 <buildfiles>
32 <include name="ServerConsole/default.build" />
33 <include name="gridserver/default.build" />
34 </buildfiles>
35 </nant>
36
37 </target>
38</project>
diff --git a/ogs/userserver/default.build b/ogs/userserver/default.build
deleted file mode 100644
index a56f925..0000000
--- a/ogs/userserver/default.build
+++ /dev/null
@@ -1,63 +0,0 @@
1<?xml version="1.0"?>
2 <project name="UserServer" 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-UserServer" />
38 <attribute type="AssemblyDescriptionAttribute" value="The core OGS User Server" />
39 <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
40 </attributes>
41 </asminfo>
42
43 <csc target="exe" output="bin/UserServer.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="src/*.cs" />
54 </sources>
55 </csc>
56
57 <copy todir="bin/">
58 <fileset basedir="../common/bin">
59 <include name="*.*" />
60 </fileset>
61 </copy>
62 </target>
63</project>
diff --git a/ogs/userserver/src/ConsoleCmds.cs b/ogs/userserver/src/ConsoleCmds.cs
deleted file mode 100644
index f2568fc..0000000
--- a/ogs/userserver/src/ConsoleCmds.cs
+++ /dev/null
@@ -1,57 +0,0 @@
1/*
2Copyright (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
30using System;
31using System.Text;
32using ServerConsole;
33
34namespace OpenGridServices
35{
36
37 public class UserConsole : conscmd_callback {
38 public UserConsole() { }
39
40 public override void RunCmd(string cmd, string[] cmdparams) {
41 switch(cmd) {
42 case "help":
43 ServerConsole.MainConsole.Instance.WriteLine("shutdown - shutdown the user server (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/userserver/src/Main.cs b/ogs/userserver/src/Main.cs
deleted file mode 100644
index 40ef916..0000000
--- a/ogs/userserver/src/Main.cs
+++ /dev/null
@@ -1,114 +0,0 @@
1/*
2Copyright (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
30using System;
31using System.Collections;
32using System.Collections.Generic;
33using System.Text;
34using libsecondlife;
35using ServerConsole;
36
37namespace OpenGridServices
38{
39 /// <summary>
40 /// </summary>
41 public class OpenUser_Main
42 {
43
44 public static OpenUser_Main userserver;
45
46 public UserHTTPServer _httpd;
47 public UserProfileManager _profilemanager;
48 public UserProfile GridGod;
49 public string DefaultStartupMsg;
50 public string GridURL;
51 public string GridSendKey;
52 public string GridRecvKey;
53
54 public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>();
55
56 [STAThread]
57 public static void Main( string[] args )
58 {
59 Console.WriteLine("OpenUser " + VersionInfo.Version + "\n");
60 Console.WriteLine("Starting...\n");
61 ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenUser", new UserConsole());
62
63 userserver = new OpenUser_Main();
64 userserver.Startup();
65
66 ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n");
67
68 while(true) {
69 ServerConsole.MainConsole.Instance.MainConsolePrompt();
70 }
71 }
72
73 public void Startup() {
74 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");
75
76 this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");
77 this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: ");
78 this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: ");
79
80 this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!");
81
82 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager");
83 _profilemanager = new UserProfileManager();
84 _profilemanager.InitUserProfiles();
85
86
87 string tempfirstname;
88 string templastname;
89 string tempMD5Passwd;
90 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please configure the grid god user:");
91 tempfirstname=ServerConsole.MainConsole.Instance.CmdPrompt("First name: ");
92 templastname=ServerConsole.MainConsole.Instance.CmdPrompt("Last name: ");
93 tempMD5Passwd=ServerConsole.MainConsole.Instance.PasswdPrompt("Password: ");
94
95 System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider();
96 byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd);
97 bs = x.ComputeHash(bs);
98 System.Text.StringBuilder s = new System.Text.StringBuilder();
99 foreach (byte b in bs)
100 {
101 s.Append(b.ToString("x2").ToLower());
102 }
103 tempMD5Passwd = "$1$" + s.ToString();
104
105 GridGod=_profilemanager.CreateNewProfile(tempfirstname,templastname,tempMD5Passwd);
106 _profilemanager.SetGod(GridGod.UUID);
107 GridGod.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f);
108 GridGod.homepos = new LLVector3(128f,128f,23f);
109
110 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process");
111 _httpd = new UserHTTPServer();
112 }
113 }
114}
diff --git a/ogs/userserver/src/OGS-UserServer.csproj b/ogs/userserver/src/OGS-UserServer.csproj
deleted file mode 100644
index f6737c8..0000000
--- a/ogs/userserver/src/OGS-UserServer.csproj
+++ /dev/null
@@ -1,68 +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>{D45B6E48-5668-478D-B9CB-6D46E665FACF}</ProjectGuid>
8 <OutputType>Exe</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>OGS_UserServer</RootNamespace>
11 <AssemblyName>OGS-UserServer</AssemblyName>
12 <StartupObject>OpenGridServices.OpenUser_Main</StartupObject>
13 </PropertyGroup>
14 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15 <DebugSymbols>true</DebugSymbols>
16 <DebugType>full</DebugType>
17 <Optimize>false</Optimize>
18 <OutputPath>bin\Debug\</OutputPath>
19 <DefineConstants>DEBUG;TRACE</DefineConstants>
20 <ErrorReport>prompt</ErrorReport>
21 <WarningLevel>4</WarningLevel>
22 </PropertyGroup>
23 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
24 <DebugType>pdbonly</DebugType>
25 <Optimize>true</Optimize>
26 <OutputPath>bin\Release\</OutputPath>
27 <DefineConstants>TRACE</DefineConstants>
28 <ErrorReport>prompt</ErrorReport>
29 <WarningLevel>4</WarningLevel>
30 </PropertyGroup>
31 <ItemGroup>
32 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
33 <SpecificVersion>False</SpecificVersion>
34 <HintPath>..\..\common\bin\libsecondlife.dll</HintPath>
35 </Reference>
36 <Reference Include="System" />
37 <Reference Include="System.Data" />
38 <Reference Include="System.Xml" />
39 </ItemGroup>
40 <ItemGroup>
41 <Compile Include="..\..\common\src\OGS-Console.cs">
42 <Link>OGS-Console.cs</Link>
43 </Compile>
44 <Compile Include="..\..\common\VersionInfo\VersionInfo.cs">
45 <Link>VersionInfo.cs</Link>
46 </Compile>
47 <Compile Include="ConsoleCmds.cs" />
48 <Compile Include="Main.cs" />
49 <Compile Include="Properties\AssemblyInfo.cs" />
50 <Compile Include="UserHttp.cs" />
51 <Compile Include="UserProfiles.cs" />
52 <Compile Include="Util.cs" />
53 </ItemGroup>
54 <ItemGroup>
55 <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">
56 <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>
57 <Name>ServerConsole</Name>
58 </ProjectReference>
59 </ItemGroup>
60 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
61 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
62 Other similar extension points exist, see Microsoft.Common.targets.
63 <Target Name="BeforeBuild">
64 </Target>
65 <Target Name="AfterBuild">
66 </Target>
67 -->
68</Project> \ No newline at end of file
diff --git a/ogs/userserver/src/OGS-UserServer.csproj.user b/ogs/userserver/src/OGS-UserServer.csproj.user
deleted file mode 100644
index 9c0b2d9..0000000
--- a/ogs/userserver/src/OGS-UserServer.csproj.user
+++ /dev/null
@@ -1,16 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <PublishUrlHistory>publish\</PublishUrlHistory>
4 <InstallUrlHistory>
5 </InstallUrlHistory>
6 <SupportUrlHistory>
7 </SupportUrlHistory>
8 <UpdateUrlHistory>
9 </UpdateUrlHistory>
10 <BootstrapperUrlHistory>
11 </BootstrapperUrlHistory>
12 <ApplicationRevision>0</ApplicationRevision>
13 <FallbackCulture>en-US</FallbackCulture>
14 <VerifyUploadedFiles>false</VerifyUploadedFiles>
15 </PropertyGroup>
16</Project> \ No newline at end of file
diff --git a/ogs/userserver/src/Properties/AssemblyInfo.cs b/ogs/userserver/src/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5d5ce8d..0000000
--- a/ogs/userserver/src/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using 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-UserServer")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("")]
12[assembly: AssemblyProduct("OGS-UserServer")]
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("e266513a-090b-4d38-80f6-8599eef68c8c")]
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/userserver/src/UserHttp.cs b/ogs/userserver/src/UserHttp.cs
deleted file mode 100644
index bc232fb..0000000
--- a/ogs/userserver/src/UserHttp.cs
+++ /dev/null
@@ -1,287 +0,0 @@
1/*
2Copyright (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
30using System;
31using System.Text;
32using Nwc.XmlRpc;
33using System.Threading;
34using System.Text.RegularExpressions;
35using System.Net;
36using System.IO;
37using System.Collections;
38using System.Collections.Generic;
39using libsecondlife;
40using ServerConsole;
41
42namespace OpenGridServices
43{
44 public class UserHTTPServer {
45 public Thread HTTPD;
46 public HttpListener Listener;
47
48 public UserHTTPServer() {
49 ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server");
50 HTTPD = new Thread(new ThreadStart(StartHTTP));
51 HTTPD.Start();
52 }
53
54 public void StartHTTP() {
55 ServerConsole.MainConsole.Instance.WriteLine("UserHttp.cs:StartHTTP() - Spawned main thread OK");
56 Listener = new HttpListener();
57
58 Listener.Prefixes.Add("http://+:8002/userserver/");
59 Listener.Prefixes.Add("http://+:8002/usersessions/");
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 XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
71
72 Hashtable requestData = (Hashtable)request.Params[0];
73 switch(request.MethodName) {
74 case "login_to_simulator":
75 bool GoodXML= (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));
76 bool GoodLogin=false;
77 string firstname="";
78 string lastname="";
79 string passwd="";
80
81 if(GoodXML) {
82 firstname=(string)requestData["first"];
83 lastname=(string)requestData["last"];
84 passwd=(string)requestData["passwd"];
85 GoodLogin=OpenUser_Main.userserver._profilemanager.AuthenticateUser(firstname,lastname,passwd);
86 }
87
88
89 if(!(GoodXML && GoodLogin)) {
90 XmlRpcResponse LoginErrorResp = new XmlRpcResponse();
91 Hashtable ErrorRespData = new Hashtable();
92 ErrorRespData["reason"]="key";
93 ErrorRespData["message"]="Error connecting to grid. Please double check your login details and check with the grid owner if you are sure these are correct";
94 ErrorRespData["login"]="false";
95 LoginErrorResp.Value=ErrorRespData;
96 return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(LoginErrorResp)," encoding=\"utf-16\"","" ));
97 }
98
99 UserProfile TheUser=OpenUser_Main.userserver._profilemanager.GetProfileByName(firstname,lastname);
100
101 if(!((TheUser.CurrentSessionID==null) && (TheUser.CurrentSecureSessionID==null))) {
102 XmlRpcResponse PresenceErrorResp = new XmlRpcResponse();
103 Hashtable PresenceErrorRespData = new Hashtable();
104 PresenceErrorRespData["reason"]="presence";
105 PresenceErrorRespData["message"]="You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner";
106 PresenceErrorRespData["login"]="false";
107 PresenceErrorResp.Value=PresenceErrorRespData;
108 return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(PresenceErrorResp)," encoding=\"utf-16\"","" ));
109
110 }
111
112 try {
113 LLUUID AgentID = TheUser.UUID;
114 TheUser.InitSessionData();
115 SimProfile SimInfo = new SimProfile();
116 SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle,OpenUser_Main.userserver.GridURL,OpenUser_Main.userserver.GridSendKey,OpenUser_Main.userserver.GridRecvKey);
117
118 XmlRpcResponse LoginGoodResp = new XmlRpcResponse();
119 Hashtable LoginGoodData = new Hashtable();
120
121 Hashtable GlobalT = new Hashtable();
122 GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271";
123 GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
124 GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
125 ArrayList GlobalTextures = new ArrayList();
126 GlobalTextures.Add(GlobalT);
127
128 Hashtable LoginFlagsHash = new Hashtable();
129 LoginFlagsHash["daylight_savings"]="N";
130 LoginFlagsHash["stipend_since_login"]="N";
131 LoginFlagsHash["gendered"]="Y";
132 LoginFlagsHash["ever_logged_in"]="Y";
133 ArrayList LoginFlags=new ArrayList();
134 LoginFlags.Add(LoginFlagsHash);
135
136 Hashtable uiconfig = new Hashtable();
137 uiconfig["allow_first_life"]="Y";
138 ArrayList ui_config=new ArrayList();
139 ui_config.Add(uiconfig);
140
141 Hashtable ClassifiedCategoriesHash = new Hashtable();
142 ClassifiedCategoriesHash["category_name"]="bla bla";
143 ClassifiedCategoriesHash["category_id"]=(Int32)1;
144 ArrayList ClassifiedCategories = new ArrayList();
145 ClassifiedCategories.Add(ClassifiedCategoriesHash);
146
147 ArrayList AgentInventory = new ArrayList();
148 foreach(InventoryFolder InvFolder in TheUser.InventoryFolders.Values) {
149 Hashtable TempHash = new Hashtable();
150 TempHash["name"]=InvFolder.FolderName;
151 TempHash["parent_id"]=InvFolder.ParentID.ToStringHyphenated();
152 TempHash["version"]=(Int32)InvFolder.Version;
153 TempHash["type_default"]=(Int32)InvFolder.DefaultType;
154 TempHash["folder_id"]=InvFolder.FolderID.ToStringHyphenated();
155 AgentInventory.Add(TempHash);
156 }
157
158 Hashtable InventoryRootHash = new Hashtable();
159 InventoryRootHash["folder_id"]=TheUser.InventoryRoot.FolderID.ToStringHyphenated();
160 ArrayList InventoryRoot = new ArrayList();
161 InventoryRoot.Add(InventoryRootHash);
162
163 Hashtable InitialOutfitHash = new Hashtable();
164 InitialOutfitHash["folder_name"]="Nightclub Female";
165 InitialOutfitHash["gender"]="female";
166 ArrayList InitialOutfit = new ArrayList();
167 InitialOutfit.Add(InitialOutfitHash);
168
169 uint circode = (uint)(new Random()).Next();
170 TheUser.AddSimCircuit(circode, SimInfo.UUID);
171
172 LoginGoodData["last_name"]="\"" + TheUser.firstname + "\"";
173 LoginGoodData["ui-config"]=ui_config;
174 LoginGoodData["sim_ip"]=SimInfo.sim_ip.ToString();
175 LoginGoodData["login-flags"]=LoginFlags;
176 LoginGoodData["global-textures"]=GlobalTextures;
177 LoginGoodData["classified_categories"]=ClassifiedCategories;
178 LoginGoodData["event_categories"]=new ArrayList();
179 LoginGoodData["inventory-skeleton"]=AgentInventory;
180 LoginGoodData["inventory-skel-lib"]=new ArrayList();
181 LoginGoodData["inventory-root"]=InventoryRoot;
182 LoginGoodData["event_notifications"]=new ArrayList();
183 LoginGoodData["gestures"]=new ArrayList();
184 LoginGoodData["inventory-lib-owner"]=new ArrayList();
185 LoginGoodData["initial-outfit"]=InitialOutfit;
186 LoginGoodData["seconds_since_epoch"]=(Int32)(DateTime.UtcNow - new DateTime(1970,1,1)).TotalSeconds;
187 LoginGoodData["start_location"]="last";
188 LoginGoodData["home"]="{'region_handle':[r" + (SimInfo.RegionLocX*256).ToString() + ",r" + (SimInfo.RegionLocY*256).ToString() + "], 'position':[r" + TheUser.homepos.X.ToString() + ",r" + TheUser.homepos.Y.ToString() + ",r" + TheUser.homepos.Z.ToString() + "], 'look_at':[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]}";
189 LoginGoodData["message"]=OpenUser_Main.userserver.DefaultStartupMsg;
190 LoginGoodData["first_name"]="\"" + firstname + "\"";
191 LoginGoodData["circuit_code"]=(Int32)circode;
192 LoginGoodData["sim_port"]=(Int32)SimInfo.sim_port;
193 LoginGoodData["secure_session_id"]=TheUser.CurrentSecureSessionID.ToStringHyphenated();
194 LoginGoodData["look_at"]="\n[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]\n";
195 LoginGoodData["agent_id"]=AgentID.ToStringHyphenated();
196 LoginGoodData["region_y"]=(Int32)SimInfo.RegionLocY*256;
197 LoginGoodData["region_x"]=(Int32)SimInfo.RegionLocX*256;
198 LoginGoodData["seed_capability"]=null;
199 LoginGoodData["agent_access"]="M";
200 LoginGoodData["session_id"]=TheUser.CurrentSessionID.ToStringHyphenated();
201 LoginGoodData["login"]="true";
202
203 LoginGoodResp.Value=LoginGoodData;
204 TheUser.SendDataToSim(SimInfo);
205 return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(LoginGoodResp),"utf-16","utf-8" ));
206
207 } catch (Exception E) {
208 Console.WriteLine(E.ToString());
209 }
210
211 break;
212 }
213
214 return "";
215 }
216
217 static string ParseREST(HttpListenerRequest www_req) {
218 Console.WriteLine("INCOMING REST - " + www_req.RawUrl);
219
220 char[] splitter = {'/'};
221 string[] rest_params = www_req.RawUrl.Split(splitter);
222 string req_type = rest_params[1]; // First part of the URL is the type of request - usersessions/userprofiles/inventory/blabla
223 switch(req_type) {
224 case "usersessions":
225 LLUUID sessionid = new LLUUID(rest_params[2]); // get usersessions/sessionid
226 if(www_req.HttpMethod=="DELETE") {
227 foreach (libsecondlife.LLUUID UUID in OpenUser_Main.userserver._profilemanager.UserProfiles.Keys) {
228 if(OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID==sessionid) {
229 OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID=null;
230 OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSecureSessionID=null;
231 OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].Circuits.Clear();
232 }
233 }
234
235 }
236 return "OK";
237 break;
238 }
239
240 return "";
241 }
242
243
244 static void HandleRequest(Object stateinfo) {
245 HttpListenerContext context=(HttpListenerContext)stateinfo;
246
247 HttpListenerRequest request = context.Request;
248 HttpListenerResponse response = context.Response;
249
250 response.KeepAlive=false;
251 response.SendChunked=false;
252
253 System.IO.Stream body = request.InputStream;
254 System.Text.Encoding encoding = System.Text.Encoding.UTF8;
255 System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
256
257 string requestBody = reader.ReadToEnd();
258 body.Close();
259 reader.Close();
260
261 string responseString="";
262 switch(request.ContentType) {
263 case "text/xml":
264 // must be XML-RPC, so pass to the XML-RPC parser
265
266 responseString=ParseXMLRPC(requestBody);
267 response.AddHeader("Content-type","text/xml");
268 break;
269
270 case "text/plaintext":
271 responseString=ParseREST(request);
272 response.AddHeader("Content-type","text/plaintext");
273 break;
274 }
275
276
277 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
278 System.IO.Stream output = response.OutputStream;
279 response.SendChunked=false;
280 response.ContentLength64=buffer.Length;
281 output.Write(buffer,0,buffer.Length);
282 output.Close();
283 }
284 }
285
286
287}
diff --git a/ogs/userserver/src/UserProfiles.cs b/ogs/userserver/src/UserProfiles.cs
deleted file mode 100644
index 4586ab3..0000000
--- a/ogs/userserver/src/UserProfiles.cs
+++ /dev/null
@@ -1,223 +0,0 @@
1/*
2Copyright (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
30using System;
31using System.Text;
32using System.Collections;
33using System.Collections.Generic;
34using libsecondlife;
35using Nwc.XmlRpc;
36using ServerConsole;
37
38namespace OpenGridServices
39{
40 /// <summary>
41 /// </summary>
42 public class UserProfileManager {
43
44 public Dictionary<LLUUID, UserProfile> UserProfiles = new Dictionary<LLUUID, UserProfile>();
45
46 public UserProfileManager() {
47 }
48
49 public void InitUserProfiles() {
50 // TODO: need to load from database
51 }
52
53 public UserProfile GetProfileByName(string firstname, string lastname) {
54 foreach (libsecondlife.LLUUID UUID in UserProfiles.Keys) {
55 if((UserProfiles[UUID].firstname==firstname) && (UserProfiles[UUID].lastname==lastname)) return UserProfiles[UUID];
56 }
57 return null;
58 }
59
60 public UserProfile GetProfileByLLUUID(LLUUID ProfileLLUUID) {
61 return UserProfiles[ProfileLLUUID];
62 }
63
64 public bool AuthenticateUser(string firstname, string lastname, string passwd) {
65 UserProfile TheUser=GetProfileByName(firstname, lastname);
66 if(TheUser != null)
67 if(TheUser.MD5passwd==passwd) {
68 return true;
69 } else {
70 return false;
71 } else return false;
72
73 }
74
75 public void SetGod(LLUUID GodID) {
76 this.UserProfiles[GodID].IsGridGod=true;
77 }
78
79 public UserProfile CreateNewProfile(string firstname, string lastname, string MD5passwd) {
80 UserProfile newprofile = new UserProfile();
81 newprofile.homeregionhandle=Util.UIntsToLong((997*256), (996*256));
82 newprofile.firstname=firstname;
83 newprofile.lastname=lastname;
84 newprofile.MD5passwd=MD5passwd;
85 newprofile.UUID=LLUUID.Random();
86 this.UserProfiles.Add(newprofile.UUID,newprofile);
87 return newprofile;
88 }
89
90 }
91
92 public class UserProfile {
93
94 public string firstname;
95 public string lastname;
96 public ulong homeregionhandle;
97 public LLVector3 homepos;
98 public LLVector3 homelookat;
99
100 public bool IsGridGod=false;
101 public bool IsLocal=true; // will be used in future for visitors from foreign grids
102 public string AssetURL;
103 public string MD5passwd;
104
105 public LLUUID CurrentSessionID;
106 public LLUUID CurrentSecureSessionID;
107 public LLUUID UUID;
108 public Dictionary<LLUUID, uint> Circuits = new Dictionary<LLUUID, uint>(); // tracks circuit codes
109
110 public InventoryFolder InventoryRoot;
111 public Dictionary<LLUUID, InventoryFolder> InventoryFolders;
112 public Dictionary<LLUUID, InventoryItem> InventoryItems;
113
114 public UserProfile() {
115 Circuits = new Dictionary<LLUUID, uint>();
116 InventoryFolders = new Dictionary<LLUUID, InventoryFolder>();
117 InventoryItems = new Dictionary<LLUUID, InventoryItem>();
118 InventoryRoot=new InventoryFolder();
119 InventoryRoot.FolderID = LLUUID.Random();
120 InventoryRoot.ParentID=new LLUUID();
121 InventoryRoot.Version=1;
122 InventoryRoot.DefaultType=8;
123 InventoryRoot.FolderName="My Inventory";
124 InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
125 homeregionhandle=Util.UIntsToLong((997*256), (996*256));;
126 }
127
128 public void InitSessionData() {
129 CurrentSessionID=LLUUID.Random();
130 CurrentSecureSessionID=LLUUID.Random();
131 }
132
133 public void AddSimCircuit(uint circuit_code, LLUUID region_UUID) {
134 if(this.Circuits.ContainsKey(region_UUID)== false)
135 this.Circuits.Add(region_UUID, circuit_code);
136 }
137
138 public void SendDataToSim(SimProfile TheSim) {
139 Console.WriteLine(TheSim.caps_url);
140 Hashtable SimParams = new Hashtable();
141 SimParams["session_id"]=this.CurrentSessionID.ToString();
142 SimParams["secure_session_id"]=this.CurrentSecureSessionID.ToString();
143 SimParams["firstname"]=this.firstname;
144 SimParams["lastname"]=this.lastname;
145 SimParams["agent_id"]=this.UUID.ToString();
146 SimParams["circuit_code"]=(Int32)this.Circuits[TheSim.UUID];
147 ArrayList SendParams = new ArrayList();
148 SendParams.Add(SimParams);
149
150 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user",SendParams);
151 XmlRpcResponse GridResp = GridReq.Send(TheSim.caps_url,3000);
152 }
153 }
154
155 public class InventoryFolder {
156 public LLUUID FolderID;
157 public LLUUID ParentID;
158 public string FolderName;
159 public ushort DefaultType;
160 public ushort Version;
161 }
162
163 public class InventoryItem { //TODO: Fixup this and add full permissions etc
164 public LLUUID FolderID;
165 public LLUUID OwnerID;
166 public LLUUID ItemID;
167 public LLUUID AssetID;
168 public LLUUID CreatorID = LLUUID.Zero;
169 public sbyte InvType;
170 public sbyte Type;
171 public string Name;
172 public string Description;
173 }
174
175 public class SimProfile {
176 public LLUUID UUID;
177 public ulong regionhandle;
178 public string regionname;
179 public string sim_ip;
180 public uint sim_port;
181 public string caps_url;
182 public uint RegionLocX;
183 public uint RegionLocY;
184 public string sendkey;
185 public string recvkey;
186
187
188 public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey) {
189 try {
190 Hashtable GridReqParams = new Hashtable();
191 GridReqParams["region_handle"]=region_handle.ToString();
192 GridReqParams["caller"]="userserver";
193 GridReqParams["authkey"]=SendKey;
194 ArrayList SendParams = new ArrayList();
195 SendParams.Add(GridReqParams);
196 XmlRpcRequest GridReq = new XmlRpcRequest("get_sim_info",SendParams);
197
198 XmlRpcResponse GridResp = GridReq.Send(GridURL,3000);
199
200 Hashtable RespData=(Hashtable)GridResp.Value;
201 this.UUID = new LLUUID((string)RespData["UUID"]);
202 this.regionhandle = (ulong)Convert.ToUInt64(RespData["regionhandle"]);
203 this.regionname=(string)RespData["regionname"];
204 this.sim_ip=(string)RespData["sim_ip"];
205 this.sim_port=(uint)Convert.ToUInt16(RespData["sim_port"]);
206 this.caps_url=(string)RespData["caps_url"];
207 this.RegionLocX=(uint)Convert.ToUInt32(RespData["RegionLocX"]);
208 this.RegionLocY=(uint)Convert.ToUInt32(RespData["RegionLocY"]);
209 this.sendkey=(string)RespData["sendkey"];
210 this.recvkey=(string)RespData["recvkey"];
211 } catch(Exception e) {
212 Console.WriteLine(e.ToString());
213 }
214 return this;
215 }
216
217 public SimProfile() {
218 }
219
220
221 }
222
223}
diff --git a/ogs/userserver/src/Util.cs b/ogs/userserver/src/Util.cs
deleted file mode 100644
index 1efa471..0000000
--- a/ogs/userserver/src/Util.cs
+++ /dev/null
@@ -1,87 +0,0 @@
1/*
2Copyright (c) OpenSim project, http://osgrid.org/
3
4* Copyright (c) <year>, <copyright holder>
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
30using System;
31using System.Collections.Generic;
32using System.Threading;
33using libsecondlife;
34using libsecondlife.Packets;
35
36namespace OpenGridServices
37{
38 /// <summary>
39 /// </summary>
40 ///
41 public class Util
42 {
43 public static ulong UIntsToLong(uint X, uint Y)
44 {
45 return Helpers.UIntsToLong(X,Y);
46 }
47 public Util()
48 {
49
50 }
51 }
52
53 public class QueItem {
54 public QueItem()
55 {
56 }
57
58 public Packet Packet;
59 public bool Incoming;
60 }
61
62
63 public class BlockingQueue< T > {
64 private Queue< T > _queue = new Queue< T >();
65 private object _queueSync = new object();
66
67 public void Enqueue(T value)
68 {
69 lock(_queueSync)
70 {
71 _queue.Enqueue(value);
72 Monitor.Pulse(_queueSync);
73 }
74 }
75
76 public T Dequeue()
77 {
78 lock(_queueSync)
79 {
80 if( _queue.Count < 1)
81 Monitor.Wait(_queueSync);
82
83 return _queue.Dequeue();
84 }
85 }
86 }
87}
generated by cgit v1.1 at 2024-11-12 13:13:12 +0000