discover: Support DHCP "pathprefix" configuration option

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index afc4c437e8a7809f685a1a03a3e2bb5af31d6819..7acd237234848d453740592cc0d16c2cad09a78d 100644 (file)
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -20,7 +20,6 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#define _GNU_SOURCE

 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
 #include <string.h>


@@ -29,35 +28,405 @@
 #include <sys/un.h>
 
 #include <log/log.h>
 #include <sys/un.h>
 
 #include <log/log.h>

+#include <url/url.h>
+#include <types/types.h>

 #include <talloc/talloc.h>
 #include <waiter/waiter.h>
 
 #include "device-handler.h"
 #include <talloc/talloc.h>
 #include <waiter/waiter.h>
 
 #include "device-handler.h"

+#include "resource.h"

 #include "event.h"
 #include "user-event.h"
 
 
 #include "event.h"
 #include "user-event.h"
 
 

+#define MAC_ADDR_SIZE  6
+#define IP_ADDR_SIZE   4
+

 struct user_event {
        struct device_handler *handler;
        int socket;
 };
 
 struct user_event {
        struct device_handler *handler;
        int socket;
 };
 

+static const char *event_action_name(enum event_action action)
+{
+       switch (action) {
+       case EVENT_ACTION_ADD:
+               return "add";
+       case EVENT_ACTION_REMOVE:
+               return "remove";
+       case EVENT_ACTION_DHCP:
+               return "dhcp";
+       default:
+               break;
+       }
+
+       return "unknown";
+}
+

 static void user_event_print_event(struct event __attribute__((unused)) *event)
 {
 static void user_event_print_event(struct event __attribute__((unused)) *event)
 {

-       const char *action, *params[] = {
-               "name", "image", "args",
-               NULL,
-       };

        int i;
 
        int i;
 

-       action = event->action == EVENT_ACTION_ADD ? "add" : "remove";
+       pb_debug("user_event %s event:\n", event_action_name(event->action));
+       pb_debug("\tdevice: %s\n", event->device);
+
+       for (i = 0; i < event->n_params; i++)
+               pb_debug("\t%-12s => %s\n",
+                       event->params[i].name, event->params[i].value);
+}
+
+static struct resource *user_event_resource(struct discover_boot_option *opt,
+               struct event *event)
+{
+       const char *siaddr, *boot_file;
+       struct resource *res;
+       struct pb_url *url;
+       char *url_str;
+
+       siaddr = event_get_param(event, "siaddr");
+       if (!siaddr) {
+               pb_log("%s: next server option not found\n", __func__);
+               return NULL;
+       }
+
+       boot_file = event_get_param(event, "boot_file");
+       if (!boot_file) {
+               pb_log("%s: boot_file not found\n", __func__);
+               return NULL;
+       }
+
+       url_str = talloc_asprintf(opt, "%s%s/%s", "tftp://", siaddr, boot_file);
+       url = pb_url_parse(opt, url_str);
+       talloc_free(url_str);
+
+       if (!url)
+               return NULL;
+
+       res = create_url_resource(opt, url);
+       if (!res) {
+               talloc_free(url);
+               return NULL;
+       }
+
+       return res;
+}
+
+static int parse_user_event(struct discover_context *ctx, struct event *event)
+{
+       struct discover_boot_option *d_opt;
+       char *server_ip, *root_dir, *p;
+       struct boot_option *opt;
+       struct device *dev;
+       const char *val;
+
+       dev = ctx->device->device;
+
+       d_opt = discover_boot_option_create(ctx, ctx->device);
+       if (!d_opt)
+               goto fail;
+
+       opt = d_opt->option;
+
+       val = event_get_param(event, "name");
+
+       if (!val) {
+               pb_log("%s: no name found\n", __func__);
+               goto fail_opt;
+       }
+
+       opt->id = talloc_asprintf(opt, "%s#%s", dev->id, val);
+       opt->name = talloc_strdup(opt, val);
+
+       d_opt->boot_image = user_event_resource(d_opt, event);
+       if (!d_opt->boot_image) {
+               pb_log("%s: no boot image found for %s!\n", __func__,
+                               opt->name);
+               goto fail_opt;
+       }
+
+       val = event_get_param(event, "rootpath");
+       if (val) {
+               server_ip = talloc_strdup(opt, val);
+               p = strchr(server_ip, ':');
+               if (p) {
+                       root_dir = talloc_strdup(opt, p + 1);
+                       *p = '\0';
+                       opt->boot_args = talloc_asprintf(opt, "%s%s:%s",
+                                       "root=/dev/nfs ip=any nfsroot=",
+                                       server_ip, root_dir);
+
+                       talloc_free(root_dir);
+               } else {
+                       opt->boot_args = talloc_asprintf(opt, "%s",
+                                       "root=/dev/nfs ip=any nfsroot=");
+               }
+
+               talloc_free(server_ip);
+       }
+
+       opt->description = talloc_asprintf(opt, "%s %s", opt->boot_image_file,
+               opt->boot_args ? : "");
+
+       if (event_get_param(event, "default"))
+               opt->is_default = true;
+
+       discover_context_add_boot_option(ctx, d_opt);
+
+       return 0;
+
+fail_opt:
+       talloc_free(d_opt);
+fail:
+       return -1;
+}
+
+static const char *parse_host_addr(struct event *event)
+{
+       const char *val;
+
+       val = event_get_param(event, "tftp");
+       if (val)
+               return val;
+
+       val = event_get_param(event, "siaddr");
+       if (val)
+               return val;
+
+       val = event_get_param(event, "serverid");
+       if (val)
+               return val;
+
+       return NULL;
+}
+
+static char *parse_mac_addr(struct discover_context *ctx, const char *mac)
+{
+       unsigned int mac_addr_arr[MAC_ADDR_SIZE];
+       char *mac_addr;
+
+       sscanf(mac, "%X:%X:%X:%X:%X:%X", mac_addr_arr, mac_addr_arr + 1,
+                       mac_addr_arr + 2, mac_addr_arr + 3, mac_addr_arr + 4,
+                       mac_addr_arr + 5);
+
+       mac_addr = talloc_asprintf(ctx, "01-%02X-%02X-%02X-%02X-%02X-%02X",
+                       mac_addr_arr[0], mac_addr_arr[1], mac_addr_arr[2],
+                       mac_addr_arr[3], mac_addr_arr[4], mac_addr_arr[5]);
+
+       return mac_addr;
+}
+
+static char *parse_ip_addr(struct discover_context *ctx, const char *ip)
+{
+       unsigned int ip_addr_arr[IP_ADDR_SIZE];
+       char *ip_hex;
+
+       sscanf(ip, "%u.%u.%u.%u", ip_addr_arr, ip_addr_arr + 1,
+                       ip_addr_arr + 2, ip_addr_arr + 3);
+
+       ip_hex = talloc_asprintf(ctx, "%02X%02X%02X%02X", ip_addr_arr[0],
+                       ip_addr_arr[1], ip_addr_arr[2], ip_addr_arr[3]);
+
+       return ip_hex;
+}
+
+struct pb_url *user_event_parse_conf_url(struct discover_context *ctx,
+               struct event *event, bool *is_complete)
+{
+       const char *conffile, *pathprefix, *host, *bootfile;
+       char *p, *basedir, *url_str;
+       struct pb_url *url;
+
+       conffile = event_get_param(event, "pxeconffile");
+       pathprefix = event_get_param(event, "pxepathprefix");
+       bootfile = event_get_param(event, "bootfile");
+
+       /* If we're given a conf file, we're able to generate a complete URL to
+        * the configuration file, and the parser doesn't need to do any
+        * further autodiscovery */
+       *is_complete = !!conffile;
+
+       /* if conffile is a URL, that's all we need */
+       if (conffile && is_url(conffile)) {
+               url = pb_url_parse(ctx, conffile);
+               return url;
+       }
+
+       /* If we can create a URL from pathprefix (optionally with
+        * conffile appended to create a complete URL), use that */
+       if (pathprefix && is_url(pathprefix)) {
+               if (conffile) {
+                       url_str = talloc_asprintf(ctx, "%s%s",
+                                       pathprefix, conffile);
+                       url = pb_url_parse(ctx, url_str);
+                       talloc_free(url_str);
+               } else {
+                       url = pb_url_parse(ctx, pathprefix);
+               }
+
+               return url;
+       }
+
+       host = parse_host_addr(event);
+       if (!host) {
+               pb_log("%s: host address not found\n", __func__);
+               return NULL;
+       }
+
+       url_str = talloc_asprintf(ctx, "tftp://%s/", host);

 
 

-       pb_log("user_event %s event:\n", action);
-       pb_log("\tdevice: %s\n", event->device);
+       /* if we have a pathprefix, use that directly.. */
+       if (pathprefix) {
+               /* strip leading slashes */
+               while (pathprefix[0] == '/')
+                       pathprefix++;
+               url_str = talloc_asprintf_append(url_str, "%s", pathprefix);

 
 

-       for (i = 0; params[i]; i++)
-               pb_log("\t%-12s => %s\n",
-                               params[i], event_get_param(event, params[i]));
+       /* ... otherwise, add a path based on the bootfile name, but only
+        * if conffile isn't an absolute path itself */
+       } else if (bootfile && !(conffile && conffile[0] == '/')) {
+
+               basedir = talloc_strdup(ctx, bootfile);
+
+               /* strip filename from the bootfile path, leaving only a
+                * directory */
+               p = strrchr(basedir, '/');
+               if (p)
+                       *p = '\0';
+
+               if (strlen(basedir))
+                       url_str = talloc_asprintf_append(url_str, "%s/",
+                                       basedir);
+
+               talloc_free(basedir);
+       }
+
+       /* finally, append conffile */
+       if (conffile)
+               url_str = talloc_asprintf_append(url_str, "%s", conffile);
+
+       url = pb_url_parse(ctx, url_str);
+
+       talloc_free(url_str);
+
+       return url;
+}
+
+char **user_event_parse_conf_filenames(
+               struct discover_context *ctx, struct event *event)
+{
+       char *mac_addr, *ip_hex;
+       const char *mac, *ip;
+       char **filenames;
+       int index, len;
+
+       mac = event_get_param(event, "mac");
+       if (mac)
+               mac_addr = parse_mac_addr(ctx, mac);
+       else
+               mac_addr = NULL;
+
+       ip = event_get_param(event, "ip");
+       if (ip) {
+               ip_hex = parse_ip_addr(ctx, ip);
+               len = strlen(ip_hex);
+       } else {
+               ip_hex = NULL;
+               len = 0;
+       }
+
+       if (!mac_addr && !ip_hex) {
+               pb_log("%s: neither mac nor ip parameter found\n", __func__);
+               return NULL;
+       }
+
+       /* Filenames as fallback IP's + mac + default */
+       filenames = talloc_array(ctx, char *, len + 3);
+
+       index = 0;
+       if (mac_addr)
+               filenames[index++] = talloc_strdup(filenames, mac_addr);
+
+       while (len) {
+               filenames[index++] = talloc_strdup(filenames, ip_hex);
+               ip_hex[--len] = '\0';
+       }
+
+       filenames[index++] = talloc_strdup(filenames, "default");
+       filenames[index++] = NULL;
+
+       if (mac_addr)
+               talloc_free(mac_addr);
+
+       if (ip_hex)
+               talloc_free(ip_hex);
+
+       return filenames;
+}
+
+static int user_event_dhcp(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+       struct discover_device *dev;
+
+       dev = discover_device_create(handler, event->device);
+
+       device_handler_dhcp(handler, dev, event);
+
+       return 0;
+}
+
+static int user_event_conf(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+       struct discover_device *dev;
+       struct pb_url *url;
+       const char *val;
+
+       val = event_get_param(event, "url");
+       if (!val)
+               return 0;
+
+       url = pb_url_parse(event, val);
+       if (!url)
+               return 0;
+
+       dev = discover_device_create(handler, event->device);
+
+       device_handler_conf(handler, dev, url);
+
+       return 0;
+}
+
+static int user_event_add(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+       struct discover_context *ctx;
+       struct discover_device *dev;
+
+       dev = discover_device_create(handler, event->device);
+       ctx = device_handler_discover_context_create(handler, dev);
+
+       parse_user_event(ctx, event);
+
+       device_handler_discover_context_commit(handler, ctx);
+
+       talloc_free(ctx);
+
+       return 0;
+}
+
+static int user_event_remove(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+       struct discover_device *dev;
+
+       dev = device_lookup_by_id(handler, event->device);
+       if (!dev)
+               return 0;
+
+       device_handler_remove(handler, dev);
+
+       return 0;

 }
 
 static void user_event_handle_message(struct user_event *uev, char *buf,
 }
 
 static void user_event_handle_message(struct user_event *uev, char *buf,


@@ -75,7 +444,24 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
                return;
 
        user_event_print_event(event);
                return;
 
        user_event_print_event(event);

-       device_handler_event(uev->handler, event);
+
+       switch (event->action) {
+       case EVENT_ACTION_ADD:
+               result = user_event_add(uev, event);
+               break;
+       case EVENT_ACTION_REMOVE:
+               result = user_event_remove(uev, event);
+               break;
+       case EVENT_ACTION_CONF:
+               result = user_event_conf(uev, event);
+               break;
+       case EVENT_ACTION_DHCP:
+               result = user_event_dhcp(uev, event);
+               break;
+       default:
+               break;
+       }
+

        talloc_free(event);
 
        return;
        talloc_free(event);
 
        return;


@@ -99,7 +485,7 @@ static int user_event_process(void *arg)
                return 0;
        }
 
                return 0;
        }
 

