MINOR: resolvers: renames some dns prefixed types using resolv prefix.
@@ -119,8 +119,8 @@ struct act_rule {
- } dns; /* dns resolution */
+ } resolv; /* resolving */
-struct dns_options {
+struct resolv_options {
diff --git a/include/haproxy/action-t.h b/include/haproxy/action-t.h
index 601b031..7079096 100644
--- a/include/haproxy/action-t.h
+++ b/include/haproxy/action-t.h
@@ -119,8 +119,8 @@
char *varname;
char *resolvers_id;
struct resolvers *resolvers;
- struct dns_options *dns_opts;
- } dns; /* dns resolution */
+ struct resolv_options *opts;
+ } resolv; /* resolving */
struct {
int i; /* integer param (status, nice, loglevel, ..) */
struct ist str; /* string param (reason, header name, ...) */
diff --git a/include/haproxy/dns-t.h b/include/haproxy/dns-t.h
index ef28298..ac0aa78 100644
--- a/include/haproxy/dns-t.h
+++ b/include/haproxy/dns-t.h
@@ -236,7 +236,7 @@
long long truncated; /* - truncated response */;
};
-struct dns_options {
+struct resolv_options {
int family_prio; /* which IP family should the resolver use when both are returned */
struct {
int family;
diff --git a/include/haproxy/dns.h b/include/haproxy/dns.h
index 260e319..f090a96 100644
--- a/include/haproxy/dns.h
+++ b/include/haproxy/dns.h
@@ -37,7 +37,7 @@
int dns_hostname_validation(const char *string, char **err);
int dns_get_ip_from_response(struct resolv_response *r_res,
- struct dns_options *dns_opts, void *currentip,
+ struct resolv_options *resolv_opts, void *currentip,
short currentip_sin_family,
void **newip, short *newip_sin_family,
void *owner);
diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index 85b6d93..b1840fd 100644
--- a/include/haproxy/server-t.h
+++ b/include/haproxy/server-t.h
@@ -296,7 +296,7 @@
char *resolvers_id; /* resolvers section used by this server */
struct resolvers *resolvers; /* pointer to the resolvers structure used by this server */
char *lastaddr; /* the address string provided by the server-state file */
- struct dns_options dns_opts;
+ struct resolv_options resolv_opts;
int hostname_dn_len; /* string length of the server hostname in Domain Name format */
char *hostname_dn; /* server hostname in Domain Name format */
char *hostname; /* server hostname */
diff --git a/src/dns.c b/src/dns.c
index 8f1fd49..5d819b4 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -719,7 +719,7 @@
srv->svc_port = item->port;
srv->flags &= ~SRV_F_MAPPORTS;
- if (!srv->dns_opts.ignore_weight) {
+ if (!srv->resolv_opts.ignore_weight) {
char weight[9];
int ha_weight;
@@ -1326,7 +1326,7 @@
* returns one of the DNS_UPD_* code
*/
int dns_get_ip_from_response(struct resolv_response *r_res,
- struct dns_options *dns_opts, void *currentip,
+ struct resolv_options *resolv_opts, void *currentip,
short currentip_sin_family,
void **newip, short *newip_sin_family,
void *owner)
@@ -1340,8 +1340,8 @@
int score, max_score;
int allowed_duplicated_ip;
- family_priority = dns_opts->family_prio;
- allowed_duplicated_ip = dns_opts->accept_duplicate_ip;
+ family_priority = resolv_opts->family_prio;
+ allowed_duplicated_ip = resolv_opts->accept_duplicate_ip;
*newip = newip4 = newip6 = NULL;
currentip_found = 0;
*newip_sin_family = AF_UNSPEC;
@@ -1382,20 +1382,20 @@
score += 8;
/* Check for preferred network. */
- for (j = 0; j < dns_opts->pref_net_nb; j++) {
+ for (j = 0; j < resolv_opts->pref_net_nb; j++) {
/* Compare only the same addresses class. */
- if (dns_opts->pref_net[j].family != ip_type)
+ if (resolv_opts->pref_net[j].family != ip_type)
continue;
if ((ip_type == AF_INET &&
in_net_ipv4(ip,
- &dns_opts->pref_net[j].mask.in4,
- &dns_opts->pref_net[j].addr.in4)) ||
+ &resolv_opts->pref_net[j].mask.in4,
+ &resolv_opts->pref_net[j].addr.in4)) ||
(ip_type == AF_INET6 &&
in_net_ipv6(ip,
- &dns_opts->pref_net[j].mask.in6,
- &dns_opts->pref_net[j].addr.in6))) {
+ &resolv_opts->pref_net[j].mask.in6,
+ &resolv_opts->pref_net[j].addr.in6))) {
score += 4;
break;
}
@@ -1728,7 +1728,7 @@
hostname_dn = &srv->hostname_dn;
hostname_dn_len = srv->hostname_dn_len;
resolvers = srv->resolvers;
- query_type = ((srv->dns_opts.family_prio == AF_INET)
+ query_type = ((srv->resolv_opts.family_prio == AF_INET)
? DNS_RTYPE_A
: DNS_RTYPE_AAAA);
break;
@@ -1745,8 +1745,8 @@
stream = (struct stream *)requester;
hostname_dn = &stream->resolv_ctx.hostname_dn;
hostname_dn_len = stream->resolv_ctx.hostname_dn_len;
- resolvers = stream->resolv_ctx.parent->arg.dns.resolvers;
- query_type = ((stream->resolv_ctx.parent->arg.dns.dns_opts->family_prio == AF_INET)
+ resolvers = stream->resolv_ctx.parent->arg.resolv.resolvers;
+ query_type = ((stream->resolv_ctx.parent->arg.resolv.opts->family_prio == AF_INET)
? DNS_RTYPE_A
: DNS_RTYPE_AAAA);
break;
@@ -2668,7 +2668,7 @@
int exp, locked = 0;
enum act_return ret = ACT_RET_CONT;
- resolvers = rule->arg.dns.resolvers;
+ resolvers = rule->arg.resolv.resolvers;
/* we have a response to our DNS resolution */
use_cache:
@@ -2688,7 +2688,7 @@
short ip_sin_family = 0;
void *ip = NULL;
- dns_get_ip_from_response(&resolution->response, rule->arg.dns.dns_opts, NULL,
+ dns_get_ip_from_response(&resolution->response, rule->arg.resolv.opts, NULL,
0, &ip, &ip_sin_family, NULL);
switch (ip_sin_family) {
@@ -2709,7 +2709,7 @@
smp.sess = sess;
smp.strm = s;
- vars_set_by_name(rule->arg.dns.varname, strlen(rule->arg.dns.varname), &smp);
+ vars_set_by_name(rule->arg.resolv.varname, strlen(rule->arg.resolv.varname), &smp);
}
}
}
@@ -2718,7 +2718,7 @@
}
/* need to configure and start a new DNS resolution */
- smp = sample_fetch_as_type(px, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, rule->arg.dns.expr, SMP_T_STR);
+ smp = sample_fetch_as_type(px, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, rule->arg.resolv.expr, SMP_T_STR);
if (smp == NULL)
goto end;
@@ -2771,10 +2771,10 @@
static void release_dns_action(struct act_rule *rule)
{
- release_sample_expr(rule->arg.dns.expr);
- free(rule->arg.dns.varname);
- free(rule->arg.dns.resolvers_id);
- free(rule->arg.dns.dns_opts);
+ release_sample_expr(rule->arg.resolv.expr);
+ free(rule->arg.resolv.varname);
+ free(rule->arg.resolv.resolvers_id);
+ free(rule->arg.resolv.opts);
}
@@ -2808,8 +2808,8 @@
end = strchr(beg, ',');
if (end == NULL)
goto do_resolve_parse_error;
- rule->arg.dns.varname = my_strndup(beg, end - beg);
- if (rule->arg.dns.varname == NULL)
+ rule->arg.resolv.varname = my_strndup(beg, end - beg);
+ if (rule->arg.resolv.varname == NULL)
goto do_resolve_parse_error;
@@ -2823,17 +2823,17 @@
end = strchr(beg, ')');
if (end == NULL)
goto do_resolve_parse_error;
- rule->arg.dns.resolvers_id = my_strndup(beg, end - beg);
- if (rule->arg.dns.resolvers_id == NULL)
+ rule->arg.resolv.resolvers_id = my_strndup(beg, end - beg);
+ if (rule->arg.resolv.resolvers_id == NULL)
goto do_resolve_parse_error;
- rule->arg.dns.dns_opts = calloc(1, sizeof(*rule->arg.dns.dns_opts));
- if (rule->arg.dns.dns_opts == NULL)
+ rule->arg.resolv.opts = calloc(1, sizeof(*rule->arg.resolv.opts));
+ if (rule->arg.resolv.opts == NULL)
goto do_resolve_parse_error;
/* Default priority is ipv6 */
- rule->arg.dns.dns_opts->family_prio = AF_INET6;
+ rule->arg.resolv.opts->family_prio = AF_INET6;
/* optional arguments accepted for now:
* ipv4 or ipv6
@@ -2847,10 +2847,10 @@
goto do_resolve_parse_error;
if (strncmp(beg, "ipv4", end - beg) == 0) {
- rule->arg.dns.dns_opts->family_prio = AF_INET;
+ rule->arg.resolv.opts->family_prio = AF_INET;
}
else if (strncmp(beg, "ipv6", end - beg) == 0) {
- rule->arg.dns.dns_opts->family_prio = AF_INET6;
+ rule->arg.resolv.opts->family_prio = AF_INET6;
}
else {
goto do_resolve_parse_error;
@@ -2877,7 +2877,7 @@
free(expr);
return ACT_RET_PRS_ERR;
}
- rule->arg.dns.expr = expr;
+ rule->arg.resolv.expr = expr;
rule->action = ACT_CUSTOM;
rule->action_ptr = dns_action_do_resolve;
*orig_arg = cur_arg;
@@ -2888,8 +2888,8 @@
return ACT_RET_PRS_OK;
do_resolve_parse_error:
- free(rule->arg.dns.varname); rule->arg.dns.varname = NULL;
- free(rule->arg.dns.resolvers_id); rule->arg.dns.resolvers_id = NULL;
+ free(rule->arg.resolv.varname); rule->arg.resolv.varname = NULL;
+ free(rule->arg.resolv.resolvers_id); rule->arg.resolv.resolvers_id = NULL;
memprintf(err, "Can't parse '%s'. Expects 'do-resolve(<varname>,<resolvers>[,<options>]) <expr>'. Available options are 'ipv4' and 'ipv6'",
args[cur_arg]);
return ACT_RET_PRS_ERR;
@@ -2918,17 +2918,17 @@
{
struct resolvers *resolvers = NULL;
- if (rule->arg.dns.resolvers_id == NULL) {
+ if (rule->arg.resolv.resolvers_id == NULL) {
memprintf(err,"Proxy '%s': %s", px->id, "do-resolve action without resolvers");
return 0;
}
- resolvers = find_resolvers_by_id(rule->arg.dns.resolvers_id);
+ resolvers = find_resolvers_by_id(rule->arg.resolv.resolvers_id);
if (resolvers == NULL) {
- memprintf(err,"Can't find resolvers section '%s' for do-resolve action", rule->arg.dns.resolvers_id);
+ memprintf(err,"Can't find resolvers section '%s' for do-resolve action", rule->arg.resolv.resolvers_id);
return 0;
}
- rule->arg.dns.resolvers = resolvers;
+ rule->arg.resolv.resolvers = resolvers;
return 1;
}
diff --git a/src/server.c b/src/server.c
index 25834ec..03b107b 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1716,15 +1716,15 @@
if (src->resolvers_id != NULL)
srv->resolvers_id = strdup(src->resolvers_id);
- srv->dns_opts.family_prio = src->dns_opts.family_prio;
- srv->dns_opts.accept_duplicate_ip = src->dns_opts.accept_duplicate_ip;
- srv->dns_opts.ignore_weight = src->dns_opts.ignore_weight;
- if (srv->dns_opts.family_prio == AF_UNSPEC)
- srv->dns_opts.family_prio = AF_INET6;
- memcpy(srv->dns_opts.pref_net,
- src->dns_opts.pref_net,
- sizeof srv->dns_opts.pref_net);
- srv->dns_opts.pref_net_nb = src->dns_opts.pref_net_nb;
+ srv->resolv_opts.family_prio = src->resolv_opts.family_prio;
+ srv->resolv_opts.accept_duplicate_ip = src->resolv_opts.accept_duplicate_ip;
+ srv->resolv_opts.ignore_weight = src->resolv_opts.ignore_weight;
+ if (srv->resolv_opts.family_prio == AF_UNSPEC)
+ srv->resolv_opts.family_prio = AF_INET6;
+ memcpy(srv->resolv_opts.pref_net,
+ src->resolv_opts.pref_net,
+ sizeof srv->resolv_opts.pref_net);
+ srv->resolv_opts.pref_net_nb = src->resolv_opts.pref_net_nb;
srv->init_addr_methods = src->init_addr_methods;
srv->init_addr = src->init_addr;
@@ -2111,8 +2111,8 @@
} else {
newsrv = &curproxy->defsrv;
cur_arg = 1;
- newsrv->dns_opts.family_prio = AF_INET6;
- newsrv->dns_opts.accept_duplicate_ip = 0;
+ newsrv->resolv_opts.family_prio = AF_INET6;
+ newsrv->resolv_opts.accept_duplicate_ip = 0;
}
while (*args[cur_arg]) {
@@ -2180,13 +2180,13 @@
*(end++) = 0;
if (strcmp(p, "allow-dup-ip") == 0) {
- newsrv->dns_opts.accept_duplicate_ip = 1;
+ newsrv->resolv_opts.accept_duplicate_ip = 1;
}
else if (strcmp(p, "ignore-weight") == 0) {
- newsrv->dns_opts.ignore_weight = 1;
+ newsrv->resolv_opts.ignore_weight = 1;
}
else if (strcmp(p, "prevent-dup-ip") == 0) {
- newsrv->dns_opts.accept_duplicate_ip = 0;
+ newsrv->resolv_opts.accept_duplicate_ip = 0;
}
else {
ha_alert("parsing [%s:%d]: '%s' : unknown resolve-opts option '%s', supported methods are 'allow-dup-ip', 'ignore-weight', and 'prevent-dup-ip'.\n",
@@ -2200,9 +2200,9 @@
}
else if (strcmp(args[cur_arg], "resolve-prefer") == 0) {
if (strcmp(args[cur_arg + 1], "ipv4") == 0)
- newsrv->dns_opts.family_prio = AF_INET;
+ newsrv->resolv_opts.family_prio = AF_INET;
else if (strcmp(args[cur_arg + 1], "ipv6") == 0)
- newsrv->dns_opts.family_prio = AF_INET6;
+ newsrv->resolv_opts.family_prio = AF_INET6;
else {
ha_alert("parsing [%s:%d]: '%s' expects either ipv4 or ipv6 as argument.\n",
file, linenum, args[cur_arg]);
@@ -2214,7 +2214,7 @@
else if (strcmp(args[cur_arg], "resolve-net") == 0) {
char *p, *e;
unsigned char mask;
- struct dns_options *opt;
+ struct resolv_options *opt;
if (!args[cur_arg + 1] || args[cur_arg + 1][0] == '\0') {
ha_alert("parsing [%s:%d]: '%s' expects a list of networks.\n",
@@ -2223,7 +2223,7 @@
goto out;
}
- opt = &newsrv->dns_opts;
+ opt = &newsrv->resolv_opts;
/* Split arguments by comma, and convert it from ipv4 or ipv6
* string network in in_addr or in6_addr.
@@ -4014,7 +4014,7 @@
goto invalid;
}
- ret = dns_get_ip_from_response(&resolution->response, &s->dns_opts,
+ ret = dns_get_ip_from_response(&resolution->response, &s->resolv_opts,
serverip, server_sin_family, &firstip,
&firstip_sin_family, s);
diff --git a/src/stream.c b/src/stream.c
index 96d6ea9..caac513 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -668,7 +668,7 @@
}
if (s->resolv_ctx.requester) {
- __decl_thread(struct resolvers *resolvers = s->resolv_ctx.parent->arg.dns.resolvers);
+ __decl_thread(struct resolvers *resolvers = s->resolv_ctx.parent->arg.resolv.resolvers);
HA_SPIN_LOCK(DNS_LOCK, &resolvers->lock);
free(s->resolv_ctx.hostname_dn); s->resolv_ctx.hostname_dn = NULL;