D53540.id165691.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53540.id165691.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
	@@ -1192,11 +1192,10 @@
	if (thflags & TH_ACK) {
	if ((s = tcp_log_addrs(&inc, th, NULL, NULL)))
	log(LOG_DEBUG, "%s; %s: Listen socket: "
	- "SYN\|ACK invalid, segment rejected\n",
	+ "SYN\|ACK invalid, segment ignored\n",
	s, __func__);
	- syncache_badack(&inc, port); /* XXX: Not needed! */
	TCPSTAT_INC(tcps_badsyn);
	- goto dropwithreset;
	+ goto dropunlock;
	}
	/*
	* If the drop_synfin option is enabled, drop all
	diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h
	--- a/sys/netinet/tcp_syncache.h
	+++ b/sys/netinet/tcp_syncache.h
	@@ -45,7 +45,6 @@
	void , void , uint8_t, uint16_t);
	void syncache_chkrst(struct in_conninfo , struct tcphdr , struct mbuf *,
	uint16_t);
	-void syncache_badack(struct in_conninfo *, uint16_t);
	int syncache_pcblist(struct sysctl_req *);

	struct syncache {
	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
	@@ -712,23 +712,6 @@
	SCH_UNLOCK(sch);
	}

	-void
	-syncache_badack(struct in_conninfo *inc, uint16_t port)
	-{
	- struct syncache *sc;
	- struct syncache_head *sch;
	-
	- if (syncache_cookiesonly())
	- return;
	- sc = syncache_lookup(inc, &sch); /* returns locked sch */
	- SCH_LOCK_ASSERT(sch);
	- if ((sc != NULL) && (sc->sc_port == port)) {
	- syncache_drop(sc, sch);
	- TCPSTAT_INC(tcps_sc_badack);
	- }
	- SCH_UNLOCK(sch);
	-}
	-
	void
	syncache_unreach(struct in_conninfo *inc, tcp_seq th_seq, uint16_t port)
	{