Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add --servers-file option.

Browse Source
This commit is contained in:
Simon Kelley
2014-02-20 13:43:28 +00:00
parent c152dc8492
commit 7b1eae4f50
8 changed files with 92 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/network.c
View File

@@ -1291,7 +1291,8 @@ void add_update_server(int flags,
const char *interface,
const char *domain)
{
struct server *serv;
struct server *serv, *next = NULL;
char *domain_str = NULL;
/* See if there is a suitable candidate, and unmark */
for (serv = daemon->servers; serv; serv = serv->next)
@@ -1308,17 +1309,18 @@ void add_update_server(int flags,
continue;
}
serv->flags &= ~SERV_MARK;
break;
}
if (!serv && (serv = whine_malloc(sizeof (struct server))))
if (serv)
{
domain_str = serv->domain;
next = serv->next;
}
else if ((serv = whine_malloc(sizeof (struct server))))
{
/* Not found, create a new one. */
memset(serv, 0, sizeof(struct server));
if (domain && !(serv->domain = whine_malloc(strlen(domain)+1)))
if (domain && !(domain_str = whine_malloc(strlen(domain)+1)))
{
free(serv);
serv = NULL;
@@ -1335,25 +1337,27 @@ void add_update_server(int flags,
s->next = serv;
}
if (domain)
strcpy(serv->domain, domain);
strcpy(domain_str, domain);
}
}
if (serv)
{
memset(serv, 0, sizeof(struct server));
serv->flags = flags;
serv->domain = domain_str;
serv->next = next;
serv->queries = serv->failed_queries = 0;
if (domain)
serv->flags |= SERV_HAS_DOMAIN;
if (interface)
strcpy(serv->interface, interface);
else
serv->interface[0] = 0;
serv->addr = *addr;
serv->source_addr = *source_addr;
strcpy(serv->interface, interface);
if (addr)
serv->addr = *addr;
if (source_addr)
serv->source_addr = *source_addr;
}
}