summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-12-16 10:49:29 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-12-18 09:52:42 +0800
commitb955fa07fc256b39caedb311f97fed404a63c8d5 (patch)
tree7e1e464163453eef09988287b2d0d3c40038a553
parent8b09f179fb71f13223e78ceb91f6a692053957b0 (diff)
downloadtalos-petitboot-b955fa07fc256b39caedb311f97fed404a63c8d5.tar.gz
talos-petitboot-b955fa07fc256b39caedb311f97fed404a63c8d5.zip
sysinfo: Add interface link status to sysinfo data
This changes adds a 'link' parameter to the interface information sent in sysinfo messages. The discover network code populates this from the incoming netlink messages. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-rw-r--r--discover/network.c13
-rw-r--r--discover/sysinfo.c25
-rw-r--r--discover/sysinfo.h4
-rw-r--r--lib/pb-protocol/pb-protocol.c9
-rw-r--r--lib/types/types.h1
5 files changed, 38 insertions, 14 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);
diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 091fab7..5a1cee7 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -228,7 +228,8 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
for (i = 0; i < sysinfo->n_interfaces; i++) {
struct interface_info *if_info = sysinfo->interfaces[i];
len += 4 + if_info->hwaddr_size +
- 4 + optional_strlen(if_info->name);
+ 4 + optional_strlen(if_info->name) +
+ sizeof(if_info->link);
}
for (i = 0; i < sysinfo->n_blockdevs; i++) {
@@ -384,6 +385,9 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
pos += if_info->hwaddr_size;
pos += pb_protocol_serialise_string(pos, if_info->name);
+
+ *(bool *)pos = if_info->link;
+ pos += sizeof(bool);
}
*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs);
@@ -765,6 +769,9 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
if (read_string(if_info, &pos, &len, &if_info->name))
goto out;
+ if_info->link = *(bool *)pos;
+ pos += sizeof(if_info->link);
+
sysinfo->interfaces[i] = if_info;
}
diff --git a/lib/types/types.h b/lib/types/types.h
index d2a2918..3a76cda 100644
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -64,6 +64,7 @@ struct interface_info {
unsigned int hwaddr_size;
uint8_t *hwaddr;
char *name;
+ bool link;
};
struct blockdev_info {
OpenPOWER on IntegriCloud