]> git.ozlabs.org Git - petitboot/blobdiff - discover/device-handler.c
discover: Add configuration events & DHCP handler
[petitboot] / discover / device-handler.c
index 6952ddefa6387b18d6f60120b7ba621ca7eae342..594a7c3c80a87b2c142cd17730cf09f46b50b149 100644 (file)
 #include <log/log.h>
 #include <types/types.h>
 #include <system/system.h>
+#include <url/url.h>
 
 #include "device-handler.h"
 #include "discover-server.h"
 #include "event.h"
 #include "parser.h"
+#include "resource.h"
 #include "udev.h"
 #include "paths.h"
 #include "boot.h"
@@ -27,8 +29,80 @@ struct device_handler {
 
        struct discover_device  **devices;
        unsigned int            n_devices;
+
+       struct list             unresolved_boot_options;
 };
 
+static bool resource_is_resolved(struct resource *res)
+{
+       return !res || res->resolved;
+}
+
+/* We only use this in an assert, which will disappear if we're compiling
+ * with NDEBUG, so we need the 'used' attribute for these builds */
+static bool __attribute__((used)) boot_option_is_resolved(
+               struct discover_boot_option *opt)
+{
+       return resource_is_resolved(opt->boot_image) &&
+               resource_is_resolved(opt->initrd) &&
+               resource_is_resolved(opt->icon);
+}
+
+static bool resource_resolve(struct resource *res, struct parser *parser,
+               struct device_handler *handler)
+{
+       if (resource_is_resolved(res))
+               return true;
+
+       parser->resolve_resource(handler, res);
+
+       return res->resolved;
+}
+
+static bool boot_option_resolve(struct discover_boot_option *opt,
+               struct device_handler *handler)
+{
+       return resource_resolve(opt->boot_image, opt->source, handler) &&
+               resource_resolve(opt->initrd, opt->source, handler) &&
+               resource_resolve(opt->icon, opt->source, handler);
+}
+
+static void boot_option_finalise(struct discover_boot_option *opt)
+{
+       assert(boot_option_is_resolved(opt));
+
+       /* check that the parsers haven't set any of the final data */
+       assert(!opt->option->boot_image_file);
+       assert(!opt->option->initrd_file);
+       assert(!opt->option->icon_file);
+
+       if (opt->boot_image)
+               opt->option->boot_image_file = opt->boot_image->url->full;
+       if (opt->initrd)
+               opt->option->initrd_file = opt->initrd->url->full;
+       if (opt->icon)
+               opt->option->icon_file = opt->icon->url->full;
+}
+
+static void process_boot_option_queue(struct device_handler *handler)
+{
+       struct discover_boot_option *opt, *tmp;
+
+       list_for_each_entry_safe(&handler->unresolved_boot_options,
+                       opt, tmp, list) {
+
+               if (!boot_option_resolve(opt, handler))
+                       continue;
+
+               list_remove(&opt->list);
+               list_add(&opt->device->boot_options, &opt->list);
+               talloc_steal(opt->device, opt);
+               boot_option_finalise(opt);
+               discover_server_notify_boot_option_add(handler->server,
+                                                       opt->option);
+       }
+}
+
 /**
  * context_commit - Commit a temporary discovery context to the handler,
  * and notify the clients about any new options / devices
@@ -37,8 +111,8 @@ static void context_commit(struct device_handler *handler,
                struct discover_context *ctx)
 {
        struct discover_device *dev = ctx->device;
-       unsigned int i, existing_device;
-       struct boot_option *opt, *tmp;
+       struct discover_boot_option *opt, *tmp;
+       unsigned int i, existing_device = 0;
 
        /* do we already have this device? */
        for (i = 0; i < handler->n_devices; i++) {
@@ -57,21 +131,34 @@ static void context_commit(struct device_handler *handler,
                talloc_steal(handler, dev);
 
                discover_server_notify_device_add(handler->server, dev->device);
+
+               /* this new device might be able to resolve existing boot
+                * options */
+               process_boot_option_queue(handler);
        }
 
 
        /* move boot options from the context to the device */
        list_for_each_entry_safe(&ctx->boot_options, opt, tmp, list) {
                list_remove(&opt->list);
-               list_add(&dev->device->boot_options, &opt->list);
-               dev->device->n_options++;
-               discover_server_notify_boot_option_add(handler->server, opt);
+
+               if (boot_option_resolve(opt, handler)) {
+                       list_add(&dev->boot_options, &opt->list);
+                       talloc_steal(dev, opt);
+                       boot_option_finalise(opt);
+                       discover_server_notify_boot_option_add(handler->server,
+                                                               opt->option);
+               } else {
+                       list_add(&handler->unresolved_boot_options, &opt->list);
+                       talloc_steal(handler, opt);
+               }
        }
 }
 
 void discover_context_add_boot_option(struct discover_context *ctx,
-               struct boot_option *boot_option)
+               struct discover_boot_option *boot_option)
 {
+       boot_option->source = ctx->parser;
        list_add(&ctx->boot_options, &boot_option->list);
        talloc_steal(ctx, boot_option);
 }
