From nobody Wed Apr 17 14:01:40 2024 X-Original-To: dev-commits-src-all@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 4VKMys05rnz5GxYQ; Wed, 17 Apr 2024 14:01: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 4VKMyr6Vc0z4t5D; Wed, 17 Apr 2024 14:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713362500; 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=GYatw+r7F3IUNe5a9bxEaee1l/2iYXjeTkc/5YrJius=; b=B4hTGLMIYMtbigzHsVcdpwGqP7wJw5nkXQn9sIeqvHMLtUSSUxsZZjoagmVfElcOzKTuxb gkwS19z5HsdmEYklh3hNzvHMaudOSturGV0wAZf/JzUG9TUEPbkyDUCM0GrOUYd9Q45EhE IIXitEXjH4q0F5F/4LrlV01wBHmvJtg0t52i2SQJEeMBtHx4NHzTfzfSrOlkXQTook2CmI hRq1wYOcYSf8PVIY+RJ45QlO2/JqOs65KaQaQOHxr8HCw7WcufYr2yfU07cktS1Yg7iEBl RHoo1YJnYQArxitcJKqU5LOBF/IpVfvlS/4OskfcCY74arRL8Y6pvPCOn4X3Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713362500; a=rsa-sha256; cv=none; b=kmlt6bd49iVdD3iAY5xnJ8J9lIPRFfi1huKM5siXdLwTdzPEvOMlKQb2X4EJa+rvgXVSQ1 hdVhPQNqx72P4FoKwRNpiHcaDSJnh4QLCjhDYxQQprDnrDvZeNFcqD1ktoLzSNqfhO/TUr ir6RTaGe97jLivUsxmV4wpr3ZtMmEIbe71OhXREkA2pjdeW2xnIuAeA+EKchQGEg3JIsXM 5iQoLsbvsHDT4X0/NcTWUUrpE4kT6OUQ+RMopqnDDnQijDUcpyhmoK32v5GxuHoFedxuB4 TEUilG2ntAckQFLxefenAy/2KPgedrybZPj7DRs1qDd7WARB8jpGBGHKoKoE1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713362500; 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=GYatw+r7F3IUNe5a9bxEaee1l/2iYXjeTkc/5YrJius=; b=fcZQAeNLEqZIYzRKKPMN0elwiLHgdy/ER9Uz4RRWaEhkBWWIwYfT8/OYnGshSC8S9vRQxl 5cdvr3L0j5q3yy0Q8bSTlIeQft5vDvHnm0FvAtWdBmjf0tpKrTRnu99Xii4HQh54/w9hwv nfJxIuUWmHbMfsmoduNjtkne/nlgFsTIaipJMb+WCiFHgAe/YTZmn1Dvg7dCMtaqUEnfp5 3SEflw2DL3fotSyxD7pJkkk2EV47lRf+Gd5aWYKqWh2IVyUvkU1jfvOpcdOmUzz98Q+07h Z60ps/kyl8arqoaTvFp08LqNiZPoXk77vxfFxdK8Rn5/fZw3S+RZje9TlSj6KQ== 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 4VKMyr66K2zTQN; Wed, 17 Apr 2024 14:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43HE1e6x052178; Wed, 17 Apr 2024 14:01:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HE1eDN052176; Wed, 17 Apr 2024 14:01:40 GMT (envelope-from git) Date: Wed, 17 Apr 2024 14:01:40 GMT Message-Id: <202404171401.43HE1eDN052176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 5344772af985 - stable/14 - tcp: add some debug output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5344772af985cf95e48cffacdcd2cc19f8cdfbf5 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5344772af985cf95e48cffacdcd2cc19f8cdfbf5 commit 5344772af985cf95e48cffacdcd2cc19f8cdfbf5 Author: Michael Tuexen AuthorDate: 2024-04-07 20:41:24 +0000 Commit: Michael Tuexen CommitDate: 2024-04-17 14:01:12 +0000 tcp: add some debug output Also log, when dropping text or FIN after having received a FIN. This is the intended behavior described in RFC 9293. A follow-up patch will enforce this behavior for the base stack and the RACK stack. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44669 (cherry picked from commit e8c149ab85c7834f76325864f22ca89298e65f75) --- sys/netinet/tcp_input.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 53fa5913311a..dbc2de17785f 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -3251,6 +3251,35 @@ dodata: /* XXX */ len = so->so_rcv.sb_hiwat; #endif } else { + if ((s = tcp_log_addrs(inc, th, NULL, NULL))) { + if (tlen > 0) { + if ((thflags & TH_FIN) != 0) { + log(LOG_DEBUG, "%s; %s: %s: " + "Received %d bytes of data and FIN " + "after having received a FIN, " + "just dropping both\n", + s, __func__, + tcpstates[tp->t_state], tlen); + } else { + log(LOG_DEBUG, "%s; %s: %s: " + "Received %d bytes of data " + "after having received a FIN, " + "just dropping it\n", + s, __func__, + tcpstates[tp->t_state], tlen); + } + } else { + if ((thflags & TH_FIN) != 0) { + log(LOG_DEBUG, "%s; %s: %s: " + "Received FIN " + "after having received a FIN, " + "just dropping it\n", + s, __func__, + tcpstates[tp->t_state]); + } + } + free(s, M_TCPLOG); + } m_freem(m); thflags &= ~TH_FIN; }