SOURCES (AC-branch): linux-2.4.26-netfilter-pom-ng-20040302.patch - update ...

glen glen at pld-linux.org
Mon Mar 30 01:56:39 CEST 2009 

Author: glen                         Date: Sun Mar 29 23:56:39 2009 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- update to 2.4.37, ipt_CLASSIFY seems merged in

---- Files affected:
SOURCES:
   linux-2.4.26-netfilter-pom-ng-20040302.patch (1.12 -> 1.12.4.1) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch
diff -u SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch:1.12 SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch:1.12.4.1
--- SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch:1.12	Fri Jun 30 10:27:48 2006
+++ SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch	Mon Mar 30 01:56:33 2009
@@ -2016,18 +2016,6 @@
 +};
 +
 +#endif
-diff -urN linux-2.4.26.org/include/linux/netfilter_ipv4/ipt_CLASSIFY.h linux-2.4.26/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
---- linux-2.4.26.org/include/linux/netfilter_ipv4/ipt_CLASSIFY.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.26/include/linux/netfilter_ipv4/ipt_CLASSIFY.h	2004-04-26 03:17:43.422038432 +0200
-@@ -0,0 +1,8 @@
-+#ifndef _IPT_CLASSIFY_H
-+#define _IPT_CLASSIFY_H
-+
-+struct ipt_classify_target_info {
-+	u_int32_t priority;
-+};
-+
-+#endif /*_IPT_CLASSIFY_H */
 diff -urN linux-2.4.26.org/include/linux/netfilter_ipv4/ipt_condition.h linux-2.4.26/include/linux/netfilter_ipv4/ipt_condition.h
 --- linux-2.4.26.org/include/linux/netfilter_ipv4/ipt_condition.h	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.4.26/include/linux/netfilter_ipv4/ipt_condition.h	2004-04-26 03:18:12.925553216 +0200
@@ -3404,9 +3392,8 @@
  /* This does not belong here, but locally generated errors need it if connection
     tracking in use: without this, connection may not be in hash table, and hence
     manufactured ICMP or RST packets will not be associated with it. */
-diff -urN linux-2.4.26.org/net/ipv4/netfilter/Config.in linux-2.4.26/net/ipv4/netfilter/Config.in
---- linux-2.4.26.org/net/ipv4/netfilter/Config.in	2004-04-26 02:59:28.880434048 +0200
-+++ linux-2.4.26/net/ipv4/netfilter/Config.in	2004-04-26 03:22:26.149057392 +0200
+--- linux-2.4.37/net/ipv4/netfilter/Config.in~	2009-03-29 22:40:59.000000000 +0300
++++ linux-2.4.37/net/ipv4/netfilter/Config.in	2009-03-29 22:45:02.915853168 +0300
 @@ -7,9 +7,18 @@
  tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK
  if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
@@ -3575,14 +3562,14 @@
        # If they want FTP, set to $CONFIG_IP_NF_NAT (m or y), 
        # or $CONFIG_IP_NF_FTP (m or y), whichever is weaker.  Argh.
        if [ "$CONFIG_IP_NF_FTP" = "m" ]; then
-@@ -104,10 +195,27 @@
+@@ -202,11 +202,27 @@
      dep_tristate '    DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE
   
      dep_tristate '    MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
 +    dep_tristate '    ROUTE target support' CONFIG_IP_NF_TARGET_ROUTE $CONFIG_IP_NF_MANGLE
 +    dep_tristate '    IPMARK target support' CONFIG_IP_NF_TARGET_IPMARK $CONFIG_IP_NF_MANGLE
 +    dep_tristate '    CONNMARK target support' CONFIG_IP_NF_TARGET_CONNMARK $CONFIG_IP_NF_MANGLE
-+    dep_tristate '    CLASSIFY target support (EXPERIMENTAL)' CONFIG_IP_NF_TARGET_CLASSIFY $CONFIG_IP_NF_MANGLE
+     dep_tristate '    CLASSIFY target support (EXPERIMENTAL)' CONFIG_IP_NF_TARGET_CLASSIFY $CONFIG_IP_NF_MANGLE
    fi
    dep_tristate '  LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES
 +  dep_tristate '  XOR target support' CONFIG_IP_NF_TARGET_XOR $CONFIG_IP_NF_IPTABLES
