X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=aef43b8cdfc06737ad72d06fc7f76a4c1670473f;hp=0456f5b90645b08cd8cc5a4499ec05ba219626df;hb=9f191cc3c194ed51534c22e2dae15b2c08c8abc2;hpb=a744f086e4c16d5b286cf264a16ceca2dc23d43e

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 0456f5b..aef43b8 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -8,7 +8,10 @@
 #include <talloc/talloc.h>
 #include <url/url.h>
 #include <log/log.h>
+#include <file/file.h>
+#include <i18n/i18n.h>
 
+#include "device-handler.h"
 #include "parser.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
@@ -16,12 +19,18 @@
 #include "paths.h"
 #include "event.h"
 #include "user-event.h"
+#include "network.h"
 
 static const char *pxelinux_prefix = "pxelinux.cfg/";
 
+static void pxe_conf_parse_cb(struct load_url_result *result, void *data);
+
 struct pxe_parser_info {
-	struct discover_boot_option *opt;
-	const char *default_name;
+	struct discover_boot_option	*opt;
+	const char			*default_name;
+	char				**pxe_conf_files;
+	struct pb_url			*pxe_base_url;
+	int				current;
 };
 
 static void pxe_finish(struct conf_context *conf)
@@ -79,6 +88,16 @@ static void pxe_append_string(struct discover_boot_option *opt,
 		opt->option->boot_args = talloc_strdup(opt->option, str);
 }
 
