From nobody Mon Nov 01 23:11:43 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 182E31833452; Mon, 1 Nov 2021 23:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hjph00FS2z3mqD; Mon, 1 Nov 2021 23:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DD17E1A504; Mon, 1 Nov 2021 23:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A1NBhuA014892; Mon, 1 Nov 2021 23:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A1NBhJh014891; Mon, 1 Nov 2021 23:11:43 GMT (envelope-from git) Date: Mon, 1 Nov 2021 23:11:43 GMT Message-Id: <202111012311.1A1NBhJh014891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 8e2796878626 - main - inet: remove tcp_debug from netinet/tcp_debug.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e2796878626ccc2fc15e4911a16af8a9fa7819a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=8e2796878626ccc2fc15e4911a16af8a9fa7819a commit 8e2796878626ccc2fc15e4911a16af8a9fa7819a Author: Mateusz Guzik AuthorDate: 2021-11-01 21:28:54 +0000 Commit: Mateusz Guzik CommitDate: 2021-11-01 23:10:30 +0000 inet: remove tcp_debug from netinet/tcp_debug.h It was a hack only needed for trpt, which can just define it locally. This makes it possible to fix up systat which also includes the file. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netinet/tcp_debug.h | 6 ------ usr.sbin/trpt/trpt.c | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h index c44930724b66..0b3c895e9909 100644 --- a/sys/netinet/tcp_debug.h +++ b/sys/netinet/tcp_debug.h @@ -73,10 +73,4 @@ static const char *tanames[] = #define TCP_NDEBUG 100 -#ifndef _KERNEL -/* XXX common variables for broken applications. */ -struct tcp_debug tcp_debug[TCP_NDEBUG]; -int tcp_debx; -#endif - #endif /* !_NETINET_TCP_DEBUG_H_ */ diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c index e8198f7d080e..59727cadaaba 100644 --- a/usr.sbin/trpt/trpt.c +++ b/usr.sbin/trpt/trpt.c @@ -85,6 +85,9 @@ __FBSDID("$FreeBSD$"); #include #include +static struct tcp_debug tcp_debug[TCP_NDEBUG]; +static int tcp_debx; + static struct nlist nl[3]; #define N_TCP_DEBUG 0 #define N_TCP_DEBX 1