From nobody Sun May 15 09:47:04 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 8C9F11AD08CE; Sun, 15 May 2022 09:47:04 +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 4L1HbX3SKcz3jkK; Sun, 15 May 2022 09:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652608024; 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=h9vhb2qoKm9s1wqLzL+fch+qk4+REAN4Vpx/pgjdxgM=; b=C8APtfB77YvR08fVAxl5mDhVoMLL7XlVKOAmxhnWGOTyE6WtnToVUBy9u+Ojgd9907Fqht La0dVdOzABWK6nQI25BcWWYvJnuQcPJn2uY1sgOB2hzZefNE1xPBq4zmHuFvkAaU6+zbOX m3McrHikp+BKNIEXYwRMbil8JbvEqkesRcq0af23eTds1yWYIWUc+TUZBaHw4YZJKtPIwO D9Jk4LH8/JoPnHa0cm2A/C4RHgyJWlZuq2EPhgqXpxZ2np05yoN6sXIWKcohHLvYoLbGJU g37hZRa+JnGVi3KYZzLW/ENjEsBjHn+MA1a+cmFtAmhhoic0SSwDUAx+1BJ/oQ== 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 56CEB167B; Sun, 15 May 2022 09:47:04 +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 24F9l4VT094380; Sun, 15 May 2022 09:47:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24F9l447094379; Sun, 15 May 2022 09:47:04 GMT (envelope-from git) Date: Sun, 15 May 2022 09:47:04 GMT Message-Id: <202205150947.24F9l447094379@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: 9312ba239e05 - main - sctp: improve path verification 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9312ba239e05b035c965e5790f70fe71a4ed2e8c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652608024; 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=h9vhb2qoKm9s1wqLzL+fch+qk4+REAN4Vpx/pgjdxgM=; b=rsUmdm4E0UPVTEwmH317xpeBcODW4H6m9EhTQ8V9EwPMcNkqIDkxstgbOJkN2YTz5Uj7us OAw1PhMYU4kE34X70CT3lpEOMB9tuIjmQQZLENSnrRlBahlhb5rvyLjcE3xmLgJceqlNO0 jD3sJtYPMRVoqMaDvXnf5maLMIn5QiaH/Ks9eWqeHVcBZDNakhc7Mi343KkYZJGq0ZpF9I aOfmi4itfIrhec9+qdm6UsyWlm6E349i3Oob3G6IWM3sbXTreZ62DBcwI1+MVRHatXbOm9 T9UPY/pDVMiSzBN/E92ify2tFrerpsEynso4oIXM7yXEuFM1ZgZAQOtdmTi7zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652608024; a=rsa-sha256; cv=none; b=DATZWF5MSXD3lUu6bPQFLq9m4rmcgijICsn2KA/l1lMHgx3JgA0UBqIJ7R/RjzkNKtx+HW +SeVEDe50sb3rCHfImIjb3iGPkRFxq0l7ORPy16QD8I22f5K8K0FKsZ7DqLxlREA3JT13O GYWrTEnpmy7JW4rk9PIi/6EVswLfhsTxDjEBlaiCR0AhRkTbMlqBpvGo4Y7vyQN6ceuUjz eNxCqCVcognyLLJ6trxifzod0g0RENT9rGJaxftrNviw/Hk5M2Ln9lU2NiEDJSlUZqjyDi fH5DKWZje8jrfJNck7t6TVeR0S3Ncy26EHYsxiYWj3LkTFwjzBdKYCLkm4CBsg== 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=9312ba239e05b035c965e5790f70fe71a4ed2e8c commit 9312ba239e05b035c965e5790f70fe71a4ed2e8c Author: Michael Tuexen AuthorDate: 2022-05-14 06:05:03 +0000 Commit: Michael Tuexen CommitDate: 2022-05-14 06:05:03 +0000 sctp: improve path verification When sending path confirmation heartbeats, do not take HB.interval into account when the path is still reachable. Thanks to Alexander Funke for finding the issue and suggesting a fix. MFC after: 3 days --- sys/netinet/sctputil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 7ac6ce6177d0..1f0b52a205fa 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -2300,7 +2300,8 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb, } else { to_ticks = UINT32_MAX; } - if (((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) && + if (!((net->dest_state & SCTP_ADDR_UNCONFIRMED) && + (net->dest_state & SCTP_ADDR_REACHABLE)) && ((net->dest_state & SCTP_ADDR_PF) == 0)) { if (net->heart_beat_delay < (UINT32_MAX - to_ticks)) { to_ticks += net->heart_beat_delay;