diff options
| author | Roland McGrath <roland@gnu.org> | 2000-02-05 12:13:22 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2000-02-05 12:13:22 +0000 |
| commit | 1a7ccb577c414677f9e763036d6ccce3a298f16d (patch) | |
| tree | 10f45d0745e0f65108ecbda92ed6f7214dc703ff /pfinet/linux-src/net/ipv4/ip_masq_mfw.c | |
| parent | add1cad493c256d0a7c939070f9ee067c2718daf (diff) | |
| parent | b39cd08347c72483a4521a55301a0fa147a2a2b1 (diff) | |
| download | hurd-1a7ccb577c414677f9e763036d6ccce3a298f16d.tar.gz hurd-1a7ccb577c414677f9e763036d6ccce3a298f16d.tar.bz2 hurd-1a7ccb577c414677f9e763036d6ccce3a298f16d.zip | |
Merge from vendor branch Linux:
Import of Linux 2.2.13 subset (ipv4 stack and related)
Diffstat (limited to 'pfinet/linux-src/net/ipv4/ip_masq_mfw.c')
| -rw-r--r-- | pfinet/linux-src/net/ipv4/ip_masq_mfw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pfinet/linux-src/net/ipv4/ip_masq_mfw.c b/pfinet/linux-src/net/ipv4/ip_masq_mfw.c index 60c77970..d28f610a 100644 --- a/pfinet/linux-src/net/ipv4/ip_masq_mfw.c +++ b/pfinet/linux-src/net/ipv4/ip_masq_mfw.c @@ -3,7 +3,7 @@ * * Does (reverse-masq) forwarding based on skb->fwmark value * - * $Id: ip_masq_mfw.c,v 1.3.2.1 1999/07/02 10:10:03 davem Exp $ + * $Id: ip_masq_mfw.c,v 1.3.2.3 1999/09/22 16:33:26 davem Exp $ * * Author: Juan Jose Ciarlante <jjciarla@raiz.uncu.edu.ar> * based on Steven Clarke's portfw @@ -216,6 +216,7 @@ static int mfw_delhost(struct ip_masq_mfw *mfw, struct ip_mfw_user *mu) (!mu->rport || h->port == mu->rport)) { /* HIT */ atomic_dec(&mfw->nhosts); + e = h->list.prev; list_del(&h->list); kfree_s(h, sizeof(*h)); MOD_DEC_USE_COUNT; @@ -687,7 +688,7 @@ static struct ip_masq * mfw_in_create(const struct sk_buff *skb, const struct ip /* * Only open TCP tunnel if SYN+!ACK packet */ - if (!tph.th->syn && tph.th->ack) + if (!tph.th->syn || tph.th->ack) return NULL; case IPPROTO_UDP: break; |