From nobody Sun May 15 09:49:04 2022 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 4BDEB1AD0E3E; Sun, 15 May 2022 09:49:05 +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 4L1Hds1cmzz3k4v; Sun, 15 May 2022 09:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652608145; 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=lilbVqrlapv5AbaSBH/oJ0yZ1dyiXkwl2gR8LBe53Ws=; b=Wvn441WnWq6j4Vu6k0ot1ed9zAebrU7pFLKLv189tC7r6mCrGR9UI/+KiWGczg1N5WLf88 G/wZS9p2pn5tg52Pu1Rp01qp6pS9hskCLhuNt/QA3MeeEOzmYJe0RGa2s7U3oEYLX9imy1 UTQ6cBgC0nHyRMkY3NavNn57osGLX6TWHIm6YQ6f1O5SOmxOoS7Zleo9n8D3IPfOkbjUdw jcU8S6pjpxEWhCFv9tHVJ0MF0CVhNQgX/5/zhm2fWG4laXcl/KsleaxmMFK+E3Umtq3c5T m95D8UEjiR54m4+mjI1TNNq2mQM26G+Z2Zln5zfEnOHsK9eh3KMHMXyumB0Cuw== 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 17651167F; Sun, 15 May 2022 09:49:05 +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 24F9n5ap094616; Sun, 15 May 2022 09:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24F9n4Uc094615; Sun, 15 May 2022 09:49:04 GMT (envelope-from git) Date: Sun, 15 May 2022 09:49:04 GMT Message-Id: <202205150949.24F9n4Uc094615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: aab6e5bd1e2b - main - sctp: improve path verification 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: aab6e5bd1e2b2919604eed68f76d4a7bb73ccb0c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652608145; 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=lilbVqrlapv5AbaSBH/oJ0yZ1dyiXkwl2gR8LBe53Ws=; b=PFVY/6/PsWjm1kpz6p0nrSdtX9bEY3o8BYr/SCxI2AiofXmJLRv1jKj85AC4y2BksIOg9i atqAu7g/W7QZz+TmSvKC+yzTKMdThjkq2i55Wz1iqzl8i6FRS7BFZG/1rDNUzkqgNZx4aN MmrHVGEM3Wabry1m9QZ49Jd+Ls5WBHdQP13Mb2N0xQqZvCBvfSzYLVsxZBH66Hwp4C0Yfl aOOuNN55GqXASLQnW21innon/n/8zBxpvdUzg/67pH14P2KAeITc7Qeaxqz3dmYA0fKlJ4 uRr2imyc+Ixtfk8GLb/HGnKhdtfDA4wdHUMLwCPbGfapqIZ9DP/QkJji1GmQkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652608145; a=rsa-sha256; cv=none; b=AIVoUk2fXhNsUR66VYxWQotiybumagsvtcRKn6xjYvKFBSSf640pAD5YlSwAXi29X38x7Y DJIuaRKyg+FyjzVBQkZRT5W6QTypF60ZsXdTdbyXSofw3ZJgLX0g4XNCiDbITGg4UtRtaT PTs9DHRfGV65K3lBtw7PXloV7tTSvcmriB43sndYuFc1q/Yskv7ev0TlPkahsN+XXreXJZ qIGUBCvsopAQg5UlBo4DCgvxcG1AqjPDwvwi5ZloUyWCiS7WK1MFHFBupdKIVwmOG7FHhk zkBRtf01xGP/n3GtsuZVtzocPT2ZwqvA7UWsym/LO3PVuMimtKaLRnliZ+6Z1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=aab6e5bd1e2b2919604eed68f76d4a7bb73ccb0c commit aab6e5bd1e2b2919604eed68f76d4a7bb73ccb0c Author: Michael Tuexen AuthorDate: 2022-05-14 06:07:28 +0000 Commit: Michael Tuexen CommitDate: 2022-05-14 06:07:28 +0000 sctp: improve path verification Ensure that a HB can be sent faster than a HB.Interval when performing path verification of a reachable peer address. Thanks to Alexander Funke for finding the issue and proposing a fix. MFC after: 3 days --- sys/netinet/sctp_timer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index 04c750b990f1..9eff569e0f53 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -1439,7 +1439,8 @@ sctp_heartbeat_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb, (TAILQ_EMPTY(&stcb->asoc.sent_queue))) { sctp_audit_stream_queues_for_size(inp, stcb); } - if (((net->dest_state & SCTP_ADDR_NOHB) == 0) && + if ((((net->dest_state & SCTP_ADDR_NOHB) == 0) || + (net->dest_state & SCTP_ADDR_UNCONFIRMED)) && (net_was_pf || ((net->dest_state & SCTP_ADDR_PF) == 0))) { /* * When moving to PF during threshold management, a HB has @@ -1459,6 +1460,7 @@ sctp_heartbeat_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb, ms_gone_by = 0xffffffff; } if ((ms_gone_by >= net->heart_beat_delay) || + (net->dest_state & SCTP_ADDR_UNCONFIRMED) || (net->dest_state & SCTP_ADDR_PF)) { sctp_send_hb(stcb, net, SCTP_SO_NOT_LOCKED); }