diff options
Diffstat (limited to '')
13 files changed, 0 insertions, 425 deletions
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 | /* | ||
2 | Copyright (c) OpenSim project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Text; | ||
32 | using ServerConsole; | ||
33 | |||
34 | namespace OpenGridServices | ||
35 | { | ||
36 | |||
37 | public class 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 7e5308e..0000000 --- a/OGS/userserver/src/Main.cs +++ /dev/null | |||
@@ -1,118 +0,0 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenSim project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Collections; | ||
32 | using System.Collections.Generic; | ||
33 | using System.Text; | ||
34 | using libsecondlife; | ||
35 | using ServerConsole; | ||
36 | using OpenSim.Framework.User; | ||
37 | using OpenSim.Framework.Sims; | ||
38 | using OpenSim.Framework.Inventory; | ||
39 | |||
40 | namespace OpenGridServices | ||
41 | { | ||
42 | /// <summary> | ||
43 | /// </summary> | ||
44 | public class OpenUser_Main | ||
45 | { | ||
46 | |||
47 | public static OpenUser_Main userserver; | ||
48 | |||
49 | public UserHTTPServer _httpd; | ||
50 | public UserProfileManager _profilemanager; | ||
51 | public UserProfile GridGod; | ||
52 | public string DefaultStartupMsg; | ||
53 | public string GridURL; | ||
54 | public string GridSendKey; | ||
55 | public string GridRecvKey; | ||
56 | |||
57 | public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); | ||
58 | |||
59 | [STAThread] | ||
60 | public static void Main( string[] args ) | ||
61 | { | ||
62 | Console.WriteLine("OpenUser " + VersionInfo.Version + "\n"); | ||
63 | Console.WriteLine("Starting...\n"); | ||
64 | ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenUser", new UserConsole()); | ||
65 | |||
66 | userserver = new OpenUser_Main(); | ||
67 | userserver.Startup(); | ||
68 | |||
69 | ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n"); | ||
70 | |||
71 | while(true) { | ||
72 | ServerConsole.MainConsole.Instance.MainConsolePrompt(); | ||
73 | } | ||
74 | } | ||
75 | |||
76 | public void Startup() { | ||
77 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings"); | ||
78 | |||
79 | this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: "); | ||
80 | this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: "); | ||
81 | this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: "); | ||
82 | |||
83 | this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!"); | ||
84 | |||
85 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager"); | ||
86 | _profilemanager = new UserProfileManager(); | ||
87 | _profilemanager.InitUserProfiles(); | ||
88 | _profilemanager.SetKeys(GridSendKey, GridRecvKey, GridURL, DefaultStartupMsg); | ||
89 | |||
90 | |||
91 | string tempfirstname; | ||
92 | string templastname; | ||
93 | string tempMD5Passwd; | ||
94 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please configure the grid god user:"); | ||
95 | tempfirstname=ServerConsole.MainConsole.Instance.CmdPrompt("First name: "); | ||
96 | templastname=ServerConsole.MainConsole.Instance.CmdPrompt("Last name: "); | ||
97 | tempMD5Passwd=ServerConsole.MainConsole.Instance.PasswdPrompt("Password: "); | ||
98 | |||
99 | System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider(); | ||
100 | byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd); | ||
101 | bs = x.ComputeHash(bs); | ||
102 | System.Text.StringBuilder s = new System.Text.StringBuilder(); | ||
103 | foreach (byte b in bs) | ||
104 | { | ||
105 | s.Append(b.ToString("x2").ToLower()); | ||
106 | } | ||
107 | tempMD5Passwd = "$1$" + s.ToString(); | ||
108 | |||
109 | GridGod=_profilemanager.CreateNewProfile(tempfirstname,templastname,tempMD5Passwd); | ||
110 | _profilemanager.SetGod(GridGod.UUID); | ||
111 | GridGod.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f); | ||
112 | GridGod.homepos = new LLVector3(128f,128f,23f); | ||
113 | |||
114 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process"); | ||
115 | _httpd = new UserHTTPServer(); | ||
116 | } | ||
117 | } | ||
118 | } | ||
diff --git a/OGS/userserver/src/OGS-UserServer.csproj b/OGS/userserver/src/OGS-UserServer.csproj deleted file mode 100644 index f4fa8b6..0000000 --- a/OGS/userserver/src/OGS-UserServer.csproj +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ProductVersion>8.0.50727</ProductVersion> | ||
6 | <SchemaVersion>2.0</SchemaVersion> | ||
7 | <ProjectGuid>{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 | </ItemGroup> | ||
52 | <ItemGroup> | ||
53 | <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj"> | ||
54 | <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project> | ||
55 | <Name>OpenSim.Framework</Name> | ||
56 | </ProjectReference> | ||
57 | <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj"> | ||
58 | <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project> | ||
59 | <Name>ServerConsole</Name> | ||
60 | </ProjectReference> | ||
61 | </ItemGroup> | ||
62 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
63 | </Project> \ No newline at end of file | ||
diff --git a/OGS/userserver/src/OGS-UserServer.csproj.user b/OGS/userserver/src/OGS-UserServer.csproj.user deleted file mode 100644 index aa75a3d..0000000 --- a/OGS/userserver/src/OGS-UserServer.csproj.user +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <PublishUrlHistory>publish\</PublishUrlHistory> | ||
4 | <ApplicationRevision>0</ApplicationRevision> | ||
5 | <FallbackCulture>en-US</FallbackCulture> | ||
6 | <VerifyUploadedFiles>false</VerifyUploadedFiles> | ||
7 | </PropertyGroup> | ||
8 | </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 @@ | |||
1 | using System.Reflection; | ||
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // General Information about an assembly is controlled through the following | ||
6 | // set of attributes. Change these attribute values to modify the information | ||
7 | // associated with an assembly. | ||
8 | [assembly: AssemblyTitle("OGS-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 ce3cfcd..0000000 --- a/OGS/userserver/src/UserHttp.cs +++ /dev/null | |||
@@ -1,146 +0,0 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenGrid project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Text; | ||
32 | using Nwc.XmlRpc; | ||
33 | using System.Threading; | ||
34 | using System.Text.RegularExpressions; | ||
35 | using System.Net; | ||
36 | using System.IO; | ||
37 | using System.Collections; | ||
38 | using System.Collections.Generic; | ||
39 | using libsecondlife; | ||
40 | using ServerConsole; | ||
41 | using OpenSim.Framework.User; | ||
42 | using OpenSim.Framework.Sims; | ||
43 | using OpenSim.Framework.Inventory; | ||
44 | |||
45 | namespace OpenGridServices | ||
46 | { | ||
47 | public class UserHTTPServer { | ||
48 | public Thread HTTPD; | ||
49 | public HttpListener Listener; | ||
50 | |||
51 | public UserHTTPServer() { | ||
52 | ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server"); | ||
53 | HTTPD = new Thread(new ThreadStart(StartHTTP)); | ||
54 | HTTPD.Start(); | ||
55 | } | ||
56 | |||
57 | public void StartHTTP() { | ||
58 | ServerConsole.MainConsole.Instance.WriteLine("UserHttp.cs:StartHTTP() - Spawned main thread OK"); | ||
59 | Listener = new HttpListener(); | ||
60 | |||
61 | Listener.Prefixes.Add("http://+:8002/userserver/"); | ||
62 | Listener.Prefixes.Add("http://+:8002/usersessions/"); | ||
63 | Listener.Start(); | ||
64 | |||
65 | HttpListenerContext context; | ||
66 | while(true) { | ||
67 | context = Listener.GetContext(); | ||
68 | ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); | ||
69 | } | ||
70 | } | ||
71 | |||
72 | static string ParseXMLRPC(string requestBody) { | ||
73 | return OpenGridServices.OpenUser_Main.userserver._profilemanager.ParseXMLRPC(requestBody); | ||
74 | } | ||
75 | |||
76 | static string ParseREST(HttpListenerRequest www_req) { | ||
77 | Console.WriteLine("INCOMING REST - " + www_req.RawUrl); | ||
78 | |||
79 | char[] splitter = {'/'}; | ||
80 | string[] rest_params = www_req.RawUrl.Split(splitter); | ||
81 | string req_type = rest_params[1]; // First part of the URL is the type of request - usersessions/userprofiles/inventory/blabla | ||
82 | switch(req_type) { | ||
83 | case "usersessions": | ||
84 | LLUUID sessionid = new LLUUID(rest_params[2]); // get usersessions/sessionid | ||
85 | if(www_req.HttpMethod=="DELETE") { | ||
86 | foreach (libsecondlife.LLUUID UUID in OpenUser_Main.userserver._profilemanager.UserProfiles.Keys) { | ||
87 | if(OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID==sessionid) { | ||
88 | OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID=null; | ||
89 | OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSecureSessionID=null; | ||
90 | OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].Circuits.Clear(); | ||
91 | } | ||
92 | } | ||
93 | |||
94 | } | ||
95 | return "OK"; | ||
96 | break; | ||
97 | } | ||
98 | |||
99 | return ""; | ||
100 | } | ||
101 | |||
102 | |||
103 | static void HandleRequest(Object stateinfo) { | ||
104 | HttpListenerContext context=(HttpListenerContext)stateinfo; | ||
105 | |||
106 | HttpListenerRequest request = context.Request; | ||
107 | HttpListenerResponse response = context.Response; | ||
108 | |||
109 | response.KeepAlive=false; | ||
110 | response.SendChunked=false; | ||
111 | |||
112 | System.IO.Stream body = request.InputStream; | ||
113 | System.Text.Encoding encoding = System.Text.Encoding.UTF8; | ||
114 | System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); | ||
115 | |||
116 | string requestBody = reader.ReadToEnd(); | ||
117 | body.Close(); | ||
118 | reader.Close(); | ||
119 | |||
120 | string responseString=""; | ||
121 | switch(request.ContentType) { | ||
122 | case "text/xml": | ||
123 | // must be XML-RPC, so pass to the XML-RPC parser | ||
124 | |||
125 | responseString=ParseXMLRPC(requestBody); | ||
126 | response.AddHeader("Content-type","text/xml"); | ||
127 | break; | ||
128 | |||
129 | case "text/plaintext": | ||
130 | responseString=ParseREST(request); | ||
131 | response.AddHeader("Content-type","text/plaintext"); | ||
132 | break; | ||
133 | } | ||
134 | |||
135 | |||
136 | byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); | ||
137 | System.IO.Stream output = response.OutputStream; | ||
138 | response.SendChunked=false; | ||
139 | response.ContentLength64=buffer.Length; | ||
140 | output.Write(buffer,0,buffer.Length); | ||
141 | output.Close(); | ||
142 | } | ||
143 | } | ||
144 | |||
145 | |||
146 | } | ||
diff --git a/OGS/gridserver/default.build b/OpenGridServices.GridServer/default.build index b113b83..b113b83 100644 --- a/OGS/gridserver/default.build +++ b/OpenGridServices.GridServer/default.build | |||
diff --git a/OGS/gridserver/src/ConsoleCmds.cs b/OpenGridServices.GridServer/src/ConsoleCmds.cs index 82a2279..82a2279 100644 --- a/OGS/gridserver/src/ConsoleCmds.cs +++ b/OpenGridServices.GridServer/src/ConsoleCmds.cs | |||
diff --git a/OGS/gridserver/src/GridHttp.cs b/OpenGridServices.GridServer/src/GridHttp.cs index 496a3bc..496a3bc 100644 --- a/OGS/gridserver/src/GridHttp.cs +++ b/OpenGridServices.GridServer/src/GridHttp.cs | |||
diff --git a/OGS/gridserver/src/Main.cs b/OpenGridServices.GridServer/src/Main.cs index d29a1ae..d29a1ae 100644 --- a/OGS/gridserver/src/Main.cs +++ b/OpenGridServices.GridServer/src/Main.cs | |||
diff --git a/OGS/gridserver/src/OGS-GridServer.csproj b/OpenGridServices.GridServer/src/OGS-GridServer.csproj index b957d40..b957d40 100644 --- a/OGS/gridserver/src/OGS-GridServer.csproj +++ b/OpenGridServices.GridServer/src/OGS-GridServer.csproj | |||
diff --git a/OGS/gridserver/src/Properties/AssemblyInfo.cs b/OpenGridServices.GridServer/src/Properties/AssemblyInfo.cs index 8471e6b..8471e6b 100644 --- a/OGS/gridserver/src/Properties/AssemblyInfo.cs +++ b/OpenGridServices.GridServer/src/Properties/AssemblyInfo.cs | |||
diff --git a/OGS/gridserver/src/SimProfiles.cs b/OpenGridServices.GridServer/src/SimProfiles.cs index 6db8331..6db8331 100644 --- a/OGS/gridserver/src/SimProfiles.cs +++ b/OpenGridServices.GridServer/src/SimProfiles.cs | |||