X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=b0668808cd859cfe7706ad5df870005878639a4e;hp=5e50dcbdafc292f8c05a29f986f1d5510259938b;hb=b16b116422f1fb817924f4d2c3d9b1354da35614;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1

diff --git a/discover/parser.c b/discover/parser.c
index 5e50dcb..b066880 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,85 +1,184 @@
 
-#include <petitboot-paths.h>
+#include <fcntl.h>
 #include <stdlib.h>
-#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
-#include "parser.h"
+#include "types/types.h"
+#include <log/log.h>
+#include <talloc/talloc.h>
 
-extern struct parser native_parser;
-extern struct parser yaboot_parser;
-extern struct parser kboot_parser;
+#include "device-handler.h"
+#include "parser.h"
+#include "parser-utils.h"
+#include "paths.h"
+#include "file.h"
 
-/* array of parsers, ordered by priority */
-static struct parser *parsers[] = {
-	&native_parser,
-	&yaboot_parser,
-	&kboot_parser,
-	NULL
+struct p_item {
+	struct list_item list;
+	struct parser *parser;
 };
 
-void iterate_parsers(const char *devpath, const char *mountpoint)
+STATIC_LIST(parsers);
+
+static char *local_path(struct discover_context *ctx,
+		struct discover_device *dev,
+		const char *filename)
 {
-	int i;
+	return join_paths(ctx, dev->mount_path, filename);
+}
 
-	pb_log("trying parsers for %s\n", devpath);
+int parser_request_file(struct discover_context *ctx,
+		struct discover_device *dev, const char *filename,
+		char **buf, int *len)
 
-	for (i = 0; parsers[i]; i++) {
-		pb_log("\ttrying parser '%s'\n", parsers[i]->name);
-		/* just use a dummy device path for now */
-		if (parsers[i]->parse(devpath))
-			return;
+{
+	char *path;
+	int rc;
+
+	/* we only support local files at present */
+	if (!dev->mount_path)
+		return -1;
+
+	path = local_path(ctx, dev, filename);
+
+	rc = read_file(ctx, path, buf, len);
+
+	talloc_free(path);
+
+	return rc;
+}
+
+int parser_replace_file(struct discover_context *ctx,
+		struct discover_device *dev, const char *filename,
+		char *buf, int len)
+{
+	bool release;
+	char *path;
+	int rc;
+
+	if (!dev->mounted)
+		return -1;
+
+	rc = device_request_write(dev, &release);
+	if (rc) {
+		pb_log("Can't write file %s: device doesn't allow write\n",
+				dev->device_path);
+		return -1;
 	}
-	pb_log("\tno boot_options found\n");
+
+	path = local_path(ctx, dev, filename);
+
+	rc = replace_file(path, buf, len);
+
+	talloc_free(path);
+
+	device_release_write(dev, release);
+
+	return rc;
 }
 
-/* convenience functions for parsers */
-void free_device(struct device *dev)
+static int download_config(struct discover_context *ctx, char **buf, int *len)
 {
-	if (!dev)
-		return;
-	if (dev->id)
-		free(dev->id);
-	if (dev->name)
-		free(dev->name);
-	if (dev->description)
-		free(dev->description);
-	if (dev->icon_file)
-		free(dev->icon_file);
-	free(dev);
+	struct load_url_result *result;
+	int rc;
+
+	result = load_url(ctx, ctx->conf_url);
+	if (!result)
+		return -1;
+
+	rc = read_file(ctx, result->local, buf, len);
+	if (rc)
+		goto out_clean;
+
+	return 0;
+
+out_clean:
+	if (result->cleanup_local)
+		unlink(result->local);
+	return -1;
 }
 
-void free_boot_option(struct boot_option *opt)
+static void iterate_parser_files(struct discover_context *ctx,
+		const struct parser *parser)
 {
-	if (!opt)
+	const char * const *filename;
+	const char *path;
+
+	if (!parser->filenames)
 		return;
-	if (opt->name)
-		free(opt->name);
-	if (opt->description)
-		free(opt->description);
-	if (opt->icon_file)
-		free(opt->icon_file);
-	if (opt->boot_image_file)
-		free(opt->boot_image_file);
-	if (opt->initrd_file)
-		free(opt->initrd_file);
-	if (opt->boot_args)
-		free(opt->boot_args);
-	free(opt);
+
+	for (filename = parser->filenames; *filename; filename++) {
+		int rc, len;
+		char *buf;
+
+		path = local_path(ctx, ctx->device, *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);
+		}
+	}
 }
 
-const char *generic_icon_file(enum generic_icon_type type)
+void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 {
-	switch (type) {
-	case ICON_TYPE_DISK:
-		return artwork_pathname("hdd.png");
-	case ICON_TYPE_USB:
-		return artwork_pathname("usbpen.png");
-	case ICON_TYPE_OPTICAL:
-		return artwork_pathname("cdrom.png");
-	case ICON_TYPE_NETWORK:
-	case ICON_TYPE_UNKNOWN:
+	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;
+
 	}
-	return artwork_pathname("hdd.png");
 }
 
+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)
+{
+}