X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fuser-event.c;h=fb3fddb5c4bc5f7390f114ec7820f33d7ec45e77;hp=8cad1a91a624f5f55cd17d49858edfab3820133c;hb=0d3caaf8e9a75e9b6ebc9427c75ed2914c60439d;hpb=999fd1a2053421b55cdd876049c40beb2921807f diff --git a/discover/user-event.c b/discover/user-event.c index 8cad1a9..fb3fddb 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 @@ -58,6 +59,10 @@ static const char *event_action_name(enum event_action action) return "url"; case EVENT_ACTION_DHCP: return "dhcp"; + case EVENT_ACTION_BOOT: + return "boot"; + case EVENT_ACTION_SYNC: + return "sync"; default: break; } @@ -78,7 +83,7 @@ static void user_event_print_event(struct event __attribute__((unused)) *event) } static struct resource *user_event_resource(struct discover_boot_option *opt, - struct event *event) + struct event *event, bool gen_boot_args_sigfile) { const char *siaddr, *boot_file; struct resource *res; @@ -97,7 +102,16 @@ static struct resource *user_event_resource(struct discover_boot_option *opt, return NULL; } - url_str = talloc_asprintf(opt, "%s%s/%s", "tftp://", siaddr, boot_file); + if (gen_boot_args_sigfile) { + char* args_sigfile_default = talloc_asprintf(opt, + "%s.cmdline.sig", boot_file); + url_str = talloc_asprintf(opt, "%s%s/%s", "tftp://", siaddr, + args_sigfile_default); + talloc_free(args_sigfile_default); + } + else + url_str = talloc_asprintf(opt, "%s%s/%s", "tftp://", siaddr, + boot_file); url = pb_url_parse(opt, url_str); talloc_free(url_str); @@ -139,12 +153,13 @@ static int parse_user_event(struct discover_context *ctx, struct event *event) 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); + d_opt->boot_image = user_event_resource(d_opt, event, false); if (!d_opt->boot_image) { pb_log("%s: no boot image found for %s!\n", __func__, opt->name); goto fail_opt; } + d_opt->args_sig_file = user_event_resource(d_opt, event, true); val = event_get_param(event, "rootpath"); if (val) { @@ -371,31 +386,20 @@ 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]; - device_handler_dhcp(handler, dev, event); + sscanf(event_get_param(event, "mac"), + "%hhX:%hhX:%hhX:%hhX:%hhX:%hhX", + hwaddr, hwaddr + 1, hwaddr + 2, + hwaddr + 3, hwaddr + 4, hwaddr + 5); - return 0; -} + system_info_set_interface_address(sizeof(hwaddr), hwaddr, + event_get_param(event, "ip")); -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; + dev = discover_device_create(handler, event_get_param(event, "mac"), + event->device); - 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); + device_handler_dhcp(handler, dev, event); return 0; } @@ -406,7 +410,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); @@ -422,8 +429,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; @@ -439,7 +451,37 @@ static int user_event_url(struct user_event *uev, struct event *event) url = event_get_param(event, "url"); if (url) - device_handler_process_url(handler, url); + device_handler_process_url(handler, url, NULL, NULL); + + return 0; +} + +static int user_event_boot(struct user_event *uev, struct event *event) +{ + struct device_handler *handler = uev->handler; + struct boot_command *cmd = talloc(handler, struct boot_command); + + cmd->option_id = talloc_strdup(cmd, event_get_param(event, "id")); + cmd->boot_image_file = talloc_strdup(cmd, event_get_param(event, "image")); + cmd->initrd_file = talloc_strdup(cmd, event_get_param(event, "initrd")); + cmd->dtb_file = talloc_strdup(cmd, event_get_param(event, "dtb")); + cmd->boot_args = talloc_strdup(cmd, event_get_param(event, "args")); + + device_handler_boot(handler, cmd); + + talloc_free(cmd); + + return 0; +} + +static int user_event_sync(struct user_event *uev, struct event *event) +{ + struct device_handler *handler = uev->handler; + + if (strncasecmp(event->device, "all", strlen("all")) != 0) + device_sync_snapshots(handler, event->device); + else + device_sync_snapshots(handler, NULL); return 0; } @@ -469,19 +511,24 @@ static void user_event_handle_message(struct user_event *uev, char *buf, break; case EVENT_ACTION_URL: result = user_event_url(uev, event); - break; - case EVENT_ACTION_CONF: - result = user_event_conf(uev, event); - break; + goto out; case EVENT_ACTION_DHCP: result = user_event_dhcp(uev, event); + goto out; + case EVENT_ACTION_BOOT: + result = user_event_boot(uev, event); + break; + case EVENT_ACTION_SYNC: + result = user_event_sync(uev, event); break; default: break; } + /* user_event_url() and user_event_dhcp() will steal the event context, + * but all others still need to free */ talloc_free(event); - +out: return; }