Revert "Temporary measure for blacklisting an abused node."

This reverts commit 9eadba894a15cd5c7d4047d0f2fbd8372b385a90.

diff --git a/Makefile b/Makefile
index 27cde30..f0a6806 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,10 @@
 WEBFETCH               := wget
 SHA1SUM                        := sha1sum
 
-ALL                    += iptables ipset
+ALL                    += iptables
 iptables-URL           := http://www.netfilter.org/projects/iptables/files/iptables-1.4.10.tar.bz2
 iptables-SHA1SUM       := 8190b8c9714a3eec825317e8ac1deeb3d11c6d29
-ipset-URL              := http://ipset.netfilter.org/ipset-4.5.tar.bz2
-ipset-SHA1SUM  := 696a5cd96459c8fb028f0dfb9927a5c4f183d28b
 iptables               := $(notdir $(iptables-URL))
-ipset          := $(notdir $(ipset-URL))
 
 all: $(ALL)
 .PHONY: all

diff --git a/iptables.spec b/iptables.spec
index 99aca2e..dca0251 100644 (file)
--- a/iptables.spec
+++ b/iptables.spec
@@ -14,7 +14,6 @@ Name: %{name}
 Version: %{version}
 Release: %{release}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
-Source: http://ipset.netfilter.org/ipset-4.5.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
 Source3: planetlab-config

diff --git a/planetlab-config b/planetlab-config
index 2851897..ac5c016 100644 (file)
--- a/planetlab-config
+++ b/planetlab-config
@@ -7,9 +7,6 @@
 -A OUTPUT -j BLACKLIST
 -A LOGDROP -j LOG
 -A LOGDROP -j DROP
--A BLACKLIST -d 199.254.222.0/24 -j DROP 
--A BLACKLIST -d 74.46.244.148/32 -j DROP 
--A BLACKLIST -d 66.165.160.105/32 -j DROP
 COMMIT
 
 *mangle