X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=b48d541050613af3b865c60fe4f684e0a2145852;hp=42aa9de9a950a3877a7b3dad8c96b96d47305373;hb=a0d9a2ebdf8265d40d51f47aa55c627c0e6decd3;hpb=bd06734362bb727b09b943688d9b69aa0a84590d

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 42aa9de..b48d541 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -110,23 +110,52 @@ 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);
+}
+
+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);
+}
+
+static void update_config(struct discover_client *client,
+		struct config *config)
+{
+	if (client->ops.update_config)
+		client->ops.update_config(config, client->ops.cb_arg);
+}
+
 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 config *config;
 	struct device *dev;
 	char *dev_id;
+	void *ctx;
 	int rc;
 
-	message = pb_protocol_read_message(client, client->fd);
+	/* We use a temporary context for processing one message; persistent
+	 * data is re-parented to the client in the callbacks. */
+	ctx = talloc_new(client);
+
+	message = pb_protocol_read_message(ctx, client->fd);
 
 	if (!message)
 		return -1;
 
 	switch (message->action) {
 	case PB_PROTOCOL_ACTION_DEVICE_ADD:
-		dev = talloc_zero(client, struct device);
+		dev = talloc_zero(ctx, struct device);
 		list_init(&dev->boot_options);
 
 		rc = pb_protocol_deserialise_device(dev, message);
@@ -138,7 +167,7 @@ static int discover_client_process(void *arg)
 		device_add(client, dev);
 		break;
 	case PB_PROTOCOL_ACTION_BOOT_OPTION_ADD:
-		opt = talloc_zero(client, struct boot_option);
+		opt = talloc_zero(ctx, struct boot_option);
 
 		rc = pb_protocol_deserialise_boot_option(opt, message);
 		if (rc) {
@@ -149,17 +178,48 @@ static int discover_client_process(void *arg)
 		boot_option_add(client, opt);
 		break;
 	case PB_PROTOCOL_ACTION_DEVICE_REMOVE:
-		dev_id = pb_protocol_deserialise_string(client, message);
+		dev_id = pb_protocol_deserialise_string(ctx, message);
 		if (!dev_id) {
 			pb_log("%s: no device id?\n", __func__);
 			return 0;
 		}
 		device_remove(client, dev_id);
 		break;
+	case PB_PROTOCOL_ACTION_STATUS:
+		status = talloc_zero(ctx, 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;
+	case PB_PROTOCOL_ACTION_SYSTEM_INFO:
+		sysinfo = talloc_zero(ctx, 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;
+	case PB_PROTOCOL_ACTION_CONFIG:
+		config = talloc_zero(ctx, struct config);
+
+		rc = pb_protocol_deserialise_config(config, message);
+		if (rc) {
+			pb_log("%s: invalid config message?\n", __func__);
+			return 0;
+		}
+		update_config(client, config);
+		break;
 	default:
 		pb_log("%s: unknown action %d\n", __func__, message->action);
 	}
 
+	talloc_free(ctx);
 
 	return 0;
 }
@@ -196,8 +256,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;
 
@@ -226,10 +286,10 @@ static void create_boot_command(struct boot_command *command,
 		const struct boot_option *boot_option,
 		const struct pb_boot_data *data)
 {
-
-	command->option_id = boot_option->id;
+	command->option_id = boot_option ? boot_option->id : NULL;
 	command->boot_image_file = data->image;
 	command->initrd_file = data->initrd;
+	command->dtb_file = data->dtb;
 	command->boot_args = data->args;
 }
 
@@ -259,3 +319,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);
+}