From nobody Fri Oct 07 02:35:41 2022 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 4MkC8s3Ymsz4f5DR; Fri, 7 Oct 2022 02:35:41 +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 4MkC8s2mR9z4G8T; Fri, 7 Oct 2022 02:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665110141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+dfCNsYoJ/q8nLoDn2if1NWhLqiiLmC3rItmOI4zOs=; b=HzQnT9wpsJPwEUPyZxNdtCOLBgxGB51jppM6iLjfRmgKPFbC0/VVHQyCoUp+maslHF53Dw hCnpzn16OY/o6Ct0V7PsFIlZUMpwk273VB5cW9xQcQ/eprsvWr8kmLH4dOQkbLZe3FGLxK wBjGA+mXbk6HTE4oWcc9hwqI/Tf6Hiyi78Vtt8rDYdy1xknjDf5O795wm/ezdaf8/OfNEu KyjaTRLywqfjeYQFOzV8fh1v8t9obiGGSOcQoDQPGXXt/JDegLs199nc+K50PW3xK8t7cT QgqM5Z+u9rtptArGsEvvq0BrYyyMRpZRLzjUgrZtvp+3lIzbxinvOKgIq9uoRg== 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 4MkC8s1TdPzS1Y; Fri, 7 Oct 2022 02:35:41 +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 2972Zfxh090648; Fri, 7 Oct 2022 02:35:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2972ZfcF090647; Fri, 7 Oct 2022 02:35:41 GMT (envelope-from git) Date: Fri, 7 Oct 2022 02:35:41 GMT Message-Id: <202210070235.2972ZfcF090647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 51c0184297eb - main - systat: remove INP_TIMEWAIT 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51c0184297eb7c57361927cf9632a85320bc4adc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665110141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+dfCNsYoJ/q8nLoDn2if1NWhLqiiLmC3rItmOI4zOs=; b=Qv+ZFQSK2OBX+umwe5Sa5XszEMntHi4NOjIoHn5nYAWeCgcb85fdVdo6xCJUM1NjON0Vk4 jcnElGl1/Kx+RywLim+t707uO9eyw3d+e3qZHL17nHd97xQktYZJi2FHe5fyQJ8RA4nrCT I8E4kZXX4kErV55OBBpcT2kvCPWp5xGa3c+IBQjO2qXS25iBuRCzegMKmnHMasntgxz5va Ep9QmeHzIDejm2bZg7xKA6tMSbYDtGJ3HPtg92BBfp2fQH8dKSdjJu2fanltA3ARw9RR4g xW73sRWM601xtCwJqyhE92pZJfZw18vxgbUsWb2JcnwzVyTJ98lN81omAZXd/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665110141; a=rsa-sha256; cv=none; b=t8ukKWaYfvmfriLiygSdrnp7W7GPp5WF4kYG3+ccJ4iC9VhIxtU72VE7YN9JMNffqjD+Ym LVqUuOh+ClAx0HlS6K4IfUYumsEPP0tEuf5bqtv7vDp7Q4Ppochqm3Ot9pKQaAHN1hmMCv oi+/zJE3/jArgVuhK2nphRA3lUZFERC1AP2lVm5mWIiUAAnNWzsZSiC5ecPStyGbwlZovE idPeCeC1eSwJ6ly7oASdQ1P8Jt1+/5NMSN7VxnY53pLEygj3GYtoZuaDnRUL9sJWpBI744 Nyux0xhyV3TzJKm7kdopSzIro5SJP3rJ+G7SX0XeouFVyCRgTw0DH/kT1YNXSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=51c0184297eb7c57361927cf9632a85320bc4adc commit 51c0184297eb7c57361927cf9632a85320bc4adc Author: Gleb Smirnoff AuthorDate: 2022-10-07 02:22:23 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-07 02:24:37 +0000 systat: remove INP_TIMEWAIT --- usr.bin/systat/netstat.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index 96d4194db72d..dc1e08c590dd 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -222,17 +222,9 @@ again: if (nports && !checkport(&inpcb.inp_inc)) continue; if (istcp) { - if (inpcb.inp_flags & INP_TIMEWAIT) { - bzero(&sockb, sizeof(sockb)); - enter_kvm(&inpcb, &sockb, TCPS_TIME_WAIT, - "tcp"); - } else { - KREAD(inpcb.inp_socket, &sockb, - sizeof (sockb)); - KREAD(inpcb.inp_ppcb, &tcpcb, sizeof (tcpcb)); - enter_kvm(&inpcb, &sockb, tcpcb.t_state, - "tcp"); - } + KREAD(inpcb.inp_socket, &sockb, sizeof (sockb)); + KREAD(inpcb.inp_ppcb, &tcpcb, sizeof (tcpcb)); + enter_kvm(&inpcb, &sockb, tcpcb.t_state, "tcp"); } else enter_kvm(&inpcb, &sockb, 0, "udp"); }