dhcpv6: allow INFO_REQ for SLAAC only

Allow DHCPV6_MSG_INFORMATION_REQUEST for RA (SLAAC) only configurations.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

Author: Noltari

src/dhcpv6.c

@@ -330,33 +330,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;
 	}
 
@@ -803,13 +826,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;
 	}
 }