X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=ae5d5cd2e50b00e03cfca47b41fb6b0c8e23d0eb;hp=f75cfb71822949d9f5533a2bd303519592a8b301;hb=e65870b0d7638ad9e848b87526a04e32bc96f756;hpb=9939af2652ce479645eaa78e891ee06f33845a99

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index f75cfb7..ae5d5cd 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -1,4 +1,5 @@
 
+#include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -37,6 +38,20 @@ void discover_client_destroy(struct discover_client *client)
 	talloc_free(client);
 }
 
+static struct device *find_device(struct discover_client *client,
+		const char *id)
+{
+	int i;
+
+	for (i = 0; i < client->n_devices; i++) {
+		struct device *dev = client->devices[i];
+		if (!strcmp(dev->id, id))
+			return dev;
+	}
+
+	return NULL;
+}
+
 static void device_add(struct discover_client *client, struct device *device)
 {
 	client->n_devices++;
@@ -46,7 +61,25 @@ static void device_add(struct discover_client *client, struct device *device)
 	client->devices[client->n_devices - 1] = device;
 	talloc_steal(client, device);
 
-	client->ops.device_add(device, client->ops.cb_arg);
+	if (client->ops.device_add)
+		client->ops.device_add(device, client->ops.cb_arg);
+}
+
+static void boot_option_add(struct discover_client *client,
+		struct boot_option *opt)
+{
+	struct device *dev;
+
+	dev = find_device(client, opt->device_id);
+
+	/* we require that devices are already present before any boot options
+	 * are added */
+	assert(dev);
+
+	talloc_steal(dev, opt);
+
+	if (client->ops.boot_option_add)
+		client->ops.boot_option_add(dev, opt, client->ops.cb_arg);
 }
 
 static void device_remove(struct discover_client *client, const char *id)
@@ -77,12 +110,23 @@ static void device_remove(struct discover_client *client, const char *id)
 	talloc_free(device);
 }
 
+static void update_status(struct discover_client *client,
+		struct boot_status *status)
+{
+	if (client->ops.update_status)
+		client->ops.update_status(status, client->ops.cb_arg);
+	talloc_free(status);
+}
+
 static int discover_client_process(void *arg)
 {
 	struct discover_client *client = arg;
 	struct pb_protocol_message *message;
+	struct boot_status *status;
+	struct boot_option *opt;
 	struct device *dev;
 	char *dev_id;
+	int rc;
 
 	message = pb_protocol_read_message(client, client->fd);
 
@@ -90,16 +134,30 @@ static int discover_client_process(void *arg)
 		return -1;
 
 	switch (message->action) {
-	case PB_PROTOCOL_ACTION_ADD:
-		dev = pb_protocol_deserialise_device(client, message);
-		if (!dev) {
+	case PB_PROTOCOL_ACTION_DEVICE_ADD:
+		dev = talloc_zero(client, struct device);
+		list_init(&dev->boot_options);
+
+		rc = pb_protocol_deserialise_device(dev, message);
+		if (rc) {
 			pb_log("%s: no device?\n", __func__);
 			return 0;
 		}
 
 		device_add(client, dev);
 		break;
-	case PB_PROTOCOL_ACTION_REMOVE:
+	case PB_PROTOCOL_ACTION_BOOT_OPTION_ADD:
+		opt = talloc_zero(client, struct boot_option);
+
+		rc = pb_protocol_deserialise_boot_option(opt, message);
+		if (rc) {
+			pb_log("%s: no boot_option?\n", __func__);
+			return 0;
+		}
+
+		boot_option_add(client, opt);
+		break;
+	case PB_PROTOCOL_ACTION_DEVICE_REMOVE:
 		dev_id = pb_protocol_deserialise_string(client, message);
 		if (!dev_id) {
 			pb_log("%s: no device id?\n", __func__);
@@ -107,6 +165,16 @@ static int discover_client_process(void *arg)
 		}
 		device_remove(client, dev_id);
 		break;
+	case PB_PROTOCOL_ACTION_STATUS:
+		status = talloc_zero(client, struct boot_status);
+
+		rc = pb_protocol_deserialise_boot_status(status, message);
+		if (rc) {
+			pb_log("%s: invalid status message?\n", __func__);
+			return 0;
+		}
+		update_status(client, status);
+		break;
 	default:
 		pb_log("%s: unknown action %d\n", __func__, message->action);
 	}
@@ -147,8 +215,8 @@ struct discover_client* discover_client_init(struct waitset *waitset,
 		goto out_err;
 	}
 
-	waiter_register(waitset, client->fd, WAIT_IN, discover_client_process,
-			client);
+	waiter_register_io(waitset, client->fd, WAIT_IN,
+			discover_client_process, client);
 
 	return client;
 
@@ -210,3 +278,16 @@ int discover_client_boot(struct discover_client *client,
 
 	return rc;
 }
+
+int discover_client_cancel_default(struct discover_client *client)
+{
+	struct pb_protocol_message *message;
+
+	message = pb_protocol_create_message(client,
+			PB_PROTOCOL_ACTION_CANCEL_DEFAULT, 0);
+
+	if (!message)
+		return -1;
+
+	return pb_protocol_write_message(client->fd, message);
+}