@@ -13894,92 +13881,6 @@
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.26.org/net/ipv4/netfilter/ipt_CLASSIFY.c linux-2.4.26/net/ipv4/netfilter/ipt_CLASSIFY.c
---- linux-2.4.26.org/net/ipv4/netfilter/ipt_CLASSIFY.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.26/net/ipv4/netfilter/ipt_CLASSIFY.c	2004-04-26 03:17:43.412039952 +0200
-@@ -0,0 +1,82 @@
-+/*
-+ * This is a module which is used for setting the skb->priority field
-+ * of an skb for qdisc classification.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/ip.h>
-+#include <net/checksum.h>
-+
-+#include <linux/netfilter_ipv4/ip_tables.h>
-+#include <linux/netfilter_ipv4/ipt_CLASSIFY.h>
-+
-+MODULE_AUTHOR("Patrick McHardy <kaber at trash.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("iptables qdisc classification target module");
-+
-+static unsigned int
-+target(struct sk_buff **pskb,
-+       unsigned int hooknum,
-+       const struct net_device *in,
-+       const struct net_device *out,
-+       const void *targinfo,
-+       void *userinfo)
-+{
-+	const struct ipt_classify_target_info *clinfo = targinfo;
-+
-+	if((*pskb)->priority != clinfo->priority) {
-+		(*pskb)->priority = clinfo->priority;
-+		(*pskb)->nfcache |= NFC_ALTERED;
-+	}
-+
-+	return IPT_CONTINUE;
-+}
-+
-+static int
-+checkentry(const char *tablename,
-+           const struct ipt_entry *e,
-+           void *targinfo,
-+           unsigned int targinfosize,
-+           unsigned int hook_mask)
-+{
-+	if (targinfosize != IPT_ALIGN(sizeof(struct ipt_classify_target_info))){
-+		printk(KERN_ERR "CLASSIFY: invalid size (%u != %u).\n",
-+		       targinfosize,
-+		       IPT_ALIGN(sizeof(struct ipt_classify_target_info)));
-+		return 0;
-+	}
-+	
-+	if (hook_mask & ~(1 << NF_IP_POST_ROUTING)) {
-+		printk(KERN_ERR "CLASSIFY: only valid in POST_ROUTING.\n");
-+		return 0;
-+	}
-+
-+	if (strcmp(tablename, "mangle") != 0) {
-+		printk(KERN_WARNING "CLASSIFY: can only be called from "
-+		                    "\"mangle\" table, not \"%s\".\n",
-+		                    tablename);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct ipt_target ipt_classify_reg
-+= { { NULL, NULL }, "CLASSIFY", target, checkentry, NULL, THIS_MODULE };
-+
-+static int __init init(void)
-+{
-+	if (ipt_register_target(&ipt_classify_reg))
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+static void __exit fini(void)
-+{
-+	ipt_unregister_target(&ipt_classify_reg);
-+}
-+
-+module_init(init);
-+module_exit(fini);
 diff -urN linux-2.4.26.org/net/ipv4/netfilter/ipt_condition.c linux-2.4.26/net/ipv4/netfilter/ipt_condition.c
 --- linux-2.4.26.org/net/ipv4/netfilter/ipt_condition.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.4.26/net/ipv4/netfilter/ipt_condition.c	2004-04-26 03:18:12.927552912 +0200
@@ -21897,9 +21798,8 @@
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.26.org/net/ipv4/netfilter/Makefile linux-2.4.26/net/ipv4/netfilter/Makefile
---- linux-2.4.26.org/net/ipv4/netfilter/Makefile	2004-04-26 02:59:28.874434960 +0200
-+++ linux-2.4.26/net/ipv4/netfilter/Makefile	2004-04-26 03:22:26.147057696 +0200
+--- linux-2.4.37/net/ipv4/netfilter/Makefile~	2009-03-29 22:40:59.000000000 +0300
++++ linux-2.4.37/net/ipv4/netfilter/Makefile	2009-03-29 22:50:09.586110056 +0300
 @@ -31,7 +31,31 @@
  # connection tracking
  obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
@@ -22019,13 +21919,12 @@
  
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  
-@@ -81,25 +149,47 @@
+@@ -156,26 +156,46 @@
  
  obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_length.o
  
 +obj-$(CONFIG_IP_NF_MATCH_U32) += ipt_u32.o
 +
-+
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o
 +obj-$(CONFIG_IP_NF_MATCH_CONNLIMIT) += ipt_connlimit.o
@@ -22039,7 +21938,7 @@
  
  # targets
  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
-+obj-$(CONFIG_IP_NF_TARGET_CLASSIFY) += ipt_CLASSIFY.o
+ obj-$(CONFIG_IP_NF_TARGET_CLASSIFY) += ipt_CLASSIFY.o
  obj-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR.o
 +obj-$(CONFIG_IP_NF_TARGET_TARPIT) += ipt_TARPIT.o
  obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch?r1=1.12&r2=1.12.4.1&f=u

More information about the pld-cvs-commit mailing list