+static char *pxe_sysappend_mac(void *ctx, uint8_t *mac)
+{
+	if (!mac)
+		return NULL;
+
+	return talloc_asprintf(ctx,
+		"BOOTIF=01-%02x-%02x-%02x-%02x-%02x-%02x",
+		mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+}
+
 static void pxe_process_sysappend(struct discover_context *ctx,
 		struct discover_boot_option *opt,
 		unsigned long val)
@@ -90,9 +109,11 @@ static void pxe_process_sysappend(struct discover_context *ctx,
 		return;
 
 	if (val & 0x2) {
-		const char *mac = event_get_param(event, "mac");
-		if (mac) {
-			str = talloc_asprintf(ctx, "BOOTIF=%s", mac);
+		uint8_t *mac = find_mac_by_name(ctx,
+				device_handler_get_network(ctx->handler),
+				event->device);
+		str = pxe_sysappend_mac(ctx, mac);
+		if (str) {
 			pxe_append_string(opt, str);
 			talloc_free(str);
 		}
@@ -127,7 +148,7 @@ static void pxe_process_pair(struct conf_context *ctx,
 		return;
 	}
 
-	if (streq(name, "LABEL")) {
+	if (streq(name, "LABEL") || streq(name, "PLUGIN")) {
 		if (opt)
 			pxe_finish(ctx);
 
@@ -137,8 +158,12 @@ static void pxe_process_pair(struct conf_context *ctx,
 		opt->option->id = talloc_asprintf(opt, "%s@%p",
 				ctx->dc->device->device->id, opt);
 
-		opt->option->is_default = parser_info->default_name &&
-					streq(parser_info->default_name, value);
+		if (streq(name, "LABEL")) {
+			opt->option->type = DISCOVER_BOOT_OPTION;
+			opt->option->is_default = parser_info->default_name &&
+						streq(parser_info->default_name, value);
+		} else
+			opt->option->type = DISCOVER_PLUGIN_OPTION;
 
 		parser_info->opt = opt;
 		return;
@@ -148,10 +173,25 @@ static void pxe_process_pair(struct conf_context *ctx,
 	if (!opt)
 		return;
 
+	if (streq(name, "TARBALL") &&
+			opt->option->type == DISCOVER_PLUGIN_OPTION) {
+		url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value);
+		opt->boot_image = create_url_resource(opt, url);
+		/* All other options apply to boot options only */
+		return;
+	}
+
 	if (streq(name, "KERNEL")) {
 		url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value);
 		opt->boot_image = create_url_resource(opt, url);
 
+		char* args_sigfile_default = talloc_asprintf(opt,
+			"%s.cmdline.sig", value);
+		url = pxe_url_join(ctx->dc, ctx->dc->conf_url,
+			args_sigfile_default);
+		opt->args_sig_file = create_url_resource(opt, url);
+		talloc_free(args_sigfile_default);
+
 	} else if (streq(name, "INITRD")) {
 		url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value);
 		opt->initrd = create_url_resource(opt, url);
@@ -177,91 +217,217 @@ static void pxe_process_pair(struct conf_context *ctx,
 		type = strtoul(value, &end, 10);
 		if (end != value && !(*end))
 			pxe_process_sysappend(ctx->dc, opt, type);
+
+	} else if (streq(name, "DTB") || streq(name, "FDT")) {
+		url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value);
+		opt->dtb = create_url_resource(opt, url);
 	}
+}
+
+static void pxe_load_next_filename(struct conf_context *conf)
+{
+	struct pxe_parser_info *info = conf->parser_info;
+	struct pb_url *url;
+
+	if (!info->pxe_conf_files)
+		return;
 
+	for (; info->pxe_conf_files[info->current]; info->current++) {
+		url = pb_url_join(conf->dc, info->pxe_base_url,
+				  info->pxe_conf_files[info->current]);
+		if (!url)
+			continue;
+
+		if (load_url_async(conf, url, pxe_conf_parse_cb, conf,
+				   NULL, NULL))
+			break;
+	}
+
+	return;
 }
 
-static int pxe_parse(struct discover_context *dc)
+/*
+ * Callback for asynchronous loads from pxe_parse()
+ * @param result Result of load_url_async()
+ * @param data   Pointer to associated conf_context
+ */
+static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 {
-	struct pb_url *pxe_base_url, *url;
-	struct pxe_parser_info *parser_info;
-	char **pxe_conf_files, **filename;
-	struct conf_context *conf;
-	bool complete_url;
-	int len, rc;
-	char *buf;
+	struct conf_context *conf = data;
+	struct device_handler *handler;
+	struct pxe_parser_info *info;
+	char *buf = NULL;
+	int len, rc = 0;
 
-	/* Expects dhcp event parameters to support network boot */
-	if (!dc->event)
-		return -1;
+	if (!data)
+		return;
+
+	handler = talloc_parent(conf);
+
+	if (result && result->status == LOAD_OK)
+		rc = read_file(conf, result->local, &buf, &len);
+	if (!result || result->status != LOAD_OK || rc) {
+		/* This load failed so try the next available filename */
+		info = conf->parser_info;
+		if (!info->pxe_conf_files) {
+			device_handler_status_dev_err(handler,
+					conf->dc->device,
+					_("Failed to download %s"),
+					pb_url_to_string(result->url));
+
+			return;
+		}
 
-	conf = talloc_zero(dc, struct conf_context);
+		info->current++;
+		pxe_load_next_filename(conf);
+		if (info->pxe_conf_files[info->current] == NULL) {
+			/* Nothing left to try */
+			device_handler_status_dev_err(handler,
+					conf->dc->device,
+					_("PXE autoconfiguration failed"));
+			goto out_clean;
+		}
+		return;
+	}
+
+	/*
+	 * Parse the first successfully downloaded file. We only want to parse
+	 * the first because otherwise we could parse options from both a
+	 * machine-specific config and a 'fallback' default config
+	 */
+
+	conf_parse_buf(conf, buf, len);
+
+	/* We may be called well after the original caller of iterate_parsers(),
+	 * commit any new boot options ourselves */
+	device_handler_discover_context_commit(handler, conf->dc);
+
+	/*
+	 * TRANSLATORS: the format specifier in this string is a URL
+	 * eg. tftp://192.168.1.1/pxelinux.cfg
+	 */
+	device_handler_status_dev_info(handler, conf->dc->device,
+			_("Parsed PXE config from %s"),
+			pb_url_to_string(result->url));
+
+	talloc_free(buf);
+out_clean:
+	if (result->cleanup_local)
+		unlink(result->local);
+	talloc_free(conf);
+}
+
+/**
+ * Return a new conf_context and increment the talloc reference count on
+ * the discover_context struct.
+ * @param  ctx  Parent talloc context
+ * @param  orig Original discover_context
+ * @return      Pointer to new conf_context
+ */
+static struct conf_context *copy_context(void *ctx, struct discover_context *dc)
+{
+	struct pxe_parser_info *info;
+	struct conf_context *conf;
+
+	conf = talloc_zero(ctx, struct conf_context);
 
 	if (!conf)
-		goto out;
+		return NULL;
 
-	conf->dc = dc;
 	conf->get_pair = conf_get_pair_space;
 	conf->process_pair = pxe_process_pair;
 	conf->finish = pxe_finish;
+	info = talloc_zero(conf, struct pxe_parser_info);
+	if (!info) {
+		talloc_free(conf);
+		return NULL;
+	}
+	conf->parser_info = info;
+
+	/*
+	 * The discover_context may be freed once pxe_parse() returns, but the
+	 * callback will still need it. Take a reference so that that it will
+	 * persist until the last callback completes.
+	 */
+	conf->dc = talloc_reference(conf, dc);
+
+	return conf;
+}
+
+static int pxe_parse(struct discover_context *dc)
+{
+	struct pb_url *pxe_base_url;
+	struct conf_context *conf = NULL;
+	struct load_url_result *result;
+	void *ctx = talloc_parent(dc);
+	struct pxe_parser_info *info;
+	char **pxe_conf_files;
+	bool complete_url;
 
-	parser_info = talloc_zero(conf, struct pxe_parser_info);
-	conf->parser_info = parser_info;
+	/* Expects dhcp event parameters to support network boot */
+	if (!dc->event)
+		return -1;
 
 	dc->conf_url = user_event_parse_conf_url(dc, dc->event, &complete_url);
 	if (!dc->conf_url)
-		goto out_conf;
+		return -1;
+
+	/*
+	 * Retrieving PXE configs over the network can take some time depending
+	 * on factors such as slow network, malformed paths, bad DNS, and
+	 * overzealous firewalls. Instead of blocking the discover server while
+	 * we wait for these, spawn an asynchronous job that will attempt to
+	 * retrieve each possible URL until it successfully finds one, and
+	 * parse and process the resulting file in a callback.
+	 */
+	conf = copy_context(ctx, dc);
+	if (!conf)
+		return -1;
 
 	if (complete_url) {
+		device_handler_status_dev_info(conf->dc->handler,
+			dc->device,
+			_("Requesting config %s"),
+			pb_url_to_string(conf->dc->conf_url));
+
 		/* we have a complete URL; use this and we're done. */
-		rc = parser_request_url(dc, dc->conf_url, &buf, &len);
-		if (rc)
+		result = load_url_async(conf->dc, conf->dc->conf_url,
+					pxe_conf_parse_cb, conf, NULL, ctx);
+		if (!result) {
+			pb_log("load_url_async fails for %s\n",
+					dc->conf_url->path);
 			goto out_conf;
+		} else if (result->status == LOAD_OK) {
+			/* Local load - call pxe_conf_parse_cb() now */
+			pxe_conf_parse_cb(result, conf);
+		}
 	} else {
 		pxe_conf_files = user_event_parse_conf_filenames(dc, dc->event);
 		if (!pxe_conf_files)
 			goto out_conf;
 
-		rc = -1;
-
 		pxe_base_url = pb_url_join(dc, dc->conf_url, pxelinux_prefix);
 		if (!pxe_base_url)
 			goto out_pxe_conf;
 
-		for (filename = pxe_conf_files; *filename; filename++) {
-			url = pb_url_join(dc, pxe_base_url, *filename);
-			if (!url)
-				continue;
+		info = conf->parser_info;
+		info->pxe_conf_files = pxe_conf_files;
+		info->pxe_base_url = pxe_base_url;
 
-			rc = parser_request_url(dc, url, &buf, &len);
-			if (!rc) /* found one, just break */
-				break;
+		device_handler_status_dev_info(conf->dc->handler,
+			conf->dc->device,
+			_("Probing from base %s"),
+			pb_url_to_string(pxe_base_url));
 
-			talloc_free(url);
-		}
-
-		talloc_free(pxe_base_url);
-
-		/* No configuration file found on the boot server */
-		if (rc)
-			goto out_pxe_conf;
-
-		talloc_free(pxe_conf_files);
+		pxe_load_next_filename(conf);
 	}
 
-	/* Call the config file parser with the data read from the file */
-	conf_parse_buf(conf, buf, len);
-
-	talloc_free(buf);
-	talloc_free(conf);
-
 	return 0;
 
 out_pxe_conf:
 	talloc_free(pxe_conf_files);
 out_conf:
 	talloc_free(conf);
-out:
 	return -1;
 }