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

Fix bad reply to DHCPCONFIRM messages (wrong message type).

Browse Source 
Thanks to renmingshuai <renmingshuai@huawei.com> for
spotting the error, and making the initial patch.
This commit is contained in:
Simon Kelley
2023-10-11 22:33:17 +01:00
parent a889c554a7
commit 3868066085
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/rfc3315.c
View File

@@ -1074,7 +1074,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbu
case DHCP6CONFIRM: case DHCP6CONFIRM:
{ {
int good_addr = 0; int good_addr = 0, bad_addr = 0;
/* set reply message type */ /* set reply message type */
outmsgtype = DHCP6REPLY; outmsgtype = DHCP6REPLY;
@@ -1096,26 +1096,24 @@ static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbu
if (!address6_valid(state->context, &req_addr, tagif, 1)) if (!address6_valid(state->context, &req_addr, tagif, 1))
{ {
o1 = new_opt6(OPTION6_STATUS_CODE); bad_addr = 1;
put_opt6_short(DHCP6NOTONLINK);
put_opt6_string(_("confirm failed"));
end_opt6(o1);
log6_quiet(state, "DHCPREPLY", &req_addr, _("confirm failed")); log6_quiet(state, "DHCPREPLY", &req_addr, _("confirm failed"));
return 1;
} }
else
{
good_addr = 1; good_addr = 1;
log6_quiet(state, "DHCPREPLY", &req_addr, state->hostname); log6_quiet(state, "DHCPREPLY", &req_addr, state->hostname);
} }
} }
}
/* No addresses, no reply: RFC 3315 18.2.2 */ /* No addresses, no reply: RFC 3315 18.2.2 */
if (!good_addr) if (!good_addr && !bad_addr)
return 0; return 0;
o1 = new_opt6(OPTION6_STATUS_CODE); o1 = new_opt6(OPTION6_STATUS_CODE);
put_opt6_short(DHCP6SUCCESS ); put_opt6_short(bad_addr ? DHCP6NOTONLINK : DHCP6SUCCESS);
put_opt6_string(_("all addresses still on link")); put_opt6_string(bad_addr ? (_("confirm failed")) : (_("all addresses still on link")));
end_opt6(o1); end_opt6(o1);
break; break;
} }