X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=5598f963e236d2c6806aa0ac9166b242c18d266a;hp=11728b779ce66f1af15900857e4d33168a1cc3a8;hb=03fe06fa71f065e918c46a65e6a45e76063a07eb;hpb=4fee70ab7c67e268eff0ba16b42a71d36c11e727;ds=sidebyside diff --git a/discover/parser.c b/discover/parser.c index 11728b7..5598f96 100644 --- a/discover/parser.c +++ b/discover/parser.c @@ -1,10 +1,9 @@ #include #include -#include -#include #include "types/types.h" +#include #include #include @@ -13,162 +12,153 @@ #include "parser-utils.h" #include "paths.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, + struct discover_device *dev, + const char *filename) { - struct stat statbuf; - int rc, fd, i, len; - char *buf; + return join_paths(ctx, dev->root_path, filename); +} - fd = open(filename, O_RDONLY); - if (fd < 0) +int parser_request_file(struct discover_context *ctx, + struct discover_device *dev, const char *filename, + char **buf, int *len) + +{ + char *path; + int rc; + + /* we only support local files at present */ + if (!dev->mount_path) return -1; - rc = fstat(fd, &statbuf); - if (rc < 0) - goto err_close; + path = local_path(ctx, dev, filename); - len = statbuf.st_size; - if (len > max_file_size) - goto err_close; + rc = read_file(ctx, path, buf, len); - buf = talloc_array(ctx, char, len); - if (!buf) - goto err_close; + talloc_free(path); - for (i = 0; i < len; i += rc) { - rc = read(fd, buf + i, len - i); + return rc; +} - /* unexpected EOF: trim and return */ - if (rc == 0) { - len = i; - break; - } +int parser_stat_path(struct discover_context *ctx, + struct discover_device *dev, const char *path, + struct stat *statbuf) +{ + int rc = -1; + char *full_path; - if (rc < 0) - goto err_free; + /* we only support local files at present */ + if (!dev->mount_path) + return -1; - } + full_path = local_path(ctx, dev, path); - close(fd); - *bufp = buf; - *lenp = len; - return 0; + rc = stat(full_path, statbuf); + if (rc) { + rc = -1; + goto out; + } -err_free: - talloc_free(buf); -err_close: - close(fd); - return -1; -} + rc = 0; +out: + talloc_free(full_path); -static char *local_path(struct discover_context *ctx, - const char *filename) -{ - return join_paths(ctx, ctx->device->mount_path, filename); + return rc; } -static int download_config(struct discover_context *ctx, char **buf, int *len) +int parser_replace_file(struct discover_context *ctx, + struct discover_device *dev, const char *filename, + char *buf, int len) { - unsigned tempfile; - const char *file; + bool release; + char *path; int rc; - file = load_url(ctx, ctx->conf_url, &tempfile); - if (!file) + if (!dev->mounted) return -1; - rc = read_file(ctx, file, buf, len); - if (rc) - goto out_clean; + 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; + } - return 0; + path = local_path(ctx, dev, filename); -out_clean: - if (tempfile) - unlink(file); - return -1; + rc = replace_file(path, buf, len); + + talloc_free(path); + + device_release_write(dev, release); + + return rc; } -static void iterate_parser_files(struct discover_context *ctx, - const struct parser *parser) +int parser_request_url(struct discover_context *ctx, struct pb_url *url, + char **buf, int *len) { - const char * const *filename; - const char *path; + struct load_url_result *result; + int rc; - if (!parser->filenames) - return; + result = load_url(ctx, url); + if (!result) + goto out; - for (filename = parser->filenames; *filename; filename++) { - int rc, len; - char *buf; + rc = read_file(ctx, result->local, buf, len); + if (rc) { + pb_log("Read failed for the parser %s on file %s\n", + ctx->parser->name, result->local); + goto out_clean; + } - path = local_path(ctx, *filename); - if (!path) - continue; + return 0; - rc = read_file(ctx, path, &buf, &len); - if (!rc) { - parser->parse(ctx, buf, len); - talloc_free(buf); - } - } +out_clean: + if (result->cleanup_local) + unlink(result->local); +out: + return -1; } -void iterate_parsers(struct discover_context *ctx, enum conf_method method) +void iterate_parsers(struct discover_context *ctx) { - int rc, i, len; - char *buf; + struct p_item* i; 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) - continue; - - pb_log("\ttrying parser '%s'\n", parsers[i]->name); - ctx->parser = parsers[i]; - 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; - } - - for (i = 0; i < n_parsers; i++) { - if (parsers[i]->method != method) - continue; + list_for_each_entry(&parsers, i, list) { + pb_debug("\ttrying parser '%s'\n", i->parser->name); + ctx->parser = i->parser; + i->parser->parse(ctx); + } + ctx->parser = NULL; +} - pb_log("\ttrying parser '%s'\n", parsers[i]->name); - ctx->parser = parsers[i]; - parsers[i]->parse(ctx, buf, len); - } +static void *parsers_ctx; - break; +void __register_parser(struct parser *parser) +{ + struct p_item *i; - case CONF_METHOD_UNKNOWN: - break; + if (!parsers_ctx) + parsers_ctx = talloc_new(NULL); - } + i = talloc(parsers_ctx, struct p_item); + i->parser = parser; + list_add(&parsers, &i->list); } -void __register_parser(struct parser *parser) +static __attribute__((destructor)) void cleanup_parsers(void) { - parsers = talloc_realloc(NULL, parsers, struct parser *, n_parsers + 1); - parsers[n_parsers] = parser; - n_parsers++; + talloc_free(parsers_ctx); } void parser_init(void)