Author: zbyniu Date: Tue Sep 23 11:56:53 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for .26
---- Files affected:
SOURCES:
kernel-pom-ng-mms-conntrack-nat.patch (1.1.2.6 -> 1.1.2.7) ,
kernel-pom-ng-IPV4OPTSSTRIP.patch (1.1.2.5 -> 1.1.2.6)
---- Diffs:
================================================================
Index: SOURCES/kernel-pom-ng-mms-conntrack-nat.patch
diff -u SOURCES/kernel-pom-ng-mms-conntrack-nat.patch:1.1.2.6
SOURCES/kernel-pom-ng-mms-conntrack-nat.patch:1.1.2.7
--- SOURCES/kernel-pom-ng-mms-conntrack-nat.patch:1.1.2.6 Mon Jul 14
20:01:46 2008
+++ SOURCES/kernel-pom-ng-mms-conntrack-nat.patch Tue Sep 23 13:56:46 2008
@@ -373,7 +373,7 @@
diff -NurpP --minimal linux-2.6.21.a/net/netfilter/nf_conntrack_mms.c
linux-2.6.21.b/net/netfilter/nf_conntrack_mms.c
--- linux-2.6.21.a/net/netfilter/nf_conntrack_mms.c 1970-01-01
01:00:00.000000000 +0100
+++ linux-2.6.21.b/net/netfilter/nf_conntrack_mms.c 2007-05-30
11:50:55.000000000 +0200
-@@ -0,0 +1,371 @@
+@@ -0,0 +1,374 @@
+/* MMS extension for IP connection tracking
+ * (C) 2002 by Filip Sneppe <[EMAIL PROTECTED]>
+ * based on ip_conntrack_ftp.c and ip_conntrack_irc.c
@@ -658,7 +658,7 @@
+
+ tuple = &ct->tuplehash[!dir].tuple;
+ port = htons(mms_port);
-+ nf_ct_expect_init(exp, tuple->src.l3num,
++ nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, tuple->src.l3num,
+ NULL, &tuple->dst.u3,
+ IPPROTO_TCP, NULL, &port);
+
@@ -695,6 +695,10 @@
+
+static struct nf_conntrack_helper mms[MAX_PORTS];
+static char mms_names[MAX_PORTS][10];
++static const struct nf_conntrack_expect_policy mms_exp_policy = {
++ .max_expected = 1,
++ .timeout = 120,
++};
+
+/* Not __exit: called from init() */
+static void fini(void)
@@ -719,9 +723,8 @@
+ memset(&mms[i], 0, sizeof(struct nf_conntrack_helper));
+ mms[i].tuple.src.u.tcp.port = htons(ports[i]);
+ mms[i].tuple.dst.protonum = IPPROTO_TCP;
-+ mms[i].max_expected = 1;
-+ mms[i].timeout = 120;
+ mms[i].me = THIS_MODULE;
++ mms[i].expect_policy = &mms_exp_policy;
+ mms[i].help = help;
+
+ tmpname = &mms_names[i][0];
================================================================
Index: SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch
diff -u SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch:1.1.2.5
SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch:1.1.2.6
--- SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch:1.1.2.5 Tue May 20 15:57:53 2008
+++ SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch Tue Sep 23 13:56:47 2008
@@ -31,7 +31,7 @@
diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c
linux-2.6.21.a/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c
--- linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c 1970-01-01
01:00:00.000000000 +0100
+++ linux-2.6.21.a/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c 2007-05-30
11:18:08.000000000 +0200
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,84 @@
+/**
+ * Strip all IP options in the IP packet header.
+ *
@@ -51,7 +51,7 @@
+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,
@@ -59,16 +59,14 @@
+ const void *targinfo)
+{
+ struct iphdr *iph;
-+ struct sk_buff *skb;
+ struct ip_options *opt;
-+ unsigned char *optiph;
++ sk_buff_data_t optiph;
+ int l;
+
-+ if (!skb_make_writable(pskb, (*pskb)->len))
++ if (!skb_make_writable(skb, skb->len))
+ return NF_DROP;
+
-+ skb = (*pskb);
-+ iph = ip_hdr(*pskb);
++ iph = ip_hdr(skb);
+ optiph = skb->network_header;
+ l = ((struct ip_options *)(&(IPCB(skb)->opt)))->optlen;
+
@@ -80,7 +78,6 @@
+ memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
+ memset(optiph+sizeof(struct iphdr), IPOPT_NOOP, l);
+ opt = &(IPCB(skb)->opt);
-+ opt->is_data = 0;
+ opt->optlen = l;
+
+ return IPT_CONTINUE;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-mms-conntrack-nat.patch?r1=1.1.2.6&r2=1.1.2.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-IPV4OPTSSTRIP.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