-       pb_log("%s: %u bytes\n", __func__, len);
+       pb_debug("%s: %u bytes\n", __func__, len);

 
        user_event_handle_message(uev, buf, len);
 
 
        user_event_handle_message(uev, buf, len);
 


@@ -110,7 +496,7 @@ static int user_event_destructor(void *arg)
 {
        struct user_event *uev = arg;
 
 {
        struct user_event *uev = arg;
 

-       pb_log("%s\n", __func__);
+       pb_debug("%s\n", __func__);

 
        if (uev->socket >= 0)
                close(uev->socket);
 
        if (uev->socket >= 0)
                close(uev->socket);


@@ -118,7 +504,8 @@ static int user_event_destructor(void *arg)
        return 0;
 }
 
        return 0;
 }
 

-struct user_event *user_event_init(struct device_handler *handler)
+struct user_event *user_event_init(struct waitset *waitset,
+               struct device_handler *handler)

 {
        struct sockaddr_un addr;
        struct user_event *uev;
 {
        struct sockaddr_un addr;
        struct user_event *uev;


@@ -147,9 +534,10 @@ struct user_event *user_event_init(struct device_handler *handler)
                        strerror(errno));
        }
 
                        strerror(errno));
        }
 

-       waiter_register(uev->socket, WAIT_IN, user_event_process, uev);
+       waiter_register_io(waitset, uev->socket, WAIT_IN,
+                       user_event_process, uev);

 
 

-       pb_log("%s: waiting on %s\n", __func__, PBOOT_USER_EVENT_SOCKET);
+       pb_debug("%s: waiting on %s\n", __func__, PBOOT_USER_EVENT_SOCKET);

 
        return uev;
 
 
        return uev;
 


@@ -158,17 +546,6 @@ out_err:
        return NULL;
 }
 
        return NULL;
 }
 

-/**
- * user_event_trigger - Trigger known user events
- *
- * SIGUSR1 causes udhcpc to renew the current lease or obtain a new lease.
- */
-
-void user_event_trigger(struct user_event __attribute__((unused)) *uev)
-{
-       /* FIXME: todo */
-}
-

 void user_event_destroy(struct user_event *uev)
 {
        talloc_free(uev);
 void user_event_destroy(struct user_event *uev)
 {
        talloc_free(uev);