SOURCES (LINUX_2_6): kernel-pom-ng-rpc.patch - missed struct; help...

[zbyniu]

Author: zbyniu                       Date: Wed Aug 15 13:42:45 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- missed struct; helper should be reviewed/rewritten

---- Files affected:
SOURCES:
   kernel-pom-ng-rpc.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/kernel-pom-ng-rpc.patch
diff -u SOURCES/kernel-pom-ng-rpc.patch:1.1.2.2 SOURCES/kernel-pom-ng-rpc.patch:1.1.2.3
--- SOURCES/kernel-pom-ng-rpc.patch:1.1.2.2	Wed Aug 15 03:48:03 2007
+++ SOURCES/kernel-pom-ng-rpc.patch	Wed Aug 15 15:42:39 2007
@@ -535,8 +535,8 @@
 +				port_buf, req_p->proto);
 +
 +			DEBUGP("expect related mask %u.%u.%u.%u:0-%u.%u.%u.%u:65535 proto=%u\n",
-+				NIPQUAD(exp->mask.src.ip),
-+				NIPQUAD(exp->mask.dst.ip),
++				NIPQUAD(exp->mask.src.u3.ip),
++				NIPQUAD(exp->mask.dst.u3.ip),
 +				exp->mask.dst.protonum);
 +
 +			if (nf_conntrack_expect_related(exp) != 0) {
@@ -559,7 +559,7 @@
 +/* RPC TCP helper */
 +/* static int help(const struct iphdr *iph, size_t len,
 +		struct nf_conn *ct, enum ip_conntrack_info ctinfo) */
-+static int help(struct sk_buff **pskb, unsigned int protoff,
++static int help(struct sk_buff **pskb,
 +		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
 +{
 +	int dir;
@@ -1086,8 +1086,8 @@
 +				port_buf, req_p->proto);
 +
 +			DEBUGP("expect related mask %u.%u.%u.%u:0-%u.%u.%u.%u:65535 proto=%u\n",
-+				NIPQUAD(exp->mask.src.ip),
-+				NIPQUAD(exp->mask.dst.ip),
++				NIPQUAD(exp->mask.src.u3.ip),
++				NIPQUAD(exp->mask.dst.u3.ip),
 +				exp->mask.dst.protonum);
 +
 +			if (nf_conntrack_expect_related(exp) != 0) {
@@ -1108,7 +1108,7 @@
 +/* RPC UDP helper */
 +/* static int help(const struct iphdr *iph, size_t len,
 +		struct nf_conn *ct, enum ip_conntrack_info ctinfo) */
-+static int help(struct sk_buff **pskb, unsigned int protoff,
++static int help(struct sk_buff **pskb,
 +		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
 +{
 +	int dir;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-pom-ng-rpc.patch?r1=1.1.2.2&r2=1.1.2.3&f=u