D56321.id.diff
No OneTemporary
Actions

Size

935 B

Referenced Files

None

Subscribers

None

D56321.id.diff
View Options

	diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
	--- a/sys/netinet/tcp_timewait.c
	+++ b/sys/netinet/tcp_timewait.c
	@@ -215,12 +215,17 @@
	/*
	* If a new connection request is received
	* while in TIME_WAIT, drop the old connection
	- * and start over if the sequence numbers
	- * are above the previous ones.
	+ * and start over if allowed by RFC 6191.
	* Allow UDP port number changes in this case.
	*/
	if (((thflags & (TH_SYN \| TH_ACK)) == TH_SYN) &&
	- SEQ_GT(th->th_seq, tp->rcv_nxt)) {
	+ ((((tp->t_flags & TF_RCVD_TSTMP) != 0) &&
	+ ((to->to_flags & TOF_TS) != 0) &&
	+ TSTMP_LT(tp->ts_recent, to->to_tsval)) \|\|
	+ (((tp->t_flags & TF_RCVD_TSTMP) == 0) &&
	+ ((to->to_flags & TOF_TS) != 0) &&
	+ (V_tcp_tolerate_missing_ts == 0)) \|\|
	+ SEQ_GT(th->th_seq, tp->rcv_nxt))) {
	/*
	* In case we can't upgrade our lock just pretend we have
	* lost this packet.