|
|
@ -1,6 +1,7 @@ |
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h
|
|
|
|
@@ -0,0 +1,498 @@
|
|
|
|
@@ -0,0 +1,498 @@
|
|
|
|
+#ifndef _IP_SET_H
|
|
|
|
+#ifndef _IP_SET_H
|
|
|
|
+#define _IP_SET_H
|
|
|
|
+#define _IP_SET_H
|
|
|
@ -500,9 +501,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set.h linux-2.6.23.pom2pa |
|
|
|
+#endif /* __KERNEL__ */
|
|
|
|
+#endif /* __KERNEL__ */
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /*_IP_SET_H*/
|
|
|
|
+#endif /*_IP_SET_H*/
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iphash.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h
|
|
|
|
@@ -0,0 +1,30 @@
|
|
|
|
@@ -0,0 +1,30 @@
|
|
|
|
+#ifndef __IP_SET_IPHASH_H
|
|
|
|
+#ifndef __IP_SET_IPHASH_H
|
|
|
|
+#define __IP_SET_IPHASH_H
|
|
|
|
+#define __IP_SET_IPHASH_H
|
|
|
@ -534,9 +536,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.23 |
|
|
|
+};
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* __IP_SET_IPHASH_H */
|
|
|
|
+#endif /* __IP_SET_IPHASH_H */
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipmap.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h
|
|
|
|
@@ -0,0 +1,56 @@
|
|
|
|
@@ -0,0 +1,56 @@
|
|
|
|
+#ifndef __IP_SET_IPMAP_H
|
|
|
|
+#ifndef __IP_SET_IPMAP_H
|
|
|
|
+#define __IP_SET_IPMAP_H
|
|
|
|
+#define __IP_SET_IPMAP_H
|
|
|
@ -594,9 +597,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.23. |
|
|
|
+}
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* __IP_SET_IPMAP_H */
|
|
|
|
+#endif /* __IP_SET_IPMAP_H */
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipporthash.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h
|
|
|
|
@@ -0,0 +1,34 @@
|
|
|
|
@@ -0,0 +1,34 @@
|
|
|
|
+#ifndef __IP_SET_IPPORTHASH_H
|
|
|
|
+#ifndef __IP_SET_IPPORTHASH_H
|
|
|
|
+#define __IP_SET_IPPORTHASH_H
|
|
|
|
+#define __IP_SET_IPPORTHASH_H
|
|
|
@ -632,9 +636,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2. |
|
|
|
+};
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* __IP_SET_IPPORTHASH_H */
|
|
|
|
+#endif /* __IP_SET_IPPORTHASH_H */
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptree.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h
|
|
|
|
@@ -0,0 +1,40 @@
|
|
|
|
@@ -0,0 +1,40 @@
|
|
|
|
+#ifndef __IP_SET_IPTREE_H
|
|
|
|
+#ifndef __IP_SET_IPTREE_H
|
|
|
|
+#define __IP_SET_IPTREE_H
|
|
|
|
+#define __IP_SET_IPTREE_H
|
|
|
@ -676,9 +681,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.23 |
|
|
|
+};
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* __IP_SET_IPTREE_H */
|
|
|
|
+#endif /* __IP_SET_IPTREE_H */
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptreemap.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h
|
|
|
|
@@ -0,0 +1,40 @@
|
|
|
|
@@ -0,0 +1,40 @@
|
|
|
|
+#ifndef __IP_SET_IPTREEMAP_H
|
|
|
|
+#ifndef __IP_SET_IPTREEMAP_H
|
|
|
|
+#define __IP_SET_IPTREEMAP_H
|
|
|
|
+#define __IP_SET_IPTREEMAP_H
|
|
|
@ -720,9 +726,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux-2.6 |
|
|
|
+};
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* __IP_SET_IPTREEMAP_H */
|
|
|
|
+#endif /* __IP_SET_IPTREEMAP_H */
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_jhash.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h
|
|
|
|
@@ -0,0 +1,148 @@
|
|
|
|
@@ -0,0 +1,148 @@
|
|
|
|
+#ifndef _LINUX_IPSET_JHASH_H
|
|
|
|
+#ifndef _LINUX_IPSET_JHASH_H
|
|
|
|
+#define _LINUX_IPSET_JHASH_H
|
|
|
|
+#define _LINUX_IPSET_JHASH_H
|
|
|
@ -872,9 +879,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.23. |
|
|
|
+}
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* _LINUX_IPSET_JHASH_H */
|
|
|
|
+#endif /* _LINUX_IPSET_JHASH_H */
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_macipmap.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h
|
|
|
|
@@ -0,0 +1,38 @@
|
|
|
|
@@ -0,0 +1,38 @@
|
|
|
|
+#ifndef __IP_SET_MACIPMAP_H
|
|
|
|
+#ifndef __IP_SET_MACIPMAP_H
|
|
|
|
+#define __IP_SET_MACIPMAP_H
|
|
|
|
+#define __IP_SET_MACIPMAP_H
|
|
|
@ -914,9 +922,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6. |
|
|
|
+};
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* __IP_SET_MACIPMAP_H */
|
|
|
|
+#endif /* __IP_SET_MACIPMAP_H */
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_malloc.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h
|
|
|
|
@@ -0,0 +1,116 @@
|
|
|
|
@@ -0,0 +1,116 @@
|
|
|
|
+#ifndef _IP_SET_MALLOC_H
|
|
|
|
+#ifndef _IP_SET_MALLOC_H
|
|
|
|
+#define _IP_SET_MALLOC_H
|
|
|
|
+#define _IP_SET_MALLOC_H
|
|
|
@ -1034,9 +1043,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.23 |
|
|
|
+#endif /* __KERNEL__ */
|
|
|
|
+#endif /* __KERNEL__ */
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /*_IP_SET_MALLOC_H*/
|
|
|
|
+#endif /*_IP_SET_MALLOC_H*/
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_nethash.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h
|
|
|
|
@@ -0,0 +1,55 @@
|
|
|
|
@@ -0,0 +1,55 @@
|
|
|
|
+#ifndef __IP_SET_NETHASH_H
|
|
|
|
+#ifndef __IP_SET_NETHASH_H
|
|
|
|
+#define __IP_SET_NETHASH_H
|
|
|
|
+#define __IP_SET_NETHASH_H
|
|
|
@ -1093,9 +1103,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.2 |
|
|
|
+}
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* __IP_SET_NETHASH_H */
|
|
|
|
+#endif /* __IP_SET_NETHASH_H */
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_portmap.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h
|
|
|
|
@@ -0,0 +1,25 @@
|
|
|
|
@@ -0,0 +1,25 @@
|
|
|
|
+#ifndef __IP_SET_PORTMAP_H
|
|
|
|
+#ifndef __IP_SET_PORTMAP_H
|
|
|
|
+#define __IP_SET_PORTMAP_H
|
|
|
|
+#define __IP_SET_PORTMAP_H
|
|
|
@ -1122,9 +1133,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.2 |
|
|
|
+};
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* __IP_SET_PORTMAP_H */
|
|
|
|
+#endif /* __IP_SET_PORTMAP_H */
|
|
|
|
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h
|
|
|
|
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h
|
|
|
|
--- linux-2.6.23/include/linux/netfilter_ipv4/ipt_set.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h
|
|
|
|
@@ -0,0 +1,21 @@
|
|
|
|
@@ -0,0 +1,21 @@
|
|
|
|
+#ifndef _IPT_SET_H
|
|
|
|
+#ifndef _IPT_SET_H
|
|
|
|
+#define _IPT_SET_H
|
|
|
|
+#define _IPT_SET_H
|
|
|
@ -1147,9 +1159,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.23.pom2p |
|
|
|
+};
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /*_IPT_SET_H*/
|
|
|
|
+#endif /*_IPT_SET_H*/
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ip_set.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set.c
|
|
|
|
@@ -0,0 +1,2003 @@
|
|
|
|
@@ -0,0 +1,2003 @@
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
@ -3154,9 +3167,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set.c linux-2.6.23.pom2patch.set/ne |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ip_set_init);
|
|
|
|
+module_init(ip_set_init);
|
|
|
|
+module_exit(ip_set_fini);
|
|
|
|
+module_exit(ip_set_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ip_set_iphash.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c
|
|
|
|
@@ -0,0 +1,429 @@
|
|
|
|
@@ -0,0 +1,429 @@
|
|
|
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+ *
|
|
|
|
+ *
|
|
|
@ -3587,9 +3601,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.23.pom2patch |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ip_set_iphash_init);
|
|
|
|
+module_init(ip_set_iphash_init);
|
|
|
|
+module_exit(ip_set_iphash_fini);
|
|
|
|
+module_exit(ip_set_iphash_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipmap.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ip_set_ipmap.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipmap.c
|
|
|
|
@@ -0,0 +1,336 @@
|
|
|
|
@@ -0,0 +1,336 @@
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
@ -3927,9 +3942,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.23.pom2patch. |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ip_set_ipmap_init);
|
|
|
|
+module_init(ip_set_ipmap_init);
|
|
|
|
+module_exit(ip_set_ipmap_fini);
|
|
|
|
+module_exit(ip_set_ipmap_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ip_set_ipporthash.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c
|
|
|
|
@@ -0,0 +1,581 @@
|
|
|
|
@@ -0,0 +1,581 @@
|
|
|
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+ *
|
|
|
|
+ *
|
|
|
@ -4512,9 +4528,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.23.pom2p |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ip_set_ipporthash_init);
|
|
|
|
+module_init(ip_set_ipporthash_init);
|
|
|
|
+module_exit(ip_set_ipporthash_fini);
|
|
|
|
+module_exit(ip_set_ipporthash_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ip_set_iptree.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c
|
|
|
|
@@ -0,0 +1,612 @@
|
|
|
|
@@ -0,0 +1,612 @@
|
|
|
|
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+ *
|
|
|
|
+ *
|
|
|
@ -5128,9 +5145,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.23.pom2patch |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ip_set_iptree_init);
|
|
|
|
+module_init(ip_set_iptree_init);
|
|
|
|
+module_exit(ip_set_iptree_fini);
|
|
|
|
+module_exit(ip_set_iptree_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ip_set_iptreemap.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c
|
|
|
|
@@ -0,0 +1,829 @@
|
|
|
|
@@ -0,0 +1,829 @@
|
|
|
|
+/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net>
|
|
|
|
+/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net>
|
|
|
|
+ *
|
|
|
|
+ *
|
|
|
@ -5961,9 +5979,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.23.pom2pa |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ip_set_iptreemap_init);
|
|
|
|
+module_init(ip_set_iptreemap_init);
|
|
|
|
+module_exit(ip_set_iptreemap_fini);
|
|
|
|
+module_exit(ip_set_iptreemap_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_macipmap.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ip_set_macipmap.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_macipmap.c
|
|
|
|
@@ -0,0 +1,375 @@
|
|
|
|
@@ -0,0 +1,375 @@
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
@ -6340,9 +6359,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.23.pom2pat |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ip_set_macipmap_init);
|
|
|
|
+module_init(ip_set_macipmap_init);
|
|
|
|
+module_exit(ip_set_macipmap_fini);
|
|
|
|
+module_exit(ip_set_macipmap_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ip_set_nethash.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c
|
|
|
|
@@ -0,0 +1,497 @@
|
|
|
|
@@ -0,0 +1,497 @@
|
|
|
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+ *
|
|
|
|
+ *
|
|
|
@ -6841,9 +6861,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.23.pom2patc |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ip_set_nethash_init);
|
|
|
|
+module_init(ip_set_nethash_init);
|
|
|
|
+module_exit(ip_set_nethash_fini);
|
|
|
|
+module_exit(ip_set_nethash_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ip_set_portmap.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c
|
|
|
|
@@ -0,0 +1,346 @@
|
|
|
|
@@ -0,0 +1,346 @@
|
|
|
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
|
|
|
+ *
|
|
|
|
+ *
|
|
|
@ -7191,9 +7212,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.23.pom2patc |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ip_set_portmap_init);
|
|
|
|
+module_init(ip_set_portmap_init);
|
|
|
|
+module_exit(ip_set_portmap_fini);
|
|
|
|
+module_exit(ip_set_portmap_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_set.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_set.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ipt_set.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_set.c 2007-10-12 11:52:38.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c
|
|
|
|
@@ -0,0 +1,160 @@
|
|
|
|
@@ -0,0 +1,160 @@
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
@ -7355,9 +7377,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_set.c linux-2.6.23.pom2patch.set/n |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ipt_ipset_init);
|
|
|
|
+module_init(ipt_ipset_init);
|
|
|
|
+module_exit(ipt_ipset_fini);
|
|
|
|
+module_exit(ipt_ipset_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/ipt_SET.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c 2007-10-12 11:52:37.000000000 +0200
|
|
|
|
--- /dev/null
|
|
|
|
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c
|
|
|
|
@@ -0,0 +1,179 @@
|
|
|
|
@@ -0,0 +1,179 @@
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
|
+ * Patrick Schaaf <bof@bof.de>
|
|
|
@ -7538,10 +7561,11 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/n |
|
|
|
+
|
|
|
|
+
|
|
|
|
+module_init(ipt_SET_init);
|
|
|
|
+module_init(ipt_SET_init);
|
|
|
|
+module_exit(ipt_SET_fini);
|
|
|
|
+module_exit(ipt_SET_fini);
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/Kconfig linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Kconfig
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/Kconfig 2007-10-09 22:31:38.000000000 +0200
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Kconfig 2007-10-12 11:52:38.000000000 +0200
|
|
|
|
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
|
|
|
|
@@ -402,5 +402,122 @@
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
|
|
|
|
|
|
|
|
@@ -385,5 +385,122 @@ config IP_NF_ARP_MANGLE
|
|
|
|
Allows altering the ARP packet payload: source and destination
|
|
|
|
Allows altering the ARP packet payload: source and destination
|
|
|
|
hardware and network addresses.
|
|
|
|
hardware and network addresses.
|
|
|
|
|
|
|
|
|
|
|
@ -7664,19 +7688,20 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/Kconfig linux-2.6.23.pom2patch.set/net |
|
|
|
+
|
|
|
|
+
|
|
|
|
endmenu
|
|
|
|
endmenu
|
|
|
|
|
|
|
|
|
|
|
|
diff -Nru linux-2.6.23/net/ipv4/netfilter/Makefile linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Makefile
|
|
|
|
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
|
|
|
|
--- linux-2.6.23/net/ipv4/netfilter/Makefile 2007-10-09 22:31:38.000000000 +0200
|
|
|
|
===================================================================
|
|
|
|
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Makefile 2007-10-12 11:52:38.000000000 +0200
|
|
|
|
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
|
|
|
|
@@ -49,6 +49,7 @@
|
|
|
|
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
|
|
|
|
|
|
|
|
@@ -46,6 +46,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
|
|
|
|
|
|
|
|
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
|
|
|
|
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
|
|
|
|
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
|
|
|
|
obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
|
|
|
|
|
|
|
|
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
|
|
|
|
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
|
|
|
|
+obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
|
|
|
|
+obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
|
|
|
|
|
|
|
|
|
|
|
|
obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
|
|
|
|
obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
|
|
|
|
|
|
|
|
|
|
|
|
@@ -64,6 +65,18 @@
|
|
|
|
@@ -59,6 +60,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i
|
|
|
|
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
|
|
|
|
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
|
|
|
|
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
|
|
|
|
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
|
|
|
|
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
|
|
|
|
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
|
|
|
|
+obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
|
|
|
|
+obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
|
|
|
|