D28652.1778247624.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28652.1778247624.diff
View Options

	diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
	--- a/sys/netinet/tcp_input.c
	+++ b/sys/netinet/tcp_input.c
	@@ -1644,7 +1644,8 @@
	TCPSTAT_INC(tcps_ecn_shs);
	}
	if ((to.to_flags & TOF_SCALE) &&
	- (tp->t_flags & TF_REQ_SCALE)) {
	+ (tp->t_flags & TF_REQ_SCALE) &&
	+ !(tp->t_flags & TF_NOOPT)) {
	tp->t_flags \|= TF_RCVD_SCALE;
	tp->snd_scale = to.to_wscale;
	} else
	@@ -1655,7 +1656,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();
	@@ -1664,10 +1666,12 @@
	if (to.to_flags & TOF_MSS)
	tcp_mss(tp, to.to_mss);
	if ((tp->t_flags & TF_SACK_PERMIT) &&
	- (to.to_flags & TOF_SACKPERM) == 0)
	+ (!(to.to_flags & TOF_SACKPERM) \|\|
	+ (tp->t_flags & TF_NOOPT)))
	tp->t_flags &= ~TF_SACK_PERMIT;
	if (IS_FASTOPEN(tp->t_flags)) {
	- if (to.to_flags & TOF_FASTOPEN) {
	+ if ((to.to_flags & TOF_FASTOPEN) &&
	+ !(tp->t_flags & TF_NOOPT)) {
	uint16_t mss;

	if (to.to_flags & TOF_MSS)
	diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
	--- a/sys/netinet/tcp_syncache.c
	+++ b/sys/netinet/tcp_syncache.c
	@@ -1655,7 +1655,8 @@
	win = imin(win, TCP_MAXWIN);
	sc->sc_wnd = win;

	- if (V_tcp_do_rfc1323) {
	+ if (V_tcp_do_rfc1323 &&
	+ !(ltflags & TF_NOOPT)) {
	/*
	* A timestamp received in a SYN makes
	* it ok to send timestamp requests and replies.