summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-04-22 17:00:42 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-04-22 17:00:42 +0200
commit5b20d409ef3062b24bbe7667f0daec34523446a6 (patch)
tree426e99a410b2b975460b5b0fb5a409d4381a16c8
parent8e0608d31d988333ff04f3faaa6e851c0ecdbc6e (diff)
Fifth stage to ipset-5
Rename files in kernel/ and get rid of old ones (2.4.x kernel tree support).
-rw-r--r--kernel/Config.in.ipset18
-rw-r--r--kernel/Makefile.export.ipset3
-rw-r--r--kernel/Makefile.ipset17
-rwxr-xr-xkernel/expand_macros.pl17
-rw-r--r--kernel/include/linux/netfilter/ip_set.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_bitmaps.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_compat.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_compat.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_getport.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_getport.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_hashes.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_hashes.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_iphash.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_iphash.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_ipmap.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_ipporthash.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_ipportiphash.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_ipportnethash.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_iptree.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_iptree.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_iptreemap.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_iptreemap.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_jhash.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_jhash.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_macipmap.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_malloc.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_malloc.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_nethash.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_nethash.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_portmap.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_portmap.h)0
-rw-r--r--kernel/include/linux/netfilter/ip_set_setlist.h (renamed from kernel/include/linux/netfilter_ipv4/ip_set_setlist.h)0
-rw-r--r--kernel/include/linux/netfilter/ipt_set.h (renamed from kernel/include/linux/netfilter_ipv4/ipt_set.h)0
-rw-r--r--kernel/ip_set_bitmap_ip.c (renamed from kernel/ip_set_ipmap.c)0
-rw-r--r--kernel/ip_set_bitmap_ipmac.c (renamed from kernel/ip_set_macipmap.c)0
-rw-r--r--kernel/ip_set_bitmap_port.c (renamed from kernel/ip_set_portmap.c)0
-rw-r--r--kernel/ip_set_hash_ip.c (renamed from kernel/ip_set_iphash.c)0
-rw-r--r--kernel/ip_set_hash_ipport.c (renamed from kernel/ip_set_ipporthash.c)0
-rw-r--r--kernel/ip_set_hash_ipportip.c (renamed from kernel/ip_set_ipportiphash.c)0
-rw-r--r--kernel/ip_set_hash_ipportnet.c (renamed from kernel/ip_set_ipportnethash.c)0
-rw-r--r--kernel/ip_set_hash_net.c (renamed from kernel/ip_set_nethash.c)0
-rw-r--r--kernel/ip_set_list_set.c (renamed from kernel/ip_set_setlist.c)0
-rw-r--r--kernel/ip_set_tree_ip.c (renamed from kernel/ip_set_iptree.c)0
-rwxr-xr-xkernel/patch_kernel70
34 files changed, 0 insertions, 125 deletions
diff --git a/kernel/Config.in.ipset b/kernel/Config.in.ipset
deleted file mode 100644
index 0f442e7..0000000
--- a/kernel/Config.in.ipset
+++ /dev/null
@@ -1,18 +0,0 @@
- dep_tristate ' IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES
- if [ "$CONFIG_IP_NF_SET" != "n" ]; then
- int ' Maximum number of sets' CONFIG_IP_NF_SET_MAX 256
- int ' Hash size for bindings of IP sets' CONFIG_IP_NF_SET_HASHSIZE 1024
- dep_tristate ' set match support' CONFIG_IP_NF_MATCH_SET $CONFIG_IP_NF_SET
- dep_tristate ' SET target support' CONFIG_IP_NF_TARGET_SET $CONFIG_IP_NF_SET
- dep_tristate ' ipmap set type support' CONFIG_IP_NF_SET_IPMAP $CONFIG_IP_NF_SET
- dep_tristate ' macipmap set type support' CONFIG_IP_NF_SET_MACIPMAP $CONFIG_IP_NF_SET
- dep_tristate ' portmap set type support' CONFIG_IP_NF_SET_PORTMAP $CONFIG_IP_NF_SET
- dep_tristate ' iphash set type support' CONFIG_IP_NF_SET_IPHASH $CONFIG_IP_NF_SET
- dep_tristate ' nethash set type support' CONFIG_IP_NF_SET_NETHASH $CONFIG_IP_NF_SET
- dep_tristate ' ipporthash set type support' CONFIG_IP_NF_SET_IPPORTHASH $CONFIG_IP_NF_SET
- dep_tristate ' ipportiphash set type support' CONFIG_IP_NF_SET_IPPORTIPHASH $CONFIG_IP_NF_SET
- dep_tristate ' ipportnethash set type support' CONFIG_IP_NF_SET_IPPORTNETHASH $CONFIG_IP_NF_SET
- dep_tristate ' iptree set type support' CONFIG_IP_NF_SET_IPTREE $CONFIG_IP_NF_SET
- dep_tristate ' iptreemap set type support' CONFIG_IP_NF_SET_IPTREEMAP $CONFIG_IP_NF_SET
- dep_tristate ' setlist set type support' CONFIG_IP_NF_SET_SETLIST $CONFIG_IP_NF_SET
- fi
diff --git a/kernel/Makefile.export.ipset b/kernel/Makefile.export.ipset
deleted file mode 100644
index 1a971df..0000000
--- a/kernel/Makefile.export.ipset
+++ /dev/null
@@ -1,3 +0,0 @@
-ifdef CONFIG_IP_NF_SET
- export-objs += ip_set.o
-endif
diff --git a/kernel/Makefile.ipset b/kernel/Makefile.ipset
deleted file mode 100644
index fe42cc1..0000000
--- a/kernel/Makefile.ipset
+++ /dev/null
@@ -1,17 +0,0 @@
-# ipset
-obj-$(CONFIG_IP_NF_SET) += ip_set.o
-obj-$(CONFIG_IP_NF_SET_IPMAP) += ip_set_ipmap.o
-obj-$(CONFIG_IP_NF_SET_PORTMAP) += ip_set_portmap.o
-obj-$(CONFIG_IP_NF_SET_MACIPMAP) += ip_set_macipmap.o
-obj-$(CONFIG_IP_NF_SET_IPHASH) += ip_set_iphash.o
-obj-$(CONFIG_IP_NF_SET_NETHASH) += ip_set_nethash.o
-obj-$(CONFIG_IP_NF_SET_IPPORTHASH) += ip_set_ipporthash.o
-obj-$(CONFIG_IP_NF_SET_IPPORTIPHASH) += ip_set_ipportiphash.o
-obj-$(CONFIG_IP_NF_SET_IPPORTNETHASH) += ip_set_ipportnethash.o
-obj-$(CONFIG_IP_NF_SET_IPTREE) += ip_set_iptree.o
-obj-$(CONFIG_IP_NF_SET_IPTREEMAP) += ip_set_iptreemap.o
-obj-$(CONFIG_IP_NF_SET_SETLIST) += ip_set_setlist.o
-
-# match and target
-obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
-obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
diff --git a/kernel/expand_macros.pl b/kernel/expand_macros.pl
deleted file mode 100755
index ea0f4b6..0000000
--- a/kernel/expand_macros.pl
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/perl
-
-my $expand = 0;
-
-while (<STDIN>) {
- if ($expand) {
- print C;
- } elsif (m,include \<(linux/netfilter_ipv4/ip_set\.h)\>,) {
- $expand = 1;
- open(C, "|gcc -D__KERNEL__ -Iinclude -E - 2>/dev/null| indent -kr -i8") || die "Can't run gcc: $!\n";
- print C;
- } else {
- print;
- }
-}
-close C;
- \ No newline at end of file
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set.h b/kernel/include/linux/netfilter/ip_set.h
index da17319..da17319 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set.h
+++ b/kernel/include/linux/netfilter/ip_set.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h b/kernel/include/linux/netfilter/ip_set_bitmaps.h
index da3493f..da3493f 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h
+++ b/kernel/include/linux/netfilter/ip_set_bitmaps.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_compat.h b/kernel/include/linux/netfilter/ip_set_compat.h
index 9f17397..9f17397 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_compat.h
+++ b/kernel/include/linux/netfilter/ip_set_compat.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_getport.h b/kernel/include/linux/netfilter/ip_set_getport.h
index 18ed729..18ed729 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_getport.h
+++ b/kernel/include/linux/netfilter/ip_set_getport.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h b/kernel/include/linux/netfilter/ip_set_hashes.h
index 8eeced3..8eeced3 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h
+++ b/kernel/include/linux/netfilter/ip_set_hashes.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h b/kernel/include/linux/netfilter/ip_set_iphash.h
index 0a0c7e8..0a0c7e8 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h
+++ b/kernel/include/linux/netfilter/ip_set_iphash.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h b/kernel/include/linux/netfilter/ip_set_ipmap.h
index d16c0ae..d16c0ae 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h
+++ b/kernel/include/linux/netfilter/ip_set_ipmap.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h b/kernel/include/linux/netfilter/ip_set_ipporthash.h
index a3b781a..a3b781a 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+++ b/kernel/include/linux/netfilter/ip_set_ipporthash.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h b/kernel/include/linux/netfilter/ip_set_ipportiphash.h
index 2202c51..2202c51 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h
+++ b/kernel/include/linux/netfilter/ip_set_ipportiphash.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h b/kernel/include/linux/netfilter/ip_set_ipportnethash.h
index 73b2430..73b2430 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h
+++ b/kernel/include/linux/netfilter/ip_set_ipportnethash.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_iptree.h b/kernel/include/linux/netfilter/ip_set_iptree.h
index 36bf5ac..36bf5ac 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_iptree.h
+++ b/kernel/include/linux/netfilter/ip_set_iptree.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_iptreemap.h b/kernel/include/linux/netfilter/ip_set_iptreemap.h
index 6ea771a..6ea771a 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+++ b/kernel/include/linux/netfilter/ip_set_iptreemap.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_jhash.h b/kernel/include/linux/netfilter/ip_set_jhash.h
index 2000b9f..2000b9f 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_jhash.h
+++ b/kernel/include/linux/netfilter/ip_set_jhash.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h b/kernel/include/linux/netfilter/ip_set_macipmap.h
index 0615e9f..0615e9f 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h
+++ b/kernel/include/linux/netfilter/ip_set_macipmap.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h b/kernel/include/linux/netfilter/ip_set_malloc.h
index 2a80443..2a80443 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h
+++ b/kernel/include/linux/netfilter/ip_set_malloc.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h b/kernel/include/linux/netfilter/ip_set_nethash.h
index cf0b794..cf0b794 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h
+++ b/kernel/include/linux/netfilter/ip_set_nethash.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h b/kernel/include/linux/netfilter/ip_set_portmap.h
index 37f411e..37f411e 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h
+++ b/kernel/include/linux/netfilter/ip_set_portmap.h
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_setlist.h b/kernel/include/linux/netfilter/ip_set_setlist.h
index 7cc6ed0..7cc6ed0 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_set_setlist.h
+++ b/kernel/include/linux/netfilter/ip_set_setlist.h
diff --git a/kernel/include/linux/netfilter_ipv4/ipt_set.h b/kernel/include/linux/netfilter/ipt_set.h
index 2a18b93..2a18b93 100644
--- a/kernel/include/linux/netfilter_ipv4/ipt_set.h
+++ b/kernel/include/linux/netfilter/ipt_set.h
diff --git a/kernel/ip_set_ipmap.c b/kernel/ip_set_bitmap_ip.c
index be3c538..be3c538 100644
--- a/kernel/ip_set_ipmap.c
+++ b/kernel/ip_set_bitmap_ip.c
diff --git a/kernel/ip_set_macipmap.c b/kernel/ip_set_bitmap_ipmac.c
index 89e907b..89e907b 100644
--- a/kernel/ip_set_macipmap.c
+++ b/kernel/ip_set_bitmap_ipmac.c
diff --git a/kernel/ip_set_portmap.c b/kernel/ip_set_bitmap_port.c
index 8bb6e76..8bb6e76 100644
--- a/kernel/ip_set_portmap.c
+++ b/kernel/ip_set_bitmap_port.c
diff --git a/kernel/ip_set_iphash.c b/kernel/ip_set_hash_ip.c
index 1accbe3..1accbe3 100644
--- a/kernel/ip_set_iphash.c
+++ b/kernel/ip_set_hash_ip.c
diff --git a/kernel/ip_set_ipporthash.c b/kernel/ip_set_hash_ipport.c
index 36e68b0..36e68b0 100644
--- a/kernel/ip_set_ipporthash.c
+++ b/kernel/ip_set_hash_ipport.c
diff --git a/kernel/ip_set_ipportiphash.c b/kernel/ip_set_hash_ipportip.c
index 8b8f2a2..8b8f2a2 100644
--- a/kernel/ip_set_ipportiphash.c
+++ b/kernel/ip_set_hash_ipportip.c
diff --git a/kernel/ip_set_ipportnethash.c b/kernel/ip_set_hash_ipportnet.c
index e0bb352..e0bb352 100644
--- a/kernel/ip_set_ipportnethash.c
+++ b/kernel/ip_set_hash_ipportnet.c
diff --git a/kernel/ip_set_nethash.c b/kernel/ip_set_hash_net.c
index e3b09e0..e3b09e0 100644
--- a/kernel/ip_set_nethash.c
+++ b/kernel/ip_set_hash_net.c
diff --git a/kernel/ip_set_setlist.c b/kernel/ip_set_list_set.c
index 3cfdae8..3cfdae8 100644
--- a/kernel/ip_set_setlist.c
+++ b/kernel/ip_set_list_set.c
diff --git a/kernel/ip_set_iptree.c b/kernel/ip_set_tree_ip.c
index 77eb180..77eb180 100644
--- a/kernel/ip_set_iptree.c
+++ b/kernel/ip_set_tree_ip.c
diff --git a/kernel/patch_kernel b/kernel/patch_kernel
deleted file mode 100755
index a3f96f0..0000000
--- a/kernel/patch_kernel
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# set -e
-
-kconfig() {
- file=$1/net/ipv4/netfilter/Kconfig
- if [ "`grep 'config IP_NF_SET' $file`" ]; then
- return
- fi
- mv $file $file.orig
- grep -v endmenu $file.orig > $file
- cat Kconfig.ipset >> $file
- echo "endmenu" >> $file
-}
-
-config() {
- file=$1/net/ipv4/netfilter/Config.in
- if [ "`grep 'CONFIG_IP_NF_SET' $file`" ]; then
- return
- fi
- mv $file $file.orig
- grep -v endmenu $file.orig > $file
- cat Config.in.ipset >> $file
- echo "endmenu" >> $file
-}
-
-makefile() {
- file=$1/net/ipv4/netfilter/Makefile
- if [ "`grep CONFIG_IP_NF_SET $file`" ]; then
- return
- fi
- cp $file $file.orig
- cat Makefile.ipset >> $file
-}
-
-oldmakefile() {
- file=$1/net/ipv4/netfilter/Makefile
- if [ "`grep CONFIG_IP_NF_SET $file`" ]; then
- return
- fi
- lineno=`grep -n Rules.make $file | cut -f1 -d:`
- lineno=$((lineno-1))
- head -n $lineno $file > $file.head
- lineno=$((lineno+1))
- tail +$lineno $file > $file.tail
- cp $file $file.orig
- cat $file.head Makefile.ipset Makefile.export.ipset $file.tail > $file
-}
-
-tree() {
- cp include/linux/netfilter_ipv4/* $1/include/linux/netfilter_ipv4/
- cp *.c $1/net/ipv4/netfilter/
-}
-
-if [ -z "$1" ]; then
- echo "Error: missing kernel directory parameter."
- exit 1
-fi
-if [ -f $1/net/ipv4/netfilter/Kconfig ]; then
- tree $1
- kconfig $1
- makefile $1
-elif [ -f $1/net/ipv4/netfilter/Config.in ]; then
- tree $1
- config $1
- oldmakefile $1
-else
- echo "Error: The directory $1 doesn't look like a Linux 2.4/2.6 kernel source tree."
- exit 1
-fi