]> git.ozlabs.org Git - petitboot/blobdiff - discover/device-handler.c
discover: Wait for net interfaces to be marked ready
[petitboot] / discover / device-handler.c
index 54a19865d2bb2e061e179afcdb9d8b6a84287b30..778cc8d8e3bffea0d4ffb623f1c1a97e11240b11 100644 (file)
@@ -19,6 +19,7 @@
 #include <url/url.h>
 #include <i18n/i18n.h>
 
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -46,6 +47,14 @@ enum default_priority {
        DEFAULT_PRIORITY_DISABLED       = 0xff,
 };
 
+struct progress_info {
+       unsigned int                    percentage;
+       unsigned long                   size;           /* size in bytes */
+
+       const struct process_info       *procinfo;
+       struct list_item        list;
+};
+
 struct device_handler {
        struct discover_server  *server;
        int                     dry_run;
@@ -72,6 +81,9 @@ struct device_handler {
 
        struct boot_task        *pending_boot;
        bool                    pending_boot_is_default;
+
+       struct list             progress;
+       unsigned int            n_progress;
 };
 
 static int mount_device(struct discover_device *dev);
@@ -114,6 +126,12 @@ const struct discover_device *device_handler_get_device(
        return handler->devices[index];
 }
 
+struct network *device_handler_get_network(
+               const struct device_handler *handler)
+{
+       return handler->network;
+}
+
 struct discover_boot_option *discover_boot_option_create(
                struct discover_context *ctx,
                struct discover_device *device)
@@ -221,17 +239,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);
 
