#include <fcntl.h>
#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include "types/types.h"
+#include <file/file.h>
#include <log/log.h>
#include <talloc/talloc.h>
#include "parser.h"
#include "parser-utils.h"
#include "paths.h"
-#include "file.h"
struct p_item {
struct list_item list;
struct discover_device *dev,
const char *filename)
{
- return join_paths(ctx, dev->mount_path, filename);
+ return join_paths(ctx, dev->root_path, filename);
}
int parser_request_file(struct discover_context *ctx,
return rc;
}
+int parser_stat_path(struct discover_context *ctx,
+ struct discover_device *dev, const char *path,
+ struct stat *statbuf)
+{
+ int rc = -1;
+ char *full_path;
+
+ /* we only support local files at present */
+ if (!dev->mount_path)
+ return -1;
+
+ full_path = local_path(ctx, dev, path);
+
+ rc = stat(full_path, statbuf);
+ if (rc) {
+ rc = -1;
+ goto out;
+ }
+
+ rc = 0;
+out:
+ talloc_free(full_path);
+
+ return rc;
+}
+
+bool parser_is_unique(struct discover_context *ctx, struct discover_device *dev,
+ const char *filename, struct list *found_list)
+{
+ struct stat stat;
+ struct parser_found_file *found_file;
+ const struct parser_found_file *entry;
+
+ if (parser_stat_path(ctx, dev, filename, &stat)) {
+ pb_debug("%s: Not found: '%s'\n", __func__, filename);
+ return false;
+ }
+
+ list_for_each_entry(found_list, entry, list) {
+ if (entry->ino == stat.st_ino) {
+ pb_log("%s: Duplicate: '%s' = '%s'\n",
+ __func__, filename, entry->filename);
+ return false;
+ }
+ }
+
+ pb_debug("%s: Found: '%s'\n", __func__, filename);
+
+ found_file = talloc_zero(found_list, struct parser_found_file);
+ found_file->filename = talloc_strdup(found_file, filename);
+ found_file->ino = stat.st_ino;
+ list_add(found_list, &found_file->list);
+
+ return true;
+}
+
int parser_replace_file(struct discover_context *ctx,
struct discover_device *dev, const char *filename,
char *buf, int len)
return rc;
}
-static int download_config(struct discover_context *ctx, char **buf, int *len)
+int parser_request_url(struct discover_context *ctx, struct pb_url *url,
+ char **buf, int *len)
{
struct load_url_result *result;
int rc;
- result = load_url(ctx, ctx->conf_url);
+ result = load_url(ctx, url);
if (!result)
- return -1;
+ goto out;
rc = read_file(ctx, result->local, buf, len);
- if (rc)
+ if (rc) {
+ pb_log("Read failed for the parser %s on file %s\n",
+ ctx->parser->name, result->local);
goto out_clean;
+ }
return 0;
out_clean:
if (result->cleanup_local)
unlink(result->local);
+out:
return -1;
}
-static void iterate_parser_files(struct discover_context *ctx,
- const struct parser *parser)
+int parser_scandir(struct discover_context *ctx, const char *dirname,
+ struct dirent ***files, int (*filter)(const struct dirent *),
+ int (*comp)(const struct dirent **, const struct dirent **))
{
- const char * const *filename;
- const char *path;
-
- if (!parser->filenames)
- return;
-
- 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);
- }
- }
+ char *path;
+ int n;
+
+ path = talloc_asprintf(ctx, "%s%s", ctx->device->mount_path, dirname);
+ if (!path)
+ return -1;
+
+ n = scandir(path, files, filter, comp);
+ talloc_free(path);
+ return n;
}
-void iterate_parsers(struct discover_context *ctx, enum conf_method method)
+void iterate_parsers(struct discover_context *ctx)
{
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_debug("\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_debug("\ttrying parser '%s'\n", i->parser->name);
- ctx->parser = i->parser;
- i->parser->parse(ctx, buf, len);
- }
-
- break;
-
- case CONF_METHOD_UNKNOWN:
- break;
-
+ 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;
}
static void *parsers_ctx;