diff options
Diffstat (limited to 'discover')
-rw-r--r-- | discover/network.c | 13 | ||||
-rw-r--r-- | discover/sysinfo.c | 25 | ||||
-rw-r--r-- | discover/sysinfo.h | 4 |
3 files changed, 29 insertions, 13 deletions
diff --git a/discover/network.c b/discover/network.c index bc7e186..7ddecc0 100644 --- a/discover/network.c +++ b/discover/network.c @@ -416,14 +416,15 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) memcpy(interface->hwaddr, ifaddr, sizeof(interface->hwaddr)); strncpy(interface->name, ifname, sizeof(interface->name) - 1); add_interface(network, interface); - - /* tell the sysinfo code about this interface */ - if (strcmp(interface->name, "lo")) - system_info_register_interface( - sizeof(interface->hwaddr), - interface->hwaddr, interface->name); } + /* notify the sysinfo code about changes to this interface */ + if (strcmp(interface->name, "lo")) + system_info_register_interface( + sizeof(interface->hwaddr), + interface->hwaddr, interface->name, + info->ifi_flags & IFF_LOWER_UP); + configure_interface(network, interface, info->ifi_flags & IFF_UP, info->ifi_flags & IFF_LOWER_UP); diff --git a/discover/sysinfo.c b/discover/sysinfo.c index 3c13277..be45438 100644 --- a/discover/sysinfo.c +++ b/discover/sysinfo.c @@ -18,12 +18,14 @@ const struct system_info *system_info_get(void) } void system_info_register_interface(unsigned int hwaddr_size, uint8_t *hwaddr, - const char *name) + const char *name, bool link) { struct interface_info *if_info; unsigned int i; for (i = 0; i < sysinfo->n_interfaces; i++) { + bool changed = false; + if_info = sysinfo->interfaces[i]; if (if_info->hwaddr_size != hwaddr_size) @@ -32,10 +34,22 @@ void system_info_register_interface(unsigned int hwaddr_size, uint8_t *hwaddr, if (memcmp(if_info->hwaddr, hwaddr, hwaddr_size)) continue; - /* update the name and we're done */ - talloc_free(if_info->name); - if_info->name = talloc_strdup(if_info, name); - discover_server_notify_system_info(server, sysinfo); + /* Found an existing interface. Notify clients on any name or + * link changes */ + if (strcmp(if_info->name, name)) { + talloc_free(if_info->name); + if_info->name = talloc_strdup(if_info, name); + changed = true; + } + + if (if_info->link != link) { + if_info->link = link; + changed = true; + } + + if (changed) + discover_server_notify_system_info(server, sysinfo); + return; } @@ -43,6 +57,7 @@ void system_info_register_interface(unsigned int hwaddr_size, uint8_t *hwaddr, if_info->hwaddr_size = hwaddr_size; if_info->hwaddr = talloc_memdup(if_info, hwaddr, hwaddr_size); if_info->name = talloc_strdup(if_info, name); + if_info->link = link; sysinfo->n_interfaces++; sysinfo->interfaces = talloc_realloc(sysinfo, sysinfo->interfaces, diff --git a/discover/sysinfo.h b/discover/sysinfo.h index d8ba33d..7181c99 100644 --- a/discover/sysinfo.h +++ b/discover/sysinfo.h @@ -7,8 +7,8 @@ struct discover_server; const struct system_info *system_info_get(void); -void system_info_register_interface(unsigned hwaddr_size, uint8_t *hwaddr, - const char *name); +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, const char *mountpoint); |