diff options
author | teravus | 2013-10-07 23:19:50 -0500 |
---|---|---|
committer | teravus | 2013-10-07 23:19:50 -0500 |
commit | 75fdd6054d6605877acb511b1bd794de963a15f3 (patch) | |
tree | 4ef82542f1ad743f30ab963572805b12f185260a /OpenSim/Region | |
parent | * Added a Basic DOS protection container/base object for the most common HTTP... (diff) | |
download | opensim-SC-75fdd6054d6605877acb511b1bd794de963a15f3.zip opensim-SC-75fdd6054d6605877acb511b1bd794de963a15f3.tar.gz opensim-SC-75fdd6054d6605877acb511b1bd794de963a15f3.tar.bz2 opensim-SC-75fdd6054d6605877acb511b1bd794de963a15f3.tar.xz |
* Refactor
* Break out common BasicDOSProtector code into separate class.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs index ed4b205..ff87ece 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | |||
@@ -53,10 +53,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
53 | { | 53 | { |
54 | AllowXForwardedFor = true, | 54 | AllowXForwardedFor = true, |
55 | ForgetTimeSpan = TimeSpan.FromMinutes(2), | 55 | ForgetTimeSpan = TimeSpan.FromMinutes(2), |
56 | MaxRequestsInTimeframe = 5, | 56 | MaxRequestsInTimeframe = 20, |
57 | ReportingName = "FRIENDSDOSPROTECTOR", | 57 | ReportingName = "FRIENDSDOSPROTECTOR", |
58 | RequestTimeSpan = TimeSpan.FromSeconds(5), | 58 | RequestTimeSpan = TimeSpan.FromSeconds(5), |
59 | ThrottledAction = ThrottleAction.DoThrottledMethod | 59 | ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod |
60 | }) | 60 | }) |
61 | { | 61 | { |
62 | m_FriendsModule = fmodule; | 62 | m_FriendsModule = fmodule; |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 0f05e07..cdf1467 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
173 | MaxRequestsInTimeframe = 4, | 173 | MaxRequestsInTimeframe = 4, |
174 | ReportingName = "MAPDOSPROTECTOR", | 174 | ReportingName = "MAPDOSPROTECTOR", |
175 | RequestTimeSpan = TimeSpan.FromSeconds(10), | 175 | RequestTimeSpan = TimeSpan.FromSeconds(10), |
176 | ThrottledAction = ThrottleAction.DoThrottledMethod | 176 | ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod |
177 | }).Process); | 177 | }).Process); |
178 | MainServer.Instance.AddLLSDHandler( | 178 | MainServer.Instance.AddLLSDHandler( |
179 | "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); | 179 | "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); |
@@ -1094,7 +1094,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1094 | { | 1094 | { |
1095 | Hashtable reply = new Hashtable(); | 1095 | Hashtable reply = new Hashtable(); |
1096 | int statuscode = 500; | 1096 | int statuscode = 500; |
1097 | reply["str_response_string"] = "I blocked you! HAHAHAHAHAHAHHAHAH"; | 1097 | reply["str_response_string"] = ""; |
1098 | reply["int_response_code"] = statuscode; | 1098 | reply["int_response_code"] = statuscode; |
1099 | reply["content_type"] = "text/plain"; | 1099 | reply["content_type"] = "text/plain"; |
1100 | return reply; | 1100 | return reply; |