From nobody Wed Jul 5 10:03:28 2023 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 4QwwGT2lDBz4lMJF; Wed, 5 Jul 2023 10:03:29 +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 4QwwGS6Csbz3G97; Wed, 5 Jul 2023 10:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688551408; 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=NqelXcEMxjl7bj8GsSAqoqOXrs6w0cI/teIb2bnvvXQ=; b=a5y6Q7Sv8kEVo15OCdVX4TMpjl+nbyL2y3vMeeRrZNzSUOKoxRW8SHc3S+8SNnm3lk7g99 Pv9/v47G1/DqNZQIw83a4EkszX1NWY+G7jD1uK/jwsvWahPEwGbZyOpRREkaJef0uPXc2y bCNKhFmVgUj7jMP9Sb3ENvGxvVaG+mjZySVQ9PXpwOo5j8fnWvAkd16Z8QFatXjRl/arvK +488MgUqLIvfPst95ZCN6FA8KB1dcewm39CKDTv25wcWiTdumjlwMLy4AX2y6xBGmiuP9N 2y30zR8b4IZN2PMDv50sDRBY+/qE2wk+8NB30PDHvd4eg8wcUunvDCpTe4AEUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688551408; 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=NqelXcEMxjl7bj8GsSAqoqOXrs6w0cI/teIb2bnvvXQ=; b=GXtGzZp0nrYdd4fYCjLG28Ib/l6tiCuaPsx73vv2J6vTtedgovkt7o5EXvNdMOevpAmXrv /i9EagK4+VPf1LlHB9AHMNe4SVqIy/fiZcEtfih8wfwZBzUbD1Lc4NefyoYb2HWthn6ZQ2 r4yThkWdsZ0JmFvYu3reDTKHMcyESWt7UOtVd5FQgv/UKyXVloWaOqjO4DzVnnKGAFeAD0 Tug8sMPFiRRYfLGDTIQb62bAmDDuqAi+6jLziwAv4e9bj2AYf5/XL+mtXZQGtcYytOo9tC 81PxeFY2YGUrZO8l99qaNgMemRAAnEBf64reozR0pnZTHX1CVS+9tth37+V2hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688551408; a=rsa-sha256; cv=none; b=KZDNdtHQuIxaQbSFFT5+4KBBnO/Jt592/0WG8bicnFZZcCF7/aRPZeArsTZniJX/ub2Klh aDvTuHJGqykd8X/IGgEnIUdc9FQfetjMDoUzphcSdPCH54//T7ym5oVrT83CE0RYvDkiUP SaiV5Ii/VkQbUOhoSTgAUow3coc9G8YkjjVsdSidMi5/zs9fVNohAjr7XHJSaLoIRYuaOR XEVQF7IqEz+XQVh4pjMdV9y9xnUu8I6WPBqWEBvF0cXDxs0JAv3/OvOkbjKVyF/eOIQ0C9 IQSGxrqo1d7NcTUbQulCKxr7r+TS3cgoaPmMe7xOlxe0vLRyWlT/eaUmCZmM+g== 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 4QwwGS51mrz19k4; Wed, 5 Jul 2023 10:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365A3S50072896; Wed, 5 Jul 2023 10:03:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365A3SYx072895; Wed, 5 Jul 2023 10:03:28 GMT (envelope-from git) Date: Wed, 5 Jul 2023 10:03:28 GMT Message-Id: <202307051003.365A3SYx072895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: cea9f49f820e - main - ping: low-effort fix to make it compilable without inet 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cea9f49f820e7dfab48fc4d1fac3497bc138081b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=cea9f49f820e7dfab48fc4d1fac3497bc138081b commit cea9f49f820e7dfab48fc4d1fac3497bc138081b Author: Mateusz Guzik AuthorDate: 2023-07-05 10:00:44 +0000 Commit: Mateusz Guzik CommitDate: 2023-07-05 10:02:32 +0000 ping: low-effort fix to make it compilable without inet --- sbin/ifconfig/ifpfsync.c | 4 ++++ sbin/ifconfig/ifvxlan.c | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c index b97b9925c644..3e880c96a97c 100644 --- a/sbin/ifconfig/ifpfsync.c +++ b/sbin/ifconfig/ifpfsync.c @@ -125,6 +125,10 @@ pfsync_syncpeer_nvlist_to_sockaddr(const nvlist_t *nvl, { int af; +#if (!defined INET && !defined INET6) + (void)sa; +#endif + if (!nvlist_exists_number(nvl, "af")) return (EINVAL); if (!nvlist_exists_binary(nvl, "address")) diff --git a/sbin/ifconfig/ifvxlan.c b/sbin/ifconfig/ifvxlan.c index 72e2eac35c2d..6a0bacfc32a6 100644 --- a/sbin/ifconfig/ifvxlan.c +++ b/sbin/ifconfig/ifvxlan.c @@ -213,7 +213,9 @@ setvxlan_local(if_ctx *ctx, const char *addr, int dummy __unused) { struct ifvxlancmd cmd; struct addrinfo *ai; +#if (defined INET || defined INET6) struct sockaddr *sa; +#endif int error; bzero(&cmd, sizeof(cmd)); @@ -222,7 +224,9 @@ setvxlan_local(if_ctx *ctx, const char *addr, int dummy __unused) errx(1, "error in parsing local address string: %s", gai_strerror(error)); +#if (defined INET || defined INET6) sa = ai->ai_addr; +#endif switch (ai->ai_family) { #ifdef INET @@ -273,7 +277,9 @@ setvxlan_remote(if_ctx *ctx, const char *addr, int dummy __unused) { struct ifvxlancmd cmd; struct addrinfo *ai; +#if (defined INET || defined INET6) struct sockaddr *sa; +#endif int error; bzero(&cmd, sizeof(cmd)); @@ -282,7 +288,9 @@ setvxlan_remote(if_ctx *ctx, const char *addr, int dummy __unused) errx(1, "error in parsing remote address string: %s", gai_strerror(error)); +#if (defined INET || defined INET6) sa = ai->ai_addr; +#endif switch (ai->ai_family) { #ifdef INET @@ -333,7 +341,9 @@ setvxlan_group(if_ctx *ctx, const char *addr, int dummy __unused) { struct ifvxlancmd cmd; struct addrinfo *ai; +#if (defined INET || defined INET6) struct sockaddr *sa; +#endif int error; bzero(&cmd, sizeof(cmd)); @@ -342,7 +352,9 @@ setvxlan_group(if_ctx *ctx, const char *addr, int dummy __unused) errx(1, "error in parsing group address string: %s", gai_strerror(error)); +#if (defined INET || defined INET6) sa = ai->ai_addr; +#endif switch (ai->ai_family) { #ifdef INET