protocol: Separate device add from boot-option add messages
[petitboot] / ui / common / discover-client.c
index 112fa65782e88e910e2ba3c11a03e1bb637b6ed2..42aa9de9a950a3877a7b3dad8c96b96d47305373 100644 (file)
@@ -1,4 +1,5 @@
 
+#include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <asm/byteorder.h>
 
 #include <talloc/talloc.h>
-#include <log.h>
+#include <log/log.h>
 
-#include "ui/common/discover-client.h"
+#include "discover-client.h"
 #include "pb-protocol/pb-protocol.h"
 
 struct discover_client {
        int fd;
        struct discover_client_ops ops;
+       int n_devices;
+       struct device **devices;
 };
 
 static int discover_client_destructor(void *arg)
@@ -30,7 +33,139 @@ static int discover_client_destructor(void *arg)
        return 0;
 }
 
-struct discover_client* discover_client_init(struct discover_client_ops *ops)
+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++;
+       client->devices = talloc_realloc(client, client->devices,
+                       struct device *, client->n_devices);
+
+       client->devices[client->n_devices - 1] = device;
+       talloc_steal(client, device);
+
+       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)
+{
+       struct device *device = NULL;
+       int i;
+
+       for (i = 0; i < client->n_devices; i++) {
+               if (!strcmp(client->devices[i]->id, id)) {
+                       device = client->devices[i];
+                       break;
+               }
+       }
+
+       if (!device)
+               return;
+
+       /* remove the device from the client's device array */
+       client->n_devices--;
+       memmove(&client->devices[i], &client->devices[i+1],
+                       (client->n_devices - i) * sizeof(client->devices[0]));
+       client->devices = talloc_realloc(client, client->devices,
+                       struct device *, client->n_devices);
+
+       /* notify the UI */
+       client->ops.device_remove(device, client->ops.cb_arg);
+
+       talloc_free(device);
+}
+
+static int discover_client_process(void *arg)
+{
+       struct discover_client *client = arg;
+       struct pb_protocol_message *message;
+       struct boot_option *opt;
+       struct device *dev;
+       char *dev_id;
+       int rc;
+
+       message = pb_protocol_read_message(client, client->fd);
+
+       if (!message)
+               return -1;
+
+       switch (message->action) {
+       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_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__);
+                       return 0;
+               }
+               device_remove(client, dev_id);
+               break;
+       default:
+               pb_log("%s: unknown action %d\n", __func__, message->action);
+       }
+
+
+       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;
@@ -40,15 +175,19 @@ struct discover_client* discover_client_init(struct discover_client_ops *ops)
                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) {
+       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);
 
@@ -57,6 +196,9 @@ struct discover_client* discover_client_init(struct discover_client_ops *ops)
                goto out_err;
        }
 
+       waiter_register(waitset, client->fd, WAIT_IN, discover_client_process,
+                       client);
+
        return client;
 
 out_err:
@@ -64,49 +206,56 @@ out_err:
        return NULL;
 }
 
-int discover_client_get_fd(struct discover_client *client)
+/* accessors for discovered devices */
+int discover_client_device_count(struct discover_client *client)
 {
-       return client->fd;
+       return client->n_devices;
 }
 
-void discover_client_destroy(struct discover_client *client)
+struct device *discover_client_get_device(struct discover_client *client,
+               int index)
 {
-       talloc_free(client);
+       if (index < 0 || index >= client->n_devices)
+               return NULL;
+
+       return client->devices[index];
 }
 
-int discover_client_process(struct discover_client *client)
+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 device *dev;
-       char *dev_id;
+       struct boot_command boot_command;
+       int len, rc;
 
-       message = pb_protocol_read_message(client, client->fd);
+       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;
 
-       switch (message->action) {
-       case PB_PROTOCOL_ACTION_ADD:
-               dev = pb_protocol_deserialise_device(client, message);
-               if (!dev) {
-                       pb_log("%s: no device?\n", __func__);
-                       return 0;
-               }
-               client->ops.add_device(dev, client->ops.cb_arg);
-               talloc_free(dev);
-               break;
-       case PB_PROTOCOL_ACTION_REMOVE:
-               dev_id = pb_protocol_deserialise_string(client, message);
-               if (!dev_id) {
-                       pb_log("%s: no device id?\n", __func__);
-                       return 0;
-               }
-               client->ops.remove_device(dev_id, client->ops.cb_arg);
-               break;
-       default:
-               pb_log("%s: unknown action %d\n", __func__, message->action);
-       }
+       pb_protocol_serialise_boot_command(&boot_command,
+                       message->payload, len);
 
+       rc = pb_protocol_write_message(client->fd, message);
 
-       return 0;
+       return rc;
 }