mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: resolvers: renames some dns prefixed types using resolv prefix.

Browse Source 
@@ -119,8 +119,8 @@ struct act_rule {
-               } dns;                         /* dns resolution */
+               } resolv;                      /* resolving */

-struct dns_options {
+struct resolv_options {
This commit is contained in:
Emeric Brun 2020-12-23 18:01:04 +01:00 committed by Willy Tarreau
parent 08622d3c0a
commit 21fbeedf97
7 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/action-t.h
View File

@ -119,8 +119,8 @@ struct act_rule {
char *varname; char *varname;
char *resolvers_id; char *resolvers_id;
struct resolvers *resolvers; struct resolvers *resolvers;
struct dns_options *dns_opts; struct resolv_options *opts;
} dns; /* dns resolution */ } resolv; /* resolving */
struct { struct {
int i; /* integer param (status, nice, loglevel, ..) */ int i; /* integer param (status, nice, loglevel, ..) */
struct ist str; /* string param (reason, header name, ...) */ struct ist str; /* string param (reason, header name, ...) */

2
include/haproxy/dns-t.h
View File

@ -236,7 +236,7 @@ struct dns_counters {
long long truncated; /* - truncated response */; 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 */ int family_prio; /* which IP family should the resolver use when both are returned */
struct { struct {
int family; int family;

2
include/haproxy/dns.h
View File

@ -37,7 +37,7 @@ int dns_dn_label_to_str(const char *dn, int dn_len, char *str, int str_len);
int dns_hostname_validation(const char *string, char **err); int dns_hostname_validation(const char *string, char **err);
int dns_get_ip_from_response(struct resolv_response *r_res, 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, short currentip_sin_family,
void **newip, short *newip_sin_family, void **newip, short *newip_sin_family,
void *owner); void *owner);

2
include/haproxy/server-t.h
View File

@ -296,7 +296,7 @@ struct server {
char *resolvers_id; /* resolvers section used by this server */ char *resolvers_id; /* resolvers section used by this server */
struct resolvers *resolvers; /* pointer to the resolvers structure 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 */ 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 */ 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_dn; /* server hostname in Domain Name format */
char *hostname; /* server hostname */ char *hostname; /* server hostname */

74
src/dns.c
View File

@ -719,7 +719,7 @@ static void dns_check_dns_response(struct resolv_resolution *res)
srv->svc_port = item->port; srv->svc_port = item->port;
srv->flags &= ~SRV_F_MAPPORTS; srv->flags &= ~SRV_F_MAPPORTS;
if (!srv->dns_opts.ignore_weight) { if (!srv->resolv_opts.ignore_weight) {
char weight[9]; char weight[9];
int ha_weight; int ha_weight;
@ -1326,7 +1326,7 @@ static int dns_validate_dns_response(unsigned char *resp, unsigned char *bufend,
* returns one of the DNS_UPD_* code * returns one of the DNS_UPD_* code
*/ */
int dns_get_ip_from_response(struct resolv_response *r_res, 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, short currentip_sin_family,
void **newip, short *newip_sin_family, void **newip, short *newip_sin_family,
void *owner) void *owner)
@ -1340,8 +1340,8 @@ int dns_get_ip_from_response(struct resolv_response *r_res,
int score, max_score; int score, max_score;
int allowed_duplicated_ip; int allowed_duplicated_ip;
family_priority = dns_opts->family_prio; family_priority = resolv_opts->family_prio;
allowed_duplicated_ip = dns_opts->accept_duplicate_ip; allowed_duplicated_ip = resolv_opts->accept_duplicate_ip;
*newip = newip4 = newip6 = NULL; *newip = newip4 = newip6 = NULL;
currentip_found = 0; currentip_found = 0;
*newip_sin_family = AF_UNSPEC; *newip_sin_family = AF_UNSPEC;
@ -1382,20 +1382,20 @@ int dns_get_ip_from_response(struct resolv_response *r_res,
score += 8; score += 8;
/* Check for preferred network. */ /* 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. */ /* 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; continue;
if ((ip_type == AF_INET && if ((ip_type == AF_INET &&
in_net_ipv4(ip, in_net_ipv4(ip,
&dns_opts->pref_net[j].mask.in4, &resolv_opts->pref_net[j].mask.in4,
&dns_opts->pref_net[j].addr.in4)) || &resolv_opts->pref_net[j].addr.in4)) ||
(ip_type == AF_INET6 && (ip_type == AF_INET6 &&
in_net_ipv6(ip, in_net_ipv6(ip,
&dns_opts->pref_net[j].mask.in6, &resolv_opts->pref_net[j].mask.in6,
&dns_opts->pref_net[j].addr.in6))) { &resolv_opts->pref_net[j].addr.in6))) {
score += 4; score += 4;
break; break;
} }
@ -1728,7 +1728,7 @@ int dns_link_resolution(void *requester, int requester_type, int requester_locke
hostname_dn = &srv->hostname_dn; hostname_dn = &srv->hostname_dn;
hostname_dn_len = srv->hostname_dn_len; hostname_dn_len = srv->hostname_dn_len;
resolvers = srv->resolvers; 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_A
: DNS_RTYPE_AAAA); : DNS_RTYPE_AAAA);
break; break;
@ -1745,8 +1745,8 @@ int dns_link_resolution(void *requester, int requester_type, int requester_locke
stream = (struct stream *)requester; stream = (struct stream *)requester;
hostname_dn = &stream->resolv_ctx.hostname_dn; hostname_dn = &stream->resolv_ctx.hostname_dn;
hostname_dn_len = stream->resolv_ctx.hostname_dn_len; hostname_dn_len = stream->resolv_ctx.hostname_dn_len;
resolvers = stream->resolv_ctx.parent->arg.dns.resolvers; resolvers = stream->resolv_ctx.parent->arg.resolv.resolvers;
query_type = ((stream->resolv_ctx.parent->arg.dns.dns_opts->family_prio == AF_INET) query_type = ((stream->resolv_ctx.parent->arg.resolv.opts->family_prio == AF_INET)
? DNS_RTYPE_A ? DNS_RTYPE_A
: DNS_RTYPE_AAAA); : DNS_RTYPE_AAAA);
break; break;
@ -2668,7 +2668,7 @@ enum act_return dns_action_do_resolve(struct act_rule *rule, struct proxy *px,
int exp, locked = 0; int exp, locked = 0;
enum act_return ret = ACT_RET_CONT; 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 */ /* we have a response to our DNS resolution */
use_cache: use_cache:
@ -2688,7 +2688,7 @@ enum act_return dns_action_do_resolve(struct act_rule *rule, struct proxy *px,
short ip_sin_family = 0; short ip_sin_family = 0;
void *ip = NULL; 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); 0, &ip, &ip_sin_family, NULL);
switch (ip_sin_family) { switch (ip_sin_family) {
@ -2709,7 +2709,7 @@ enum act_return dns_action_do_resolve(struct act_rule *rule, struct proxy *px,
smp.sess = sess; smp.sess = sess;
smp.strm = s; 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 @@ enum act_return dns_action_do_resolve(struct act_rule *rule, struct proxy *px,
} }
/* need to configure and start a new DNS resolution */ /* 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) if (smp == NULL)
goto end; goto end;
@ -2771,10 +2771,10 @@ enum act_return dns_action_do_resolve(struct act_rule *rule, struct proxy *px,
static void release_dns_action(struct act_rule *rule) static void release_dns_action(struct act_rule *rule)
{ {
release_sample_expr(rule->arg.dns.expr); release_sample_expr(rule->arg.resolv.expr);
free(rule->arg.dns.varname); free(rule->arg.resolv.varname);
free(rule->arg.dns.resolvers_id); free(rule->arg.resolv.resolvers_id);
free(rule->arg.dns.dns_opts); free(rule->arg.resolv.opts);
} }
@ -2808,8 +2808,8 @@ enum act_parse_ret dns_parse_do_resolve(const char **args, int *orig_arg, struct
end = strchr(beg, ','); end = strchr(beg, ',');
if (end == NULL) if (end == NULL)
goto do_resolve_parse_error; goto do_resolve_parse_error;
rule->arg.dns.varname = my_strndup(beg, end - beg); rule->arg.resolv.varname = my_strndup(beg, end - beg);
if (rule->arg.dns.varname == NULL) if (rule->arg.resolv.varname == NULL)
goto do_resolve_parse_error; goto do_resolve_parse_error;
@ -2823,17 +2823,17 @@ enum act_parse_ret dns_parse_do_resolve(const char **args, int *orig_arg, struct
end = strchr(beg, ')'); end = strchr(beg, ')');
if (end == NULL) if (end == NULL)
goto do_resolve_parse_error; goto do_resolve_parse_error;
rule->arg.dns.resolvers_id = my_strndup(beg, end - beg); rule->arg.resolv.resolvers_id = my_strndup(beg, end - beg);
if (rule->arg.dns.resolvers_id == NULL) if (rule->arg.resolv.resolvers_id == NULL)
goto do_resolve_parse_error; goto do_resolve_parse_error;
rule->arg.dns.dns_opts = calloc(1, sizeof(*rule->arg.dns.dns_opts)); rule->arg.resolv.opts = calloc(1, sizeof(*rule->arg.resolv.opts));
if (rule->arg.dns.dns_opts == NULL) if (rule->arg.resolv.opts == NULL)
goto do_resolve_parse_error; goto do_resolve_parse_error;
/* Default priority is ipv6 */ /* 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: /* optional arguments accepted for now:
* ipv4 or ipv6 * ipv4 or ipv6
@ -2847,10 +2847,10 @@ enum act_parse_ret dns_parse_do_resolve(const char **args, int *orig_arg, struct
goto do_resolve_parse_error; goto do_resolve_parse_error;
if (strncmp(beg, "ipv4", end - beg) == 0) { 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) { 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 { else {
goto do_resolve_parse_error; goto do_resolve_parse_error;
@ -2877,7 +2877,7 @@ enum act_parse_ret dns_parse_do_resolve(const char **args, int *orig_arg, struct
free(expr); free(expr);
return ACT_RET_PRS_ERR; return ACT_RET_PRS_ERR;
} }
rule->arg.dns.expr = expr; rule->arg.resolv.expr = expr;
rule->action = ACT_CUSTOM; rule->action = ACT_CUSTOM;
rule->action_ptr = dns_action_do_resolve; rule->action_ptr = dns_action_do_resolve;
*orig_arg = cur_arg; *orig_arg = cur_arg;
@ -2888,8 +2888,8 @@ enum act_parse_ret dns_parse_do_resolve(const char **args, int *orig_arg, struct
return ACT_RET_PRS_OK; return ACT_RET_PRS_OK;
do_resolve_parse_error: do_resolve_parse_error:
free(rule->arg.dns.varname); rule->arg.dns.varname = NULL; free(rule->arg.resolv.varname); rule->arg.resolv.varname = NULL;
free(rule->arg.dns.resolvers_id); rule->arg.dns.resolvers_id = 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'", memprintf(err, "Can't parse '%s'. Expects 'do-resolve(<varname>,<resolvers>[,<options>]) <expr>'. Available options are 'ipv4' and 'ipv6'",
args[cur_arg]); args[cur_arg]);
return ACT_RET_PRS_ERR; return ACT_RET_PRS_ERR;
@ -2918,17 +2918,17 @@ int check_action_do_resolve(struct act_rule *rule, struct proxy *px, char **err)
{ {
struct resolvers *resolvers = NULL; 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"); memprintf(err,"Proxy '%s': %s", px->id, "do-resolve action without resolvers");
return 0; 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) { 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; return 0;
} }
rule->arg.dns.resolvers = resolvers; rule->arg.resolv.resolvers = resolvers;
return 1; return 1;
} }

38
src/server.c
View File

@ -1716,15 +1716,15 @@ static void srv_settings_cpy(struct server *srv, struct server *src, int srv_tmp
if (src->resolvers_id != NULL) if (src->resolvers_id != NULL)
srv->resolvers_id = strdup(src->resolvers_id); srv->resolvers_id = strdup(src->resolvers_id);
srv->dns_opts.family_prio = src->dns_opts.family_prio; srv->resolv_opts.family_prio = src->resolv_opts.family_prio;
srv->dns_opts.accept_duplicate_ip = src->dns_opts.accept_duplicate_ip; srv->resolv_opts.accept_duplicate_ip = src->resolv_opts.accept_duplicate_ip;
srv->dns_opts.ignore_weight = src->dns_opts.ignore_weight; srv->resolv_opts.ignore_weight = src->resolv_opts.ignore_weight;
if (srv->dns_opts.family_prio == AF_UNSPEC) if (srv->resolv_opts.family_prio == AF_UNSPEC)
srv->dns_opts.family_prio = AF_INET6; srv->resolv_opts.family_prio = AF_INET6;
memcpy(srv->dns_opts.pref_net, memcpy(srv->resolv_opts.pref_net,
src->dns_opts.pref_net, src->resolv_opts.pref_net,
sizeof srv->dns_opts.pref_net); sizeof srv->resolv_opts.pref_net);
srv->dns_opts.pref_net_nb = src->dns_opts.pref_net_nb; srv->resolv_opts.pref_net_nb = src->resolv_opts.pref_net_nb;
srv->init_addr_methods = src->init_addr_methods; srv->init_addr_methods = src->init_addr_methods;
srv->init_addr = src->init_addr; srv->init_addr = src->init_addr;
@ -2111,8 +2111,8 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
} else { } else {
newsrv = &curproxy->defsrv; newsrv = &curproxy->defsrv;
cur_arg = 1; cur_arg = 1;
newsrv->dns_opts.family_prio = AF_INET6; newsrv->resolv_opts.family_prio = AF_INET6;
newsrv->dns_opts.accept_duplicate_ip = 0; newsrv->resolv_opts.accept_duplicate_ip = 0;
} }
while (*args[cur_arg]) { while (*args[cur_arg]) {
@ -2180,13 +2180,13 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
*(end++) = 0; *(end++) = 0;
if (strcmp(p, "allow-dup-ip") == 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) { 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) { else if (strcmp(p, "prevent-dup-ip") == 0) {
newsrv->dns_opts.accept_duplicate_ip = 0; newsrv->resolv_opts.accept_duplicate_ip = 0;
} }
else { 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", 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 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
} }
else if (strcmp(args[cur_arg], "resolve-prefer") == 0) { else if (strcmp(args[cur_arg], "resolve-prefer") == 0) {
if (strcmp(args[cur_arg + 1], "ipv4") == 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) else if (strcmp(args[cur_arg + 1], "ipv6") == 0)
newsrv->dns_opts.family_prio = AF_INET6; newsrv->resolv_opts.family_prio = AF_INET6;
else { else {
ha_alert("parsing [%s:%d]: '%s' expects either ipv4 or ipv6 as argument.\n", ha_alert("parsing [%s:%d]: '%s' expects either ipv4 or ipv6 as argument.\n",
file, linenum, args[cur_arg]); file, linenum, args[cur_arg]);
@ -2214,7 +2214,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
else if (strcmp(args[cur_arg], "resolve-net") == 0) { else if (strcmp(args[cur_arg], "resolve-net") == 0) {
char *p, *e; char *p, *e;
unsigned char mask; unsigned char mask;
struct dns_options *opt; struct resolv_options *opt;
if (!args[cur_arg + 1] || args[cur_arg + 1][0] == '\0') { if (!args[cur_arg + 1] || args[cur_arg + 1][0] == '\0') {
ha_alert("parsing [%s:%d]: '%s' expects a list of networks.\n", ha_alert("parsing [%s:%d]: '%s' expects a list of networks.\n",
@ -2223,7 +2223,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
goto out; goto out;
} }
opt = &newsrv->dns_opts; opt = &newsrv->resolv_opts;
/* Split arguments by comma, and convert it from ipv4 or ipv6 /* Split arguments by comma, and convert it from ipv4 or ipv6
* string network in in_addr or in6_addr. * string network in in_addr or in6_addr.
@ -4014,7 +4014,7 @@ int snr_resolution_cb(struct resolv_requester *requester, struct dns_counters *c
goto invalid; 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, serverip, server_sin_family, &firstip,
&firstip_sin_family, s); &firstip_sin_family, s);

2
src/stream.c
View File

@ -668,7 +668,7 @@ static void stream_free(struct stream *s)
} }
if (s->resolv_ctx.requester) { 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); HA_SPIN_LOCK(DNS_LOCK, &resolvers->lock);
free(s->resolv_ctx.hostname_dn); s->resolv_ctx.hostname_dn = NULL; free(s->resolv_ctx.hostname_dn); s->resolv_ctx.hostname_dn = NULL;