discover: remove register_parser printf

[petitboot] / discover / parser.c

diff --git a/discover/parser.c b/discover/parser.c
index 2b4ddd2668e0e30a808184c004c0aac879b0e938..b0668808cd859cfe7706ad5df870005878639a4e 100644 (file)
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,46 +1,184 @@
 
+#include <fcntl.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
-#include "pb-protocol/pb-protocol.h"
+#include "types/types.h"
 #include <log/log.h>
+#include <talloc/talloc.h>
 
 #include "device-handler.h"
 #include "parser.h"
 #include "parser-utils.h"
+#include "paths.h"
+#include "file.h"
 
-extern struct parser __start_parsers[], __stop_parsers[];
+struct p_item {
+       struct list_item list;
+       struct parser *parser;
+};
+
+STATIC_LIST(parsers);
 
-void iterate_parsers(struct discover_context *ctx)
+static char *local_path(struct discover_context *ctx,
+               struct discover_device *dev,
+               const char *filename)
 {
-       struct parser *parser;
+       return join_paths(ctx, dev->mount_path, filename);
+}
 
-       pb_log("trying parsers for %s\n", ctx->device_path);
+int parser_request_file(struct discover_context *ctx,
+               struct discover_device *dev, const char *filename,
+               char **buf, int *len)
 
-       for (parser = __start_parsers; parser < __stop_parsers; parser++) {
-               pb_log("\ttrying parser '%s'\n", parser->name);
-               /* just use a dummy device path for now */
-               if (parser->parse(ctx))
-                       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;
 }
 
-static int compare_parsers(const void *a, const void *b)
+static int download_config(struct discover_context *ctx, char **buf, int *len)
 {
-       const struct parser *parser_a = a, *parser_b = b;
+       struct load_url_result *result;
+       int rc;
 
-       if (parser_a->priority > parser_b->priority)
+       result = load_url(ctx, ctx->conf_url);
+       if (!result)
                return -1;
 
-       if (parser_a->priority < parser_b->priority)
-               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;
+}
+
+static void iterate_parser_files(struct discover_context *ctx,
+               const struct parser *parser)
+{
+       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);
+               }
+       }
+}
+
+void iterate_parsers(struct discover_context *ctx, enum conf_method method)
+{
+       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;
+
+       }
+}
+
+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)
 {
-       /* sort our parsers into descending priority order */
-       qsort(__start_parsers, __stop_parsers - __start_parsers,
-                       sizeof(struct parser), compare_parsers);
 }