RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-11 03:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: resolvers: replace nameserver's resolver ref by generic parent pointer

Browse Source 
This will allow to use nameservers in something else than a resolver
section (load balancing for instance).
This commit is contained in:
Emeric Brun 2021-01-04 13:18:55 +01:00 committed by Willy Tarreau
parent 8a55193d4e
commit 6a2006ae37
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,12 +201,12 @@ struct resolvers {
*/ */
struct dns_nameserver { struct dns_nameserver {
char *id; /* nameserver unique identifier */ char *id; /* nameserver unique identifier */
void *parent;
struct { struct {
const char *file; /* file where the section appears */ const char *file; /* file where the section appears */
int line; /* line where the section appears */ int line; /* line where the section appears */
} conf; /* config information */ } conf; /* config information */
struct resolvers *resolvers;
struct dgram_conn *dgram; /* transport layer */ struct dgram_conn *dgram; /* transport layer */
struct sockaddr_storage addr; /* IP address */ struct sockaddr_storage addr; /* IP address */

20
src/dns.c
View File

@ -275,13 +275,13 @@ static int dns_connect_namesaver(struct dns_nameserver *ns)
if ((fd = socket(ns->addr.ss_family, SOCK_DGRAM, IPPROTO_UDP)) == -1) { if ((fd = socket(ns->addr.ss_family, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
send_log(NULL, LOG_WARNING, send_log(NULL, LOG_WARNING,
"DNS : resolvers '%s': can't create socket for nameserver '%s'.\n", "DNS : resolvers '%s': can't create socket for nameserver '%s'.\n",
ns->resolvers->id, ns->id); ns->counters->pid, ns->id);
return -1; return -1;
} }
if (connect(fd, (struct sockaddr*)&ns->addr, get_addr_len(&ns->addr)) == -1) { if (connect(fd, (struct sockaddr*)&ns->addr, get_addr_len(&ns->addr)) == -1) {
send_log(NULL, LOG_WARNING, send_log(NULL, LOG_WARNING,
"DNS : resolvers '%s': can't connect socket for nameserver '%s'.\n", "DNS : resolvers '%s': can't connect socket for nameserver '%s'.\n",
ns->resolvers->id, ns->id); ns->counters->id, ns->id);
close(fd); close(fd);
return -1; return -1;
} }
@ -1901,7 +1901,7 @@ static void dns_resolve_recv(struct dgram_conn *dgram)
return; return;
} }
resolvers = ns->resolvers; resolvers = ns->parent;
HA_SPIN_LOCK(DNS_LOCK, &resolvers->lock); HA_SPIN_LOCK(DNS_LOCK, &resolvers->lock);
/* process all pending input messages */ /* process all pending input messages */
@ -2092,7 +2092,7 @@ static void dns_resolve_send(struct dgram_conn *dgram)
if ((ns = dgram->owner) == NULL) if ((ns = dgram->owner) == NULL)
return; return;
resolvers = ns->resolvers; resolvers = ns->parent;
HA_SPIN_LOCK(DNS_LOCK, &resolvers->lock); HA_SPIN_LOCK(DNS_LOCK, &resolvers->lock);
list_for_each_entry(res, &resolvers->resolutions.curr, list) { list_for_each_entry(res, &resolvers->resolutions.curr, list) {
@ -2318,12 +2318,6 @@ static int resolvers_finalize_config(void)
dgram->t.sock.fd = -1; dgram->t.sock.fd = -1;
ns->dgram = dgram; ns->dgram = dgram;
/* Store the ns counters pointer */
if (ns->extra_counters) {
ns->counters = EXTRA_COUNTERS_GET(ns->extra_counters, &dns_stats_module);
ns->counters->id = ns->id;
ns->counters->pid = ns->resolvers->id;
}
} }
/* Create the task associated to the resolvers section */ /* Create the task associated to the resolvers section */
@ -2512,7 +2506,7 @@ int dns_allocate_counters(struct list *stat_modules)
if (strcmp(mod->name, "dns") == 0) { if (strcmp(mod->name, "dns") == 0) {
ns->counters = (struct dns_counters *)ns->extra_counters->data + mod->counters_off[COUNTERS_DNS]; ns->counters = (struct dns_counters *)ns->extra_counters->data + mod->counters_off[COUNTERS_DNS];
ns->counters->id = ns->id; ns->counters->id = ns->id;
ns->counters->pid = ns->resolvers->id; ns->counters->pid = resolvers->id;
} }
} }
} }
@ -3042,7 +3036,7 @@ int cfg_parse_resolvers(const char *file, int linenum, char **args, int kwm)
/* the nameservers are linked backward first */ /* the nameservers are linked backward first */
LIST_ADDQ(&curr_resolvers->nameservers, &newnameserver->list); LIST_ADDQ(&curr_resolvers->nameservers, &newnameserver->list);
newnameserver->resolvers = curr_resolvers; newnameserver->parent = curr_resolvers;
newnameserver->conf.file = strdup(file); newnameserver->conf.file = strdup(file);
newnameserver->conf.line = linenum; newnameserver->conf.line = linenum;
newnameserver->id = strdup(args[1]); newnameserver->id = strdup(args[1]);
@ -3160,7 +3154,7 @@ int cfg_parse_resolvers(const char *file, int linenum, char **args, int kwm)
goto resolv_out; goto resolv_out;
} }
newnameserver->resolvers = curr_resolvers; newnameserver->parent = curr_resolvers;
newnameserver->conf.line = resolv_linenum; newnameserver->conf.line = resolv_linenum;
newnameserver->addr = *sk; newnameserver->addr = *sk;