From 7daa3955bc3a1918e40962851f9e8d38597a245e Mon Sep 17 00:00:00 2001 From: gareth Date: Thu, 22 Mar 2007 10:11:15 +0000 Subject: brought zircon branch into trunk --- ogs/OGS-UserServer.sln | 32 --- ogs/ServerConsole/Properties/AssemblyInfo.cs | 33 --- ogs/ServerConsole/ServerConsole.cs | 98 ------- ogs/ServerConsole/ServerConsole.csproj | 49 ---- ogs/ServerConsole/default.build | 48 ---- .../assets/00000000000000005005000000000005/data | Bin 291 -> 0 bytes .../assets/00000000000000007007000000000006/data | Bin 153 -> 0 bytes .../assets/00000000000000007009000000000008/data | Bin 570 -> 0 bytes .../assets/66c41e3938f9f75a024e585989bfab73/data | 105 -------- .../assets/e0ee49b5a4184df8d3c9a65361fe7f49/data | 52 ---- ogs/common/VersionInfo/VersionInfo.cs | 37 --- ogs/common/bin/libsecondlife.dll | Bin 2338816 -> 0 bytes ogs/common/src/OGS-Console.cs | 181 ------------- ogs/common/src/Util.cs | 87 ------- ogs/common/src/VersionInfo.cs.template | 37 --- ogs/genvers.sh | 9 - ogs/gridserver/default.build | 64 ----- ogs/gridserver/src/ConsoleCmds.cs | 57 ---- ogs/gridserver/src/GridHttp.cs | 165 ------------ ogs/gridserver/src/Main.cs | 94 ------- ogs/gridserver/src/OGS-GridServer.csproj | 69 ----- ogs/gridserver/src/Properties/AssemblyInfo.cs | 33 --- ogs/gridserver/src/SimProfiles.cs | 111 -------- ogs/ogs.build | 38 --- ogs/userserver/default.build | 63 ----- ogs/userserver/src/ConsoleCmds.cs | 57 ---- ogs/userserver/src/Main.cs | 114 -------- ogs/userserver/src/OGS-UserServer.csproj | 68 ----- ogs/userserver/src/OGS-UserServer.csproj.user | 16 -- ogs/userserver/src/Properties/AssemblyInfo.cs | 33 --- ogs/userserver/src/UserHttp.cs | 287 --------------------- ogs/userserver/src/UserProfiles.cs | 223 ---------------- ogs/userserver/src/Util.cs | 87 ------- 33 files changed, 2347 deletions(-) delete mode 100644 ogs/OGS-UserServer.sln delete mode 100644 ogs/ServerConsole/Properties/AssemblyInfo.cs delete mode 100644 ogs/ServerConsole/ServerConsole.cs delete mode 100644 ogs/ServerConsole/ServerConsole.csproj delete mode 100644 ogs/ServerConsole/default.build delete mode 100644 ogs/assetserver/assets/00000000000000005005000000000005/data delete mode 100644 ogs/assetserver/assets/00000000000000007007000000000006/data delete mode 100644 ogs/assetserver/assets/00000000000000007009000000000008/data delete mode 100644 ogs/assetserver/assets/66c41e3938f9f75a024e585989bfab73/data delete mode 100644 ogs/assetserver/assets/e0ee49b5a4184df8d3c9a65361fe7f49/data delete mode 100644 ogs/common/VersionInfo/VersionInfo.cs delete mode 100755 ogs/common/bin/libsecondlife.dll delete mode 100644 ogs/common/src/OGS-Console.cs delete mode 100644 ogs/common/src/Util.cs delete mode 100644 ogs/common/src/VersionInfo.cs.template delete mode 100644 ogs/genvers.sh delete mode 100644 ogs/gridserver/default.build delete mode 100644 ogs/gridserver/src/ConsoleCmds.cs delete mode 100644 ogs/gridserver/src/GridHttp.cs delete mode 100644 ogs/gridserver/src/Main.cs delete mode 100644 ogs/gridserver/src/OGS-GridServer.csproj delete mode 100644 ogs/gridserver/src/Properties/AssemblyInfo.cs delete mode 100644 ogs/gridserver/src/SimProfiles.cs delete mode 100644 ogs/ogs.build delete mode 100644 ogs/userserver/default.build delete mode 100644 ogs/userserver/src/ConsoleCmds.cs delete mode 100644 ogs/userserver/src/Main.cs delete mode 100644 ogs/userserver/src/OGS-UserServer.csproj delete mode 100644 ogs/userserver/src/OGS-UserServer.csproj.user delete mode 100644 ogs/userserver/src/Properties/AssemblyInfo.cs delete mode 100644 ogs/userserver/src/UserHttp.cs delete mode 100644 ogs/userserver/src/UserProfiles.cs delete mode 100644 ogs/userserver/src/Util.cs (limited to 'ogs') 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 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C# Express 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-UserServer", "userserver\src\OGS-UserServer.csproj", "{D45B6E48-5668-478D-B9CB-6D46E665FACF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerConsole", "ServerConsole\ServerConsole.csproj", "{7667E6E2-F227-41A2-B1B2-315613E1BAFC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-GridServer", "gridserver\src\OGS-GridServer.csproj", "{FE50A574-C8ED-433B-95F0-213A5EED2AB2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.Build.0 = Release|Any CPU - {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.Build.0 = Release|Any CPU - {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal 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 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ServerConsole")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ServerConsole")] -[assembly: AssemblyCopyright("Copyright © 2007")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c4d85def-4c2e-449d-bf4a-449b8cf03736")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[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 @@ -/* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -*/ -using System; - -namespace ServerConsole -{ - public class MainConsole { - - private static ConsoleBase instance; - - public static ConsoleBase Instance - { - get - { - return instance; - } - set - { - instance = value; - } - } - - public MainConsole() - { - - } - } - - public abstract class conscmd_callback { - public abstract void RunCmd(string cmd, string[] cmdparams); - public abstract void Show(string ShowWhat); - } - - public abstract class ConsoleBase - { - - public enum ConsoleType { - Local, // Use stdio - TCP, // Use TCP/telnet - SimChat // Use in-world chat (for gods) - } - - public abstract void Close(); - - // 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 - public abstract void WriteLine(string Line) ; - - public abstract string ReadLine(); - - public abstract int Read() ; - - public abstract void Write(string Line) ; - - public abstract string PasswdPrompt(string prompt); - - // Displays a command prompt and waits for the user to enter a string, then returns that string - public abstract string CmdPrompt(string prompt) ; - - // Displays a command prompt and returns a default value if the user simply presses enter - public abstract string CmdPrompt(string prompt, string defaultresponse); - - // Displays a command prompt and returns a default value, user may only enter 1 of 2 options - public abstract string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) ; - - // Runs a command with a number of parameters - public abstract Object RunCmd(string Cmd, string[] cmdparams) ; - - // Shows data about something - public abstract void ShowCommands(string ShowWhat) ; - - // Displays a prompt to the user and then runs the command they entered - public abstract void MainConsolePrompt() ; - } -} 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 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {7667E6E2-F227-41A2-B1B2-315613E1BAFC} - Library - Properties - ServerConsole - ServerConsole - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\common\bin\ - TRACE - prompt - 4 - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ogs/assetserver/assets/00000000000000005005000000000005/data b/ogs/assetserver/assets/00000000000000005005000000000005/data deleted file mode 100644 index e6840e2..0000000 Binary files a/ogs/assetserver/assets/00000000000000005005000000000005/data and /dev/null differ diff --git a/ogs/assetserver/assets/00000000000000007007000000000006/data b/ogs/assetserver/assets/00000000000000007007000000000006/data deleted file mode 100644 index 5ad1fd0..0000000 Binary files a/ogs/assetserver/assets/00000000000000007007000000000006/data and /dev/null differ diff --git a/ogs/assetserver/assets/00000000000000007009000000000008/data b/ogs/assetserver/assets/00000000000000007009000000000008/data deleted file mode 100644 index cd2fd94..0000000 Binary files a/ogs/assetserver/assets/00000000000000007009000000000008/data and /dev/null 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 @@ -LLWearable version 22 -Female Shape and Outfit 3 Shape -Created by system from avatar's appearance. - permissions 0 - { - base_mask 00082000 - owner_mask 00082000 - group_mask 00082000 - everyone_mask 00082000 - next_owner_mask 00082000 - creator_id 3d924400-038e-6ad9-920b-cfbb9b40585c - owner_id 542ffb8e-8932-49b9-8664-58f53e442797 - last_owner_id 3d924400-038e-6ad9-920b-cfbb9b40585c - group_id 00000000-0000-0000-0000-000000000000 - } - sale_info 0 - { - sale_type not - sale_price 0 - } -type 0 -parameters 82 -1 .21 -2 -.5 -4 -.11 -5 -.1 -6 -.3 -7 -.4 -8 -.5 -10 .7 -11 .34 -12 -.5 -13 0 -14 .04 -15 .58 -17 .56 -18 -.26 -19 -.73 -20 -.34 -21 -.01 -22 1 -23 -.5 -24 -.63 -25 .44 -27 .05 -33 -.24 -34 -.7 -35 -.16 -36 -.2 -37 -.98 -38 -.5 -80 0 -105 .07 -155 -.22 -157 0 -185 -1 -193 .86 -196 -.74 -505 .65 -506 .12 -507 -1.5 -515 0 -517 .16 -518 .8 -629 0 -637 0 -646 .4 -647 1 -649 .36 -650 .85 -652 .49 -653 -1 -656 0 -659 .65 -662 .5 -663 0 -664 0 -665 0 -675 -.15 -676 .26 -678 .28 -682 .27 -683 -.19 -684 -.09 -685 0 -690 .45 -692 .4 -693 -0 -753 -.5 -756 -.08 -758 .24 -759 .6 -760 .11 -764 -.38 -765 -.3 -769 .42 -773 .51 -795 .16 -796 .11 -799 .36 -841 0 -842 -.82 -879 0 -880 0 -textures 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 @@ -LLWearable version 22 -Sexy - Female Skin - - permissions 0 - { - base_mask 00086000 - owner_mask 00086000 - group_mask 00000000 - everyone_mask 00000000 - next_owner_mask 00086000 - creator_id 3b659a92-dbf0-4301-8fdc-208d78f00d77 - owner_id 3d924400-038e-6ad9-920b-cfbb9b40585c - last_owner_id 101358d5-469d-4b24-9b85-4dc3c05e635d - group_id 00000000-0000-0000-0000-000000000000 - } - sale_info 0 - { - sale_type not - sale_price 10 - } -type 1 -parameters 26 -108 0 -110 0 -111 0 -116 0 -117 1 -150 0 -162 0 -163 0 -165 0 -700 .01 -701 .5 -702 .26 -703 0 -704 0 -705 .5 -706 .6 -707 0 -708 0 -709 0 -710 0 -711 .5 -712 0 -713 .7 -714 0 -715 0 -775 0 -textures 3 -0 f9261672-5058-9ef8-c0c4-48f43a0b16d4 -5 b6ba53be-b5bf-9a1f-2e19-21daf998429c -6 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 @@ -/* -Copyright (c) OpenSim project, http://osgrid.org/ -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; - -namespace OpenGridServices -{ - /// - /// - public class VersionInfo - { - public static string Version = "0.1, Build 1173843165, Revision 193:206M"; - } -} diff --git a/ogs/common/bin/libsecondlife.dll b/ogs/common/bin/libsecondlife.dll deleted file mode 100755 index 89d692a..0000000 Binary files a/ogs/common/bin/libsecondlife.dll and /dev/null 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 @@ -/* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -*/ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Threading; -using System.IO; -using System.Net; -using ServerConsole; - -namespace OpenGridServices -{ - /// - /// Description of ServerConsole. - /// - public class MServerConsole : ConsoleBase - { - - private ConsoleType ConsType; - StreamWriter Log; - public conscmd_callback cmdparser; - public string componentname; - - // STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!! - // constype - the type of console to use (see enum ConsoleType) - // sparam - depending on the console type: - // TCP - the IP to bind to (127.0.0.1 if blank) - // Local - param ignored - // and for the iparam: - // TCP - the port to bind to - // Local - param ignored - // LogFile - duh - // componentname - which component of the OGS system? (user, asset etc) - // cmdparser - a reference to a conscmd_callback object - - public MServerConsole(ConsoleType constype, string sparam, int iparam, string LogFile, string componentname, conscmd_callback cmdparser) { - ConsType = constype; - this.componentname = componentname; - this.cmdparser = cmdparser; - switch(constype) { - case ConsoleType.Local: - Console.WriteLine("ServerConsole.cs - creating new local console"); - Console.WriteLine("Logs will be saved to current directory in " + LogFile); - Log=File.AppendText(LogFile); - Log.WriteLine("========================================================================"); - Log.WriteLine(componentname + " " + VersionInfo.Version + " Started at " + DateTime.Now.ToString()); - break; - - case ConsoleType.TCP: - break; - - default: - Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!"); - break; - } - } - - public override void Close() { - Log.WriteLine("Shutdown at " + DateTime.Now.ToString()); - Log.Close(); - } - - // 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 - public override void WriteLine(string Line) { - Log.WriteLine(Line); - Console.WriteLine(Line); - return; - } - - public override string ReadLine() { - string TempStr=Console.ReadLine(); - Log.WriteLine(TempStr); - return TempStr; - } - - public override int Read() { - int TempInt= Console.Read(); - Log.Write((char)TempInt); - return TempInt; - } - - public override void Write(string Line) { - Console.Write(Line); - Log.Write(Line); - return; - } - - - // Displays a prompt and waits for the user to enter a string, then returns that string - // Done with no echo and suitable for passwords - public override string PasswdPrompt(string prompt) { - // FIXME: Needs to be better abstracted - Log.WriteLine(prompt); - this.Write(prompt); - ConsoleColor oldfg=Console.ForegroundColor; - Console.ForegroundColor=Console.BackgroundColor; - string temp=Console.ReadLine(); - Console.ForegroundColor=oldfg; - return temp; - } - - // Displays a command prompt and waits for the user to enter a string, then returns that string - public override string CmdPrompt(string prompt) { - this.Write(prompt); - return this.ReadLine(); - } - - // Displays a command prompt and returns a default value if the user simply presses enter - public override string CmdPrompt(string prompt, string defaultresponse) { - string temp=CmdPrompt(prompt); - if(temp=="") { - return defaultresponse; - } else { - return temp; - } - } - - // Displays a command prompt and returns a default value, user may only enter 1 of 2 options - public override string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) { - bool itisdone=false; - string temp=CmdPrompt(prompt,defaultresponse); - while(itisdone==false) { - if((temp==OptionA) || (temp==OptionB)) { - itisdone=true; - } else { - this.WriteLine("Valid options are " + OptionA + " or " + OptionB); - temp=CmdPrompt(prompt,defaultresponse); - } - } - return temp; - } - - // Runs a command with a number of parameters - public override Object RunCmd(string Cmd, string[] cmdparams) { - cmdparser.RunCmd(Cmd, cmdparams); - return null; - } - - // Shows data about something - public override void ShowCommands(string ShowWhat) { - cmdparser.Show(ShowWhat); - } - - public override void MainConsolePrompt() { - string[] tempstrarray; - string tempstr = this.CmdPrompt(this.componentname + "# "); - tempstrarray = tempstr.Split(' '); - string cmd=tempstrarray[0]; - Array.Reverse(tempstrarray); - Array.Resize(ref tempstrarray,tempstrarray.Length-1); - Array.Reverse(tempstrarray); - string[] cmdparams=(string[])tempstrarray; - RunCmd(cmd,cmdparams); - } - } -} 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 @@ -/* -Copyright (c) OpenSim project, http://osgrid.org/ - -* Copyright (c) , -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Collections.Generic; -using System.Threading; -using libsecondlife; -using libsecondlife.Packets; - -namespace OpenGridServices -{ - /// - /// - /// - public class Util - { - public static ulong UIntsToLong(uint X, uint Y) - { - return Helpers.UIntsToLong(X,Y); - } - public Util() - { - - } - } - - public class QueItem { - public QueItem() - { - } - - public Packet Packet; - public bool Incoming; - } - - - public class BlockingQueue< T > { - private Queue< T > _queue = new Queue< T >(); - private object _queueSync = new object(); - - public void Enqueue(T value) - { - lock(_queueSync) - { - _queue.Enqueue(value); - Monitor.Pulse(_queueSync); - } - } - - public T Dequeue() - { - lock(_queueSync) - { - if( _queue.Count < 1) - Monitor.Wait(_queueSync); - - return _queue.Dequeue(); - } - } - } -} 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 @@ -/* -Copyright (c) OpenSim project, http://osgrid.org/ -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; - -namespace OpenGridServices -{ - /// - /// - public class VersionInfo - { - public static string Version = "@@VERSION"; - } -} 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 @@ -#!/bin/bash - -MAJOR=0 -MINOR=1 -BUILD=`date +%s` -REVISION=`svnversion . | sed s/:// | sed s/M//` -REALREVISION=`svnversion` -cat common/src/VersionInfo.cs.template | sed s/@@VERSION/"$MAJOR.$MINOR, Build $BUILD, Revision $REALREVISION"/g >common/src/VersionInfo.cs -echo -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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ -/* -Copyright (c) OpenSim project, http://osgrid.org/ - - -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Text; -using ServerConsole; - -namespace OpenGridServices -{ - - public class GridConsole : conscmd_callback { - public GridConsole() { } - - public override void RunCmd(string cmd, string[] cmdparams) { - switch(cmd) { - case "help": - ServerConsole.MainConsole.Instance.WriteLine("shutdown - shutdown the grid (USE CAUTION!)" -); - break; - - case "shutdown": - ServerConsole.MainConsole.Instance.Close(); - Environment.Exit(0); - break; - } - } - - public override void Show(string ShowWhat) { - } - } -} 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 @@ -/* -Copyright (c) OpenGrid project, http://osgrid.org/ - - -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Text; -using Nwc.XmlRpc; -using System.Threading; -using System.Text.RegularExpressions; -using System.Net; -using System.IO; -using System.Collections; -using System.Collections.Generic; -using libsecondlife; -using ServerConsole; - -namespace OpenGridServices -{ - public class GridHTTPServer { - public Thread HTTPD; - public HttpListener Listener; - - public GridHTTPServer() { - ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server"); - HTTPD = new Thread(new ThreadStart(StartHTTP)); - HTTPD.Start(); - } - - public void StartHTTP() { - ServerConsole.MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK"); - Listener = new HttpListener(); - - Listener.Prefixes.Add("http://+:8001/gridserver/"); - Listener.Start(); - - HttpListenerContext context; - while(true) { - context = Listener.GetContext(); - ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); - } - } - - static string ParseXMLRPC(string requestBody) { - try{ - XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody); - - Hashtable requestData = (Hashtable)request.Params[0]; - switch(request.MethodName) { - case "get_sim_info": - ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]); - SimProfile TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle); - string RecvKey=""; - string caller=(string)requestData["caller"]; - switch(caller) { - case "userserver": - RecvKey=OpenGrid_Main.thegrid.UserRecvKey; - break; - case "assetserver": - RecvKey=OpenGrid_Main.thegrid.AssetRecvKey; - break; - } - if((TheSim!=null) && (string)requestData["authkey"]==RecvKey) { - XmlRpcResponse SimInfoResp = new XmlRpcResponse(); - Hashtable SimInfoData = new Hashtable(); - SimInfoData["UUID"]=TheSim.UUID.ToString(); - SimInfoData["regionhandle"]=TheSim.regionhandle.ToString(); - SimInfoData["regionname"]=TheSim.regionname; - SimInfoData["sim_ip"]=TheSim.sim_ip; - SimInfoData["sim_port"]=TheSim.sim_port.ToString(); - SimInfoData["caps_url"]=TheSim.caps_url; - SimInfoData["RegionLocX"]=TheSim.RegionLocX.ToString(); - SimInfoData["RegionLocY"]=TheSim.RegionLocY.ToString(); - SimInfoData["sendkey"]=TheSim.sendkey; - SimInfoData["recvkey"]=TheSim.recvkey; - SimInfoResp.Value=SimInfoData; - return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(SimInfoResp),"utf-16","utf-8")); - } else { - XmlRpcResponse SimErrorResp = new XmlRpcResponse(); - Hashtable SimErrorData = new Hashtable(); - SimErrorData["error"]="sim not found"; - SimErrorResp.Value=SimErrorData; - return(XmlRpcResponseSerializer.Singleton.Serialize(SimErrorResp)); - } - break; - } - } catch(Exception e) { - Console.WriteLine(e.ToString()); - } - return ""; - } - - static string ParseREST(string requestBody, string requestURL) { - return ""; - } - - - static void HandleRequest(Object stateinfo) { - HttpListenerContext context=(HttpListenerContext)stateinfo; - - HttpListenerRequest request = context.Request; - HttpListenerResponse response = context.Response; - - response.KeepAlive=false; - response.SendChunked=false; - - System.IO.Stream body = request.InputStream; - System.Text.Encoding encoding = System.Text.Encoding.UTF8; - System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); - - string requestBody = reader.ReadToEnd(); - body.Close(); - reader.Close(); - - string responseString=""; - switch(request.ContentType) { - case "text/xml": - // must be XML-RPC, so pass to the XML-RPC parser - - responseString=ParseXMLRPC(requestBody); - response.AddHeader("Content-type","text/xml"); - break; - - case null: - // must be REST or invalid crap, so pass to the REST parser - responseString=ParseREST(request.Url.OriginalString,requestBody); - break; - } - - - byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); - System.IO.Stream output = response.OutputStream; - response.SendChunked=false; - response.ContentLength64=buffer.Length; - output.Write(buffer,0,buffer.Length); - output.Close(); - } - } - - -} 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 @@ -/* -Copyright (c) OpenSim project, http://osgrid.org/ - - -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Text; -using libsecondlife; -using ServerConsole; - -namespace OpenGridServices -{ - /// - /// - public class OpenGrid_Main - { - - public static OpenGrid_Main thegrid; - public string GridOwner; - public string DefaultStartupMsg; - public string DefaultAssetServer; - public string AssetSendKey; - public string AssetRecvKey; - public string DefaultUserServer; - public string UserSendKey; - public string UserRecvKey; - - public GridHTTPServer _httpd; - public SimProfileManager _regionmanager; - - [STAThread] - public static void Main( string[] args ) - { - Console.WriteLine("OpenGrid " + VersionInfo.Version + "\n"); - Console.WriteLine("Starting...\n"); - ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenGrid", new GridConsole()); - - thegrid = new OpenGrid_Main(); - thegrid.Startup(); - - ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n"); - - while(true) { - ServerConsole.MainConsole.Instance.MainConsolePrompt(); - } - } - - public void Startup() { - ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings"); - - this.GridOwner=ServerConsole.MainConsole.Instance.CmdPrompt("Grid owner [OGS development team]: ","OGS development team"); - this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!]: ","Welcome to OGS!"); - - this.DefaultAssetServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default asset server [no default]: "); - this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to asset server: "); - this.AssetRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from asset server: "); - - this.DefaultUserServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default user server [no default]: "); - this.UserSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to user server: "); - this.UserRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from user server: "); - - ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process"); - _httpd = new GridHTTPServer(); - - this._regionmanager=new SimProfileManager(); - _regionmanager.CreateNewProfile("OpenSim Test", "http://there-is-no-caps.com", "4.78.190.75", 9000, 997, 996, this.UserSendKey, this.UserRecvKey); - - } - } -} 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 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {FE50A574-C8ED-433B-95F0-213A5EED2AB2} - Exe - Properties - OGS_GridServer - OGS-GridServer - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - ..\..\common\bin\libsecondlife.dll - - - - - - - - OGS-Console.cs - - - Util.cs - - - VersionInfo.cs - - - - - - - - - - {7667E6E2-F227-41A2-B1B2-315613E1BAFC} - ServerConsole - - - - - \ 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 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OGS-GridServer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OGS-GridServer")] -[assembly: AssemblyCopyright("Copyright © 2007")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[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 @@ -/* -Copyright (c) OpenGrid project, http://osgrid.org/ - - -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using libsecondlife; -using ServerConsole; - -namespace OpenGridServices -{ - /// - /// - public class SimProfileManager { - - public Dictionary SimProfiles = new Dictionary(); - - public SimProfileManager() { - } - - public void InitSimProfiles() { - // TODO: need to load from database - } - - public SimProfile GetProfileByHandle(ulong reqhandle) { - foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) { - if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID]; - } - return null; - } - - public SimProfile GetProfileByLLUUID(LLUUID ProfileLLUUID) { - return SimProfiles[ProfileLLUUID]; - } - - public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) { - SimProfile TheSim=GetProfileByHandle(regionhandle); - if(TheSim != null) - if(TheSim.recvkey==simrecvkey) { - return true; - } else { - return false; - } else return false; - - } - - public SimProfile CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) { - SimProfile newprofile = new SimProfile(); - newprofile.regionname=regionname; - newprofile.sim_ip=sim_ip; - newprofile.sim_port=sim_port; - newprofile.RegionLocX=RegionLocX; - newprofile.RegionLocY=RegionLocY; - newprofile.caps_url="http://" + sim_ip + ":9000/"; - newprofile.sendkey=sendkey; - newprofile.recvkey=recvkey; - newprofile.regionhandle=Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); - newprofile.UUID=LLUUID.Random(); - this.SimProfiles.Add(newprofile.UUID,newprofile); - return newprofile; - } - - } - - public class SimProfile { - public LLUUID UUID; - public ulong regionhandle; - public string regionname; - public string sim_ip; - public uint sim_port; - public string caps_url; - public uint RegionLocX; - public uint RegionLocY; - public string sendkey; - public string recvkey; - - - public SimProfile() { - } - - - } - -} 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 @@ - - - nant buildfile for OpenSim - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ -/* -Copyright (c) OpenSim project, http://osgrid.org/ - - -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Text; -using ServerConsole; - -namespace OpenGridServices -{ - - public class UserConsole : conscmd_callback { - public UserConsole() { } - - public override void RunCmd(string cmd, string[] cmdparams) { - switch(cmd) { - case "help": - ServerConsole.MainConsole.Instance.WriteLine("shutdown - shutdown the user server (USE CAUTION!)" -); - break; - - case "shutdown": - ServerConsole.MainConsole.Instance.Close(); - Environment.Exit(0); - break; - } - } - - public override void Show(string ShowWhat) { - } - } -} 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 @@ -/* -Copyright (c) OpenSim project, http://osgrid.org/ - - -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Text; -using libsecondlife; -using ServerConsole; - -namespace OpenGridServices -{ - /// - /// - public class OpenUser_Main - { - - public static OpenUser_Main userserver; - - public UserHTTPServer _httpd; - public UserProfileManager _profilemanager; - public UserProfile GridGod; - public string DefaultStartupMsg; - public string GridURL; - public string GridSendKey; - public string GridRecvKey; - - public Dictionary UserSessions = new Dictionary(); - - [STAThread] - public static void Main( string[] args ) - { - Console.WriteLine("OpenUser " + VersionInfo.Version + "\n"); - Console.WriteLine("Starting...\n"); - ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenUser", new UserConsole()); - - userserver = new OpenUser_Main(); - userserver.Startup(); - - ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n"); - - while(true) { - ServerConsole.MainConsole.Instance.MainConsolePrompt(); - } - } - - public void Startup() { - ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings"); - - this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: "); - this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: "); - this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: "); - - this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!"); - - ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager"); - _profilemanager = new UserProfileManager(); - _profilemanager.InitUserProfiles(); - - - string tempfirstname; - string templastname; - string tempMD5Passwd; - ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please configure the grid god user:"); - tempfirstname=ServerConsole.MainConsole.Instance.CmdPrompt("First name: "); - templastname=ServerConsole.MainConsole.Instance.CmdPrompt("Last name: "); - tempMD5Passwd=ServerConsole.MainConsole.Instance.PasswdPrompt("Password: "); - - System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider(); - byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd); - bs = x.ComputeHash(bs); - System.Text.StringBuilder s = new System.Text.StringBuilder(); - foreach (byte b in bs) - { - s.Append(b.ToString("x2").ToLower()); - } - tempMD5Passwd = "$1$" + s.ToString(); - - GridGod=_profilemanager.CreateNewProfile(tempfirstname,templastname,tempMD5Passwd); - _profilemanager.SetGod(GridGod.UUID); - GridGod.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f); - GridGod.homepos = new LLVector3(128f,128f,23f); - - ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process"); - _httpd = new UserHTTPServer(); - } - } -} 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 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {D45B6E48-5668-478D-B9CB-6D46E665FACF} - Exe - Properties - OGS_UserServer - OGS-UserServer - OpenGridServices.OpenUser_Main - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - ..\..\common\bin\libsecondlife.dll - - - - - - - - OGS-Console.cs - - - VersionInfo.cs - - - - - - - - - - - {7667E6E2-F227-41A2-B1B2-315613E1BAFC} - ServerConsole - - - - - \ 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 @@ - - - publish\ - - - - - - - - - 0 - en-US - false - - \ 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 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OGS-UserServer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OGS-UserServer")] -[assembly: AssemblyCopyright("Copyright © 2007")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e266513a-090b-4d38-80f6-8599eef68c8c")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[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 @@ -/* -Copyright (c) OpenGrid project, http://osgrid.org/ - - -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Text; -using Nwc.XmlRpc; -using System.Threading; -using System.Text.RegularExpressions; -using System.Net; -using System.IO; -using System.Collections; -using System.Collections.Generic; -using libsecondlife; -using ServerConsole; - -namespace OpenGridServices -{ - public class UserHTTPServer { - public Thread HTTPD; - public HttpListener Listener; - - public UserHTTPServer() { - ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server"); - HTTPD = new Thread(new ThreadStart(StartHTTP)); - HTTPD.Start(); - } - - public void StartHTTP() { - ServerConsole.MainConsole.Instance.WriteLine("UserHttp.cs:StartHTTP() - Spawned main thread OK"); - Listener = new HttpListener(); - - Listener.Prefixes.Add("http://+:8002/userserver/"); - Listener.Prefixes.Add("http://+:8002/usersessions/"); - Listener.Start(); - - HttpListenerContext context; - while(true) { - context = Listener.GetContext(); - ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); - } - } - - static string ParseXMLRPC(string requestBody) { - XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody); - - Hashtable requestData = (Hashtable)request.Params[0]; - switch(request.MethodName) { - case "login_to_simulator": - bool GoodXML= (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd")); - bool GoodLogin=false; - string firstname=""; - string lastname=""; - string passwd=""; - - if(GoodXML) { - firstname=(string)requestData["first"]; - lastname=(string)requestData["last"]; - passwd=(string)requestData["passwd"]; - GoodLogin=OpenUser_Main.userserver._profilemanager.AuthenticateUser(firstname,lastname,passwd); - } - - - if(!(GoodXML && GoodLogin)) { - XmlRpcResponse LoginErrorResp = new XmlRpcResponse(); - Hashtable ErrorRespData = new Hashtable(); - ErrorRespData["reason"]="key"; - 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"; - ErrorRespData["login"]="false"; - LoginErrorResp.Value=ErrorRespData; - return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(LoginErrorResp)," encoding=\"utf-16\"","" )); - } - - UserProfile TheUser=OpenUser_Main.userserver._profilemanager.GetProfileByName(firstname,lastname); - - if(!((TheUser.CurrentSessionID==null) && (TheUser.CurrentSecureSessionID==null))) { - XmlRpcResponse PresenceErrorResp = new XmlRpcResponse(); - Hashtable PresenceErrorRespData = new Hashtable(); - PresenceErrorRespData["reason"]="presence"; - 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"; - PresenceErrorRespData["login"]="false"; - PresenceErrorResp.Value=PresenceErrorRespData; - return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(PresenceErrorResp)," encoding=\"utf-16\"","" )); - - } - - try { - LLUUID AgentID = TheUser.UUID; - TheUser.InitSessionData(); - SimProfile SimInfo = new SimProfile(); - SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle,OpenUser_Main.userserver.GridURL,OpenUser_Main.userserver.GridSendKey,OpenUser_Main.userserver.GridRecvKey); - - XmlRpcResponse LoginGoodResp = new XmlRpcResponse(); - Hashtable LoginGoodData = new Hashtable(); - - Hashtable GlobalT = new Hashtable(); - GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271"; - GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621"; - GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621"; - ArrayList GlobalTextures = new ArrayList(); - GlobalTextures.Add(GlobalT); - - Hashtable LoginFlagsHash = new Hashtable(); - LoginFlagsHash["daylight_savings"]="N"; - LoginFlagsHash["stipend_since_login"]="N"; - LoginFlagsHash["gendered"]="Y"; - LoginFlagsHash["ever_logged_in"]="Y"; - ArrayList LoginFlags=new ArrayList(); - LoginFlags.Add(LoginFlagsHash); - - Hashtable uiconfig = new Hashtable(); - uiconfig["allow_first_life"]="Y"; - ArrayList ui_config=new ArrayList(); - ui_config.Add(uiconfig); - - Hashtable ClassifiedCategoriesHash = new Hashtable(); - ClassifiedCategoriesHash["category_name"]="bla bla"; - ClassifiedCategoriesHash["category_id"]=(Int32)1; - ArrayList ClassifiedCategories = new ArrayList(); - ClassifiedCategories.Add(ClassifiedCategoriesHash); - - ArrayList AgentInventory = new ArrayList(); - foreach(InventoryFolder InvFolder in TheUser.InventoryFolders.Values) { - Hashtable TempHash = new Hashtable(); - TempHash["name"]=InvFolder.FolderName; - TempHash["parent_id"]=InvFolder.ParentID.ToStringHyphenated(); - TempHash["version"]=(Int32)InvFolder.Version; - TempHash["type_default"]=(Int32)InvFolder.DefaultType; - TempHash["folder_id"]=InvFolder.FolderID.ToStringHyphenated(); - AgentInventory.Add(TempHash); - } - - Hashtable InventoryRootHash = new Hashtable(); - InventoryRootHash["folder_id"]=TheUser.InventoryRoot.FolderID.ToStringHyphenated(); - ArrayList InventoryRoot = new ArrayList(); - InventoryRoot.Add(InventoryRootHash); - - Hashtable InitialOutfitHash = new Hashtable(); - InitialOutfitHash["folder_name"]="Nightclub Female"; - InitialOutfitHash["gender"]="female"; - ArrayList InitialOutfit = new ArrayList(); - InitialOutfit.Add(InitialOutfitHash); - - uint circode = (uint)(new Random()).Next(); - TheUser.AddSimCircuit(circode, SimInfo.UUID); - - LoginGoodData["last_name"]="\"" + TheUser.firstname + "\""; - LoginGoodData["ui-config"]=ui_config; - LoginGoodData["sim_ip"]=SimInfo.sim_ip.ToString(); - LoginGoodData["login-flags"]=LoginFlags; - LoginGoodData["global-textures"]=GlobalTextures; - LoginGoodData["classified_categories"]=ClassifiedCategories; - LoginGoodData["event_categories"]=new ArrayList(); - LoginGoodData["inventory-skeleton"]=AgentInventory; - LoginGoodData["inventory-skel-lib"]=new ArrayList(); - LoginGoodData["inventory-root"]=InventoryRoot; - LoginGoodData["event_notifications"]=new ArrayList(); - LoginGoodData["gestures"]=new ArrayList(); - LoginGoodData["inventory-lib-owner"]=new ArrayList(); - LoginGoodData["initial-outfit"]=InitialOutfit; - LoginGoodData["seconds_since_epoch"]=(Int32)(DateTime.UtcNow - new DateTime(1970,1,1)).TotalSeconds; - LoginGoodData["start_location"]="last"; - 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() + "]}"; - LoginGoodData["message"]=OpenUser_Main.userserver.DefaultStartupMsg; - LoginGoodData["first_name"]="\"" + firstname + "\""; - LoginGoodData["circuit_code"]=(Int32)circode; - LoginGoodData["sim_port"]=(Int32)SimInfo.sim_port; - LoginGoodData["secure_session_id"]=TheUser.CurrentSecureSessionID.ToStringHyphenated(); - LoginGoodData["look_at"]="\n[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]\n"; - LoginGoodData["agent_id"]=AgentID.ToStringHyphenated(); - LoginGoodData["region_y"]=(Int32)SimInfo.RegionLocY*256; - LoginGoodData["region_x"]=(Int32)SimInfo.RegionLocX*256; - LoginGoodData["seed_capability"]=null; - LoginGoodData["agent_access"]="M"; - LoginGoodData["session_id"]=TheUser.CurrentSessionID.ToStringHyphenated(); - LoginGoodData["login"]="true"; - - LoginGoodResp.Value=LoginGoodData; - TheUser.SendDataToSim(SimInfo); - return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(LoginGoodResp),"utf-16","utf-8" )); - - } catch (Exception E) { - Console.WriteLine(E.ToString()); - } - - break; - } - - return ""; - } - - static string ParseREST(HttpListenerRequest www_req) { - Console.WriteLine("INCOMING REST - " + www_req.RawUrl); - - char[] splitter = {'/'}; - string[] rest_params = www_req.RawUrl.Split(splitter); - string req_type = rest_params[1]; // First part of the URL is the type of request - usersessions/userprofiles/inventory/blabla - switch(req_type) { - case "usersessions": - LLUUID sessionid = new LLUUID(rest_params[2]); // get usersessions/sessionid - if(www_req.HttpMethod=="DELETE") { - foreach (libsecondlife.LLUUID UUID in OpenUser_Main.userserver._profilemanager.UserProfiles.Keys) { - if(OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID==sessionid) { - OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID=null; - OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSecureSessionID=null; - OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].Circuits.Clear(); - } - } - - } - return "OK"; - break; - } - - return ""; - } - - - static void HandleRequest(Object stateinfo) { - HttpListenerContext context=(HttpListenerContext)stateinfo; - - HttpListenerRequest request = context.Request; - HttpListenerResponse response = context.Response; - - response.KeepAlive=false; - response.SendChunked=false; - - System.IO.Stream body = request.InputStream; - System.Text.Encoding encoding = System.Text.Encoding.UTF8; - System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); - - string requestBody = reader.ReadToEnd(); - body.Close(); - reader.Close(); - - string responseString=""; - switch(request.ContentType) { - case "text/xml": - // must be XML-RPC, so pass to the XML-RPC parser - - responseString=ParseXMLRPC(requestBody); - response.AddHeader("Content-type","text/xml"); - break; - - case "text/plaintext": - responseString=ParseREST(request); - response.AddHeader("Content-type","text/plaintext"); - break; - } - - - byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); - System.IO.Stream output = response.OutputStream; - response.SendChunked=false; - response.ContentLength64=buffer.Length; - output.Write(buffer,0,buffer.Length); - output.Close(); - } - } - - -} 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 @@ -/* -Copyright (c) OpenGrid project, http://osgrid.org/ - - -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using libsecondlife; -using Nwc.XmlRpc; -using ServerConsole; - -namespace OpenGridServices -{ - /// - /// - public class UserProfileManager { - - public Dictionary UserProfiles = new Dictionary(); - - public UserProfileManager() { - } - - public void InitUserProfiles() { - // TODO: need to load from database - } - - public UserProfile GetProfileByName(string firstname, string lastname) { - foreach (libsecondlife.LLUUID UUID in UserProfiles.Keys) { - if((UserProfiles[UUID].firstname==firstname) && (UserProfiles[UUID].lastname==lastname)) return UserProfiles[UUID]; - } - return null; - } - - public UserProfile GetProfileByLLUUID(LLUUID ProfileLLUUID) { - return UserProfiles[ProfileLLUUID]; - } - - public bool AuthenticateUser(string firstname, string lastname, string passwd) { - UserProfile TheUser=GetProfileByName(firstname, lastname); - if(TheUser != null) - if(TheUser.MD5passwd==passwd) { - return true; - } else { - return false; - } else return false; - - } - - public void SetGod(LLUUID GodID) { - this.UserProfiles[GodID].IsGridGod=true; - } - - public UserProfile CreateNewProfile(string firstname, string lastname, string MD5passwd) { - UserProfile newprofile = new UserProfile(); - newprofile.homeregionhandle=Util.UIntsToLong((997*256), (996*256)); - newprofile.firstname=firstname; - newprofile.lastname=lastname; - newprofile.MD5passwd=MD5passwd; - newprofile.UUID=LLUUID.Random(); - this.UserProfiles.Add(newprofile.UUID,newprofile); - return newprofile; - } - - } - - public class UserProfile { - - public string firstname; - public string lastname; - public ulong homeregionhandle; - public LLVector3 homepos; - public LLVector3 homelookat; - - public bool IsGridGod=false; - public bool IsLocal=true; // will be used in future for visitors from foreign grids - public string AssetURL; - public string MD5passwd; - - public LLUUID CurrentSessionID; - public LLUUID CurrentSecureSessionID; - public LLUUID UUID; - public Dictionary Circuits = new Dictionary(); // tracks circuit codes - - public InventoryFolder InventoryRoot; - public Dictionary InventoryFolders; - public Dictionary InventoryItems; - - public UserProfile() { - Circuits = new Dictionary(); - InventoryFolders = new Dictionary(); - InventoryItems = new Dictionary(); - InventoryRoot=new InventoryFolder(); - InventoryRoot.FolderID = LLUUID.Random(); - InventoryRoot.ParentID=new LLUUID(); - InventoryRoot.Version=1; - InventoryRoot.DefaultType=8; - InventoryRoot.FolderName="My Inventory"; - InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot); - homeregionhandle=Util.UIntsToLong((997*256), (996*256));; - } - - public void InitSessionData() { - CurrentSessionID=LLUUID.Random(); - CurrentSecureSessionID=LLUUID.Random(); - } - - public void AddSimCircuit(uint circuit_code, LLUUID region_UUID) { - if(this.Circuits.ContainsKey(region_UUID)== false) - this.Circuits.Add(region_UUID, circuit_code); - } - - public void SendDataToSim(SimProfile TheSim) { - Console.WriteLine(TheSim.caps_url); - Hashtable SimParams = new Hashtable(); - SimParams["session_id"]=this.CurrentSessionID.ToString(); - SimParams["secure_session_id"]=this.CurrentSecureSessionID.ToString(); - SimParams["firstname"]=this.firstname; - SimParams["lastname"]=this.lastname; - SimParams["agent_id"]=this.UUID.ToString(); - SimParams["circuit_code"]=(Int32)this.Circuits[TheSim.UUID]; - ArrayList SendParams = new ArrayList(); - SendParams.Add(SimParams); - - XmlRpcRequest GridReq = new XmlRpcRequest("expect_user",SendParams); - XmlRpcResponse GridResp = GridReq.Send(TheSim.caps_url,3000); - } - } - - public class InventoryFolder { - public LLUUID FolderID; - public LLUUID ParentID; - public string FolderName; - public ushort DefaultType; - public ushort Version; - } - - public class InventoryItem { //TODO: Fixup this and add full permissions etc - public LLUUID FolderID; - public LLUUID OwnerID; - public LLUUID ItemID; - public LLUUID AssetID; - public LLUUID CreatorID = LLUUID.Zero; - public sbyte InvType; - public sbyte Type; - public string Name; - public string Description; - } - - public class SimProfile { - public LLUUID UUID; - public ulong regionhandle; - public string regionname; - public string sim_ip; - public uint sim_port; - public string caps_url; - public uint RegionLocX; - public uint RegionLocY; - public string sendkey; - public string recvkey; - - - public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey) { - try { - Hashtable GridReqParams = new Hashtable(); - GridReqParams["region_handle"]=region_handle.ToString(); - GridReqParams["caller"]="userserver"; - GridReqParams["authkey"]=SendKey; - ArrayList SendParams = new ArrayList(); - SendParams.Add(GridReqParams); - XmlRpcRequest GridReq = new XmlRpcRequest("get_sim_info",SendParams); - - XmlRpcResponse GridResp = GridReq.Send(GridURL,3000); - - Hashtable RespData=(Hashtable)GridResp.Value; - this.UUID = new LLUUID((string)RespData["UUID"]); - this.regionhandle = (ulong)Convert.ToUInt64(RespData["regionhandle"]); - this.regionname=(string)RespData["regionname"]; - this.sim_ip=(string)RespData["sim_ip"]; - this.sim_port=(uint)Convert.ToUInt16(RespData["sim_port"]); - this.caps_url=(string)RespData["caps_url"]; - this.RegionLocX=(uint)Convert.ToUInt32(RespData["RegionLocX"]); - this.RegionLocY=(uint)Convert.ToUInt32(RespData["RegionLocY"]); - this.sendkey=(string)RespData["sendkey"]; - this.recvkey=(string)RespData["recvkey"]; - } catch(Exception e) { - Console.WriteLine(e.ToString()); - } - return this; - } - - public SimProfile() { - } - - - } - -} 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 @@ -/* -Copyright (c) OpenSim project, http://osgrid.org/ - -* Copyright (c) , -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Collections.Generic; -using System.Threading; -using libsecondlife; -using libsecondlife.Packets; - -namespace OpenGridServices -{ - /// - /// - /// - public class Util - { - public static ulong UIntsToLong(uint X, uint Y) - { - return Helpers.UIntsToLong(X,Y); - } - public Util() - { - - } - } - - public class QueItem { - public QueItem() - { - } - - public Packet Packet; - public bool Incoming; - } - - - public class BlockingQueue< T > { - private Queue< T > _queue = new Queue< T >(); - private object _queueSync = new object(); - - public void Enqueue(T value) - { - lock(_queueSync) - { - _queue.Enqueue(value); - Monitor.Pulse(_queueSync); - } - } - - public T Dequeue() - { - lock(_queueSync) - { - if( _queue.Count < 1) - Monitor.Wait(_queueSync); - - return _queue.Dequeue(); - } - } - } -} -- cgit v1.1