Skip to content

dhcpv6: allow INFO_REQ for SLAAC only #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Noltari wants to merge 1 commit into from
Closed

dhcpv6: allow INFO_REQ for SLAAC only #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1969,9 +1969,14 @@ struct lease_cfg *config_find_lease_cfg_by_ipv4(const struct in_addr ipv4)
void reload_services(struct interface *iface)
{
if (iface->ifflags & IFF_RUNNING) {
bool enable_dhcpv6;

enable_dhcpv6 = iface->dhcpv6 != MODE_DISABLED;
enable_dhcpv6 |= iface->ra == MODE_SERVER && iface->ra_flags & ND_RA_FLAG_OTHER;

debug("Enabling services with %s running", iface->ifname);
router_setup_interface(iface, iface->ra != MODE_DISABLED);
dhcpv6_setup_interface(iface, iface->dhcpv6 != MODE_DISABLED);
dhcpv6_setup_interface(iface, enable_dhcpv6);
ndp_setup_interface(iface, iface->ndp != MODE_DISABLED);
dhcpv4_setup_interface(iface, iface->dhcpv4 != MODE_DISABLED);
} else {
Expand Down
82 changes: 56 additions & 26 deletions src/dhcpv6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ int dhcpv6_setup_interface(struct interface *iface, bool enable)
{
int ret = 0;

enable = enable && (iface->dhcpv6 != MODE_DISABLED);
if (enable && iface->dhcpv6 == MODE_DISABLED)
enable = iface->ra == MODE_SERVER && iface->ra_flags & ND_RA_FLAG_OTHER;

if (iface->dhcpv6_event.uloop.fd >= 0) {
uloop_fd_delete(&iface->dhcpv6_event.uloop);
Expand Down Expand Up @@ -330,33 +331,56 @@ static void handle_client_request(void *addr, void *data, size_t len,
if (len < sizeof(*hdr))
return;

switch (hdr->msg_type) {
/* Valid message types for clients */
case DHCPV6_MSG_SOLICIT:
case DHCPV6_MSG_REQUEST:
case DHCPV6_MSG_CONFIRM:
case DHCPV6_MSG_RENEW:
case DHCPV6_MSG_REBIND:
case DHCPV6_MSG_RELEASE:
case DHCPV6_MSG_DECLINE:
case DHCPV6_MSG_INFORMATION_REQUEST:
case DHCPV6_MSG_RELAY_FORW:
switch (iface->dhcpv6)
{
case MODE_DISABLED:
if (!(iface->ra == MODE_SERVER && iface->ra_flags & ND_RA_FLAG_OTHER))
return;

switch (hdr->msg_type) {
case DHCPV6_MSG_INFORMATION_REQUEST:
break;
default:
return;
}

break;

case MODE_SERVER:
switch (hdr->msg_type) {
/* Valid message types for clients */
case DHCPV6_MSG_SOLICIT:
case DHCPV6_MSG_REQUEST:
case DHCPV6_MSG_CONFIRM:
case DHCPV6_MSG_RENEW:
case DHCPV6_MSG_REBIND:
case DHCPV6_MSG_RELEASE:
case DHCPV6_MSG_DECLINE:
case DHCPV6_MSG_INFORMATION_REQUEST:
case DHCPV6_MSG_RELAY_FORW:
#ifdef DHCPV4_SUPPORT
/* if we include DHCPV4 support, handle this message type */
case DHCPV6_MSG_DHCPV4_QUERY:
/* if we include DHCPV4 support, handle this message type */
case DHCPV6_MSG_DHCPV4_QUERY:
#endif
break;
/* Invalid message types for clients i.e. server messages */
case DHCPV6_MSG_ADVERTISE:
case DHCPV6_MSG_REPLY:
case DHCPV6_MSG_RECONFIGURE:
case DHCPV6_MSG_RELAY_REPL:
break;

/* Invalid message types for clients i.e. server messages */
case DHCPV6_MSG_ADVERTISE:
case DHCPV6_MSG_REPLY:
case DHCPV6_MSG_RECONFIGURE:
case DHCPV6_MSG_RELAY_REPL:
#ifndef DHCPV4_SUPPORT
/* if we omit DHCPV4 support, ignore this client message type */
case DHCPV6_MSG_DHCPV4_QUERY:
/* if we omit DHCPV4 support, ignore this client message type */
case DHCPV6_MSG_DHCPV4_QUERY:
#endif
case DHCPV6_MSG_DHCPV4_RESPONSE:
default:
case DHCPV6_MSG_DHCPV4_RESPONSE:
return;
}

break;

case MODE_HYBRID:
case MODE_RELAY:
return;
}

Expand Down Expand Up @@ -803,13 +827,19 @@ static void handle_client_request(void *addr, void *data, size_t len,
static void handle_dhcpv6(void *addr, void *data, size_t len,
struct interface *iface, void *dest_addr)
{
if (iface->dhcpv6 == MODE_SERVER) {
switch (iface->dhcpv6) {
case MODE_SERVER:
case MODE_DISABLED:
handle_client_request(addr, data, len, iface, dest_addr);
} else if (iface->dhcpv6 == MODE_RELAY) {
break;
case MODE_RELAY:
if (iface->master)
relay_server_response(data, len);
else
relay_client_request(addr, data, len, iface);
break;
case MODE_HYBRID:
break;
}
}

Expand Down