#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_LIST(parsers);
static const int max_file_size = 1024 * 1024;
if (len > max_file_size)
goto err_close;
- buf = talloc_array(ctx, char, len);
+ buf = talloc_array(ctx, char, len + 1);
if (!buf)
goto err_close;
}
+ buf[len] = '\0';
+
close(fd);
*bufp = buf;
*lenp = len;
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);
}
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;
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;
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);
+
+ i->parser = parser;
+ list_add(&parsers, &i->list);
}
void parser_init(void)