3 files changed, 50 insertions, 0 deletions

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index c3f3f38..90cd3b4 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -118,10 +118,19 @@ static void update_status(struct discover_client *client,
 	talloc_free(status);
 }
 
+static void update_sysinfo(struct discover_client *client,
+		struct system_info *sysinfo)
+{
+	if (client->ops.update_sysinfo)
+		client->ops.update_sysinfo(sysinfo, client->ops.cb_arg);
+	talloc_free(sysinfo);
+}
+
 static int discover_client_process(void *arg)
 {
 	struct discover_client *client = arg;
 	struct pb_protocol_message *message;
+	struct system_info *sysinfo;
 	struct boot_status *status;
 	struct boot_option *opt;
 	struct device *dev;
@@ -175,6 +184,16 @@ static int discover_client_process(void *arg)
 		}
 		update_status(client, status);
 		break;
+	case PB_PROTOCOL_ACTION_SYSTEM_INFO:
+		sysinfo = talloc_zero(client, struct system_info);
+
+		rc = pb_protocol_deserialise_system_info(sysinfo, message);
+		if (rc) {
+			pb_log("%s: invalid sysinfo message?\n", __func__);
+			return 0;
+		}
+		update_sysinfo(client, sysinfo);
+		break;
 	default:
 		pb_log("%s: unknown action %d\n", __func__, message->action);
 	}
diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index ed1f504..feca63b 100644
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -26,6 +26,7 @@ struct discover_client_ops {
 			void *arg);
 	void (*device_remove)(struct device *device, void *arg);
 	void (*update_status)(struct boot_status *status, void *arg);
+	void (*update_sysinfo)(struct system_info *sysinfo, void *arg);
 	void *cb_arg;
 };
 
diff --git a/ui/test/discover-test.c b/ui/test/discover-test.c
index faf1d89..576f293 100644
--- a/ui/test/discover-test.c
+++ b/ui/test/discover-test.c
@@ -82,11 +82,41 @@ static void print_status(struct boot_status *status,
 
 }
 
+static void print_sysinfo(struct system_info *sysinfo,
+	void __attribute__((unused)) *arg)
+{
+	unsigned int i;
+
+	printf("sysinfo:\n");
+	printf("\ttype:     %s\n", sysinfo->type);
+	printf("\tid:       %s\n", sysinfo->identifier);
+
+	if (sysinfo->n_interfaces == 0)
+		printf("\tno interfaces.\n");
+	else
+		printf("\tinterfaces:\n");
+
+	for (i = 0; i < sysinfo->n_interfaces; i++) {
+		struct interface_info *if_info = sysinfo->interfaces[i];
+		uint8_t *m = if_info->hwaddr;
+
+		printf("\t\tname:   %s\n", if_info->name);
+
+		if (if_info->hwaddr_size == 6)
+			printf("\t\tmac:    %02x:%02x:%02x:%02x:%02x:%02x\n",
+					m[0], m[1], m[2], m[3], m[4], m[5]);
+		else
+			printf("\t\tmac:    unknown hwaddr size %d\n",
+					if_info->hwaddr_size);
+	}
+}
+
 static struct discover_client_ops client_ops = {
 	.device_add = print_device_add,
 	.boot_option_add = print_boot_option_add,
 	.device_remove = print_device_remove,
 	.update_status = print_status,
+	.update_sysinfo = print_sysinfo,
 };
 
 int main(void)