mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
qemu: introduce qemuARPGetInterfaces to get IP from host's arp table
introduce VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP to get ip address of VM from the message of netlink RTM_GETNEIGH Signed-off-by: Chen Hanxiao <chenhanxiao@gmail.com> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
a176d67cdf
commit
e24d4c9051
@ -4672,6 +4672,7 @@ typedef virMemoryParameter *virMemoryParameterPtr;
|
||||
typedef enum {
|
||||
VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE = 0, /* Parse DHCP lease file */
|
||||
VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT = 1, /* Query qemu guest agent */
|
||||
VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP = 2, /* Query ARP tables */
|
||||
|
||||
# ifdef VIR_ENUM_SENTINELS
|
||||
VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LAST
|
||||
|
@ -11721,6 +11721,12 @@ virDomainFSInfoFree(virDomainFSInfoPtr info)
|
||||
* To match such interface with the one from @dom XML use MAC address or IP
|
||||
* range.
|
||||
*
|
||||
* If @source is VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP, the host
|
||||
* ARP table will be check to obtain the interface addresses. As
|
||||
* the arp cache refreshes in time, the returned ip address may
|
||||
* be unreachable. Depending on the route table config of the
|
||||
* guest, the returned mac address may be duplicated.
|
||||
*
|
||||
* @ifaces->name and @ifaces->hwaddr are never NULL.
|
||||
*
|
||||
* The caller *must* free @ifaces when no longer needed. Usual use case
|
||||
|
@ -70,6 +70,7 @@
|
||||
#include "virnetdevopenvswitch.h"
|
||||
#include "capabilities.h"
|
||||
#include "viralloc.h"
|
||||
#include "virarptable.h"
|
||||
#include "viruuid.h"
|
||||
#include "domain_conf.h"
|
||||
#include "domain_audit.h"
|
||||
@ -157,6 +158,9 @@ static int qemuGetDHCPInterfaces(virDomainPtr dom,
|
||||
virDomainObjPtr vm,
|
||||
virDomainInterfacePtr **ifaces);
|
||||
|
||||
static int qemuARPGetInterfaces(virDomainObjPtr vm,
|
||||
virDomainInterfacePtr **ifaces);
|
||||
|
||||
static virQEMUDriverPtr qemu_driver;
|
||||
|
||||
|
||||
@ -20516,6 +20520,10 @@ qemuDomainInterfaceAddresses(virDomainPtr dom,
|
||||
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP:
|
||||
ret = qemuARPGetInterfaces(vm, ifaces);
|
||||
break;
|
||||
|
||||
default:
|
||||
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
|
||||
_("Unknown IP address data source %d"),
|
||||
@ -20625,6 +20633,69 @@ qemuGetDHCPInterfaces(virDomainPtr dom,
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
qemuARPGetInterfaces(virDomainObjPtr vm,
|
||||
virDomainInterfacePtr **ifaces)
|
||||
{
|
||||
size_t i, j;
|
||||
size_t ifaces_count = 0;
|
||||
int ret = -1;
|
||||
char macaddr[VIR_MAC_STRING_BUFLEN];
|
||||
virDomainInterfacePtr *ifaces_ret = NULL;
|
||||
virDomainInterfacePtr iface = NULL;
|
||||
virArpTablePtr table;
|
||||
|
||||
table = virArpTableGet();
|
||||
if (!table)
|
||||
goto cleanup;
|
||||
|
||||
for (i = 0; i < vm->def->nnets; i++) {
|
||||
if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK)
|
||||
continue;
|
||||
|
||||
virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr);
|
||||
for (j = 0; j < table->n; j++) {
|
||||
virArpTableEntry entry = table->t[j];
|
||||
|
||||
if (STREQ(entry.mac, macaddr)) {
|
||||
if (VIR_ALLOC(iface) < 0)
|
||||
goto cleanup;
|
||||
|
||||
iface->naddrs = 1;
|
||||
if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (VIR_STRDUP(iface->hwaddr, macaddr) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (VIR_STRDUP(iface->addrs->addr, entry.ipaddr) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (VIR_APPEND_ELEMENT(ifaces_ret, ifaces_count, iface) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
VIR_STEAL_PTR(*ifaces, ifaces_ret);
|
||||
ret = ifaces_count;
|
||||
|
||||
cleanup:
|
||||
virArpTableFree(table);
|
||||
|
||||
if (ifaces_ret) {
|
||||
for (i = 0; i < ifaces_count; i++)
|
||||
virDomainInterfaceFree(ifaces_ret[i]);
|
||||
}
|
||||
VIR_FREE(ifaces_ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
qemuDomainSetUserPassword(virDomainPtr dom,
|
||||
const char *user,
|
||||
|
Loading…
Reference in New Issue
Block a user