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

Remove nested struct/union in cache records and all_addr.

Browse Source
This commit is contained in:
Simon Kelley
2019-01-02 22:48:59 +00:00
parent ab194ed7ca
commit cc921df9ce
23 changed files with 336 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/option.c
View File

@@ -2064,7 +2064,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
int is_exclude = 0;
char *prefix;
struct addrlist *subnet = NULL;
struct all_addr addr;
union all_addr addr;
comma = split(arg);
prefix = split_chr(arg, '/');
@@ -2078,13 +2078,13 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
arg = arg+8;
}
if (inet_pton(AF_INET, arg, &addr.addr.addr4))
if (inet_pton(AF_INET, arg, &addr.addr4))
{
subnet = opt_malloc(sizeof(struct addrlist));
subnet->prefixlen = (prefixlen == 0) ? 24 : prefixlen;
subnet->flags = ADDRLIST_LITERAL;
}
else if (inet_pton(AF_INET6, arg, &addr.addr.addr6))
else if (inet_pton(AF_INET6, arg, &addr.addr6))
{
subnet = opt_malloc(sizeof(struct addrlist));
subnet->prefixlen = (prefixlen == 0) ? 64 : prefixlen;
@@ -4268,7 +4268,7 @@ err:
while (arg)
{
struct all_addr addr;
union all_addr addr;
char *dig;
for (dig = arg; *dig != 0; dig++)
@@ -4276,10 +4276,10 @@ err:
break;
if (*dig == 0)
new->ttl = atoi(arg);
else if (inet_pton(AF_INET, arg, &addr))
new->addr = addr.addr.addr4;
else if (inet_pton(AF_INET6, arg, &addr))
new->addr6 = addr.addr.addr6;
else if (inet_pton(AF_INET, arg, &addr.addr4))
new->addr = addr.addr4;
else if (inet_pton(AF_INET6, arg, &addr.addr6))
new->addr6 = addr.addr6;
else
{
int nomem;