From: sbyx <steven@midlink.org>
Date: Thu, 9 Jan 2014 09:47:30 +0000 (-0800)
Subject: Merge pull request #6 from dedeckeh/bugfixes
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=commitdiff_plain;h=fccc53a8947946b9c8ee1cc5e3e038cf4afc8e17;hp=359a2c478832b41af427f6a96c4d11d81447e65a

Merge pull request #6 from dedeckeh/bugfixes

Fix ALL_DHCPV6_RELAYS/ALL_DHCPV6_SERVERS membership subscription
---

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 8f8f435..9b802c4 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -84,12 +84,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;