X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=ec4a6f611ff289ee9d4bc61182401897c41ff1ba;hp=5b7afd0d3f56d7be992d3725f757d80d2c2c412a;hb=2713a008a6b7fb9e63d5b8004fc39dae22e1abf7;hpb=d0602ed25e3bff8298c19bece8cd8b3f80d86624 diff --git a/discover/device-handler.c b/discover/device-handler.c index 5b7afd0..ec4a6f6 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -360,6 +361,7 @@ void device_handler_reinit(struct device_handler *handler) /* 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, @@ -626,7 +628,8 @@ static void countdown_status(struct device_handler *handler, status.type = STATUS_INFO; status.message = talloc_asprintf(handler, - _("Booting in %d sec: %s"), sec, opt->option->name); + _("Booting in %d sec: [%s] %s"), sec, + opt->device->device->id, opt->option->name); status.backlog = false; device_handler_status(handler, &status); @@ -1082,6 +1085,8 @@ int device_handler_dhcp(struct device_handler *handler, _("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); talloc_steal(ctx, event); @@ -1240,62 +1245,101 @@ static char *device_from_addr(void *ctx, struct pb_url *url) return dev; } +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 event *event = data; + const char *mac; + + if (result->status != LOAD_OK) { + pb_log("%s: Load failed for %s\n", __func__, result->url->full); + return; + } + + if (!event) + return; + + 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"); + } + + 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; - struct param *param; - if (!handler->network) { - device_handler_status_err(handler, _("No network configured")); - return; - } - - event = talloc(handler, struct 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)) { 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) { - device_handler_status_err(handler, + if (!event->device) { + device_handler_status_err(handler, _("Unable to route to host %s"), pb_url->host); + talloc_free(event); + return; + } + } else { + event_set_param(event, "pxeconffile", url); + allow_async = true; + } + + 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; @@ -1381,15 +1425,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; @@ -1406,11 +1450,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)