types: Remove detail and progress from struct status

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

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 0e7da9d2cca4a6a9535d9dd601601307f771e67f..dce74f9080b527a23afc7acd73dcf7b971e04faa 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,8 +112,26 @@ 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)
+               struct status *status)
 {
        if (client->ops.update_status)
                client->ops.update_status(status, client->ops.cb_arg);
@@ -136,8 +156,8 @@ 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 status *status;
        struct config *config;
        struct device *dev;
        char *dev_id;
@@ -161,7 +181,7 @@ static int discover_client_process(void *arg)
                rc = pb_protocol_deserialise_device(dev, message);
                if (rc) {
                        pb_log("%s: no device?\n", __func__);
-                       return 0;
+                       goto out;
                }
 
                device_add(client, dev);
@@ -172,7 +192,7 @@ static int discover_client_process(void *arg)
                rc = pb_protocol_deserialise_boot_option(opt, message);
                if (rc) {
                        pb_log("%s: no boot_option?\n", __func__);
-                       return 0;
+                       goto out;
                }
 
                boot_option_add(client, opt);
@@ -181,17 +201,17 @@ static int discover_client_process(void *arg)
                dev_id = pb_protocol_deserialise_string(ctx, message);
                if (!dev_id) {
                        pb_log("%s: no device id?\n", __func__);
-                       return 0;
+                       goto out;
                }
                device_remove(client, dev_id);
                break;
        case PB_PROTOCOL_ACTION_STATUS:
-               status = talloc_zero(ctx, struct boot_status);
+               status = talloc_zero(ctx, struct status);
 
                rc = pb_protocol_deserialise_boot_status(status, message);
                if (rc) {
                        pb_log("%s: invalid status message?\n", __func__);
-                       return 0;
+                       goto out;
                }
                update_status(client, status);
                break;
@@ -201,7 +221,7 @@ static int discover_client_process(void *arg)
                rc = pb_protocol_deserialise_system_info(sysinfo, message);
                if (rc) {
                        pb_log("%s: invalid sysinfo message?\n", __func__);
-                       return 0;
+                       goto out;
                }
                update_sysinfo(client, sysinfo);
                break;
@@ -211,7 +231,7 @@ static int discover_client_process(void *arg)
                rc = pb_protocol_deserialise_config(config, message);
                if (rc) {
                        pb_log("%s: invalid config message?\n", __func__);
-                       return 0;
+                       goto out;
                }
                update_config(client, config);
                break;
@@ -219,6 +239,7 @@ static int discover_client_process(void *arg)
                pb_log("%s: unknown action %d\n", __func__, message->action);
        }
 
+out:
        talloc_free(ctx);
 
        return 0;
@@ -291,6 +312,8 @@ static void create_boot_command(struct boot_command *command,
        command->initrd_file = data->initrd;
        command->dtb_file = data->dtb;
        command->boot_args = data->args;
+       command->args_sig_file = data->args_sig_file;
+       command->console = ttyname(STDIN_FILENO);
 }
 
 int discover_client_boot(struct discover_client *client,
@@ -333,6 +356,19 @@ 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)
 {
@@ -350,3 +386,21 @@ int discover_client_send_config(struct discover_client *client,
 
        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);
+}