diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/IPBan')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs | 35 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs | 31 |
2 files changed, 60 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs index 28e0382..bfe2a71 100644 --- a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs +++ b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 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 OpenSimulator 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 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.IO; | 30 | using System.IO; |
4 | using System.Text; | 31 | using System.Text; |
@@ -19,11 +46,11 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan | |||
19 | { | 46 | { |
20 | new SceneBanner(scene, m_bans); | 47 | new SceneBanner(scene, m_bans); |
21 | 48 | ||
22 | lock(m_bans) | 49 | lock (m_bans) |
23 | { | 50 | { |
24 | foreach (EstateBan ban in scene.RegionInfo.EstateSettings.EstateBans) | 51 | foreach (EstateBan ban in scene.RegionInfo.EstateSettings.EstateBans) |
25 | { | 52 | { |
26 | if(!String.IsNullOrEmpty(ban.BannedHostIPMask)) | 53 | if (!String.IsNullOrEmpty(ban.BannedHostIPMask)) |
27 | m_bans.Add(ban.BannedHostIPMask); | 54 | m_bans.Add(ban.BannedHostIPMask); |
28 | if (!String.IsNullOrEmpty(ban.BannedHostNameMask)) | 55 | if (!String.IsNullOrEmpty(ban.BannedHostNameMask)) |
29 | m_bans.Add(ban.BannedHostNameMask); | 56 | m_bans.Add(ban.BannedHostNameMask); |
@@ -33,7 +60,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan | |||
33 | 60 | ||
34 | public void PostInitialise() | 61 | public void PostInitialise() |
35 | { | 62 | { |
36 | if(File.Exists("bans.txt")) | 63 | if (File.Exists("bans.txt")) |
37 | { | 64 | { |
38 | string[] bans = File.ReadAllLines("bans.txt"); | 65 | string[] bans = File.ReadAllLines("bans.txt"); |
39 | foreach (string ban in bans) | 66 | foreach (string ban in bans) |
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs index a5e9963..dbfcfee 100644 --- a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs +++ b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System.Collections.Generic; | 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 OpenSimulator 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 | |||
28 | using System.Collections.Generic; | ||
2 | using System.Net; | 29 | using System.Net; |
3 | using OpenSim.Framework.Client; | 30 | using OpenSim.Framework.Client; |
4 | using OpenSim.Region.Framework.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
@@ -23,7 +50,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan | |||
23 | void EventManager_OnClientConnect(IClientCore client) | 50 | void EventManager_OnClientConnect(IClientCore client) |
24 | { | 51 | { |
25 | IClientIPEndpoint ipEndpoint; | 52 | IClientIPEndpoint ipEndpoint; |
26 | if(client.TryGet(out ipEndpoint)) | 53 | if (client.TryGet(out ipEndpoint)) |
27 | { | 54 | { |
28 | IPAddress end = ipEndpoint.EndPoint; | 55 | IPAddress end = ipEndpoint.EndPoint; |
29 | 56 | ||