From nobody Wed Feb 01 22:47:49 2023 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 4P6cWT43bDz3cFVJ; Wed, 1 Feb 2023 22:47:49 +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 4P6cWT3J7mz4Psf; Wed, 1 Feb 2023 22:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675291669; 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=60rtUCFXjCFjfHCKDIatVxgZGs6SmMA70bMeVVyB1NM=; b=A5lvTOCKk44obRy8mmU567TyzdchSEL9no6KFWtyTmX8EYMATCGUpjKNcyqBGsL80QN2B2 G7yjBm1mD0Gzxl1MMrFwU089DJ+YDK7zyzKD625DBXaXodGPtkmSabfSZFCFdxSJngqmYS NJrqy3xzja1V/z8UzQTOfOVuhPIijzvv3pSkYsoOXhBBbRKE9aS+nUqBi8Jk1dgpQ8kQMX WSjsic1s1XQIu5i+qLyH/Ht5394tUyRaPyLC77RZyfLMzZl/2XybIH3/TvicRAYwWhhz/1 KfPGfHRzk5rsn/h/QH+iOU+WnGXlO7U0JTdQbO+l8guUfifelvE+Z786FDiSBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675291669; 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=60rtUCFXjCFjfHCKDIatVxgZGs6SmMA70bMeVVyB1NM=; b=tfyQByPOO8Wtd1XxLoiVJbA3CLyeGXZ7os0U8zPoYW+k/AQJWrmQDGmbdeS8T0veP/6kXL nkg2NOJC4Uh93oHEBK01FFpAf1UIERwXjhXXN7YPMwf7XbPsuwOFj7FepCs81v2mVogiML wSIHXqiBbWiUu4/UmXPgjj6hmPVzMg7oQkBQMGqvQMiL0q8hrNj4qM1twJQNAKUGVMEDdK eTMxqFfeXksYaIzCh0ztuG6Z2lvY5Ox9iSe0UaiCxTN0/Nkb1xe22w/RElZof16Tnq3Brs fBt0vtraf0Da9e2QSh7wtXW5tqj/lPlAEqgfi9pW3a2RtvzIbN4bEuUbnoD3bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291669; a=rsa-sha256; cv=none; b=ci23RxwHngwOtHDqeNcCo5QDR9e29mOfKnoJMXn63Z4yeLhRU64y9eFNHeX1UKptMdj+8e gK5IaWfuT2eGmelTVIHH+CqmhbnBHhT6rGVi02isAuSh90JXut0N2PirJF9NCgS3wUR+LC aOyNuhO8LFwLvGWqJ9KHmzDh1UjuLp6Mati8sIlRafICg/fDf+eIfsz8lJ2qvNyd4VJXCw FDwy+aKw/jDUaCUd75aVSG9xUSzNNvVBU/gv+eSn5yYlrx04hL+UHkbgwHS5k3GVEGetIr BUGw2E/YaMDfCWIwautAqjzBiyCTOnKobO9eaxZlqolla/qfpLu5Y0QshlAg4w== 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 4P6cWT2M3szWmm; Wed, 1 Feb 2023 22:47:49 +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 311Mlnab003500; Wed, 1 Feb 2023 22:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MlnE9003499; Wed, 1 Feb 2023 22:47:49 GMT (envelope-from git) Date: Wed, 1 Feb 2023 22:47:49 GMT Message-Id: <202302012247.311MlnE9003499@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: 429c706669e8 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 429c706669e887139aa64e7b573757865a40a2bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=429c706669e887139aa64e7b573757865a40a2bc commit 429c706669e887139aa64e7b573757865a40a2bc Author: Michael Tuexen AuthorDate: 2022-05-14 06:05:03 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 22:47:23 +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. (cherry picked from commit 9312ba239e05b035c965e5790f70fe71a4ed2e8c) --- 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 29d8c6a5e964..f2065beb2bb2 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;