Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix one of the iptables 1.3.4 compile errors on 2.4

Browse source 
SVN-Revision: 2691
This commit is contained in:
Waldemar Brodkorb 2005-12-15 23:15:50 +00:00
parent b9296811d3
commit 6070f77c0f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
openwrt/target/linux/linux-2.4/patches/generic/610-netfilter_connbytes.patch
View file

@ -271,7 +271,7 @@
+ if (!(ct = ip_conntrack_get((struct sk_buff *)skb, &ctinfo))) + if (!(ct = ip_conntrack_get((struct sk_buff *)skb, &ctinfo)))
+ return 0; /* no match */ + return 0; /* no match */
+ switch (sinfo->what) { + switch (sinfo->what) {
+ case IPT_CONNBYTES_WHAT_PKTS: + case IPT_CONNBYTES_PKTS:
+ switch (sinfo->direction) { + switch (sinfo->direction) {
+ case IPT_CONNBYTES_DIR_ORIGINAL: + case IPT_CONNBYTES_DIR_ORIGINAL:
+ what = ct->counters[IP_CT_DIR_ORIGINAL].packets; + what = ct->counters[IP_CT_DIR_ORIGINAL].packets;
@ -285,7 +285,7 @@
+ break; + break;
+ } + }
+ break; + break;
+ case IPT_CONNBYTES_WHAT_BYTES: + case IPT_CONNBYTES_BYTES:
+ switch (sinfo->direction) { + switch (sinfo->direction) {
+ case IPT_CONNBYTES_DIR_ORIGINAL: + case IPT_CONNBYTES_DIR_ORIGINAL:
+ what = ct->counters[IP_CT_DIR_ORIGINAL].bytes; + what = ct->counters[IP_CT_DIR_ORIGINAL].bytes;
@ -299,7 +299,7 @@
+ break; + break;
+ } + }
+ break; + break;
+ case IPT_CONNBYTES_WHAT_AVGPKT: + case IPT_CONNBYTES_AVGPKT:
+ switch (sinfo->direction) { + switch (sinfo->direction) {
+ case IPT_CONNBYTES_DIR_ORIGINAL: + case IPT_CONNBYTES_DIR_ORIGINAL:
+ { + {
@ -358,9 +358,9 @@
+ +
+ if (matchsize != IPT_ALIGN(sizeof(struct ipt_connbytes_info))) + if (matchsize != IPT_ALIGN(sizeof(struct ipt_connbytes_info)))
+ return 0; + return 0;
+ if (sinfo->what != IPT_CONNBYTES_WHAT_PKTS && + if (sinfo->what != IPT_CONNBYTES_PKTS &&
+ sinfo->what != IPT_CONNBYTES_WHAT_BYTES && + sinfo->what != IPT_CONNBYTES_BYTES &&
+ sinfo->what != IPT_CONNBYTES_WHAT_AVGPKT) + sinfo->what != IPT_CONNBYTES_AVGPKT)
+ return 0; + return 0;
+ +
+ if (sinfo->direction != IPT_CONNBYTES_DIR_ORIGINAL && + if (sinfo->direction != IPT_CONNBYTES_DIR_ORIGINAL &&
@ -393,9 +393,9 @@
+#ifndef _IPT_CONNBYTES_H +#ifndef _IPT_CONNBYTES_H
+#define _IPT_CONNBYTES_H +#define _IPT_CONNBYTES_H
+enum ipt_connbytes_what { +enum ipt_connbytes_what {
+ IPT_CONNBYTES_WHAT_PKTS, + IPT_CONNBYTES_PKTS,
+ IPT_CONNBYTES_WHAT_BYTES, + IPT_CONNBYTES_BYTES,
+ IPT_CONNBYTES_WHAT_AVGPKT, + IPT_CONNBYTES_AVGPKT,
+}; +};
+ +
+enum ipt_connbytes_direction { +enum ipt_connbytes_direction {