SOURCES (LINUX_2_6): kernel-pom-ng-IPV4OPTSSTRIP.patch, kernel-pom-ng-ipv4o...
zbyniu
zbyniu at pld-linux.org
Tue May 20 15:57:59 CEST 2008
Author: zbyniu Date: Tue May 20 13:57:58 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- better api adjustment
---- Files affected:
SOURCES:
kernel-pom-ng-IPV4OPTSSTRIP.patch (1.1.2.4 -> 1.1.2.5) , kernel-pom-ng-ipv4options.patch (1.1.2.3 -> 1.1.2.4) , kernel-pom-ng-ROUTE.patch (1.1.2.10 -> 1.1.2.11) , kernel-pom-ng-IPMARK.patch (1.1.2.5 -> 1.1.2.6) , kernel-pom-ng-geoip.patch (1.1.2.3 -> 1.1.2.4) , kernel-pom-ng-ipp2p.patch (1.1.2.4 -> 1.1.2.5)
---- Diffs:
================================================================
Index: SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch
diff -u SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch:1.1.2.4 SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch:1.1.2.5
--- SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch:1.1.2.4 Fri Jan 18 15:21:59 2008
+++ SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch Tue May 20 15:57:53 2008
@@ -86,7 +86,7 @@
+ return IPT_CONTINUE;
+}
+
-+static int
++static bool
+checkentry(const char *tablename,
+ const void *e,
+ const struct xt_target *target,
================================================================
Index: SOURCES/kernel-pom-ng-ipv4options.patch
diff -u SOURCES/kernel-pom-ng-ipv4options.patch:1.1.2.3 SOURCES/kernel-pom-ng-ipv4options.patch:1.1.2.4
--- SOURCES/kernel-pom-ng-ipv4options.patch:1.1.2.3 Fri Jan 18 15:26:35 2008
+++ SOURCES/kernel-pom-ng-ipv4options.patch Tue May 20 15:57:53 2008
@@ -60,7 +60,7 @@
diff -NurpP --minimal linux-2.6.21.a/net/ipv4/netfilter/ipt_ipv4options.c linux-2.6.21.b/net/ipv4/netfilter/ipt_ipv4options.c
--- linux-2.6.21.a/net/ipv4/netfilter/ipt_ipv4options.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.21.b/net/ipv4/netfilter/ipt_ipv4options.c 2007-05-30 11:22:30.000000000 +0200
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,176 @@
+/*
+ This is a module which is used to match ipv4 options.
+ This file is distributed under the terms of the GNU General Public
@@ -84,7 +84,7 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Fabrice Marie <fabrice at netfilter.org>");
+
-+static int
++static bool
+match(const struct sk_buff *skb,
+ const struct net_device *in,
+ const struct net_device *out,
@@ -92,7 +92,7 @@
+ const void *matchinfo,
+ int offset,
+ unsigned int protoff,
-+ int *hotdrop)
++ bool *hotdrop)
+{
+ const struct ipt_ipv4options_info *info = matchinfo; /* match info for rule */
+ const struct iphdr *iph = ip_hdr(skb);
@@ -168,12 +168,11 @@
+ return 1;
+}
+
-+static int
++static bool
+checkentry(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
-+
+ unsigned int hook_mask)
+{
+ const struct ipt_ipv4options_info *info = matchinfo; /* match info for rule */
================================================================
Index: SOURCES/kernel-pom-ng-ROUTE.patch
diff -u SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.10 SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.11
--- SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.10 Thu May 8 23:33:23 2008
+++ SOURCES/kernel-pom-ng-ROUTE.patch Tue May 20 15:57:53 2008
@@ -489,7 +489,7 @@
+}
+
+
-+static int ipt_route_checkentry(const char *tablename,
++static bool ipt_route_checkentry(const char *tablename,
+ const void *e,
+ const struct xt_target *target,
+ void *targinfo,
@@ -842,7 +842,7 @@
+}
+
+
-+static int
++static bool
+ip6t_route_checkentry(const char *tablename,
+ const void *entry,
+ const struct xt_target *target,
================================================================
Index: SOURCES/kernel-pom-ng-IPMARK.patch
diff -u SOURCES/kernel-pom-ng-IPMARK.patch:1.1.2.5 SOURCES/kernel-pom-ng-IPMARK.patch:1.1.2.6
--- SOURCES/kernel-pom-ng-IPMARK.patch:1.1.2.5 Tue Jan 29 09:05:51 2008
+++ SOURCES/kernel-pom-ng-IPMARK.patch Tue May 20 15:57:53 2008
@@ -56,7 +56,7 @@
diff -NurpP --minimal linux-2.6.21.a/net/ipv4/netfilter/ipt_IPMARK.c linux-2.6.21.b/net/ipv4/netfilter/ipt_IPMARK.c
--- linux-2.6.21.a/net/ipv4/netfilter/ipt_IPMARK.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.21.b/net/ipv4/netfilter/ipt_IPMARK.c 2007-05-30 12:01:21.000000000 +0200
-@@ -0,0 +1,125 @@
+@@ -0,0 +1,99 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/version.h>
@@ -71,26 +71,15 @@
+MODULE_LICENSE("GPL");
+
+static unsigned int
-+target(struct sk_buff **pskb,
++target(struct sk_buff *skb,
+ const struct net_device *in,
+ const struct net_device *out,
+ unsigned int hooknum,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ const struct xt_target *target,
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+ const void *targinfo,
-+ void *userinfo)
-+#else
+ const void *targinfo)
-+#endif
+{
+ const struct ipt_ipmark_target_info *ipmarkinfo = targinfo;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-+ struct iphdr *iph = ip_hdr(*pskb);
-+#else
-+ struct iphdr *iph = (*pskb)->nh.iph;
-+#endif
++ struct iphdr *iph = ip_hdr(skb);
+ unsigned long mark;
+
+ if (ipmarkinfo->addr == IPT_IPMARK_SRC)
@@ -101,30 +90,16 @@
+ mark &= ipmarkinfo->andmask;
+ mark |= ipmarkinfo->ormask;
+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-+ if ((*pskb)->nfmark != mark)
-+ (*pskb)->nfmark = mark;
-+#else
-+ if ((*pskb)->mark != mark)
-+ (*pskb)->mark = mark;
-+#endif
++ if (skb->mark != mark)
++ skb->mark = mark;
+ return IPT_CONTINUE;
+}
+
-+static int
++static bool
+checkentry(const char *tablename,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+ const void *e,
-+#else
-+ const struct ipt_entry *e,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ const struct xt_target *target,
-+#endif
+ void *targinfo,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+ unsigned int targinfosize,
-+#endif
+ unsigned int hook_mask)
+{
+
================================================================
Index: SOURCES/kernel-pom-ng-geoip.patch
diff -u SOURCES/kernel-pom-ng-geoip.patch:1.1.2.3 SOURCES/kernel-pom-ng-geoip.patch:1.1.2.4
--- SOURCES/kernel-pom-ng-geoip.patch:1.1.2.3 Sun Apr 13 00:34:21 2008
+++ SOURCES/kernel-pom-ng-geoip.patch Tue May 20 15:57:53 2008
@@ -85,7 +85,7 @@
diff -NurpP --minimal linux-2.6.21.a/net/ipv4/netfilter/ipt_geoip.c linux-2.6.21.b/net/ipv4/netfilter/ipt_geoip.c
--- linux-2.6.21.a/net/ipv4/netfilter/ipt_geoip.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.21.b/net/ipv4/netfilter/ipt_geoip.c 2007-05-30 12:08:43.000000000 +0200
-@@ -0,0 +1,302 @@
+@@ -0,0 +1,289 @@
+/* iptables kernel module for the geoip match
+ *
+ * This program is free software; you can redistribute it and/or modify
@@ -183,18 +183,14 @@
+ return NULL;
+}
+
-+static int match(const struct sk_buff *skb,
++static bool match(const struct sk_buff *skb,
+ const struct net_device *in,
+ const struct net_device *out,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ const struct xt_match *match,
-+#endif
+ const void *matchinfo,
+ int offset,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+ unsigned int protoff,
-+#endif
-+ int *hotdrop)
++ bool *hotdrop)
+{
+ const struct ipt_geoip_info *info = matchinfo;
+ const struct geoip_info *node; /* This keeps the code sexy */
@@ -227,19 +223,10 @@
+ return (info->flags & IPT_GEOIP_INV) ? 1 : 0;
+}
+
-+static int geoip_checkentry(const char *tablename,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++static bool geoip_checkentry(const char *tablename,
+ const void *ip,
-+#else
-+ const struct ipt_ip *ip,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ const struct xt_match *match,
-+#endif
+ void *matchinfo,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
-+ unsigned int matchsize,
-+#endif
+ unsigned int hook_mask)
+{
+ struct ipt_geoip_info *info = matchinfo;
================================================================
Index: SOURCES/kernel-pom-ng-ipp2p.patch
diff -u SOURCES/kernel-pom-ng-ipp2p.patch:1.1.2.4 SOURCES/kernel-pom-ng-ipp2p.patch:1.1.2.5
--- SOURCES/kernel-pom-ng-ipp2p.patch:1.1.2.4 Tue Jan 22 03:07:49 2008
+++ SOURCES/kernel-pom-ng-ipp2p.patch Tue May 20 15:57:53 2008
@@ -763,7 +763,7 @@
+};
+
+
-+static int
++static bool
+match(const struct sk_buff *skb,
+ const struct net_device *in,
+ const struct net_device *out,
@@ -781,7 +781,7 @@
+ unsigned int protoff,
+#endif
+
-+ int *hotdrop)
++ bool *hotdrop)
+{
+ const struct ipt_p2p_info *info = matchinfo;
+ unsigned char *haystack;
@@ -863,7 +863,7 @@
+
+
+
-+static int
++static bool
+checkentry(const char *tablename,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+ const void *ip,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-ipv4options.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-ROUTE.patch?r1=1.1.2.10&r2=1.1.2.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-IPMARK.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-geoip.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-ipp2p.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
More information about the pld-cvs-commit
mailing list