From nobody Wed May 21 17:08:23 2025 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 4b2dD81Q5vz5wDCB; Wed, 21 May 2025 17:08:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2dD80CcGz3hRf; Wed, 21 May 2025 17:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847304; 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=6b30fqr/YDz7nzAEWnE2TXkY2lQAPwaGkqNiScUjqkY=; b=pQg/abG8rgsazjsYnCvUUktkGSwGx1LxIEyIu0vFWrGwqxEOUIxecnQK5YXQD1wsUnPBF8 ULGJvjvXCJuKfffL7bOEtsEf0fH92BoeT5RapBGVRoDWT62hjQn8DWfM8VGDZMyeCFZUJG CWZRc9+gKMW9mSV5ozdcjn3r356GQChHso0du1Cv5XEb66YAmuhc/qt6tQah5S5fGBTWYN uc2NRYeO/sk1zl6t5gZfVE8TA41ujX3JT9ZYK8U/pLhIqPETWAcrkNaS8wpIC1ZSL7Q/1F snn3o5npJQdqSknrVx0b4pJ3yGEUBmp8iGfth/GR+3cersr+eCMGTQPpddPrmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847304; 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=6b30fqr/YDz7nzAEWnE2TXkY2lQAPwaGkqNiScUjqkY=; b=FhrDNZv1Z0SdmV3Co0rDudal0I8YJLZMUvkaOSErtbwBgUIH5h1kM9x5EOPpZ7LoBx1Ock crFyAtrZqCR2SzDgFAAF3KEGFKksrFlT0jLnSTLmnLgmAspwUcs0kLrmf+gIZS6auShtbq EKFTixnaFU7PSNVP8Mf++Jk3rnTEDD3VQj1RTcTWkJ2Q7nlAwGri9Bl0VgI/svSLJsXQ9x qFNq3of4scRJbE1OdkpeUfIA9wGNlllQOmtomRKXI9DL3J7UsnK+21uO39omDTkJ18uqJZ RfMDvrIYzPufdB53NAVMJeh1PJ+FHl4RVvMS8JCL5JX4Z4yOTSdhx/OKTpInkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747847304; a=rsa-sha256; cv=none; b=M6CfJJ9G7Wtew+kPWkn5p53sFq6qHn7nGXC1Vli53aKmDgBfsxuU39PeNV7LuvEv7kzxrF CdmYcBeU/tSvnm5LBMRUyZ3ghfemiuFkMFB0+6jJQEpLeNfrXuWrYq/D14gbYomf7tmG5E FO0bO/kVsOG9Bj5zx/lAxKRRklFCWj6Qq+evq2AuOs7z7gVnHeii5Xwbo3KgmVM+cSQyKM p58I5GrEBrtmuiKar7OzBM4sHxUnzms6/VmKZ0QASztFQ84Cop/1A2ZSJkokKKLeJH5wJM 5MYYtG3EL4uhpqgxBMwvqsMZkUWAh/KxDEleZnOF3jdeRABIcGtDokqIZLYKYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b2dD76wTtzkjK; Wed, 21 May 2025 17:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54LH8Nvp099866; Wed, 21 May 2025 17:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LH8NfG099863; Wed, 21 May 2025 17:08:23 GMT (envelope-from git) Date: Wed, 21 May 2025 17:08:23 GMT Message-Id: <202505211708.54LH8NfG099863@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: d300875d011c - stable/14 - sctp: fix mapping of interface address flags 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: d300875d011c056f10dd7ef6915d041c7b559fff Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d300875d011c056f10dd7ef6915d041c7b559fff commit d300875d011c056f10dd7ef6915d041c7b559fff Author: Michael Tuexen AuthorDate: 2025-05-04 19:05:48 +0000 Commit: Michael Tuexen CommitDate: 2025-05-21 17:07:57 +0000 sctp: fix mapping of interface address flags Do not clear the SCTP_ADDR_IFA_UNUSEABLE flag, if it was set due to the address being deprecated. Also don't declare tentative addresses as unusable. While there, cleanup the code. PR: 230242 (cherry picked from commit 9639de2a6f7eec8b2158782fbfab3419d507fdc5) --- sys/netinet/sctp_bsd_addr.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index a10fbcc5ca40..65b271afd84d 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -119,23 +119,21 @@ sctp_gather_internal_ifa_flags(struct sctp_ifa *ifa) ifa6 = (struct in6_ifaddr *)ifa->ifa; ifa->flags = ifa6->ia6_flags; - if (!MODULE_GLOBAL(ip6_use_deprecated)) { - if (ifa->flags & - IN6_IFF_DEPRECATED) { + if (MODULE_GLOBAL(ip6_use_deprecated)) { + ifa->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; + } else { + if (ifa->flags & IN6_IFF_DEPRECATED) { ifa->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; } else { ifa->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; } - } else { - ifa->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; } - if (ifa->flags & - (IN6_IFF_DETACHED | - IN6_IFF_ANYCAST | - IN6_IFF_NOTREADY)) { + if (ifa->flags & (IN6_IFF_DETACHED | IN6_IFF_DUPLICATED)) { + ifa->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; + } + /* Right now, do not support IPv6 anycast addresses */ + if (ifa->flags & IN6_IFF_ANYCAST) { ifa->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; - } else { - ifa->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; } } #endif /* INET6 */