diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2015-01-03 13:58:15 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2015-01-03 13:58:15 +0100 |
| commit | 4aca87515a5083ae0e31ce3177189fd43b6d05ac (patch) | |
| tree | 7b1d9a31393ca090757dc6f0d3859b4fcd93f271 /release/src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c | |
| parent | 008d0be72b2f160382c6e880765e96b64a050c65 (diff) | |
| download | tomato-4aca87515a5083ae0e31ce3177189fd43b6d05ac.tar.gz tomato-4aca87515a5083ae0e31ce3177189fd43b6d05ac.tar.bz2 | |
patch to Vanilla Tomato 1.28
Diffstat (limited to 'release/src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c')
| -rw-r--r-- | release/src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/release/src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/release/src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index 02f20742..ebb9b493 100644 --- a/release/src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/release/src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c @@ -173,7 +173,7 @@ static int tcp_packet(struct ip_conntrack *conntrack, have an established connection: this is a fairly common problem case, so we can delete the conntrack immediately. --RR */ - if (!(conntrack->status & IPS_SEEN_REPLY) && tcph->rst) { + if (!test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status) && tcph->rst) { WRITE_UNLOCK(&tcp_lock); if (del_timer(&conntrack->timeout)) conntrack->timeout.function((unsigned long)conntrack); @@ -211,12 +211,6 @@ static int tcp_new(struct ip_conntrack *conntrack, return 0; } - if (tcph->syn && tcph->ack) - { - DEBUGP("ip_conntrack_tcp: invalid new deleting.\n"); - return 0; - } - conntrack->proto.tcp.state = newconntrack; return 1; } |