X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fuser-event.c;h=77d28c116e635fb74698e49f0c59dfb1cb193335;hp=7ceddb12c7e0b3def7dd4acd9b0795981cc6e43b;hb=0460a745e355158559c01b25f8138404f21b5d92;hpb=e2c92865481a5fb043c03c0cde625a96ca608699 diff --git a/discover/user-event.c b/discover/user-event.c index 7ceddb1..77d28c1 100644 --- a/discover/user-event.c +++ b/discover/user-event.c @@ -37,6 +37,7 @@ #include "resource.h" #include "event.h" #include "user-event.h" +#include "sysinfo.h" #define MAC_ADDR_SIZE 6 @@ -62,6 +63,8 @@ static const char *event_action_name(enum event_action action) return "boot"; case EVENT_ACTION_SYNC: return "sync"; + case EVENT_ACTION_PLUGIN: + return "plugin"; default: break; } @@ -385,7 +388,18 @@ 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); + uint8_t hwaddr[MAC_ADDR_SIZE]; + + sscanf(event_get_param(event, "mac"), + "%hhX:%hhX:%hhX:%hhX:%hhX:%hhX", + hwaddr, hwaddr + 1, hwaddr + 2, + hwaddr + 3, hwaddr + 4, hwaddr + 5); + + system_info_set_interface_address(sizeof(hwaddr), hwaddr, + event_get_param(event, "ip")); + + dev = discover_device_create(handler, event_get_param(event, "mac"), + event->device); device_handler_dhcp(handler, dev, event); @@ -398,7 +412,10 @@ static int user_event_add(struct user_event *uev, struct event *event) struct discover_context *ctx; struct discover_device *dev; - dev = discover_device_create(handler, event->device); + /* In case this is a network interface, try to refer to it by UUID */ + dev = discover_device_create(handler, event_get_param(event, "mac"), + event->device); + dev->device->id = talloc_strdup(dev, event->device); ctx = device_handler_discover_context_create(handler, dev); parse_user_event(ctx, event); @@ -414,8 +431,13 @@ static int user_event_remove(struct user_event *uev, struct event *event) { struct device_handler *handler = uev->handler; struct discover_device *dev; + const char *mac = event_get_param(event, "mac"); + + if (mac) + dev = device_lookup_by_uuid(handler, event_get_param(event, "mac")); + else + dev = device_lookup_by_id(handler, event->device); - dev = device_lookup_by_id(handler, event->device); if (!dev) return 0; @@ -466,6 +488,111 @@ static int user_event_sync(struct user_event *uev, struct event *event) return 0; } +static int process_uninstalled_plugin(struct user_event *uev, + struct event *event) +{ + struct device_handler *handler = uev->handler; + struct discover_boot_option *file_opt; + struct discover_device *device; + struct discover_context *ctx; + const char *path; + struct resource *res; + + if (!event_get_param(event, "path")) { + pb_log("Uninstalled pb-plugin event missing path param\n"); + return -1; + } + + device = device_lookup_by_name(handler, event->device); + if (!device) { + pb_log("Couldn't find device matching %s for plugin\n", + event->device); + return -1; + } + + ctx = device_handler_discover_context_create(handler, device); + file_opt = discover_boot_option_create(ctx, device); + file_opt->option->name = talloc_strdup(file_opt, + event_get_param(event, "name")); + file_opt->option->id = talloc_asprintf(file_opt, "%s@%p", + device->device->id, file_opt); + file_opt->option->type = DISCOVER_PLUGIN_OPTION; + + + path = event_get_param(event, "path"); + /* path may be relative to root */ + if (strncmp(device->mount_path, path, strlen(device->mount_path)) == 0) { + path += strlen(device->mount_path) + 1; + } + + res = talloc(file_opt, struct resource); + resolve_resource_against_device(res, device, path); + file_opt->boot_image = res; + + discover_context_add_boot_option(ctx, file_opt); + device_handler_discover_context_commit(handler, ctx); + + return 0; +} + +/* + * Notification of a plugin event. This can either be for an uninstalled plugin + * that pb-plugin has scanned, or the result of a plugin that pb-plugin has + * installed. + */ +static int user_event_plugin(struct user_event *uev, struct event *event) +{ + struct device_handler *handler = uev->handler; + char *executable, *executables, *saveptr; + struct plugin_option *opt; + const char *installed; + + installed = event_get_param(event, "installed"); + if (!installed || strncmp(installed, "no", strlen("no")) == 0) + return process_uninstalled_plugin(uev, event); + + opt = talloc_zero(handler, struct plugin_option); + if (!opt) + return -1; + opt->name = talloc_strdup(opt, event_get_param(event, "name")); + opt->id = talloc_strdup(opt, event_get_param(event, "id")); + opt->version = talloc_strdup(opt, event_get_param(event, "version")); + opt->vendor = talloc_strdup(opt, event_get_param(event, "vendor")); + opt->vendor_id = talloc_strdup(opt, event_get_param(event, "vendor_id")); + opt->date = talloc_strdup(opt, event_get_param(event, "date")); + opt->plugin_file = talloc_strdup(opt, + event_get_param(event, "source_file")); + + executables = talloc_strdup(opt, event_get_param(event, "executables")); + if (!executables) { + talloc_free(opt); + return -1; + } + + /* + * The 'executables' parameter is a space-delimited list of installed + * executables + */ + executable = strtok_r(executables, " ", &saveptr); + while (executable) { + opt->executables = talloc_realloc(opt, opt->executables, + char *, opt->n_executables + 1); + if (!opt->executables) { + talloc_free(opt); + return -1; + } + opt->executables[opt->n_executables++] = talloc_strdup(opt, + executable); + executable = strtok_r(NULL, " ", &saveptr); + } + + device_handler_add_plugin_option(handler, opt); + + talloc_free(executables); + + return 0; +} + static void user_event_handle_message(struct user_event *uev, char *buf, int len) { @@ -501,6 +628,9 @@ static void user_event_handle_message(struct user_event *uev, char *buf, case EVENT_ACTION_SYNC: result = user_event_sync(uev, event); break; + case EVENT_ACTION_PLUGIN: + result = user_event_plugin(uev, event); + break; default: break; }