From nobody Wed Apr 13 23:09:35 2022 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 1E5B71B40CF6; Wed, 13 Apr 2022 23:09:37 +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 4KdywJ1clYz4lv4; Wed, 13 Apr 2022 23:09:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891376; 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=rzzqTC/RZ2tLxUhm8ZcSJxICOmqBFoXivK07uzPGWN0=; b=pcMORV/8fD6qTtjbFoUVgamaidBm6v478aWs6qIMe3gaOC/9TL1l1Gi2CfbI9NzmErlkZX S6Qu/CrBtVK+OkMzvgFsdizh6/k7IDy27Cg86G4xxAqhT4NrG71ReoJnSW9OdAR7c4j7jR pgAgGgUL3JDEOetlGlv8JcbkS34i8Ot/m8CsRIEP1JVFfucmgw9Ez0PYW9cLiYp3IpqQIg oiLGINlPea6WsTKCHAFI0gkWe944sC/iF91USejgoKhkMv89evRszJ5UCmz7eURLas8NXl nGkKlLDMGgHx/VU5uOHqfEeSimJcF573/E+g15ue60+moaoeqdSTrnCscT7trw== 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 EF6EA15263; Wed, 13 Apr 2022 23:09:35 +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 23DN9ZkK074589; Wed, 13 Apr 2022 23:09:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9ZhZ074588; Wed, 13 Apr 2022 23:09:35 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:35 GMT Message-Id: <202204132309.23DN9ZhZ074588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 29a843177e10 - main - sctp: #ifdef INET-only and INET6-only variables. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29a843177e108c688d7daaccac6ada4d16f01dca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891376; 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=rzzqTC/RZ2tLxUhm8ZcSJxICOmqBFoXivK07uzPGWN0=; b=oEnBsxMUYR9LfAGIdNi/oRS3S3uegFXIc+OiRP/972sAhVLRMbEbGOMbRg/UwvsRaVhnCR KSIK9RazjJ8CsDszvJied8EHc2zk8MSS9kSIjfAbsL/fM9D6RFSXws9r1SrAcAzlXZoOuF wDXzNYaF1+Til6br5iov3JsgtGhhgBUWETscMJV+o4bg8/iqaAzvXQdZQAXmWO6KXtC1ri cAU2zHGrQzRFPYxrQ+yGpZBcw7dF89x3wln+vPQZ7rvg1PCL5Wv8YaOH1c8DaWe5GrCW8r CRJ+IQhLWqBprbkfbXA3poGTVJCZ/1fYTL9ZQxvwNQ4ULuPcqfyaKBDEOumInw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891376; a=rsa-sha256; cv=none; b=NNeIEQoNUuqwORykfH05imReRnxlc+f9KAR+c70XFKKkwkSKtL7GQIR8FS6aY6T/LKL4JG 1L332EltqcjvxIC7A1fFlOAGc9Yd8k8Pr0wZFGw/xBjF/xvpJK9f5TEOp8jD18Widdrlo/ Ny1lrVXCScpFDN5OtDD0BBxEm+XbjRdS482dLMeE+niUo49HUpFdT4LugAtQOqNpMUnO9a S7BNE9vQn/0cyxNtiyXDou6oeZ+fOGeLtvachEkvJP6AGDjp8f2vl6WDxGz3mCEWDwNrCr TxwqBTwEpvbmihWCEYwBqdSlIJl0T+akEAOgLJsCBhXBG+ZZZEznW1Xk+i1uIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=29a843177e108c688d7daaccac6ada4d16f01dca commit 29a843177e108c688d7daaccac6ada4d16f01dca Author: John Baldwin AuthorDate: 2022-04-13 23:08:21 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:21 +0000 sctp: #ifdef INET-only and INET6-only variables. Duplicating the SCTP_PCB_FLAGS_BOUND_V6 check made the #ifdef's simpler than applying #ifdef's directly to the original code. Modern compilers should cache the result rather than testing the flag twice. --- sys/netinet/sctp_sysctl.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index cc0be9ba36f4..34f727363b7b 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -188,8 +188,15 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st { struct sctp_ifn *sctp_ifn; struct sctp_ifa *sctp_ifa; - int loopback_scope, ipv4_local_scope, local_scope, site_scope; - int ipv4_addr_legal, ipv6_addr_legal; + int loopback_scope; +#ifdef INET + int ipv4_local_scope; + int ipv4_addr_legal; +#endif +#ifdef INET6 + int local_scope, site_scope; + int ipv6_addr_legal; +#endif struct sctp_vrf *vrf; struct xsctp_laddr xladdr; struct sctp_laddr *laddr; @@ -199,28 +206,34 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st if (stcb) { /* use association specific values */ loopback_scope = stcb->asoc.scope.loopback_scope; +#ifdef INET ipv4_local_scope = stcb->asoc.scope.ipv4_local_scope; + ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal; +#endif +#ifdef INET6 local_scope = stcb->asoc.scope.local_scope; site_scope = stcb->asoc.scope.site_scope; - ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal; ipv6_addr_legal = stcb->asoc.scope.ipv6_addr_legal; +#endif } else { /* Use generic values for endpoints. */ loopback_scope = 1; +#ifdef INET ipv4_local_scope = 1; + if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6 && + SCTP_IPV6_V6ONLY(inp)) + ipv4_addr_legal = 0; + else + ipv4_addr_legal = 1; +#endif +#ifdef INET6 local_scope = 1; site_scope = 1; - if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) { + if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) ipv6_addr_legal = 1; - if (SCTP_IPV6_V6ONLY(inp)) { - ipv4_addr_legal = 0; - } else { - ipv4_addr_legal = 1; - } - } else { + else ipv6_addr_legal = 0; - ipv4_addr_legal = 1; - } +#endif } /* neither Mac OS X nor FreeBSD support multiple routing functions */