D28652.id83837.diff
No OneTemporary
Actions

Size

970 B

Referenced Files

None

Subscribers

None

D28652.id83837.diff
View Options

	Index: sys/netinet/tcp_input.c
	===================================================================
	--- sys/netinet/tcp_input.c
	+++ sys/netinet/tcp_input.c
	@@ -1660,7 +1660,8 @@
	*/
	tp->snd_wnd = th->th_win;
	if ((to.to_flags & TOF_TS) &&
	- (tp->t_flags & TF_REQ_TSTMP)) {
	+ (tp->t_flags & TF_REQ_TSTMP) &&
	+ !(tp->t_flags & TF_NOOPT)) {
	tp->t_flags \|= TF_RCVD_TSTMP;
	tp->ts_recent = to.to_tsval;
	tp->ts_recent_age = tcp_ts_getticks();
	Index: sys/netinet/tcp_syncache.c
	===================================================================
	--- sys/netinet/tcp_syncache.c
	+++ sys/netinet/tcp_syncache.c
	@@ -1660,7 +1660,8 @@
	* A timestamp received in a SYN makes
	* it ok to send timestamp requests and replies.
	*/
	- if (to->to_flags & TOF_TS) {
	+ if ((to->to_flags & TOF_TS) &&
	+ !(ltflags & TF_NOOPT)) {
	sc->sc_tsreflect = to->to_tsval;
	sc->sc_flags \|= SCF_TIMESTAMP;
	sc->sc_tsoff = tcp_new_ts_offset(inc);