X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=ca20113a22267d8ca23b0bd25c472234bd3682b7;hp=9f6e7daaa6793b40f8389ef69ee22edb35498d5d;hb=9974f2d82b9450eaccd7661b3bfabb686ab8e161;hpb=bd06734362bb727b09b943688d9b69aa0a84590d

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 9f6e7da..ca20113 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -145,6 +145,24 @@ static int write_device_remove_message(struct discover_server *server,
 	return client_write_message(server, client, message);
 }
 
+static int write_boot_status_message(struct discover_server *server,
+		struct client *client, const struct boot_status *status)
+{
+	struct pb_protocol_message *message;
+	int len;
+
+	len = pb_protocol_boot_status_len(status);
+
+	message = pb_protocol_create_message(client,
+			PB_PROTOCOL_ACTION_STATUS, len);
+	if (!message)
+		return -1;
+
+	pb_protocol_serialise_boot_status(status, message->payload, len);
+
+	return client_write_message(server, client, message);
+}
+
 static int discover_server_process_message(void *arg)
 {
 	struct pb_protocol_message *message;
@@ -200,15 +218,15 @@ static int discover_server_process_connection(void *arg)
 	/* send existing devices to client */
 	n_devices = device_handler_get_device_count(server->device_handler);
 	for (i = 0; i < n_devices; i++) {
-		const struct device *device;
-		struct boot_option *opt;
+		const struct discover_boot_option *opt;
+		const struct discover_device *device;
 
 		device = device_handler_get_device(server->device_handler, i);
-		write_device_add_message(server, client, device);
+		write_device_add_message(server, client, device->device);
 
 		list_for_each_entry(&device->boot_options, opt, list)
-			discover_server_notify_boot_option_add(server, opt);
-
+			write_boot_option_add_message(server, client,
+					opt->option);
 	}
 
 	waiter_register(server->waitset, client->fd, WAIT_IN,
@@ -246,6 +264,15 @@ void discover_server_notify_device_remove(struct discover_server *server,
 
 }
 
+void discover_server_notify_boot_status(struct discover_server *server,
+		struct boot_status *status)
+{
+	struct client *client;
+
+	list_for_each_entry(&server->clients, client, list)
+		write_boot_status_message(server, client, status);
+}
+
 void discover_server_set_device_source(struct discover_server *server,
 		struct device_handler *handler)
 {