From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Sun, 12 Apr 2026 06:06:38 +0000 (+0200)
Subject: virarptable: add FreeBSD support
X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=HEAD;p=thirdparty%2Flibvirt.git

virarptable: add FreeBSD support

Add a FreeBSD implementation of the virArpTableGet() function.

Update the bhyve driver's bhyveDomainInterfaceAddresses()
to use it for the VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP
source type.

Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 93c07c6945..c8dd1a728a 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1868,12 +1868,15 @@ bhyveDomainInterfaceAddresses(virDomainPtr domain,
         goto cleanup;
 
     switch (source) {
+    case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP:
+        ret = virDomainNetARPInterfaces(vm->def, ifaces);
+        break;
+
     case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE:
         ret = virDomainNetDHCPInterfaces(vm->def, ifaces);
         break;
 
     case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT:
-    case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP:
         virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
                        _("Unsupported IP address data source %1$d"),
                        source);
diff --git a/src/util/virarptable.c b/src/util/virarptable.c
index 20d11f97b0..53cfea7dae 100644
--- a/src/util/virarptable.c
+++ b/src/util/virarptable.c
@@ -1,7 +1,8 @@
 /*
- * virarptable.c Linux ARP table handling
+ * virarptable.c ARP table handling
  *
  * Copyright (C) 2018 Chen Hanxiao
+ * Copyright (C) 2026 The FreeBSD Foundation
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,16 @@
 
 #ifdef __linux__
 # include <linux/rtnetlink.h>
+#elif defined(__FreeBSD__)
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <sys/sysctl.h>
+# include <net/if.h>
+# include <net/if_dl.h>
+# include <net/if_types.h>
+# include <netinet/in.h>
+# include <net/route.h>
+# include <arpa/inet.h>
 #endif
 
 #include "viralloc.h"
@@ -145,6 +156,80 @@ virArpTableGet(void)
     return NULL;
 }
 
+#elif defined(__FreeBSD__)
+
+virArpTable *
+virArpTableGet(void)
+{
+    int num = 0;
+    int mib[6] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, 0};
+    size_t needed;
+    g_autofree char *buf = NULL;
+    char *next, *lim;
+    struct rt_msghdr *rtm;
+    struct sockaddr_in *sin;
+    struct sockaddr_dl *sdl;
+    virArpTable *table = NULL;
+
+    if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) {
+        virReportSystemError(errno, "%s", _("failed to get ARP table via sysctl"));
+        return NULL;
+    }
+
+    if (needed == 0)
+        return NULL;
+
+    buf = g_new0(char, needed);
+
+    if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+        virReportSystemError(errno, "%s", _("failed to get ARP table via sysctl"));
+        return NULL;
+    }
+
+    table = g_new0(virArpTable, 1);
+
+    lim = buf + needed;
+    VIR_WARNINGS_NO_CAST_ALIGN
+    for (next = buf; next < lim; next += rtm->rtm_msglen) {
+        rtm = (struct rt_msghdr *)next;
+
+        if (rtm->rtm_msglen == 0)
+            break;
+
+        sin = (struct sockaddr_in *)(rtm + 1);
+        sdl = (struct sockaddr_dl *)((char *)sin + SA_SIZE(sin));
+
+        if (sdl->sdl_alen &&
+            (sdl->sdl_type == IFT_ETHER || sdl->sdl_type == IFT_BRIDGE)) {
+            char *ipstr = NULL;
+            virSocketAddr virAddr = { 0 };
+            virMacAddr macaddr;
+            char ifmac[VIR_MAC_STRING_BUFLEN];
+
+            VIR_REALLOC_N(table->t, num + 1);
+            table->n = num + 1;
+
+            virAddr.len = sizeof(virAddr.data.inet4);
+            virAddr.data.inet4.sin_family = AF_INET;
+            virAddr.data.inet4.sin_addr = sin->sin_addr;
+            ipstr = virSocketAddrFormat(&virAddr);
+
+            table->t[num].ipaddr = g_steal_pointer(&ipstr);
+
+            memcpy(macaddr.addr, LLADDR(sdl), VIR_MAC_BUFLEN);
+
+            virMacAddrFormat(&macaddr, ifmac);
+
+            table->t[num].mac = g_strdup(ifmac);
+
+            num++;
+        }
+    }
+    VIR_WARNINGS_RESET
+
+    return table;
+}
+
 #else
 
 virArpTable *
@@ -155,7 +240,7 @@ virArpTableGet(void)
     return NULL;
 }
 
-#endif /* __linux__ */
+#endif
 
 void
 virArpTableFree(virArpTable *table)