aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2008-05-29 15:46:54 +0000
committerDr Scofield2008-05-29 15:46:54 +0000
commitd7ec68669151b75cba1a5a213c653b4d365cf962 (patch)
tree2c9cd41eb4903dc91574d02fafcfe4d3eb6891ba
parentattempting to get to the bottom of unresponsive grids servers by (diff)
downloadopensim-SC-d7ec68669151b75cba1a5a213c653b4d365cf962.zip
opensim-SC-d7ec68669151b75cba1a5a213c653b4d365cf962.tar.gz
opensim-SC-d7ec68669151b75cba1a5a213c653b4d365cf962.tar.bz2
opensim-SC-d7ec68669151b75cba1a5a213c653b4d365cf962.tar.xz
this is a snapshot of the OSHttpServer work-in-progress. it's an initial skeleton,
far from complete, just want to check in early and often.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/OSHttpRequest.cs14
-rw-r--r--OpenSim/Framework/Servers/OSHttpRequestPump.cs58
-rw-r--r--OpenSim/Framework/Servers/OSHttpServer.cs119
-rw-r--r--prebuild.xml38
4 files changed, 193 insertions, 36 deletions
diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs
index a290e0e..dac2347 100644
--- a/OpenSim/Framework/Servers/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequest.cs
@@ -44,7 +44,9 @@ namespace OpenSim.Framework.Servers
44 private string _httpMethod; 44 private string _httpMethod;
45 private Stream _inputStream; 45 private Stream _inputStream;
46 private bool _isSecureConnection; 46 private bool _isSecureConnection;
47 private bool _isAuthenticated;
47 private bool _keepAlive; 48 private bool _keepAlive;
49 private bool _hasbody;
48 private string _rawUrl; 50 private string _rawUrl;
49 private Uri _url; 51 private Uri _url;
50 private NameValueCollection _queryString; 52 private NameValueCollection _queryString;
@@ -95,6 +97,16 @@ namespace OpenSim.Framework.Servers
95 get { return _isSecureConnection; } 97 get { return _isSecureConnection; }
96 } 98 }
97 99
100 public bool IsAuthenticated
101 {
102 get { return _isAuthenticated; }
103 }
104
105 public bool HasEntityBody
106 {
107 get { return _hasbody; }
108 }
109
98 public bool KeepAlive 110 public bool KeepAlive
99 { 111 {
100 get { return _keepAlive; } 112 get { return _keepAlive; }
@@ -133,8 +145,10 @@ namespace OpenSim.Framework.Servers
133 _cookies = req.Cookies; 145 _cookies = req.Cookies;
134 _headers = req.Headers; 146 _headers = req.Headers;
135 _httpMethod = req.HttpMethod; 147 _httpMethod = req.HttpMethod;
148 _hasbody = req.HasEntityBody;
136 _inputStream = req.InputStream; 149 _inputStream = req.InputStream;
137 _isSecureConnection = req.IsSecureConnection; 150 _isSecureConnection = req.IsSecureConnection;
151 _isAuthenticated = req.IsAuthenticated;
138 _keepAlive = req.KeepAlive; 152 _keepAlive = req.KeepAlive;
139 _rawUrl = req.RawUrl; 153 _rawUrl = req.RawUrl;
140 _url = req.Url; 154 _url = req.Url;
diff --git a/OpenSim/Framework/Servers/OSHttpRequestPump.cs b/OpenSim/Framework/Servers/OSHttpRequestPump.cs
new file mode 100644
index 0000000..78348bb
--- /dev/null
+++ b/OpenSim/Framework/Servers/OSHttpRequestPump.cs
@@ -0,0 +1,58 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using HttpServer;
30
31namespace OpenSim.Framework.Servers
32{
33 /// <summary>
34 /// OSHttpServer provides an HTTP server bound to a specific
35 /// port. When instantiated with just address and port it uses
36 /// normal HTTP, when instantiated with address, port, and X509
37 /// certificate, it uses HTTPS.
38 /// </summary>
39 public class OSHttpRequestPump
40 {
41 protected OSHttpServer _httpServer;
42
43 public OSHttpRequestPump()
44 {
45 }
46
47 public static OSHttpRequestPump[] Pumps(OSHttpServer server, int poolSize)
48 {
49 OSHttpRequestPump[] pumps = new OSHttpRequestPump[poolSize];
50 for(int i = 0; i < pumps.Length; i++)
51 {
52 pumps[i]._httpServer = server;
53 }
54
55 return pumps;
56 }
57 }
58} \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/OSHttpServer.cs b/OpenSim/Framework/Servers/OSHttpServer.cs
new file mode 100644
index 0000000..e6caac3
--- /dev/null
+++ b/OpenSim/Framework/Servers/OSHttpServer.cs
@@ -0,0 +1,119 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Net;
30using System.Net.Sockets;
31using System.Reflection;
32using System.Threading;
33using System.Security.Cryptography.X509Certificates;
34using log4net;
35using HttpServer;
36
37using HttpListener = HttpServer.HttpListener;
38
39namespace OpenSim.Framework.Servers
40{
41 /// <summary>
42 /// OSHttpServer provides an HTTP server bound to a specific
43 /// port. When instantiated with just address and port it uses
44 /// normal HTTP, when instantiated with address, port, and X509
45 /// certificate, it uses HTTPS.
46 /// </summary>
47 public class OSHttpServer
48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50
51 // underlying HttpServer.HttpListener
52 protected HttpListener _listener;
53 protected Thread _engine;
54
55 // OSHttpRequestPumps "pumping" incoming OSHttpRequests
56 // upwards
57 protected OSHttpRequestPump[] _pumps;
58
59 // thread identifier
60 protected string _engineId;
61 public string EngineID
62 {
63 get { return _engineId; }
64 }
65
66 /// <summary>
67 /// True if this is an HTTPS connection; false otherwise.
68 /// </summary>
69 protected bool _isSecure;
70 public bool IsSecure
71 {
72 get { return _isSecure; }
73 }
74
75 /// <summary>
76 /// Instantiate an HTTP server.
77 /// </summary>
78 public OSHttpServer(IPAddress address, int port, int poolSize)
79 {
80 _engineId = String.Format("OSHttpServer [HTTP:{0}/ps:{1}]", port, poolSize);
81 _isSecure = false;
82
83 _pumps = OSHttpRequestPump.Pumps(this, poolSize);
84 }
85
86 /// <summary>
87 /// Instantiate an HTTPS server.
88 /// </summary>
89 public OSHttpServer(IPAddress address, int port, X509Certificate certificate, int poolSize) :
90 this(address, port, poolSize)
91 {
92 _engineId = String.Format("OSHttpServer [HTTPS:{0}/ps:{1}]", port, poolSize);
93 _isSecure = true;
94 }
95
96 /// <summary>
97 /// Start the HTTP server engine.
98 /// </summary>
99 public void Start()
100 {
101 _engine = new Thread(new ThreadStart(Engine));
102 _engine.Name = _engineId;
103 _engine.IsBackground = true;
104 _engine.Start();
105 ThreadTracker.Add(_engine);
106 }
107
108 /// <summary>
109 /// </summary>
110 private void Engine()
111 {
112 while (true)
113 {
114 // do stuff
115 }
116 }
117
118 }
119}
diff --git a/prebuild.xml b/prebuild.xml
index b2a2bd8..2122d9e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -457,6 +457,7 @@
457 <Reference name="libsecondlife.dll"/> 457 <Reference name="libsecondlife.dll"/>
458 <Reference name="XMLRPC.dll"/> 458 <Reference name="XMLRPC.dll"/>
459 <Reference name="log4net"/> 459 <Reference name="log4net"/>
460 <Reference name="HttpServer"/>
460 461
461 <Files> 462 <Files>
462 <Match pattern="*.cs" recurse="true"/> 463 <Match pattern="*.cs" recurse="true"/>
@@ -1125,6 +1126,7 @@
1125 <Match pattern="*.cs" recurse="false"/> 1126 <Match pattern="*.cs" recurse="false"/>
1126 </Files> 1127 </Files>
1127 </Project> 1128 </Project>
1129
1128 <Project name="OpenSim.ApplicationPlugins.Rest.Regions" 1130 <Project name="OpenSim.ApplicationPlugins.Rest.Regions"
1129 path="OpenSim/ApplicationPlugins/Rest/Regions" type="Library"> 1131 path="OpenSim/ApplicationPlugins/Rest/Regions" type="Library">
1130 <Configuration name="Debug"> 1132 <Configuration name="Debug">
@@ -1163,42 +1165,6 @@
1163 </Project> 1165 </Project>
1164 <!-- /REST plugins --> 1166 <!-- /REST plugins -->
1165 1167
1166
1167
1168 <Project name="OpenSim.ApplicationPlugins.RemoteInventoryController" path="OpenSim/ApplicationPlugins/RemoteInventoryController" type="Library">
1169 <Configuration name="Debug">
1170 <Options>
1171 <OutputPath>../../../bin/</OutputPath>
1172 </Options>
1173 </Configuration>
1174 <Configuration name="Release">
1175 <Options>
1176 <OutputPath>../../../bin/</OutputPath>
1177 </Options>
1178 </Configuration>
1179
1180 <ReferencePath>../../../bin/</ReferencePath>
1181 <Reference name="Mono.Addins.dll" />
1182 <Reference name="System"/>
1183 <Reference name="System.Xml"/>
1184 <Reference name="libsecondlife.dll" />
1185 <Reference name="Nini.dll" />
1186 <Reference name="XMLRPC.dll" />
1187 <Reference name="OpenSim"/>
1188 <Reference name="OpenSim.Region.ClientStack"/>
1189 <Reference name="OpenSim.Region.Environment"/>
1190 <Reference name="OpenSim.Framework"/>
1191 <Reference name="OpenSim.Framework.Servers"/>
1192 <Reference name="OpenSim.Framework.Console"/>
1193 <Reference name="OpenSim.Framework.Communications"/>
1194 <Reference name="OpenSim.Framework.Communications.Cache"/>
1195 <Reference name="log4net"/>
1196
1197 <Files>
1198 <Match pattern="*.cs" recurse="true"/>
1199 </Files>
1200 </Project>
1201
1202 <!-- Scene Server API Example Apps --> 1168 <!-- Scene Server API Example Apps -->
1203 1169
1204 <Project name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library"> 1170 <Project name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library">