Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
#include <talloc/talloc.h>
#include <process/process.h>
#include <log/log.h>
#include <talloc/talloc.h>
#include <process/process.h>
#include <log/log.h>
#include "discover-server.h"
#include "platform.h"
#include "discover-server.h"
#include "platform.h"
{
struct interface_info *if_info;
unsigned int i;
{
struct interface_info *if_info;
unsigned int i;
+ char mac[20], **if_addr, *new_addr, *subnet;
for (i = 0; i < sysinfo->n_interfaces; i++) {
if_info = sysinfo->interfaces[i];
for (i = 0; i < sysinfo->n_interfaces; i++) {
if_info = sysinfo->interfaces[i];
if (memcmp(if_info->hwaddr, hwaddr, hwaddr_size))
continue;
if (memcmp(if_info->hwaddr, hwaddr, hwaddr_size))
continue;
+ /*
+ * Don't include the subnet from a static config, and check if
+ * we're updating the IPv4 or IPv6 address.
+ * */
+ if ((subnet = strchr(address, '/')))
+ new_addr = talloc_strndup(if_info, address, subnet - address);
+ else
+ new_addr = talloc_strdup(if_info, address);
+ if (addr_scheme(new_addr) == AF_INET)
+ if_addr = &if_info->address;
+ else
+ if_addr = &if_info->address_v6;
+
/* Found an existing interface. Notify clients if a new address
* is set */
/* Found an existing interface. Notify clients if a new address
* is set */
- if (!if_info->address || strcmp(if_info->address, address)) {
- talloc_free(if_info->address);
- if_info->address = talloc_strdup(if_info, address);
+ if (!*if_addr || strcmp(*if_addr, address)) {
+ talloc_free(*if_addr);
+ *if_addr = new_addr;
discover_server_notify_system_info(server, sysinfo);
return;
}
discover_server_notify_system_info(server, sysinfo);
return;
}
line("%s:", info->name);
line(_(" MAC: %s"), macbuf);
line(_(" IP Address: %s"), info->address ?: _("none"));
line("%s:", info->name);
line(_(" MAC: %s"), macbuf);
line(_(" IP Address: %s"), info->address ?: _("none"));
+ if (info->address_v6)
+ line(_(" IPv6 Address: %s"),
+ info->address_v6 ?: _("none"));
/* TRANSLATORS: these "up" / "down" strings refer to the
* link status for a network connection. */
line(_(" link: %s"), info->link ? _("up") : _("down"));
/* TRANSLATORS: these "up" / "down" strings refer to the
* link status for a network connection. */
line(_(" link: %s"), info->link ? _("up") : _("down"));