Skip to content

V
varnish-cache
Commit 539961be authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Pass protocol info into DNS iterator

parent e83ea40d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
bin/varnishd/mgt/mgt_acceptor.c
View file @ 539961be
...@@ -115,6 +115,8 @@ struct mac_help { ...@@ -115,6 +115,8 @@ struct mac_help {
const char *name; const char *name;
int good; int good;
const char **err; const char **err;
const char *proto_name;
enum sess_step first_step;
}; };
static int __match_proto__(vss_resolver_f) static int __match_proto__(vss_resolver_f)
...@@ -132,8 +134,8 @@ mac_callback(void *priv, const struct suckaddr *sa) ...@@ -132,8 +134,8 @@ mac_callback(void *priv, const struct suckaddr *sa)
AN(ls); AN(ls);
ls->sock = -1; ls->sock = -1;
ls->addr = sa; ls->addr = sa;
ls->first_step = S_STP_H1NEWSESS; ls->proto_name = mh->proto_name;
ls->proto_name = "HTTP/1"; ls->first_step = mh->first_step;
fail = mac_opensocket(ls, NULL); fail = mac_opensocket(ls, NULL);
if (ls->sock < 0) { if (ls->sock < 0) {
*(mh->err) = strerror(fail); *(mh->err) = strerror(fail);
...@@ -180,6 +182,8 @@ MAC_Arg(const char *arg) ...@@ -180,6 +182,8 @@ MAC_Arg(const char *arg)
AN(mh); AN(mh);
mh->name = av[1]; mh->name = av[1];
mh->err = &err; mh->err = &err;
mh->first_step = S_STP_H1NEWSESS;
mh->proto_name = "HTTP/1";
error = VSS_resolver(av[1], "80", mac_callback, mh, &err); error = VSS_resolver(av[1], "80", mac_callback, mh, &err);
if (mh->good == 0 || err != NULL) if (mh->good == 0 || err != NULL)
ARGV_ERR("Could not bind to address %s: %s\n", av[1], err); ARGV_ERR("Could not bind to address %s: %s\n", av[1], err);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment