X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=ca20113a22267d8ca23b0bd25c472234bd3682b7;hp=6c803728511cb5ea523ee52f33668a7f6982c166;hb=d28c07b5e23237a97387435e157e248e19128598;hpb=b8122dc9340e2f208220f0c88b4d71f91b78774f

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 6c80372..ca20113 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -91,7 +91,7 @@ static int client_write_message(
 	return rc;
 }
 
-static int write_add_message(struct discover_server *server,
+static int write_device_add_message(struct discover_server *server,
 		struct client *client, const struct device *dev)
 {
 	struct pb_protocol_message *message;
@@ -100,7 +100,7 @@ static int write_add_message(struct discover_server *server,
 	len = pb_protocol_device_len(dev);
 
 	message = pb_protocol_create_message(client,
-			PB_PROTOCOL_ACTION_ADD, len);
+			PB_PROTOCOL_ACTION_DEVICE_ADD, len);
 	if (!message)
 		return -1;
 
@@ -109,7 +109,25 @@ static int write_add_message(struct discover_server *server,
 	return client_write_message(server, client, message);
 }
 
-static int write_remove_message(struct discover_server *server,
+static int write_boot_option_add_message(struct discover_server *server,
+		struct client *client, const struct boot_option *opt)
+{
+	struct pb_protocol_message *message;
+	int len;
+
+	len = pb_protocol_boot_option_len(opt);
+
+	message = pb_protocol_create_message(client,
+			PB_PROTOCOL_ACTION_BOOT_OPTION_ADD, len);
+	if (!message)
+		return -1;
+
+	pb_protocol_serialise_boot_option(opt, message->payload, len);
+
+	return client_write_message(server, client, message);
+}
+
+static int write_device_remove_message(struct discover_server *server,
 		struct client *client, char *dev_id)
 {
 	struct pb_protocol_message *message;
@@ -118,7 +136,7 @@ static int write_remove_message(struct discover_server *server,
 	len = strlen(dev_id) + sizeof(uint32_t);
 
 	message = pb_protocol_create_message(client,
-			PB_PROTOCOL_ACTION_REMOVE, len);
+			PB_PROTOCOL_ACTION_DEVICE_REMOVE, len);
 	if (!message)
 		return -1;
 
@@ -127,11 +145,30 @@ static int write_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;
 	struct boot_command *boot_command;
 	struct client *client = arg;
+	int rc;
 
 	message = pb_protocol_read_message(client, client->fd);
 
@@ -143,8 +180,10 @@ static int discover_server_process_message(void *arg)
 		return 0;
 	}
 
-	boot_command = pb_protocol_deserialise_boot_command(client, message);
-	if (!boot_command) {
+	boot_command = talloc(client, struct boot_command);
+
+	rc = pb_protocol_deserialise_boot_command(boot_command, message);
+	if (rc) {
 		pb_log("%s: no boot command?", __func__);
 		return 0;
 	}
@@ -179,10 +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;
+		const struct discover_boot_option *opt;
+		const struct discover_device *device;
 
 		device = device_handler_get_device(server->device_handler, i);
-		write_add_message(server, client, device);
+		write_device_add_message(server, client, device->device);
+
+		list_for_each_entry(&device->boot_options, opt, list)
+			write_boot_option_add_message(server, client,
+					opt->option);
 	}
 
 	waiter_register(server->waitset, client->fd, WAIT_IN,
@@ -191,24 +235,42 @@ static int discover_server_process_connection(void *arg)
 	return 0;
 }
 
-void discover_server_notify_add(struct discover_server *server,
+void discover_server_notify_device_add(struct discover_server *server,
 		struct device *device)
 {
 	struct client *client;
 
 	list_for_each_entry(&server->clients, client, list)
-		write_add_message(server, client, device);
+		write_device_add_message(server, client, device);
+
+}
 
+void discover_server_notify_boot_option_add(struct discover_server *server,
+		struct boot_option *boot_option)
+{
+	struct client *client;
+
+	list_for_each_entry(&server->clients, client, list)
+		write_boot_option_add_message(server, client, boot_option);
 }
 
-void discover_server_notify_remove(struct discover_server *server,
+void discover_server_notify_device_remove(struct discover_server *server,
 		struct device *device)
 {
 	struct client *client;
 
 	list_for_each_entry(&server->clients, client, list)
-		write_remove_message(server, client, device->id);
+		write_device_remove_message(server, client, device->id);
+
+}
 
+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,