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

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index b1ef440..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>
@@ -12,7 +13,7 @@
 #include <talloc/talloc.h>
 #include <log/log.h>
 
-#include "ui/common/discover-client.h"
+#include "discover-client.h"
 #include "pb-protocol/pb-protocol.h"
 
 struct discover_client {
@@ -32,53 +33,23 @@ static int discover_client_destructor(void *arg)
 	return 0;
 }
 
-struct discover_client* discover_client_init(
-	const struct discover_client_ops *ops, void *cb_arg)
+void discover_client_destroy(struct discover_client *client)
 {
-	struct discover_client *client;
-	struct sockaddr_un addr;
-
-	client = talloc(NULL, struct discover_client);
-	if (!client)
-		return NULL;
-
-	memcpy(&client->ops, ops, sizeof(client->ops));
-	client->ops.cb_arg = cb_arg;
-
-	client->fd = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (!client->fd < 0) {
-		pb_log("%s: socket: %s\n", __func__, strerror(errno));
-		goto out_err;
-	}
-
-	talloc_set_destructor(client, discover_client_destructor);
-
-	client->n_devices = 0;
-	client->devices = NULL;
-
-	addr.sun_family = AF_UNIX;
-	strcpy(addr.sun_path, PB_SOCKET_PATH);
-
-	if (connect(client->fd, (struct sockaddr *)&addr, sizeof(addr))) {
-		pb_log("%s: connect: %s\n", __func__, strerror(errno));
-		goto out_err;
-	}
-
-	return client;
-
-out_err:
 	talloc_free(client);
-	return NULL;
 }
 
-int discover_client_get_fd(const struct discover_client *client)
+static struct device *find_device(struct discover_client *client,
+		const char *id)
 {
-	return client->fd;
-}
+	int i;
 
-void discover_client_destroy(struct discover_client *client)
-{
-	talloc_free(client);
+	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)
@@ -90,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)
@@ -111,7 +100,7 @@ static void device_remove(struct discover_client *client, const char *id)
 	/* remove the device from the client's device array */
 	client->n_devices--;
 	memmove(&client->devices[i], &client->devices[i+1],
-			client->n_devices - i);
+			(client->n_devices - i) * sizeof(client->devices[0]));
 	client->devices = talloc_realloc(client, client->devices,
 			struct device *, client->n_devices);
 
@@ -121,11 +110,23 @@ static void device_remove(struct discover_client *client, const char *id)
 	talloc_free(device);
 }
 
-int discover_client_process(struct discover_client *client)
+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);
 
@@ -133,16 +134,30 @@ int discover_client_process(struct discover_client *client)
 		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__);
@@ -150,6 +165,16 @@ int discover_client_process(struct discover_client *client)
 		}
 		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);
 	}
@@ -158,6 +183,48 @@ int discover_client_process(struct discover_client *client)
 	return 0;
 }
 
+struct discover_client* discover_client_init(struct waitset *waitset,
+	const struct discover_client_ops *ops, void *cb_arg)
+{
+	struct discover_client *client;
+	struct sockaddr_un addr;
+
+	client = talloc(NULL, struct discover_client);
+	if (!client)
+		return NULL;
+
+	memcpy(&client->ops, ops, sizeof(client->ops));
+	client->ops.cb_arg = cb_arg;
+
+	client->fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (client->fd < 0) {
+		pb_log("%s: socket: %s\n", __func__, strerror(errno));
+		goto out_err;
+	}
+
+	talloc_set_destructor(client, discover_client_destructor);
+
+	client->n_devices = 0;
+	client->devices = NULL;
+
+	addr.sun_family = AF_UNIX;
+	strcpy(addr.sun_path, PB_SOCKET_PATH);
+
+	if (connect(client->fd, (struct sockaddr *)&addr, sizeof(addr))) {
+		pb_log("%s: connect: %s\n", __func__, strerror(errno));
+		goto out_err;
+	}
+
+	waiter_register_io(waitset, client->fd, WAIT_IN,
+			discover_client_process, client);
+
+	return client;
+
+out_err:
+	talloc_free(client);
+	return NULL;
+}
+
 /* accessors for discovered devices */
 int discover_client_device_count(struct discover_client *client)
 {
@@ -172,3 +239,55 @@ struct device *discover_client_get_device(struct discover_client *client,
 
 	return client->devices[index];
 }
+
+static void create_boot_command(struct boot_command *command,
+		const struct device *device __attribute__((unused)),
+		const struct boot_option *boot_option,
+		const struct pb_boot_data *data)
+{
+
+	command->option_id = boot_option->id;
+	command->boot_image_file = data->image;
+	command->initrd_file = data->initrd;
+	command->boot_args = data->args;
+}
+
+int discover_client_boot(struct discover_client *client,
+		const struct device *device,
+		const struct boot_option *boot_option,
+		const struct pb_boot_data *data)
+{
+	struct pb_protocol_message *message;
+	struct boot_command boot_command;
+	int len, rc;
+
+	create_boot_command(&boot_command, device, boot_option, data);
+
+	len = pb_protocol_boot_len(&boot_command);
+
+	message = pb_protocol_create_message(client,
+			PB_PROTOCOL_ACTION_BOOT, len);
+
+	if (!message)
+		return -1;
+
+	pb_protocol_serialise_boot_command(&boot_command,
+			message->payload, len);
+
+	rc = pb_protocol_write_message(client->fd, message);
+
+	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);
+}