return;
}
+ system_info_set_interface_address(sizeof(interface->hwaddr),
+ interface->hwaddr,
+ config->static_config.address);
+
/* we need the interface up before we can route through it */
rc = interface_up(interface);
if (rc)
#include <talloc/talloc.h>
#include <process/process.h>
+#include <log/log.h>
#include "discover-server.h"
#include "platform.h"
return sysinfo;
}
+
+void system_info_set_interface_address(unsigned int hwaddr_size,
+ uint8_t *hwaddr, const char *address)
+{
+ struct interface_info *if_info;
+ unsigned int i;
+
+ for (i = 0; i < sysinfo->n_interfaces; i++) {
+ if_info = sysinfo->interfaces[i];
+
+ if (if_info->hwaddr_size != hwaddr_size)
+ continue;
+
+ if (memcmp(if_info->hwaddr, hwaddr, hwaddr_size))
+ continue;
+
+ /* 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);
+ discover_server_notify_system_info(server, sysinfo);
+ return;
+ }
+ }
+
+ pb_log("Couldn't find interface matching %s\n", "foo");
+}
+
void system_info_register_interface(unsigned int hwaddr_size, uint8_t *hwaddr,
const char *name, bool link)
{
const struct system_info *system_info_get(void);
+void system_info_set_interface_address(unsigned int hwaddr_size,
+ uint8_t *hwaddr, const char *address);
void system_info_register_interface(unsigned int hwaddr_size, uint8_t *hwaddr,
const char *name, bool link);
void system_info_register_blockdev(const char *name, const char *uuid,
#include "resource.h"
#include "event.h"
#include "user-event.h"
+#include "sysinfo.h"
#define MAC_ADDR_SIZE 6
struct device_handler *handler = uev->handler;
struct discover_device *dev;
+ uint8_t hwaddr[MAC_ADDR_SIZE];
+
+ sscanf(event_get_param(event, "mac"),
+ "%hhX:%hhX:%hhX:%hhX:%hhX:%hhX",
+ hwaddr, hwaddr + 1, hwaddr + 2,
+ hwaddr + 3, hwaddr + 4, hwaddr + 5);
+
+ system_info_set_interface_address(sizeof(hwaddr), hwaddr,
+ event_get_param(event, "ip"));
+
dev = discover_device_create(handler, event_get_param(event, "mac"),
event->device);
struct interface_info *if_info = sysinfo->interfaces[i];
len += 4 + if_info->hwaddr_size +
4 + optional_strlen(if_info->name) +
- sizeof(if_info->link);
+ sizeof(if_info->link) +
+ 4 + optional_strlen(if_info->address);
}
for (i = 0; i < sysinfo->n_blockdevs; i++) {
*(bool *)pos = if_info->link;
pos += sizeof(bool);
+
+ pos += pb_protocol_serialise_string(pos, if_info->address);
}
*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs);
if_info->link = *(bool *)pos;
pos += sizeof(if_info->link);
+ if (read_string(if_info, &pos, &len, &if_info->address))
+ goto out;
+
sysinfo->interfaces[i] = if_info;
}
uint8_t *hwaddr;
char *name;
bool link;
+ char *address;
};
struct blockdev_info {
(void)status;
}
+void system_info_set_interface_address(unsigned int hwaddr_size,
+ uint8_t *hwaddr, const char *address)
+{
+ (void)hwaddr_size;
+ (void)hwaddr;
+ (void)address;
+}
+
void discover_server_notify_config(struct discover_server *server,
struct config *config)
{