diff options
| author | rwatson <rwatson@FreeBSD.org> | 2003-05-07 05:26:27 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2003-05-07 05:26:27 +0000 |
| commit | f332b502284cf247d9ce1dfe30f6378c9bc2afc8 (patch) | |
| tree | 4bf0def48b8e6b582f1bbfe666aaa3118c608844 /sys/netinet/tcp_reass.c | |
| parent | e1aef65def425d59eed46af0910c0f1df5461703 (diff) | |
| download | FreeBSD-src-f332b502284cf247d9ce1dfe30f6378c9bc2afc8.zip FreeBSD-src-f332b502284cf247d9ce1dfe30f6378c9bc2afc8.tar.gz | |
Correct a bug introduced with reduced TCP state handling; make
sure that the MAC label on TCP responses during TIMEWAIT is
properly set from either the socket (if available), or the mbuf
that it's responding to.
Unfortunately, this is made somewhat difficult by the TCP code,
as tcp_twstart() calls tcp_twrespond() after discarding the socket
but without a reference to the mbuf that causes the "response".
Passing both the socket and the mbuf works arounds this--eventually
it might be good to make sure the mbuf always gets passed in in
"response" scenarios but working through this provided to
complicate things too much.
Approved by: re (scottl)
Reviewed by: hsu
Obtained from: TrustedBSD Project
Sponsored by: DARPA, Network Associates Laboratories
Diffstat (limited to 'sys/netinet/tcp_reass.c')
| -rw-r--r-- | sys/netinet/tcp_reass.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index b01b01e..0683047 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -2950,7 +2950,7 @@ tcp_timewait(tw, to, th, m, tlen) */ if (thflags != TH_ACK || tlen != 0 || th->th_seq != tw->rcv_nxt || th->th_ack != tw->snd_nxt) - tcp_twrespond(tw, TH_ACK); + tcp_twrespond(tw, NULL, m, TH_ACK); goto drop; reset: |
