X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6.c;h=bf48d78f639525ff852f85cf1fe08331d34cb161;hp=8f8f4356774029e367c9e3caf765a446f187dffb;hb=56c6a4a72a0e086074f69d2ee5cc46079d179dac;hpb=6deafcc1fad03312b4df0778ef8ebef11fb93e34

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 8f8f435..bf48d78 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -22,6 +22,8 @@
 #include "odhcpd.h"
 #include "dhcpv6.h"
 
+static const char *excluded_class = "HOMENET";
+
 
 static void relay_client_request(struct sockaddr_in6 *source,
 		const void *data, size_t len, struct interface *iface);
@@ -84,12 +86,10 @@ int setup_dhcpv6_interface(struct interface *iface, bool enable)
 
 		struct ipv6_mreq relay = {ALL_DHCPV6_RELAYS, iface->ifindex};
 		struct ipv6_mreq server = {ALL_DHCPV6_SERVERS, iface->ifindex};
-		setsockopt(iface->dhcpv6_event.uloop.fd, IPPROTO_IPV6,
-				IPV6_ADD_MEMBERSHIP, &relay, sizeof(relay));
+		setsockopt(sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &relay, sizeof(relay));
 
 		if (iface->dhcpv6 == RELAYD_SERVER)
-			setsockopt(iface->dhcpv6_event.uloop.fd, IPPROTO_IPV6,
-					IPV6_ADD_MEMBERSHIP, &server, sizeof(server));
+			setsockopt(sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &server, sizeof(server));
 
 		iface->dhcpv6_event.uloop.fd = sock;
 		iface->dhcpv6_event.handle_dgram = handle_dhcpv6;
@@ -277,6 +277,13 @@ static void handle_client_request(void *addr, void *data, size_t len,
 			if (olen != ntohs(dest.serverid_length) ||
 					memcmp(odata, &dest.duid_type, olen))
 				return; // Not for us
+		} else if (otype == DHCPV6_OPT_USER_CLASS) {
+			uint8_t *c = odata, *cend = &odata[olen];
+			for (; &c[2] <= cend && &c[2 + (c[0] << 8) + c[1]] <= cend; c = &c[2 + (c[0] << 8) + c[1]]) {
+				size_t elen = strlen(excluded_class);
+				if (((((size_t)c[0]) << 8) | c[1]) == elen && !memcmp(&c[2], excluded_class, elen))
+					return; // Ignore from homenet
+			}
 		}
 	}