* Add a session concurrency option per key. Allows developer/config to specify number of concurrent requests on a service.

3 files changed, 21 insertions, 8 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
index 9b8b8c2..1b88545 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
@@ -55,12 +55,14 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             byte[] result;
             RequestsReceived++;
-
-            if (_dosProtector.Process(GetClientString(httpRequest), GetRemoteAddr(httpRequest)))
+            string clientstring = GetClientString(httpRequest);
+            string endpoint = GetRemoteAddr(httpRequest);
+            if (_dosProtector.Process(clientstring, endpoint))
                 result = ProcessRequest(path, request, httpRequest, httpResponse);
             else
                 result = ThrottledRequest(path, request, httpRequest, httpResponse);
-
+            if (_options.MaxConcurrentSessions > 0)
+                _dosProtector.ProcessEnd(clientstring, endpoint);
             
             RequestsHandled++;
 
diff --git a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
index 39c98b4..cd4b8ff 100644
--- a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
@@ -47,10 +47,18 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
         public Hashtable Process(Hashtable request)
         {
-            if (_dosProtector.Process(GetClientString(request), GetRemoteAddr(request)))
-                return _normalMethod(request);
+            Hashtable process = null;
+            string clientstring= GetClientString(request);
+            string endpoint = GetRemoteAddr(request);
+            if (_dosProtector.Process(clientstring, endpoint))
+                process =  _normalMethod(request);
             else
-                return _throttledMethod(request);
+                process = _throttledMethod(request);
+
+            if (_options.MaxConcurrentSessions>0)
+                _dosProtector.ProcessEnd(clientstring, endpoint);
+
+            return process;
         }
         
         private string GetRemoteAddr(Hashtable request)
diff --git a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
index bc7efb6..f212208 100644
--- a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
@@ -53,11 +53,14 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
 
             XmlRpcResponse resp = null;
-            if (_dosProtector.Process(GetClientString(request, client), GetEndPoint(request, client)))
+            string clientstring = GetClientString(request, client);
+            string endpoint = GetEndPoint(request, client);
+            if (_dosProtector.Process(clientstring, endpoint))
                 resp = _normalMethod(request, client);
             else
                 resp = _throttledMethod(request, client);
-            
+            if (_options.MaxConcurrentSessions > 0)
+                _dosProtector.ProcessEnd(clientstring, endpoint);
             return resp;
         }