D39693.id120668.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39693.id120668.diff
View Options

	diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c
	--- a/sys/netinet/tcp_log_buf.c
	+++ b/sys/netinet/tcp_log_buf.c
	@@ -1432,11 +1432,11 @@


	INP_WLOCK_ASSERT(tptoinpcb(tp));
	-#ifdef TCP_ACCOUNTING
	if (tp->_t_logstate) {
	- struct tcp_log_buffer *lgb;
	union tcp_log_stackspecific log;
	struct timeval tv;
	+#ifdef TCP_ACCOUNTING
	+ struct tcp_log_buffer *lgb;
	int i;

	memset(&log, 0, sizeof(log));
	@@ -1468,15 +1468,15 @@
	}
	}
	skip_out:
	+#endif
	log.u_bbr.timeStamp = tcp_get_usecs(&tv);
	log.u_bbr.cur_del_rate = tp->t_end_info;
	- TCP_LOG_EVENTP(tp, NULL,
	- NULL,
	- NULL,
	- TCP_LOG_CONNEND, 0,
	- 0, &log, false, &tv);
	+ (void)tcp_log_event(tp, NULL,
	+ NULL,
	+ NULL,
	+ TCP_LOG_CONNEND, 0,
	+ 0, &log, false, NULL, NULL, 0, &tv);
	}
	-#endif
	/*
	* If we were gathering packets to be automatically dumped, try to do
	* it now. If this succeeds, the log information in the TCPCB will be
	@@ -2910,7 +2910,7 @@
	continue;
	}
	/* If we reach here its a allocated closed end request */
	- if ((ent->start == offset) \|\|
	+ if ((ent->start == offset) \|\|
	((offset > ent->start) && (offset < ent->end))){
	/* Its within this request?? */
	fnd = 1;
	diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
	--- a/sys/netinet/tcp_subr.c
	+++ b/sys/netinet/tcp_subr.c
	@@ -2423,13 +2423,13 @@

	CC_ALGO(tp) = NULL;

	-#ifdef TCP_BLACKBOX
	- tcp_log_tcpcbfini(tp);
	-#endif
	TCPSTATES_DEC(tp->t_state);

	if (tp->t_fb->tfb_tcp_fb_fini)
	(*tp->t_fb->tfb_tcp_fb_fini)(tp, 1);
	+#ifdef TCP_BLACKBOX
	+ tcp_log_tcpcbfini(tp);
	+#endif
	MPASS(STAILQ_EMPTY(&tp->t_inqueue));

	/*