X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=6896075ed1742b82b4e9306a5b1072556c8463df;hp=c106dec0ae20c0a6210d317060cbe125f9656450;hb=f611bde3f182e9a4befb48a0160d1831708aca67;hpb=7c5e552c210b38a06ed9fbb99418b62e20978666

diff --git a/discover/parser.c b/discover/parser.c
index c106dec..6896075 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,38 +1,132 @@
 
+#include <fcntl.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
-#include "pb-protocol/pb-protocol.h"
+#include "types/types.h"
 #include <log/log.h>
+#include <talloc/talloc.h>
 
 #include "device-handler.h"
 #include "parser.h"
 #include "parser-utils.h"
+#include "paths.h"
+#include "file.h"
 
-struct parser __native_parser;
-struct parser __yaboot_parser;
-struct parser __kboot_parser;
-struct parser __grub2_parser;
-
-static const struct parser *const parsers[] = {
-//	&__native_parser,
-	&__yaboot_parser,
-	&__kboot_parser,
-	NULL
+struct p_item {
+	struct list_item list;
+	struct parser *parser;
 };
 
-void iterate_parsers(struct discover_context *ctx)
+STATIC_LIST(parsers);
+
+static char *local_path(struct discover_context *ctx,
+		const char *filename)
+{
+	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)
 {
-	int i;
-	unsigned int count = 0;
+	const char * const *filename;
+	const char *path;
 
-	pb_log("trying parsers for %s\n", ctx->device_path);
+	if (!parser->filenames)
+		return;
 
-	for (i = 0; parsers[i]; i++) {
-		pb_log("\ttrying parser '%s'\n", parsers[i]->name);
-		count += parsers[i]->parse(ctx);
+	for (filename = parser->filenames; *filename; filename++) {
+		int rc, len;
+		char *buf;
+
+		path = local_path(ctx, *filename);
+		if (!path)
+			continue;
+
+		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);
+		}
 	}
-	if (!count)
-		pb_log("\tno boot_options found\n");
+}
+
+void iterate_parsers(struct discover_context *ctx, enum conf_method method)
+{
+	struct p_item* i;
+	int rc, len;
+	char *buf;
+
+	pb_log("trying parsers for %s\n", ctx->device->device->id);
+
+	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;
+
+	}
+}
+
+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)