fix one of the iptables 1.3.4 compile errors on 2.4
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>
Thu, 15 Dec 2005 23:15:50 +0000 (23:15 +0000)
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>
Thu, 15 Dec 2005 23:15:50 +0000 (23:15 +0000)
SVN-Revision: 2691

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

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