X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=035794cd8a6416362cf20fb0a255bed9ac6ac851;hp=75d7e7e0b51cdadef245caf5d972a31eaee9696e;hb=9e869ebe3a5127575105d82c4d289d95cbed2db9;hpb=f00b8c2d08e4ef57f2da0ed3b1701ed50331b91d

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 75d7e7e..035794c 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -31,13 +31,18 @@ struct pxe_parser_info {
 	char				**pxe_conf_files;
 	struct pb_url			*pxe_base_url;
 	int				current;
+	char	                        *proxy;
 };
 
 static void pxe_finish(struct conf_context *conf)
 {
 	struct pxe_parser_info *info = conf->parser_info;
-	if (info->opt)
+	if (info->opt) {
+		if (info->proxy)
+			info->opt->proxy = talloc_strdup(info->opt, info->proxy);
 		discover_context_add_boot_option(conf->dc, info->opt);
+		info->opt = NULL;
+	}
 }
 
 /* We need a slightly modified version of pb_url_join, to allow for the
@@ -148,7 +153,15 @@ static void pxe_process_pair(struct conf_context *ctx,
 		return;
 	}
 
-	if (streq(name, "LABEL")) {
+	if (streq(name, "PROXY")) {
+		if (parser_info->proxy)
+			talloc_free(parser_info->proxy);
+
+		parser_info->proxy = talloc_strdup(parser_info, value);
+		return;
+	}
+
+	if (streq(name, "LABEL") || streq(name, "PLUGIN")) {
 		if (opt)
 			pxe_finish(ctx);
 
@@ -158,8 +171,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;
@@ -169,6 +186,14 @@ 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);
@@ -210,7 +235,6 @@ static void pxe_process_pair(struct conf_context *ctx,
 		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)
@@ -227,13 +251,110 @@ static void pxe_load_next_filename(struct conf_context *conf)
 		if (!url)
 			continue;
 
-		if (load_url_async(conf, url, pxe_conf_parse_cb, conf))
+		if (load_url_async(conf, url, pxe_conf_parse_cb, conf,
+				   NULL, NULL))
 			break;
 	}
 
 	return;
 }
 
+/*
+ * Parse a limited set of iPXE commands. This is handled separately from
+ * conf_parse_buf() since not all commands will have a value.
+ */
+static bool ipxe_simple_parser(struct conf_context *ctx, char *buf, int len)
+{
+	struct discover_boot_option *opt;
+	char *p, *name, *value;
+	struct pb_url *url;
+
+	p = strstr(buf, "#!ipxe");
+
+	/* Only try to parse this if the ipxe header is right at the start */
+	if (!p || p != buf)
+		return false;
+	p = strchr(buf, '\n') + 1;
+
+	opt = discover_boot_option_create(ctx->dc, ctx->dc->device);
+
+	opt->option->id = talloc_asprintf(opt, "%s@%p",
+			ctx->dc->device->device->id, opt);
+	opt->option->type = DISCOVER_BOOT_OPTION;
+
+	while (p && p <= buf + len) {
+
+		p = conf_get_pair(ctx, p, &name, &value, ' ', '\n');
+
+		/* The 'boot' command appears by itself without options */
+		if (!name && value && streq(value, "boot")) {
+			opt->option->is_default = true;
+			continue;
+		}
+
+		if (!name) {
+			pb_debug_fn("missing name from conf_get_pair\n");
+			continue;
+		}
+
+		/* All other parameters require a value */
+		if (!value) {
+			pb_debug_fn("'%s' missing value\n", name);
+			continue;
+		}
+
+		if (streq(name, "kernel")) {
+			char *args, *name = NULL, *saveptr = NULL, *tmp;
+
+			/*
+			 * value is of the form:
+			 * boot_image [--name option_name ] [option args ...]
+			 */
+			tmp = strtok_r(value, " ", &saveptr);
+			if (!tmp) {
+				pb_log("%s: malformed kernel statement\n", __func__);
+				break;
+			}
+
+			url = pxe_url_join(ctx->dc, ctx->dc->conf_url, tmp);
+			opt->boot_image = create_url_resource(opt, url);
+
+			tmp = strtok_r(NULL, " ", &saveptr);
+			if (!tmp)
+				continue;
+			if (streq(tmp, "--name")) {
+				tmp = strtok_r(NULL, " ", &saveptr);
+				name = talloc_asprintf(opt, "%s",
+						tmp ?: "malformed ipxe option");
+				args = strtok_r(NULL, " ", &saveptr);
+			} else
+				args = tmp;
+
+			while (args) {
+				pxe_append_string(opt, args);
+				args = strtok_r(NULL, " ", &saveptr);
+			}
+
+			opt->option->name = name ?: talloc_asprintf(opt,
+					"ipxe option (%s)", url->full);
+			continue;
+		}
+
+		if (streq(name, "initrd")) {
+			url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value);
+			opt->initrd = create_url_resource(opt, url);
+			continue;
+		}
+	}
+
+	if (opt->boot_image)
+		discover_context_add_boot_option(ctx->dc, opt);
+	else
+		pb_debug("ipxe file did not contain a valid option\n");
+
+	return true;
+}
+
 /*
  * Callback for asynchronous loads from pxe_parse()
  * @param result Result of load_url_async()
@@ -249,19 +370,32 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
 	if (!data)
 		return;
+	if (!result)
+		goto out_clean;
 
-	if (result && result->status == LOAD_OK)
+	handler = talloc_parent(conf);
+
+	if (result->status == LOAD_OK)
 		rc = read_file(conf, result->local, &buf, &len);
-	if (!result || result->status != LOAD_OK || rc) {
+	if (result->status != LOAD_OK || rc) {
 		/* This load failed so try the next available filename */
 		info = conf->parser_info;