@@ -118,7 +205,7 @@ int device_handler_get_device_count(const struct device_handler *handler)
  * device_handler_get_device - Get a handler device by index.
  */
 
-const struct device *device_handler_get_device(
+const struct discover_device *device_handler_get_device(
        const struct device_handler *handler, unsigned int index)
 {
        if (index >= handler->n_devices) {
@@ -126,80 +213,16 @@ const struct device *device_handler_get_device(
                return NULL;
        }
 
-       return handler->devices[index]->device;
+       return handler->devices[index];
 }
 
-static void setup_device_links(struct discover_context *ctx)
+static int mount_device(struct discover_device *dev)
 {
-       struct discover_device *dev = ctx->device;
-       struct link {
-               char *env, *dir;
-       } *link, links[] = {
-               {
-                       .env = "ID_FS_UUID",
-                       .dir = "disk/by-uuid"
-               },
-               {
-                       .env = "ID_FS_LABEL",
-                       .dir = "disk/by-label"
-               },
-               {
-                       .env = NULL
-               }
-       };
-
-       for (link = links; link->env; link++) {
-               char *enc, *dir, *path;
-               const char *value;
-
-               value = event_get_param(ctx->event, link->env);
-               if (!value || !*value)
-                       continue;
-
-               enc = encode_label(ctx, value);
-               dir = join_paths(ctx, mount_base(), link->dir);
-               path = join_paths(dev, dir, value);
-
-               if (!pb_mkdir_recursive(dir)) {
-                       unlink(path);
-                       if (symlink(dev->mount_path, path)) {
-                               pb_log("symlink(%s,%s): %s\n",
-                                               dev->mount_path, path,
-                                               strerror(errno));
-                               talloc_free(path);
-                       } else {
-                               int i = dev->n_links++;
-                               dev->links = talloc_realloc(dev,
-                                               dev->links, char *,
-                                               dev->n_links);
-                               dev->links[i] = path;
-                       }
-
-               }
-
-               talloc_free(dir);
-               talloc_free(enc);
-       }
-}
-
-static void remove_device_links(struct discover_device *dev)
-{
-       int i;
-
-       for (i = 0; i < dev->n_links; i++)
-               unlink(dev->links[i]);
-}
-
-static int mount_device(struct discover_context *ctx)
-{
-       struct discover_device *dev = ctx->device;
-       const char *mountpoint;
        const char *argv[6];
 
-       if (!dev->mount_path) {
-               mountpoint = mountpoint_for_device(dev->device_path);
-               dev->mount_path = talloc_strdup(dev, mountpoint);
-       }
+       if (!dev->mount_path)
+               dev->mount_path = join_paths(dev, mount_base(),
+                                               dev->device_path);
 
        if (pb_mkdir_recursive(dev->mount_path))
                pb_log("couldn't create mount directory %s: %s\n",
@@ -225,7 +248,6 @@ static int mount_device(struct discover_context *ctx)
                        goto out_rmdir;
        }
 
-       setup_device_links(ctx);
        return 0;
 
 out_rmdir:
@@ -238,8 +260,6 @@ static int umount_device(struct discover_device *dev)
        int status;
        pid_t pid;
 
-       remove_device_links(dev);
-
        if (!dev->mount_path)
                return 0;
 
@@ -307,7 +327,7 @@ static struct discover_device *discover_device_create(
 
        dev = talloc_zero(ctx, struct discover_device);
        dev->device = talloc_zero(dev, struct device);
-       list_init(&dev->device->boot_options);
+       list_init(&dev->boot_options);
 
        devname = event_get_param(ctx->event, "DEVNAME");
        if (devname)
@@ -320,11 +340,26 @@ static struct discover_device *discover_device_create(
        return dev;
 }
 
+struct discover_boot_option *discover_boot_option_create(
+               struct discover_context *ctx,
+               struct discover_device *device)
+{
+       struct discover_boot_option *opt;
+
+       opt = talloc_zero(ctx, struct discover_boot_option);
+       opt->option = talloc_zero(opt, struct boot_option);
+       opt->device = device;
+
+       return opt;
+}
+
+
 static int handle_add_udev_event(struct device_handler *handler,
                struct event *event)
 {
        struct discover_context *ctx;
        struct discover_device *dev;
+       const char *param;
        int rc;
 
        /* create our context */
@@ -337,14 +372,23 @@ static int handle_add_udev_event(struct device_handler *handler,
 
        ctx->device = dev;
 
-       rc = mount_device(ctx);
+       /* try to parse UUID and labels */
+       param = event_get_param(ctx->event, "ID_FS_UUID");
+       if (param)
+               dev->uuid = talloc_strdup(dev, param);
+
+       param = event_get_param(ctx->event, "ID_FS_LABEL");
+       if (param)
+               dev->label = talloc_strdup(dev, param);
+
+       rc = mount_device(dev);
        if (rc) {
                talloc_free(ctx);
                return 0;
        }
 
        /* run the parsers. This will populate the ctx's boot_option list. */
-       iterate_parsers(ctx);
+       iterate_parsers(ctx, CONF_METHOD_LOCAL_FILE);
 
        /* add discovered stuff to the handler */
        context_commit(handler, ctx);
@@ -407,6 +451,61 @@ static int handle_remove_user_event(struct device_handler *handler,
        return 0;
 }
 
+static enum conf_method parse_conf_method(const char *str)
+{
+
+       if (!strcasecmp(str, "dhcp")) {
+               return CONF_METHOD_DHCP;
+       }
+       return CONF_METHOD_UNKNOWN;
+}
+
+static int handle_conf_user_event(struct device_handler *handler,
+               struct event *event)
+{
+       struct discover_context *ctx;
+       struct discover_device *dev;
+       enum conf_method method;
+       const char *val;
+
+       ctx = talloc(handler, struct discover_context);
+       ctx->event = event;
+       list_init(&ctx->boot_options);
+
+       val = event_get_param(event, "url");
+       if (!val) {
+               talloc_free(ctx);
+               return 0;
+       }
+
+       ctx->conf_url = pb_url_parse(ctx, val);
+       if (!ctx->conf_url) {
+               talloc_free(ctx);
+               return 0;
+       }
+
+       val = event_get_param(event, "method");
+       if (!val) {
+               talloc_free(ctx);
+               return 0;
+       }
+
+       method = parse_conf_method(val);
+       if (method == CONF_METHOD_UNKNOWN) {
+               talloc_free(ctx);
+               return 0;
+       }
+
+       dev = discover_device_create(handler, ctx, event);
+       ctx->device = dev;
+
+       iterate_parsers(ctx, method);
+
+       context_commit(handler, ctx);
+
+       return 0;
+}
+
 typedef int (*event_handler)(struct device_handler *, struct event *);
 
 static event_handler handlers[EVENT_TYPE_MAX][EVENT_ACTION_MAX] = {
@@ -417,6 +516,7 @@ static event_handler handlers[EVENT_TYPE_MAX][EVENT_ACTION_MAX] = {
        [EVENT_TYPE_USER] = {
                [EVENT_ACTION_ADD]      = handle_add_user_event,
                [EVENT_ACTION_REMOVE]   = handle_remove_user_event,
+               [EVENT_ACTION_CONF]     = handle_conf_user_event,
        }
 };
 
@@ -444,6 +544,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
        handler->n_devices = 0;
        handler->server = server;
        handler->dry_run = dry_run;
+       list_init(&handler->unresolved_boot_options);
 
        /* set up our mount point base */
        pb_mkdir_recursive(mount_base());
@@ -458,17 +559,104 @@ void device_handler_destroy(struct device_handler *handler)
        talloc_free(handler);
 }
 
-static struct boot_option *find_boot_option_by_id(
+static int device_match_path(struct discover_device *dev, const char *path)
+{
+       return !strcmp(dev->device_path, path);
+}
+
+static int device_match_uuid(struct discover_device *dev, const char *uuid)
+{
+       return dev->uuid && !strcmp(dev->uuid, uuid);
+}
+
+static int device_match_label(struct discover_device *dev, const char *label)
+{
+       return dev->label && !strcmp(dev->label, label);
+}
+
+static int device_match_id(struct discover_device *dev, const char *id)
+{
+       return !strcmp(dev->device->id, id);
+}
+
+static struct discover_device *device_lookup(
+               struct device_handler *device_handler,
+               int (match_fn)(struct discover_device *, const char *),
+               const char *str)
+{
+       struct discover_device *dev;
+       unsigned int i;
+
+       if (!str)
+               return NULL;
+
+       for (i = 0; i < device_handler->n_devices; i++) {
+               dev = device_handler->devices[i];
+
+               if (match_fn(dev, str))
+                       return dev;
+       }
+
+       return NULL;
+}
+
+struct discover_device *device_lookup_by_name(struct device_handler *handler,
+               const char *name)
+{
+       struct discover_device *dev;
+       char *path;
+
+       if (strncmp(name, "/dev/", strlen("/dev/")))
+               path = talloc_asprintf(NULL, "/dev/%s", name);
+       else
+               path = talloc_strdup(NULL, name);
+
+       dev = device_lookup_by_path(handler, path);
+
+       talloc_free(path);
+
+       return dev;
+}
+
+struct discover_device *device_lookup_by_path(
+               struct device_handler *device_handler,
+               const char *path)
+{
+       return device_lookup(device_handler, device_match_path, path);
+}
+
+struct discover_device *device_lookup_by_uuid(
+               struct device_handler *device_handler,
+               const char *uuid)
+{
+       return device_lookup(device_handler, device_match_uuid, uuid);
+}
+
+struct discover_device *device_lookup_by_label(
+               struct device_handler *device_handler,
+               const char *label)
+{
+       return device_lookup(device_handler, device_match_label, label);
+}
+
+struct discover_device *device_lookup_by_id(
+               struct device_handler *device_handler,
+               const char *id)
+{
+       return device_lookup(device_handler, device_match_id, id);
+}
+
+static struct discover_boot_option *find_boot_option_by_id(
                struct device_handler *handler, const char *id)
 {
        unsigned int i;
 
        for (i = 0; i < handler->n_devices; i++) {
                struct discover_device *dev = handler->devices[i];
-               struct boot_option *opt;
+               struct discover_boot_option *opt;
 
-               list_for_each_entry(&dev->device->boot_options, opt, list)
-                       if (!strcmp(opt->id, id))
+               list_for_each_entry(&dev->boot_options, opt, list)
+                       if (!strcmp(opt->option->id, id))
                                return opt;
        }
 
@@ -478,7 +666,7 @@ static struct boot_option *find_boot_option_by_id(
 void device_handler_boot(struct device_handler *handler,
                struct boot_command *cmd)
 {
-       struct boot_option *opt;
+       struct discover_boot_option *opt;
 
        opt = find_boot_option_by_id(handler, cmd->option_id);