From nobody Fri Feb 27 07:56:34 2026 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 4fMgdG3XSNz6Tqk1 for ; Fri, 27 Feb 2026 07:56:34 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMgdG1453z3vmp for ; Fri, 27 Feb 2026 07:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772178994; 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=u2qR766iZo713PEfkQnX6cWnGzFTiwHsyxKeS/epWDc=; b=RLdXLRi40JJCrUGE7iLaRh4cUE2SDUdafQSZwrX+PBiKiyfOpWv/zL7s+GzbaQCtzwaoql V88+Nt3BLBWPfP25biSlyehgc6rUwYkCJafO3qjqe6g56UUjbHrTJwEZCFPzTmfD3QwVjl rchCcBd7R+WQIcckb7Ln2qJxrKIw2XXtWH+xGuFoTDs/t1V3/B7EX17ZwlSig06qAa4JHP dr8OFnU3kBgq9bPbwoG/N3Elinu317FLnc5yTqs6F4NtB/NlBLRAUtN+gbQaoMXB2kTOom XxFWeQJpQLvY0lxihEIZSrJbFktJ4LAVHpJvQ+d1UZyfXuKrduAuohbTtvAD5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772178994; a=rsa-sha256; cv=none; b=q0Pcp+RPh9W6JapyXHZhWOUHvtUdAgfXvxSXSL9YZVOlcfEy90pDn+LArdEucUT2cBRgWK IAMf9e4PFIwH8VIDuVEnnZ1V8KqrVGUDeBIwrPbhyNahQlP94uhVT3Au0mUTw9eiwB2hVK rlw0Yp5fXADe0pjOtSTkpefa2eEfmQeS1e9xa4VhyHJtaCTb1TXmcyK+m4DnzAM8Cur1Yx k2m5qlzFdXdhIVnZei9FtknJtaf1y6wTys5YB5UWCF+FHUZcwJcZJv1p5C+WVlqt0Y10SW v4q/UhX5X4sdjIHmMiQt2wGmZwF8X+ko6GCRGU5FNBYzHNcTIBkMNkuhNVDEdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772178994; 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=u2qR766iZo713PEfkQnX6cWnGzFTiwHsyxKeS/epWDc=; b=u+B//JuKIDIdtoKlS0513k+5IqN+5eXhbc1VwPoZNuyZmLdMWopRz6pvWT4LP3NPhu8Vlb NPV+K83tUysSrVtbeAmR/xxYEVZ5Wf4KOeofUwgtuHSslhKCXNjTMmPcxbM+drWXO2BE4l UxqxCqRRLzNrbm4HNSaDMtddStGXq9n59MbMYMBRXvrrY8ok5qk35hPrPFXAHF4a6I0wDN 5frMeIUs2/FsoEhEXxNGQr7Ckyt0He1qBfyI4ZNzMV2j9bVcOFh3NS19XOawbwK5RapOIf Zn+AsR87wNkkesXv1PuKI4+8wfqDgr5ONWs2/7djUzFEKAYKI10t5Derd9W0uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMgdG0GnFz17WB for ; Fri, 27 Feb 2026 07:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19f22 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 07:56:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 6bd97e9e01ff - main - sctp: fix NOINET build 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/main X-Git-Reftype: branch X-Git-Commit: 6bd97e9e01ff159eef49b2521fdbe67d5db10d95 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 07:56:34 +0000 Message-Id: <69a14e32.19f22.11b1a73c@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd97e9e01ff159eef49b2521fdbe67d5db10d95 commit 6bd97e9e01ff159eef49b2521fdbe67d5db10d95 Author: Michael Tuexen AuthorDate: 2026-02-27 07:51:29 +0000 Commit: Michael Tuexen CommitDate: 2026-02-27 07:56:01 +0000 sctp: fix NOINET build Reported by: ngie Fixes: 454212b9718b ("sctp: fix so_proto when peeling off a socket") MFC after: 3 days --- sys/netinet/sctp_syscalls.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index 01f241d29637..4837925fdfd7 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -29,6 +29,8 @@ */ #include "opt_capsicum.h" +#include "opt_inet.h" +#include "opt_inet6.h" #include "opt_sctp.h" #include "opt_ktrace.h" @@ -77,6 +79,9 @@ #include #include #include +#ifdef INET6 +#include +#endif #include #include @@ -173,7 +178,21 @@ sys_sctp_peeloff(struct thread *td, struct sctp_peeloff_args *uap) td->td_retval[0] = fd; CURVNET_SET(head->so_vnet); - so = sopeeloff(head, &sctp_stream_protosw); + switch (head->so_proto->pr_domain->dom_family) { +#ifdef INET + case AF_INET: + so = sopeeloff(head, &sctp_stream_protosw); + break; +#endif +#ifdef INET6 + case AF_INET6: + so = sopeeloff(head, &sctp6_stream_protosw); + break; +#endif + default: + error = EOPNOTSUPP; + goto noconnection; + } if (so == NULL) { error = ENOMEM; goto noconnection;