diff options
| author | wollman <wollman@FreeBSD.org> | 1995-10-12 17:37:25 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-10-12 17:37:25 +0000 |
| commit | 4afe99dda1ec1050df5757c66a91e642bb0718d4 (patch) | |
| tree | 00add62c3c7de27b8ae7616adcc2c40b1f6f9beb /sys/netinet | |
| parent | 5820893213840443ff8ccce6d2a74b3ebd94e21f (diff) | |
| download | FreeBSD-src-4afe99dda1ec1050df5757c66a91e642bb0718d4.zip FreeBSD-src-4afe99dda1ec1050df5757c66a91e642bb0718d4.tar.gz | |
The additional checks involving sequence numbers in MTU discovery resends
turned out not to be necessary; simply watching for MTU decreases (which
we already did) automagically eliminates all the cases we were trying to
protect against.
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/tcp_subr.c | 12 | ||||
| -rw-r--r-- | sys/netinet/tcp_timewait.c | 12 | ||||
| -rw-r--r-- | sys/netinet/tcp_var.h | 4 |
3 files changed, 11 insertions, 17 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 0fe5d0f..4042083 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $Id: tcp_subr.c,v 1.17 1995/10/03 16:54:15 wollman Exp $ + * $Id: tcp_subr.c,v 1.18 1995/10/10 17:45:40 wollman Exp $ */ #include <sys/param.h> @@ -525,12 +525,10 @@ tcp_mtudisc(inp, errno) tp->t_maxseg = mss; - if (SEQ_GT(tp->snd_una, tp->t_lastmturesend)) { - tcpstat.tcps_mturesent++; - tp->t_rtt = 0; - tp->snd_nxt = tp->t_lastmturesend = tp->snd_una; - tcp_output(tp); - } + tcpstat.tcps_mturesent++; + tp->t_rtt = 0; + tp->snd_nxt = tp->snd_una; + tcp_output(tp); } } #endif /* MTUDISC */ diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 0fe5d0f..4042083 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $Id: tcp_subr.c,v 1.17 1995/10/03 16:54:15 wollman Exp $ + * $Id: tcp_subr.c,v 1.18 1995/10/10 17:45:40 wollman Exp $ */ #include <sys/param.h> @@ -525,12 +525,10 @@ tcp_mtudisc(inp, errno) tp->t_maxseg = mss; - if (SEQ_GT(tp->snd_una, tp->t_lastmturesend)) { - tcpstat.tcps_mturesent++; - tp->t_rtt = 0; - tp->snd_nxt = tp->t_lastmturesend = tp->snd_una; - tcp_output(tp); - } + tcpstat.tcps_mturesent++; + tp->t_rtt = 0; + tp->snd_nxt = tp->snd_una; + tcp_output(tp); } } #endif /* MTUDISC */ diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 759b793..b2703ae 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $Id: tcp_var.h,v 1.18 1995/10/04 20:49:03 wollman Exp $ + * $Id: tcp_var.h,v 1.19 1995/10/10 17:45:43 wollman Exp $ */ #ifndef _NETINET_TCP_VAR_H_ @@ -141,8 +141,6 @@ struct tcpcb { caddr_t t_tuba_pcb; /* next level down pcb for TCP over z */ /* More RTT stuff */ u_long t_rttupdated; /* number of times rtt sampled */ -/* For MTU discovery */ - tcp_seq t_lastmturesend; /* seq of resend for mtu discovery */ }; /* |
