types: Remove detail and progress from struct status

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 346cb0221d7f08e8b5bcbd7b72f33c596f344f8b..2e96c2b4b7e35e026bfb0c1772bfff9fd319f3c8 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -221,17 +221,22 @@ static int destroy_device(void *arg)
 }
 
 struct discover_device *discover_device_create(struct device_handler *handler,
-               const char *id)
+               const char *uuid, const char *id)
 {
        struct discover_device *dev;
 
-       dev = device_lookup_by_id(handler, id);
+       if (uuid)
+               dev = device_lookup_by_uuid(handler, uuid);
+       else
+               dev = device_lookup_by_id(handler, id);
+
        if (dev)
                return dev;
 
        dev = talloc_zero(handler, struct discover_device);
        dev->device = talloc_zero(dev, struct device);
        dev->device->id = talloc_strdup(dev->device, id);
+       dev->uuid = talloc_strdup(dev, uuid);
        list_init(&dev->params);
        list_init(&dev->boot_options);
 
@@ -405,7 +410,7 @@ void device_handler_remove(struct device_handler *handler,
        talloc_free(device);
 }
 
-void device_handler_boot_status(void *arg, struct boot_status *status)
+void device_handler_boot_status(void *arg, struct status *status)
 {
        struct device_handler *handler = arg;
 
@@ -415,11 +420,9 @@ void device_handler_boot_status(void *arg, struct boot_status *status)
 static void countdown_status(struct device_handler *handler,
                struct discover_boot_option *opt, unsigned int sec)
 {
-       struct boot_status status;
+       struct status status;
 
-       status.type = BOOT_STATUS_INFO;
-       status.progress = -1;
-       status.detail = NULL;
+       status.type = STATUS_INFO;
        status.message = talloc_asprintf(handler,
                        _("Booting in %d sec: %s"), sec, opt->option->name);
 
@@ -831,11 +834,11 @@ int device_handler_discover(struct device_handler *handler,
                struct discover_device *dev)
 {
        struct discover_context *ctx;
-       struct boot_status *status;
+       struct status *status;
        int rc;
 
-       status = talloc_zero(handler, struct boot_status);
-       status->type = BOOT_STATUS_INFO;
+       status = talloc_zero(handler, struct status);
+       status->type = STATUS_INFO;
        /*
         * TRANSLATORS: this string will be passed the type and identifier
         * of the device. For example, the first parameter could be "Disk",
@@ -886,10 +889,10 @@ int device_handler_dhcp(struct device_handler *handler,
                struct discover_device *dev, struct event *event)
 {
        struct discover_context *ctx;
-       struct boot_status *status;
+       struct status *status;
 
-       status = talloc_zero(handler, struct boot_status);
-       status->type = BOOT_STATUS_INFO;
+       status = talloc_zero(handler, struct status);
+       status->type = STATUS_INFO;
        /*
         * TRANSLATORS: this format specifier will be the name of a network
         * device, like 'eth0'.
@@ -921,36 +924,6 @@ int device_handler_dhcp(struct device_handler *handler,
        return 0;
 }
 
-/* incoming conf event */
-int device_handler_conf(struct device_handler *handler,
-               struct discover_device *dev, struct pb_url *url)
-{
-       struct discover_context *ctx;
-       struct boot_status *status;
-
-       status = talloc_zero(handler, struct boot_status);
-       status->type = BOOT_STATUS_INFO;
-       status->message = talloc_asprintf(status, _("Processing user config"));
-       device_handler_boot_status(handler, status);
-
-       /* create our context */
-       ctx = device_handler_discover_context_create(handler, dev);
-       ctx->conf_url = url;
-
-       iterate_parsers(ctx);
-
-       device_handler_discover_context_commit(handler, ctx);
-
-       status->message = talloc_asprintf(status,
-                               _("Processing user config complete"));
-       device_handler_boot_status(handler, status);
-
-       talloc_free(status);
-       talloc_unlink(handler, ctx);
-
-       return 0;
-}
-
 static struct discover_boot_option *find_boot_option_by_id(
                struct device_handler *handler, const char *id)
 {
@@ -988,7 +961,7 @@ void device_handler_boot(struct device_handler *handler,
 
 void device_handler_cancel_default(struct device_handler *handler)
 {
-       struct boot_status status;
+       struct status status;
 
        if (handler->timeout_waiter)
                waiter_remove(handler->timeout_waiter);
@@ -1010,9 +983,7 @@ void device_handler_cancel_default(struct device_handler *handler)
 
        handler->default_boot_option = NULL;
 
-       status.type = BOOT_STATUS_INFO;
-       status.progress = -1;
-       status.detail = NULL;
+       status.type = STATUS_INFO;
        status.message = _("Default boot cancelled");
 
        discover_server_notify_boot_status(handler->server, &status);
@@ -1107,17 +1078,13 @@ void device_handler_process_url(struct device_handler *handler,
 {
        struct discover_context *ctx;
        struct discover_device *dev;
-       struct boot_status *status;
+       struct status *status;
        struct pb_url *pb_url;
        struct event *event;
        struct param *param;
 
-       status = talloc(handler, struct boot_status);
-
-       status->type = BOOT_STATUS_ERROR;
-       status->progress = 0;
-       status->detail = talloc_asprintf(status,
-                       _("Received config URL %s"), url);
+       status = talloc(handler, struct status);
+       status->type = STATUS_ERROR;
 
        if (!handler->network) {
                status->message = talloc_asprintf(handler,
@@ -1127,7 +1094,7 @@ void device_handler_process_url(struct device_handler *handler,
 
        event = talloc(handler, struct event);
        event->type = EVENT_TYPE_USER;
-       event->action = EVENT_ACTION_CONF;
+       event->action = EVENT_ACTION_URL;
 
        if (url[strlen(url) - 1] == '/') {
                event->params = talloc_array(event, struct param, 3);
@@ -1168,7 +1135,7 @@ void device_handler_process_url(struct device_handler *handler,
                goto msg;
        }
 
-       dev = discover_device_create(handler, event->device);
+       dev = discover_device_create(handler, mac, event->device);
        if (pb_url->scheme == pb_url_file)
                dev->device->type = DEVICE_TYPE_ANY;
        ctx = device_handler_discover_context_create(handler, dev);
@@ -1181,7 +1148,7 @@ void device_handler_process_url(struct device_handler *handler,
 
        talloc_unlink(handler, ctx);
 
-       status->type = BOOT_STATUS_INFO;
+       status->type = STATUS_INFO;
        status->message = talloc_asprintf(status, _("Config file %s parsed"),
                                        pb_url->file);
 msg:
@@ -1201,7 +1168,7 @@ void device_handler_discover_context_commit(struct device_handler *handler,
        struct discover_device *dev = ctx->device;
        struct discover_boot_option *opt, *tmp;
 
-       if (!device_lookup_by_id(handler, dev->device->id))
+       if (!device_lookup_by_uuid(handler, dev->uuid))
                device_handler_add_device(handler, dev);
 
        /* move boot options from the context to the device */