D38436.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D38436.diff
View Options

	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
	@@ -90,6 +90,9 @@
	#include <netinet/tcp_var.h>
	#include <netinet/tcp_syncache.h>
	#include <netinet/tcp_ecn.h>
	+#ifdef TCP_BLACKBOX
	+#include <netinet/tcp_log_buf.h>
	+#endif
	#ifdef TCP_OFFLOAD
	#include <netinet/toecore.h>
	#endif
	@@ -1013,6 +1016,20 @@

	tod->tod_offload_socket(tod, sc->sc_todctx, so);
	}
	+#endif
	+#ifdef TCP_BLACKBOX
	+ /*
	+ * Inherit the log state from the listening socket, if
	+ * - the log state of the listening socket is not off and
	+ * - the listening socket was not auto selected from all sessions and
	+ * - a log id is not set on the listening socket.
	+ * This avoids inheriting a log state which was automatically set.
	+ */
	+ if ((tcp_get_bblog_state(sototcpcb(lso)) != TCP_LOG_STATE_OFF) &&
	+ ((sototcpcb(lso)->t_flags2 & TF2_LOG_AUTO) == 0) &&
	+ (sototcpcb(lso)->t_lib == NULL)) {
	+ tcp_log_state_change(tp, tcp_get_bblog_state(sototcpcb(lso)));
	+ }
	#endif
	/*
	* Copy and activate timers.