From nobody Fri Feb 24 10:21:19 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 4PNQsW3jffz3tny6; Fri, 24 Feb 2023 10:21:19 +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 4PNQsW2t2Gz3kkq; Fri, 24 Feb 2023 10:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677234079; 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=8yiVtR0HmTX3UhrGoBeyhPaXZ3Sap5gVj7F02No4T8I=; b=t27Txqc2XLhJ22TGfH1aGgPa+PaB8QdneqdVX/DjxvQjIhxRT6bwf+UyDNDS1yKWc+ZfF9 6EAMQJBtBCSUPZ3ot4LX31bwkOZT8+Bz3ugAFXoI3bZ8W4jmsDeCwbDZM6WRYxx4pxTHDN z3gIf/P4GgJSWFwOHFiGMhHJDnxraV6YHCIpDOaqeWvS9EPoOBePLSuPjF4tViH2lVDnFi 07tldZl1/bMPfQGg/lxf52DZLJ70J3qaMAhrsNaO/CTRcsg22q2TDpQx2Dt9PUpZMEsOwp kQO0j8bgAT43u4+E2MIkVAsIUMChnoWg66hvfMgBsnRkV1rX2vMgwxi9OU4J6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677234079; 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=8yiVtR0HmTX3UhrGoBeyhPaXZ3Sap5gVj7F02No4T8I=; b=WsOsmTkgLFlt4NlNhwbLmIDQ1rpnel3ZMzjX8cMGLQeDqyM7aZt1hfEALh6q3uk92FOr+t JImMexGYxY8yzOJS2TL1NKP+ESXkEkGKsoKYxmPFM20JJ9Y3IixOSPX/q8qrUgC8tTCbxf mvHA2WHN3CNH7yTgegK/qUcyNEajhPUZQniIBIIn9ZHkE6rxJO9GwC+tfR/zyKxT87dU8W ozUwCb5TIBZSQR/U1XmjVjTFi7hCMZ3sLLiEZgkCEPkywuCUmprGsno3HFpc5KZUn0n5HE dh1uKx6RwIzAWxussHjT5qkoYj4NalfNBraGbbXRK0A2m4yhYXwqcMz4MkgnTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677234079; a=rsa-sha256; cv=none; b=IZqxXQHwwqa6+hW4fCtcazGjpI6iGGzoVsiMVNLMih0zt5yRFp+5dclh1DOdVHXZIi7LaQ D+dk/EkO5u0UnpedzSV6ib/BzDdKNzwKcLZrzl6ApJOQM78Okn57RHkLuCpQkTYRJFUnz4 30eh/N9f6saSgN9OnwgprXEBeMfkoKt6Amq7RvxyVBVffzWBXUQ0pvI5Lp3lp4R1sm1lnC QfI7Tdvy0vGMlCbZBpqo00P7xZ9+nm54uEYMMI2q/ffc06XVTuZZGOwJbHIw87f2/ierwM StMXQM6u9kBSFMEIn667Bnvy8qLwTxuXcB5RMfw+lTB2qHZzdGTfUXFGmZkb6A== 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 4PNQsW1xX0zKlf; Fri, 24 Feb 2023 10:21:19 +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 31OALJhg086125; Fri, 24 Feb 2023 10:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31OALJBA086124; Fri, 24 Feb 2023 10:21:19 GMT (envelope-from git) Date: Fri, 24 Feb 2023 10:21:19 GMT Message-Id: <202302241021.31OALJBA086124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: efeb80031170 - main - netlink: fix NOINET6 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: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efeb8003117073d29bf82c8a69e036b8dbd78352 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=efeb8003117073d29bf82c8a69e036b8dbd78352 commit efeb8003117073d29bf82c8a69e036b8dbd78352 Author: Alexander V. Chernikov AuthorDate: 2023-02-24 10:19:12 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-24 10:21:06 +0000 netlink: fix NOINET6 build. Reported by: Michael Paepcke PR: 269787 MFC after: 3 days --- sys/net/route/nhop_ctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index 73c34f675a04..d99b78351952 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -836,16 +836,20 @@ nhop_set_blackhole(struct nhop_object *nh, int blackhole_rt_flag) bzero(&nh->gw_sa, sizeof(nh->gw_sa)); switch (nh->nh_priv->nh_upper_family) { +#ifdef INET case AF_INET: nh->gw4_sa.sin_family = AF_INET; nh->gw4_sa.sin_len = sizeof(struct sockaddr_in); nh->gw4_sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); break; +#endif +#ifdef INET6 case AF_INET6: nh->gw6_sa.sin6_family = AF_INET6; nh->gw6_sa.sin6_len = sizeof(struct sockaddr_in6); nh->gw6_sa.sin6_addr = in6addr_loopback; break; +#endif } }