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

Fixed code passing tags to helper to work when there are no context tags.

Browse Source 
Fixed call to sendto() in dhcp6.c. How did it every work before?
This commit is contained in:
Simon Kelley
2012-02-18 21:20:43 +00:00
committed by Simon Kelley
parent e44ddcac63
commit 87b8ecb13a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dhcp6.c
View File

@@ -222,7 +222,7 @@ void dhcp6_packet(time_t now)
lease_update_dns();
if (sz != 0)
while (sendto(daemon->dhcp6fd, daemon->outpacket.iov_base, sz, 0, (struct sockaddr *)&from, sizeof(from)) &&
while (sendto(daemon->dhcp6fd, daemon->outpacket.iov_base, sz, 0, (struct sockaddr *)&from, sizeof(from)) == -1 &&
retry_send());
}

9
src/rfc3315.c
View File

@@ -682,14 +682,17 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
lease_add_extradata(lease, NULL, 0, 0);
else
{
struct dhcp_netid *n, *l;
struct dhcp_netid *n, *l, *tmp = tags;
/* link temporarily */
for (n = context_tags; n && n->next; n = n->next);
if ((l = n))
l->next = tags;
{
l->next = tags;
tmp = context_tags;
}
for (n = run_tag_if(context_tags); n; n = n->next)
for (n = run_tag_if(tmp); n; n = n->next)
{
struct dhcp_netid *n1;
/* kill dupes */