X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=7d9cd0d4f439487f7907f872efd6a019c1f27378;hp=c04a0afca610b31bfb07468824770445cfc94d92;hb=2ea5eb23b027519372dd20fbe8f958c06ac2aa6c;hpb=5e7c90eddd7ac2e4a3b05a7a5f6e29166edfa161

diff --git a/discover/parser.c b/discover/parser.c
index c04a0af..7d9cd0d 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -12,67 +12,43 @@
 #include "parser.h"
 #include "parser-utils.h"
 #include "paths.h"
+#include "file.h"
 
-static int n_parsers;
-static struct parser **parsers;
+struct p_item {
+	struct list_item list;
+	struct parser *parser;
+};
 
-static const int max_file_size = 1024 * 1024;
+STATIC_LIST(parsers);
 
-static int read_file(struct discover_context *ctx,
-		const char *filename, char **bufp, int *lenp)
+static char *local_path(struct discover_context *ctx,
+		const char *filename)
 {
-	struct stat statbuf;
-	int rc, fd, i, len;
-	char *buf;
-
-	fd = open(filename, O_RDONLY);
-	if (fd < 0)
-		return -1;
-
-	rc = fstat(fd, &statbuf);
-	if (rc < 0)
-		goto err_close;
-
-	len = statbuf.st_size;
-	if (len > max_file_size)
-		goto err_close;
-
-	buf = talloc_array(ctx, char, len);
-	if (!buf)
-		goto err_close;
-
-	for (i = 0; i < len; i += rc) {
-		rc = read(fd, buf + i, len - i);
+	return join_paths(ctx, ctx->device->mount_path, filename);
+}
 
-		/* unexpected EOF: trim and return */
-		if (rc == 0) {
-			len = i;
-			break;
-		}
+static int download_config(struct discover_context *ctx, char **buf, int *len)
+{
+	unsigned tempfile;
+	const char *file;
+	int rc;
 
-		if (rc < 0)
-			goto err_free;
+	file = load_url(ctx, ctx->conf_url, &tempfile);
+	if (!file)
+		return -1;
 
-	}
+	rc = read_file(ctx, file, buf, len);
+	if (rc)
+		goto out_clean;
 
-	close(fd);
-	*bufp = buf;
-	*lenp = len;
 	return 0;
 
-err_free:
-	talloc_free(buf);
-err_close:
-	close(fd);
+out_clean:
+	if (tempfile)
+		unlink(file);
 	return -1;
 }
 
-static char *local_path(struct discover_context *ctx,
-		const char *filename)
-{
-	return join_paths(ctx, ctx->device->mount_path, filename);
-}
-
 static void iterate_parser_files(struct discover_context *ctx,
 		const struct parser *parser)
 {
@@ -92,6 +68,8 @@ 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);
 		}
@@ -100,28 +78,57 @@ static void iterate_parser_files(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);
 
-	if (method == CONF_METHOD_LOCAL_FILE) {
-		for (i = 0; i < n_parsers; i++) {
-			if (parsers[i]->method != CONF_METHOD_LOCAL_FILE)
+	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", parsers[i]->name);
-			ctx->parser = parsers[i];
+			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)
 {
-	parsers = talloc_realloc(NULL, parsers, struct parser *, n_parsers + 1);
-	parsers[n_parsers] = parser;
-	n_parsers++;
+	struct p_item* i = talloc(NULL, struct p_item);
+
+	printf("%s: %s\n", __func__, parser->name);
+
+	i->parser = parser;
+	list_add(&parsers, &i->list);
 }
 
 void parser_init(void)