char *pb_url_to_string(struct pb_url *url)
{
const struct pb_scheme_info *scheme = pb_url_scheme_info(url->scheme);
+ char *str, *port;
assert(scheme);
- return talloc_asprintf(url, "%s://%s%s", scheme->str,
- scheme->has_host ? url->host : "", url->path);
+ port = url->port ? talloc_asprintf(url, ":%s", url->port) : NULL;
+
+ str = talloc_asprintf(url, "%s://%s%s%s", scheme->str,
+ scheme->has_host ? url->host : "",
+ port ?: "", url->path);
+
+ talloc_free(port);
+ return str;
}
static void pb_url_update_full(struct pb_url *url)
test/parser/test-pxe-non-url-pathprefix-with-conf \
test/parser/test-pxe-pathprefix-discover \
test/parser/test-pxe-pathprefix-discover-mac \
+ test/parser/test-pxe-pathprefix-port \
test/parser/test-pxe-path-resolve-relative \
test/parser/test-pxe-path-resolve-absolute \
test/parser/test-pxe-discover-bootfile-root \
--- /dev/null
+
+#include "parser-test.h"
+
+#if 0 /* PARSER_EMBEDDED_CONFIG */
+default linux
+
+label linux
+kernel ./kernel
+append command line
+initrd /initrd
+#endif
+
+void run_test(struct parser_test *test)
+{
+ struct discover_boot_option *opt;
+ struct discover_context *ctx;
+
+ test_read_conf_embedded_url(test,
+ "http://host:8080/path/to/pxelinux.cfg/default");
+
+ test_set_event_source(test);
+ test_set_event_param(test->ctx->event, "ip", "192.168.0.1");
+ test_set_event_param(test->ctx->event, "pxepathprefix",
+ "http://host:8080/path/to/");
+
+ test_run_parser(test, "pxe");
+
+ ctx = test->ctx;
+
+ check_boot_option_count(ctx, 1);
+ opt = get_boot_option(ctx, 0);
+
+ check_name(opt, "linux");
+ check_args(opt, "command line");
+
+ check_resolved_url_resource(opt->boot_image,
+ "http://host:8080/path/to/./kernel");
+ check_resolved_url_resource(opt->initrd,
+ "http://host:8080/path/to/initrd");
+}