@@ -299,10 +322,12 @@ struct device_handler *device_handler_init(struct discover_server *server,
        handler->server = server;
        handler->waitset = waitset;
        handler->dry_run = dry_run;
-       handler->autoboot_enabled = config_get()->autoboot_enabled;
+       handler->autoboot_enabled = config_autoboot_active(config_get());
 
        list_init(&handler->unresolved_boot_options);
 
+       list_init(&handler->progress);
+
        /* set up our mount point base */
        pb_mkdir_recursive(mount_base());
 
@@ -327,6 +352,16 @@ void device_handler_reinit(struct device_handler *handler)
        unsigned int i;
 
        device_handler_cancel_default(handler);
+       /* Cancel any pending non-default boot */
+       if (handler->pending_boot) {
+               boot_cancel(handler->pending_boot);
+               handler->pending_boot = NULL;
+               handler->pending_boot_is_default = false;
+       }
+
+       /* Cancel any remaining async jobs */
+       process_stop_async_all();
+       pending_network_jobs_cancel();
 
        /* free unresolved boot options */
        list_for_each_entry_safe(&handler->unresolved_boot_options,
@@ -405,25 +440,198 @@ 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_status(struct device_handler *handler,
+               struct status *status)
 {
-       struct device_handler *handler = arg;
-
        discover_server_notify_boot_status(handler->server, status);
 }
 
+static void _device_handler_vstatus(struct device_handler *handler,
+               enum status_type type, const char *fmt, va_list ap)
+{
+       struct status status;
+
+       status.type = type;
+       status.message = talloc_vasprintf(handler, fmt, ap);
+       status.backlog = false;
+
+       device_handler_status(handler, &status);
+
+       talloc_free(status.message);
+}
+
+static void _device_handler_vdevstatus(struct device_handler *handler,
+               struct discover_device *device, enum status_type type,
+               const char *fmt, va_list ap)
+{
+       char *msg;
+
+       msg = talloc_asprintf(handler, "[%s] %s",
+                       device ? device->device->id : "unknown", fmt);
+       _device_handler_vstatus(handler, type, msg, ap);
+       talloc_free(msg);
+}
+
+void device_handler_status_dev_info(struct device_handler *handler,
+               struct discover_device *dev, const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       _device_handler_vdevstatus(handler, dev, STATUS_INFO, fmt, ap);
+       va_end(ap);
+}
+
+void device_handler_status_dev_err(struct device_handler *handler,
+               struct discover_device *dev, const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       _device_handler_vdevstatus(handler, dev, STATUS_ERROR, fmt, ap);
+       va_end(ap);
+}
+
+void device_handler_status_info(struct device_handler *handler,
+               const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       _device_handler_vstatus(handler, STATUS_INFO, fmt, ap);
+       va_end(ap);
+}
+
+void device_handler_status_err(struct device_handler *handler,
+               const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       _device_handler_vstatus(handler, STATUS_ERROR, fmt, ap);
+       va_end(ap);
+}
+
+void device_handler_status_download(struct device_handler *handler,
+               const struct process_info *procinfo,
+               unsigned int percentage, unsigned int size, char suffix)
+{
+       struct progress_info *p, *progress = NULL;
+       uint64_t current_converted, current = 0;
+       const char *units = " kMGTP";
+       unsigned long size_bytes;
+       char *update = NULL;
+       double total = 0;
+       unsigned int i;
+       int unit = 0;
+
+       list_for_each_entry(&handler->progress, p, list)
+               if (p->procinfo == procinfo)
+                       progress = p;
+
+       if (!progress) {
+               pb_log("Registering new progress struct\n");
+               progress = talloc_zero(handler, struct progress_info);
+               if (!progress) {
+                       pb_log("Failed to allocate room for progress struct\n");
+                       return;
+               }
+               progress->procinfo = procinfo;
+               list_add(&handler->progress, &progress->list);
+               handler->n_progress++;
+       }
+
+       size_bytes = size;
+       for (i = 0; i < strlen(units); i++) {
+               if (units[i] == suffix)
+                       break;
+       }
+
+       if (i >= strlen(units)) {
+           pb_log("Couldn't recognise suffix '%c'\n", suffix);
+           size_bytes = 0;
+       } else {
+               while (i--)
+                       size_bytes <<= 10;
+       }
+
+       progress->percentage = percentage;
+       progress->size = size_bytes;
+
+       /*
+        * Aggregate the info we have and update status. If a progress struct
+        * has zero for both percentage and size we assume progress information
+        * is unavailable and fall back to a generic progress message.
+        */
+       list_for_each_entry(&handler->progress, p, list) {
+               uint64_t c;
+               double t;
+               if (!p->percentage || !p->size) {
+                       update = talloc_asprintf(handler,
+                                       _("%u downloads in progress..."),
+                                       handler->n_progress);
+                       current = total = 0;
+                       break;
+               }
+
+               c = p->size;
+               t = (100 * c) / p->percentage;
+
+               current += c;
+               total += t;
+       }
+
+       if (total) {
+               current_converted = current;
+               while (current_converted >= 1000) {
+                       current_converted >>= 10;
+                       unit++;
+               }
+               update = talloc_asprintf(handler,
+                               _("%u %s downloading: %.0f%% - %lu%cB"),
+                               handler->n_progress,
+                               ngettext("item", "items", handler->n_progress),
+                               (current / total) * 100, current_converted,
+                               units[unit]);
+       }
+
+       if (!update) {
+               pb_log("%s: failed to allocate new status\n", __func__);
+       } else {
+               device_handler_status_info(handler, "%s\n", update);
+               talloc_free(update);
+       }
+}
+
+void device_handler_status_download_remove(struct device_handler *handler,
+               struct process_info *procinfo)
+{
+       struct progress_info *p, *tmp;
+
+       list_for_each_entry_safe(&handler->progress, p, tmp, list)
+               if (p->procinfo == procinfo) {
+                       list_remove(&p->list);
+                       talloc_free(p);
+                       handler->n_progress--;
+               }
+}
+
+static void device_handler_boot_status_cb(void *arg, struct status *status)
+{
+       device_handler_status(arg, 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);
+       status.backlog = false;
 
-       discover_server_notify_boot_status(handler->server, &status);
+       device_handler_status(handler, &status);
 
        talloc_free(status.message);
 }
@@ -457,7 +665,7 @@ static int default_timeout(void *arg)
        platform_pre_boot();
 
        handler->pending_boot = boot(handler, handler->default_boot_option,
-                       NULL, handler->dry_run, device_handler_boot_status,
+                       NULL, handler->dry_run, device_handler_boot_status_cb,
                        handler);
        handler->pending_boot_is_default = true;
        return 0;
@@ -716,8 +924,8 @@ struct discover_context *device_handler_discover_context_create(
        struct discover_context *ctx;
 
        ctx = talloc_zero(handler, struct discover_context);
+       ctx->handler = handler;
        ctx->device = device;
-       ctx->network = handler->network;
        list_init(&ctx->boot_options);
 
        return ctx;
@@ -831,23 +1039,16 @@ int device_handler_discover(struct device_handler *handler,
                struct discover_device *dev)
 {
        struct discover_context *ctx;
-       struct boot_status *status;
        int rc;
 
-       status = talloc_zero(handler, struct boot_status);
-       status->type = BOOT_STATUS_INFO;
-       /*
-        * TRANSLATORS: this string will be passed the type and identifier
-        * of the device. For example, the first parameter could be "Disk",
-        * (which will be translated accordingly) and the second a Linux device
-        * identifier like 'sda1' (which will not be translated)
-        */
-       status->message = talloc_asprintf(status, _("Processing %s device %s"),
-                               device_type_display_name(dev->device->type),
-                               dev->device->id);
-       device_handler_boot_status(handler, status);
-
-       process_boot_option_queue(handler);
+       device_handler_status_dev_info(handler, dev,
+               /*
+                * TRANSLATORS: this string will be passed the type of the
+                * device (eg "disk" or "network"), which will be translated
+                * accordingly.
+                */
+               _("Processing new %s device"),
+               device_type_display_name(dev->device->type));
 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);
@@ -866,16 +1067,8 @@ int device_handler_discover(struct device_handler *handler,
        /* add discovered stuff to the handler */
        device_handler_discover_context_commit(handler, ctx);
 
+       process_boot_option_queue(handler);
 out:
-       /*
-        * TRANSLATORS: the format specifier in this string is a Linux
-        * device identifier, like 'sda1'
-        */
-       status->message = talloc_asprintf(status,_("Processing %s complete"),
-                               dev->device->id);
-       device_handler_boot_status(handler, status);
-
-       talloc_free(status);
        talloc_unlink(handler, ctx);
 
        return 0;
@@ -886,17 +1079,12 @@ int device_handler_dhcp(struct device_handler *handler,
                struct discover_device *dev, struct event *event)
 {
        struct discover_context *ctx;
-       struct boot_status *status;
 
-       status = talloc_zero(handler, struct boot_status);
-       status->type = BOOT_STATUS_INFO;
-       /*
-        * TRANSLATORS: this format specifier will be the name of a network
-        * device, like 'eth0'.
-        */
-       status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
-                               dev->device->id);
-       device_handler_boot_status(handler, status);
+       device_handler_status_dev_info(handler, dev,
+                       _("Processing DHCP lease response (ip: %s)"),
+                       event_get_param(event, "ip"));
+
+       pending_network_jobs_start();
 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);
@@ -907,15 +1095,6 @@ int device_handler_dhcp(struct device_handler *handler,
 
        device_handler_discover_context_commit(handler, ctx);
 
-       /*
-        * TRANSLATORS: this format specifier will be the name of a network
-        * device, like 'eth0'.
-        */
-       status->message = talloc_asprintf(status,_("Processing %s complete"),
-                               dev->device->id);
-       device_handler_boot_status(handler, status);
-
-       talloc_free(status);
        talloc_unlink(handler, ctx);
 
        return 0;
@@ -952,14 +1131,12 @@ void device_handler_boot(struct device_handler *handler,
        platform_pre_boot();
 
        handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
-                       device_handler_boot_status, handler);
+                       device_handler_boot_status_cb, handler);
        handler->pending_boot_is_default = false;
 }
 
 void device_handler_cancel_default(struct device_handler *handler)
 {
-       struct boot_status status;
-
        if (handler->timeout_waiter)
                waiter_remove(handler->timeout_waiter);
 
@@ -980,12 +1157,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.message = _("Default boot cancelled");
-
-       discover_server_notify_boot_status(handler->server, &status);
+       device_handler_status_info(handler, _("Default boot cancelled"));
 }
 
 void device_handler_update_config(struct device_handler *handler,
@@ -1072,73 +1244,102 @@ static char *device_from_addr(void *ctx, struct pb_url *url)
        return dev;
 }
 
-void device_handler_process_url(struct device_handler *handler,
-               const char *url, const char *mac, const char *ip)
+static void process_url_cb(struct load_url_result *result, void *data)
 {
+       struct device_handler *handler;
        struct discover_context *ctx;
        struct discover_device *dev;
-       struct boot_status *status;
-       struct pb_url *pb_url;
-       struct event *event;
-       struct param *param;
+       struct event *event = data;
+       const char *mac;
 
-       status = talloc(handler, struct boot_status);
+       if (result->status != LOAD_OK) {
+               pb_log("%s: Load failed for %s\n", __func__, result->url->full);
+               return;
+       }
 
-       status->type = BOOT_STATUS_ERROR;
-       status->progress = 0;
-       status->detail = talloc_asprintf(status,
-                       _("Received config URL %s"), url);
+       if (!event)
+               return;
 
-       if (!handler->network) {
-               status->message = talloc_asprintf(handler,
-                                       _("No network configured"));
-               goto msg;
+       handler = talloc_parent(event);
+       if (!handler)
+               return;
+
+       event->device = device_from_addr(event, result->url);
+       if (!event->device) {
+               pb_log("Downloaded a file but can't find its interface - pretending it was local\n");
+               event->device = talloc_asprintf(event, "local");
        }
 
-       event = talloc(handler, struct event);
+       mac = event_get_param(event, "mac");
+       char *url = talloc_asprintf(event, "file://%s", result->local);
+       event_set_param(event, "pxeconffile", url);
+
+       dev = discover_device_create(handler, mac, event->device);
+       ctx = device_handler_discover_context_create(handler, dev);
+       talloc_steal(ctx, event);
+       ctx->event = event;
+
+       iterate_parsers(ctx);
+
+       device_handler_discover_context_commit(handler, ctx);
+
+       talloc_unlink(handler, ctx);
+}
+
+void device_handler_process_url(struct device_handler *handler,
+               const char *url, const char *mac, const char *ip)
+{
+       struct discover_context *ctx;
+       struct discover_device *dev;
+       bool allow_async = false;
+       struct pb_url *pb_url;
+       struct event *event;
+
+       event = talloc_zero(handler, struct event);
        event->type = EVENT_TYPE_USER;
        event->action = EVENT_ACTION_URL;
 
-       if (url[strlen(url) - 1] == '/') {
-               event->params = talloc_array(event, struct param, 3);
-               param = &event->params[0];
-               param->name = talloc_strdup(event, "pxepathprefix");
-               param->value = talloc_strdup(event, url);
-               param = &event->params[1];
-               param->name = talloc_strdup(event, "mac");
-               param->value = talloc_strdup(event, mac);
-               param = &event->params[2];
-               param->name = talloc_strdup(event, "ip");
-               param->value = talloc_strdup(event, ip);
-               event->n_params = 3;
-       } else {
-               event->params = talloc_array(event, struct param, 1);
-               param = &event->params[0];
-               param->name = talloc_strdup(event, "pxeconffile");
-               param->value = talloc_strdup(event, url);
-               event->n_params = 1;
-       }
-
-       pb_url = pb_url_parse(event, event->params->value);
+       pb_url = pb_url_parse(event, url);
        if (!pb_url || (pb_url->scheme != pb_url_file && !pb_url->host)) {
-               status->message = talloc_asprintf(handler,
-                                       _("Invalid config URL!"));
-               goto msg;
+               device_handler_status_err(handler, _("Invalid config URL!"));
+               talloc_free(event);
+               return;
        }
 
-       if (pb_url->scheme == pb_url_file)
-               event->device = talloc_asprintf(event, "local");
-       else
+       if (url[strlen(url) - 1] == '/') {
+               event_set_param(event, "pxepathprefix", url);
+               event_set_param(event, "mac", mac);
+               event_set_param(event, "ip", ip);
                event->device = device_from_addr(event, pb_url);
-
-       if (!event->device) {
-               status->message = talloc_asprintf(status,
+               if (!event->device) {
+                       device_handler_status_err(handler,
                                        _("Unable to route to host %s"),
                                        pb_url->host);
-               goto msg;
+                       talloc_free(event);
+                       return;
+               }
+       } else {
+               event_set_param(event, "pxeconffile", url);
+               allow_async = true;
        }
 
-       dev = discover_device_create(handler, event->device);
+       if (pb_url->scheme == pb_url_file)
+               event->device = talloc_asprintf(event, "local");
+       else if (allow_async) {
+               /* If file is remote load asynchronously before passing to
+                * parser. This allows us to wait for network to be available */
+               if (!load_url_async(handler, pb_url, process_url_cb, event,
+                                       NULL, handler)) {
+                       pb_log("Failed to load url %s\n", pb_url->full);
+                       device_handler_status_err(handler, _("Failed to load URL!"));
+                       talloc_free(event);
+               }
+               return;
+       }
+
+       /* If path is local we can parse straight away */
+
+       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);
@@ -1150,13 +1351,6 @@ void device_handler_process_url(struct device_handler *handler,
        device_handler_discover_context_commit(handler, ctx);
 
        talloc_unlink(handler, ctx);
-
-       status->type = BOOT_STATUS_INFO;
-       status->message = talloc_asprintf(status, _("Config file %s parsed"),
-                                       pb_url->file);
-msg:
-       device_handler_boot_status(handler, status);
-       talloc_free(status);
 }
 
 #ifndef PETITBOOT_TEST
@@ -1171,7 +1365,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 */
@@ -1230,15 +1424,15 @@ static void device_handler_update_lang(const char *lang)
 static int device_handler_init_sources(struct device_handler *handler)
 {
        /* init our device sources: udev, network and user events */
-       handler->udev = udev_init(handler, handler->waitset);
-       if (!handler->udev)
-               return -1;
-
        handler->network = network_init(handler, handler->waitset,
                        handler->dry_run);
        if (!handler->network)
                return -1;
 
+       handler->udev = udev_init(handler, handler->waitset);
+       if (!handler->udev)
+               return -1;
+
        handler->user_event = user_event_init(handler, handler->waitset);
        if (!handler->user_event)
                return -1;
@@ -1255,11 +1449,13 @@ static void device_handler_reinit_sources(struct device_handler *handler)
                return;
        }
 
-       udev_reinit(handler->udev);
+       system_info_reinit();
 
        network_shutdown(handler->network);
        handler->network = network_init(handler, handler->waitset,
                        handler->dry_run);
+
+       udev_reinit(handler->udev);
 }
 
 static inline const char *get_device_path(struct discover_device *dev)