diff options
| author | Florian Fainelli <florian@openwrt.org> | 2006-02-04 21:08:21 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2006-02-04 21:08:21 +0000 |
| commit | b436e07724236238d9ddb7c3b384d22131612c65 (patch) | |
| tree | 703d06b11599ad016fda5e481f5f0494571385a3 /openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch | |
| parent | 8d181b4022a22fedbaf12232227d82b8911fcc92 (diff) | |
| download | upstream-b436e07724236238d9ddb7c3b384d22131612c65.tar.gz upstream-b436e07724236238d9ddb7c3b384d22131612c65.tar.bz2 upstream-b436e07724236238d9ddb7c3b384d22131612c65.zip | |
Fixed call to ip_ct_refresh, and replaced with ip_ct_refresh_acct, added needed structures for this new function to work. Closes #267
SVN-Revision: 3128
Diffstat (limited to 'openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch')
| -rw-r--r-- | openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch b/openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch index d9761171c6..95bc10f2bc 100644 --- a/openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch +++ b/openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch @@ -415,3 +415,25 @@ +}; + +#endif +--- linux-2.4.32/net/ipv4/netfilter/ip_conntrack_proto_gre.c 2006-02-04 19:16:25.000000000 +0100 ++++ /home/florian//openwrt/trunk/openwrt/build_mipsel/linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c 2006-02-04 18:19:08.000000000 +0100 +@@ -237,16 +237,16 @@ + /* Returns verdict for packet, and may modify conntrack */ + static int gre_packet(struct ip_conntrack *ct, + struct iphdr *iph, size_t len, +- enum ip_conntrack_info conntrackinfo) ++ enum ip_conntrack_info ctinfo) + { + /* If we've seen traffic both ways, this is a GRE connection. + * Extend timeout. */ + if (ct->status & IPS_SEEN_REPLY) { +- ip_ct_refresh_acct(ct, ct->proto.gre.stream_timeout); ++ ip_ct_refresh_acct(ct, ctinfo, iph, ct->proto.gre.stream_timeout); + /* Also, more likely to be important, and not a probe. */ + set_bit(IPS_ASSURED_BIT, &ct->status); + } else +- ip_ct_refresh_acct(ct, ct->proto.gre.timeout); ++ ip_ct_refresh_acct(ct, ctinfo, iph, ct->proto.gre.timeout); + + return NF_ACCEPT; + } |