From nobody Sun May 4 19:14:33 2025 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 4ZrDqY3cxCz5v7ns; Sun, 04 May 2025 19:14:33 +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 4ZrDqY38K2z3Rwm; Sun, 04 May 2025 19:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746386073; 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=TQPZ80ixkFmJ/XyqdEpkKDTfv+YB0STp+auh43CbKVQ=; b=vbTOGwlU0N+RZz71tPgr2/AV04PWeIHkOI/r9UYyu8b1I3lMCech5s+9d+KJ4N4Ie4UAQ0 OMN4uZNht81PkPXQq9nlzp8BcbqtnpzU3LPoXr3UZAlUBhUIDyXU9r8BqWdLazN3VjCP9N sM5mdlnd8a3+vXynEOw3BIJt4CCiSqo/pA6cD7y2u9E3V5OjwmYyUnmLiym0y9IH5G7YZI kFwUB5X8DBS96I/UakzLbY84FNXz1Gwut+SSN8WKTYC4Wf28JXM5H8kCmbO3exGY//xF53 /buTBJCaa9aXPURqdLUfvYDWeINI2l7qXPVh3kgZvxHjWMK7nVH2AaEiYVeLXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746386073; 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=TQPZ80ixkFmJ/XyqdEpkKDTfv+YB0STp+auh43CbKVQ=; b=QDK60RukYbALobwNhq0vDyT52c6FzkGnwzSCMh2Rnkl/Au0/TJN9htjXoGfvgKpkeaMBI3 xyYPUfY7wVdYUAwGajG8X3VOdvpwspmUXjO0hN3cr1llDBfJIiTHd3Q8hc+xXYaDN7ntTo jDAelIqhlAxQGe3pXWejR/pzL9A8dN19RAZXTwfeNsbZsqgK4+NVamt/qKtHvWOlZ/yzJA HPgjFAE4bgJj5gug+MJoAxGYIhCxat/O6X9XSWdza5htohsA5tbGeKRjvmHPXePHza5Yys wzDQhLKa47NaDRR6xfzvh5FXsrFPLGdZpulJfFhzNHQNmqcesWZxWmEmwMPxWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746386073; a=rsa-sha256; cv=none; b=CiaYTEpKj6sUky5iDhf0v8ITnqE0BdtOfYiP8L7AIDuJBOoNn/ZLF9TwOrHe2DvMAhv99o huw5wAO5Al5y2cYWCBOrnJ9J44OpLdmXw/wTREKlpM05K3EKi2FTe9PSW6T/53by8LpF5H EqEN/8gtiGwMxgpBWtuv/+plAGqHt5T7tipGC8ke+1xobMmJs3VSnSMGlAJt10hNN8aJVQ zq4Z+ZeVnixdGH3Hh5Tbx/Ypb0+W9O4CFX3BSWSk1NrnTXG+Z8gF5RQZ+8zc+lVpexXOhS XxdWuXyV2gXawfuQ0gZy3ZWw2I11OSGG0h9yL1ZkPMMlOSYDQCZ0IdXb3azpHQ== 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 4ZrDqY2gR6zhDc; Sun, 04 May 2025 19:14:33 +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 544JEXFv004024; Sun, 4 May 2025 19:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 544JEXFb004021; Sun, 4 May 2025 19:14:33 GMT (envelope-from git) Date: Sun, 4 May 2025 19:14:33 GMT Message-Id: <202505041914.544JEXFb004021@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: 9639de2a6f7e - main - sctp: fix mapping of interface address flags 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 9639de2a6f7eec8b2158782fbfab3419d507fdc5 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9639de2a6f7eec8b2158782fbfab3419d507fdc5 commit 9639de2a6f7eec8b2158782fbfab3419d507fdc5 Author: Michael Tuexen AuthorDate: 2025-05-04 19:05:48 +0000 Commit: Michael Tuexen CommitDate: 2025-05-04 19:11:08 +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 MFC after: 3 days --- 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 */