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

Make DHCP6ADVERTISE messages RFC 8415 compliant.

Browse Source 
Include IA_* options even if no addresses are allocated, and
always return options specified in ORO.
This commit is contained in:
Simon Kelley
2025-07-22 23:05:54 +01:00
parent e775264539
commit ea5b0e64e2
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/rfc3315.c
View File

@@ -774,15 +774,6 @@ static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbu
if (address_assigned != 1) if (address_assigned != 1)
{ {
/* If the server will not assign any addresses to any IAs in a
subsequent Request from the client, the server MUST send an Advertise
message to the client that doesn't include any IA options. */
if (!state->lease_allocate)
{
save_counter(o);
continue;
}
/* If the server cannot assign any addresses to an IA in the message /* If the server cannot assign any addresses to an IA in the message
from the client, the server MUST include the IA in the Reply message from the client, the server MUST include the IA in the Reply message
with no addresses in the IA and a Status Code option in the IA with no addresses in the IA and a Status Code option in the IA
@@ -809,7 +800,6 @@ static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbu
o = new_opt6(OPTION6_PREFERENCE); o = new_opt6(OPTION6_PREFERENCE);
put_opt6_char(option_bool(OPT_AUTHORITATIVE) ? 255 : 0); put_opt6_char(option_bool(OPT_AUTHORITATIVE) ? 255 : 0);
end_opt6(o); end_opt6(o);
tagif = add_options(state, 0);
} }
else else
{ {
@@ -830,6 +820,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbu
} }
} }
tagif = add_options(state, 0);
break; break;
} }