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

Fix DHCPv6 "use multicast" response which previously failed

Browse Source 
to set the message type correctly.

Thanks to Petr Menšík for spotting the problem.
This commit is contained in:
Simon Kelley
2023-03-15 21:12:55 +00:00
parent ef5aac95d4
commit 00be8b39e2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rfc3315.c
View File

@@ -353,7 +353,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbu
put_opt6_short(DHCP6USEMULTI); put_opt6_short(DHCP6USEMULTI);
put_opt6_string("Use multicast"); put_opt6_string("Use multicast");
end_opt6(o1); end_opt6(o1);
return 1; goto done;
} }
/* match vendor and user class options */ /* match vendor and user class options */
@@ -1277,12 +1277,14 @@ static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbu
} }
log_tags(tagif, state->xid);
done:
/* Fill in the message type. Note that we store the offset, /* Fill in the message type. Note that we store the offset,
not a direct pointer, since the packet memory may have been not a direct pointer, since the packet memory may have been
reallocated. */ reallocated. */
((unsigned char *)(daemon->outpacket.iov_base))[start_msg] = outmsgtype; ((unsigned char *)(daemon->outpacket.iov_base))[start_msg] = outmsgtype;
log_tags(tagif, state->xid);
log6_opts(0, state->xid, daemon->outpacket.iov_base + start_opts, daemon->outpacket.iov_base + save_counter(-1)); log6_opts(0, state->xid, daemon->outpacket.iov_base + start_opts, daemon->outpacket.iov_base + save_counter(-1));
return 1; return 1;