discover/discover-server: explicit #include <string.h>

[petitboot] / discover / pxe-parser.c

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index ff867229e5fa9b32c238509a9f89dea9cb32ba53..fd8b8e866d012ac4baeb8d6a772bd90eadbb9a03 100644 (file)
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -31,13 +31,17 @@ struct pxe_parser_info {
        char                            **pxe_conf_files;
        struct pb_url                   *pxe_base_url;
        int                             current;
+       char                            *proxy;
 };
 
 static void pxe_finish(struct conf_context *conf)
 {
        struct pxe_parser_info *info = conf->parser_info;
-       if (info->opt)
+       if (info->opt) {
+               if (info->proxy)
+                       info->opt->proxy = talloc_strdup(info->opt, info->proxy);
                discover_context_add_boot_option(conf->dc, info->opt);
+       }
 }
 
 /* We need a slightly modified version of pb_url_join, to allow for the
@@ -148,7 +152,15 @@ static void pxe_process_pair(struct conf_context *ctx,
                return;
        }
 
-       if (streq(name, "LABEL")) {
+       if (streq(name, "PROXY")) {
+               if (parser_info->proxy)
+                       talloc_free(parser_info->proxy);
+
+               parser_info->proxy = talloc_strdup(parser_info, value);
+               return;
+       }
+
+       if (streq(name, "LABEL") || streq(name, "PLUGIN")) {
                if (opt)
                        pxe_finish(ctx);
 
@@ -158,8 +170,12 @@ static void pxe_process_pair(struct conf_context *ctx,
                opt->option->id = talloc_asprintf(opt, "%s@%p",
                                ctx->dc->device->device->id, opt);
 
-               opt->option->is_default = parser_info->default_name &&
-                                       streq(parser_info->default_name, value);
+               if (streq(name, "LABEL")) {
+                       opt->option->type = DISCOVER_BOOT_OPTION;
+                       opt->option->is_default = parser_info->default_name &&
+                                               streq(parser_info->default_name, value);
+               } else
+                       opt->option->type = DISCOVER_PLUGIN_OPTION;
 
                parser_info->opt = opt;
                return;
@@ -169,6 +185,14 @@ static void pxe_process_pair(struct conf_context *ctx,
        if (!opt)
                return;
 
+       if (streq(name, "TARBALL") &&
+                       opt->option->type == DISCOVER_PLUGIN_OPTION) {
+               url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value);
+               opt->boot_image = create_url_resource(opt, url);
+               /* All other options apply to boot options only */
+               return;
+       }
+
        if (streq(name, "KERNEL")) {
                url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value);
                opt->boot_image = create_url_resource(opt, url);
@@ -210,7 +234,6 @@ static void pxe_process_pair(struct conf_context *ctx,
                url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value);
                opt->dtb = create_url_resource(opt, url);
        }
-
 }
 
 static void pxe_load_next_filename(struct conf_context *conf)
@@ -250,12 +273,14 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
        if (!data)
                return;
+       if (!result)
+               goto out_clean;
 
        handler = talloc_parent(conf);
 
-       if (result && result->status == LOAD_OK)
+       if (result->status == LOAD_OK)
                rc = read_file(conf, result->local, &buf, &len);
-       if (!result || result->status != LOAD_OK || rc) {
+       if (result->status != LOAD_OK || rc) {
                /* This load failed so try the next available filename */
                info = conf->parser_info;
                if (!info->pxe_conf_files) {
@@ -301,7 +326,7 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
        talloc_free(buf);
 out_clean:
-       if (result->cleanup_local)
+       if (result && result->cleanup_local)
                unlink(result->local);
        talloc_free(conf);
 }
@@ -345,7 +370,7 @@ static struct conf_context *copy_context(void *ctx, struct discover_context *dc)
 
 static int pxe_parse(struct discover_context *dc)
 {
-       struct pb_url *pxe_base_url;
+       struct pb_url *pxe_base_url, *file_url;
        struct conf_context *conf = NULL;
        struct load_url_result *result;
        void *ctx = talloc_parent(dc);
@@ -374,21 +399,30 @@ static int pxe_parse(struct discover_context *dc)
                return -1;
 
        if (complete_url) {
+               /* Check if this file has already been downloaded */
+               if (event_get_param(dc->event, "pxeconffile-local"))
+                       file_url = pb_url_parse(dc, event_get_param(dc->event,
+                                               "pxeconffile-local"));
+               else
+                       file_url = dc->conf_url;
+
+               if (!file_url) {
+                       pb_log("%s: Failed to parse conf url!\n", __func__);
+                       goto out_conf;
+               }
+
                device_handler_status_dev_info(conf->dc->handler,
                        dc->device,
                        _("Requesting config %s"),
                        pb_url_to_string(conf->dc->conf_url));
 
                /* we have a complete URL; use this and we're done. */
-               result = load_url_async(conf->dc, conf->dc->conf_url,
+               result = load_url_async(conf->dc, file_url,
                                        pxe_conf_parse_cb, conf, NULL, ctx);
                if (!result) {
                        pb_log("load_url_async fails for %s\n",
                                        dc->conf_url->path);
                        goto out_conf;
-               } else if (result->status == LOAD_OK) {
-                       /* Local load - call pxe_conf_parse_cb() now */
-                       pxe_conf_parse_cb(result, conf);
                }
        } else {
                pxe_conf_files = user_event_parse_conf_filenames(dc, dc->event);