ui/ncurses: Add support for 'add-url' action

[petitboot] / ui / common / discover-client.c

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index de210bd785bd940af1a27eac7784dc6c87133529..14f36da4e9004871f7704e8f76dcaea2a3fe253b 100644 (file)
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -60,6 +60,7 @@ static void device_add(struct discover_client *client, struct device *device)
 
        client->devices[client->n_devices - 1] = device;
        talloc_steal(client, device);
+       list_init(&device->boot_options);
 
        if (client->ops.device_add)
                client->ops.device_add(device, client->ops.cb_arg);
@@ -77,6 +78,7 @@ static void boot_option_add(struct discover_client *client,
        assert(dev);
 
        talloc_steal(dev, opt);
+       list_add(&dev->boot_options, &opt->list);
 
        if (client->ops.boot_option_add)
                client->ops.boot_option_add(dev, opt, client->ops.cb_arg);
@@ -110,12 +112,29 @@ static void device_remove(struct discover_client *client, const char *id)
        talloc_free(device);
 }
 
+void discover_client_enumerate(struct discover_client *client)
+{
+       struct boot_option *opt;
+       struct device *device;
+       int i;
+
+       for (i = 0; i < client->n_devices; i++) {
+               device = client->devices[i];
+               if (client->ops.device_add)
+                       client->ops.device_add(device, client->ops.cb_arg);
+
+               list_for_each_entry(&device->boot_options, opt, list)
+                       if (client->ops.boot_option_add)
+                               client->ops.boot_option_add(device, opt,
+                                               client->ops.cb_arg);
+       }
+}
+
 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 void update_sysinfo(struct discover_client *client,
@@ -123,7 +142,6 @@ static void update_sysinfo(struct discover_client *client,
 {
        if (client->ops.update_sysinfo)
                client->ops.update_sysinfo(sysinfo, client->ops.cb_arg);
-       talloc_free(sysinfo);
 }
 
 static void update_config(struct discover_client *client,
@@ -143,16 +161,21 @@ static int discover_client_process(void *arg)
        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);
@@ -164,7 +187,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) {
@@ -175,7 +198,7 @@ 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;
@@ -183,7 +206,7 @@ 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);
+               status = talloc_zero(ctx, struct boot_status);
 
                rc = pb_protocol_deserialise_boot_status(status, message);
                if (rc) {
@@ -193,7 +216,7 @@ static int discover_client_process(void *arg)
                update_status(client, status);
                break;
        case PB_PROTOCOL_ACTION_SYSTEM_INFO:
-               sysinfo = talloc_zero(client, struct system_info);
+               sysinfo = talloc_zero(ctx, struct system_info);
 
                rc = pb_protocol_deserialise_system_info(sysinfo, message);
                if (rc) {
@@ -216,6 +239,7 @@ static int discover_client_process(void *arg)
                pb_log("%s: unknown action %d\n", __func__, message->action);
        }
 
+       talloc_free(ctx);
 
        return 0;
 }
@@ -328,3 +352,52 @@ int discover_client_cancel_default(struct discover_client *client)
 
        return pb_protocol_write_message(client->fd, message);
 }
+
+int discover_client_send_reinit(struct discover_client *client)
+{
+       struct pb_protocol_message *message;
+
+       message = pb_protocol_create_message(client,
+                       PB_PROTOCOL_ACTION_REINIT, 0);
+
+       if (!message)
+               return -1;
+
+       return pb_protocol_write_message(client->fd, message);
+}
+
+int discover_client_send_config(struct discover_client *client,
+               struct config *config)
+{
+       struct pb_protocol_message *message;
+       int len;
+
+       len = pb_protocol_config_len(config);
+
+       message = pb_protocol_create_message(client,
+                               PB_PROTOCOL_ACTION_CONFIG, len);
+       if (!message)
+               return -1;
+
+       pb_protocol_serialise_config(config, message->payload, len);
+
+       return pb_protocol_write_message(client->fd, message);
+}
+
+int discover_client_send_url(struct discover_client *client,
+               char *url)
+{
+       struct pb_protocol_message *message;
+       int len;
+
+       len = pb_protocol_url_len(url);
+
+       message = pb_protocol_create_message(client,
+                               PB_PROTOCOL_ACTION_ADD_URL, len);
+       if (!message)
+               return -1;
+
+       pb_protocol_serialise_url(url, message->payload, len);
+
+       return pb_protocol_write_message(client->fd, message);
+}