diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-02-04 21:08:21 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-02-04 21:08:21 +0000 |
| commit | 16acc475ea7c946f340c3d582f5b2085816a6c0c (patch) | |
| tree | cd1309088a45ba9203b31dbdffa0974e1bd11033 /target/linux/generic-2.4/patches/610-netfilter_connbytes.patch | |
| parent | c77b08e060582432be49ef133d751ad4f5465880 (diff) | |
Fixed call to ip_ct_refresh, and replaced with ip_ct_refresh_acct, added needed structures for this new function to work. Closes #267
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3128 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.4/patches/610-netfilter_connbytes.patch')
| -rw-r--r-- | target/linux/generic-2.4/patches/610-netfilter_connbytes.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch b/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch index d9761171c..95bc10f2b 100644 --- a/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch +++ b/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; + } |