X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=e2940e19e1b939a3aaaaf2dca45b28d8a02e418b;hp=0df8a737c103c5265782c75a6b140ef0fb945648;hb=1435814a67d3c1a0199f84b91246b37eb8fa8b99;hpb=5444648fe1ff9b79f3db5ee6feadd51341f59d71

diff --git a/discover/parser.c b/discover/parser.c
index 0df8a73..e2940e1 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -13,19 +13,13 @@
 #include "parser-utils.h"
 #include "paths.h"
 
-struct parser __grub2_parser;
-struct parser __kboot_parser;
-struct parser __native_parser;
-struct parser __yaboot_parser;
-
-static struct parser *const parsers[] = {
-//	&__native_parser,
-	&__kboot_parser,
-	&__grub2_parser,
-	&__yaboot_parser,
-	NULL
+struct p_item {
+	struct list_item list;
+	struct parser *parser;
 };
 
+STATIC_LIST(parsers);
+
 static const int max_file_size = 1024 * 1024;
 
 static int read_file(struct discover_context *ctx,
@@ -47,7 +41,7 @@ static int read_file(struct discover_context *ctx,
 	if (len > max_file_size)
 		goto err_close;
 
-	buf = talloc_array(ctx, char, len);
+	buf = talloc_array(ctx, char, len + 1);
 	if (!buf)
 		goto err_close;
 
@@ -65,6 +59,8 @@ static int read_file(struct discover_context *ctx,
 
 	}
 
+	buf[len] = '\0';
+
 	close(fd);
 	*bufp = buf;
 	*lenp = len;
@@ -83,6 +79,28 @@ static char *local_path(struct discover_context *ctx,
 	return join_paths(ctx, ctx->device->mount_path, filename);
 }
 
+static int download_config(struct discover_context *ctx, char **buf, int *len)
+{
+	unsigned tempfile;
+	const char *file;
+	int rc;
+
+	file = load_url(ctx, ctx->conf_url, &tempfile);
+	if (!file)
+		return -1;
+
+	rc = read_file(ctx, file, buf, len);
+	if (rc)
+		goto out_clean;
+
+	return 0;
+
+out_clean:
+	if (tempfile)
+		unlink(file);
+	return -1;
+}
+
 static void iterate_parser_files(struct discover_context *ctx,
 		const struct parser *parser)
 {
@@ -102,24 +120,65 @@ static void iterate_parser_files(struct discover_context *ctx,
 
 		rc = read_file(ctx, path, &buf, &len);
 		if (!rc) {
+			pb_log("Running parser %s on file %s\n",
+					parser->name, *filename);
 			parser->parse(ctx, buf, len);
 			talloc_free(buf);
 		}
 	}
 }
 
-void iterate_parsers(struct discover_context *ctx)
+void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 {
-	int i;
+	struct p_item* i;
+	int rc, len;
+	char *buf;
 
 	pb_log("trying parsers for %s\n", ctx->device->device->id);
 
-	for (i = 0; parsers[i]; i++) {
-		pb_log("\ttrying parser '%s'\n", parsers[i]->name);
-		ctx->parser = parsers[i];
-		iterate_parser_files(ctx, parsers[i]);
+	switch (method) {
+	case CONF_METHOD_LOCAL_FILE:
+		list_for_each_entry(&parsers, i, list) {
+			if (i->parser->method != CONF_METHOD_LOCAL_FILE)
+				continue;
+
+			pb_log("\ttrying parser '%s'\n", i->parser->name);
+			ctx->parser = i->parser;
+			iterate_parser_files(ctx, ctx->parser);
+		}
+		ctx->parser = NULL;
+		break;
+
+	case CONF_METHOD_DHCP:
+		rc = download_config(ctx, &buf, &len);
+		if (rc) {
+			pb_log("\tdownload failed, aborting\n");
+			return;
+		}
+
+		list_for_each_entry(&parsers, i, list) {
+			if (i->parser->method != method)
+				continue;
+
+			pb_log("\ttrying parser '%s'\n", i->parser->name);
+			ctx->parser = i->parser;
+			i->parser->parse(ctx, buf, len);
+		}
+
+		break;
+
+	case CONF_METHOD_UNKNOWN:
+		break;
+
 	}
-	ctx->parser = NULL;
+}
+
+void __register_parser(struct parser *parser)
+{
+	struct p_item* i = talloc(NULL, struct p_item);
+
+	i->parser = parser;
+	list_add(&parsers, &i->list);
 }
 
 void parser_init(void)