X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=a304f0c989e32f4e124d1f62647547b067d952b5;hp=42ee2e55c9a0f352949e26551abc5c344bd1d84a;hb=58dd7a044cdbbb2deba5c45032f166304bd234ff;hpb=19dab336ae13f0476bfbf0db34f1329a802eeb8e

diff --git a/discover/parser.c b/discover/parser.c
index 42ee2e5..a304f0c 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -12,60 +12,14 @@
 #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 int read_file(struct discover_context *ctx,
-		const char *filename, char **bufp, int *lenp)
-{
-	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);
-
-		/* unexpected EOF: trim and return */
-		if (rc == 0) {
-			len = i;
-			break;
-		}
-
-		if (rc < 0)
-			goto err_free;
-
-	}
-
-	close(fd);
-	*bufp = buf;
-	*lenp = len;
-	return 0;
-
-err_free:
-	talloc_free(buf);
-err_close:
-	close(fd);
-	return -1;
-}
+STATIC_LIST(parsers);
 
 static char *local_path(struct discover_context *ctx,
 		const char *filename)
@@ -75,23 +29,22 @@ static char *local_path(struct discover_context *ctx,
 
 static int download_config(struct discover_context *ctx, char **buf, int *len)
 {
-	unsigned tempfile;
-	const char *file;
+	struct load_url_result *result;
 	int rc;
 
-	file = load_url(ctx, ctx->conf_url, &tempfile);
-	if (!file)
+	result = load_url(ctx, ctx->conf_url);
+	if (!result)
 		return -1;
 
-	rc = read_file(ctx, file, buf, len);
+	rc = read_file(ctx, result->local, buf, len);
 	if (rc)
 		goto out_clean;
 
 	return 0;
 
 out_clean:
-	if (tempfile)
-		unlink(file);
+	if (result->cleanup_local)
+		unlink(result->local);
 	return -1;
 }
 
@@ -114,6 +67,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);
 		}
@@ -122,19 +77,20 @@ static void iterate_parser_files(struct discover_context *ctx,
 
 void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 {
-	int rc, i, len;
+	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:
-		for (i = 0; i < n_parsers; i++) {
-			if (parsers[i]->method != 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;
@@ -142,16 +98,18 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 
 	case CONF_METHOD_DHCP:
 		rc = download_config(ctx, &buf, &len);
-		if (rc)
+		if (rc) {
+			pb_log("\tdownload failed, aborting\n");
 			return;
+		}
 
-		for (i = 0; i < n_parsers; i++) {
-			if (parsers[i]->method != method)
+		list_for_each_entry(&parsers, i, list) {
+			if (i->parser->method != method)
 				continue;
 
-			pb_log("\ttrying parser '%s'\n", parsers[i]->name);
-			ctx->parser = parsers[i];
-			parsers[i]->parse(ctx, buf, len);
+			pb_log("\ttrying parser '%s'\n", i->parser->name);
+			ctx->parser = i->parser;
+			i->parser->parse(ctx, buf, len);
 		}
 
 		break;
@@ -164,9 +122,12 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 
 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)