-		if (!info->pxe_conf_files)
+		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;
+		}
 
 		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;
@@ -271,13 +405,13 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 	 * 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
+	 * We also check if the file is in the limited ipxe format.
 	 */
-
-	conf_parse_buf(conf, buf, len);
+	if (!ipxe_simple_parser(conf, buf, len))
+		conf_parse_buf(conf, buf, len);
 
 	/* We may be called well after the original caller of iterate_parsers(),
 	 * commit any new boot options ourselves */
-	handler = talloc_parent(conf);
 	device_handler_discover_context_commit(handler, conf->dc);
 
 	/*
@@ -286,11 +420,11 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 	 */
 	device_handler_status_dev_info(handler, conf->dc->device,
 			_("Parsed PXE config from %s"),
-			pb_url_to_string(conf->dc->conf_url));
+			pb_url_to_string(result->url));
 
 	talloc_free(buf);
 out_clean:
-	if (result->cleanup_local)
+	if (result && result->cleanup_local)
 		unlink(result->local);
 	talloc_free(conf);
 }
@@ -334,7 +468,7 @@ static struct conf_context *copy_context(void *ctx, struct discover_context *dc)
 
 static int pxe_parse(struct discover_context *dc)
 {
-	struct pb_url *pxe_base_url;
+	struct pb_url *pxe_base_url, *file_url;
 	struct conf_context *conf = NULL;
 	struct load_url_result *result;
 	void *ctx = talloc_parent(dc);
@@ -363,14 +497,26 @@ static int pxe_parse(struct discover_context *dc)
 		return -1;
 
 	if (complete_url) {
+		/* Check if this file has already been downloaded */
+		if (event_get_param(dc->event, "pxeconffile-local"))
+			file_url = pb_url_parse(dc, event_get_param(dc->event,
+						"pxeconffile-local"));
+		else
+			file_url = dc->conf_url;
+
+		if (!file_url) {
+			pb_log_fn("Failed to parse conf url!\n");
+			goto out_conf;
+		}
+
 		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. */
-		result = load_url_async(conf->dc, conf->dc->conf_url,
-					pxe_conf_parse_cb, conf);
+		result = load_url_async(conf->dc, file_url,
+					pxe_conf_parse_cb, conf, NULL, ctx);
 		if (!result) {
 			pb_log("load_url_async fails for %s\n",
 					dc->conf_url->path);