X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdhcpv6.c;h=0d206f352d8d1d1ad04fb8066cd289bfb5603525;hb=3dabd4b1c14df34f0a315c3e329d73ba27ac42b5;hp=e501d77a542827eab7410db4475b79e6cec7cd7d;hpb=3aa69f2d8dce4a961033efaf59d58cee225cd64b;p=odhcp6c.git

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index e501d77..0d206f3 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -188,7 +188,6 @@ int init_dhcpv6(const char *ifname, unsigned int options, int sol_timeout)
 	setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof(val));
 	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
 	setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &val, sizeof(val));
-	val = 0;
 	setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, ifname, strlen(ifname));
 
 	struct sockaddr_in6 client_addr = { .sin6_family = AF_INET6,
@@ -914,6 +913,7 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
 		odhcp6c_clear_state(STATE_SIP_IP);
 		odhcp6c_clear_state(STATE_SIP_FQDN);
 		odhcp6c_clear_state(STATE_AFTR_NAME);
+		odhcp6c_clear_state(STATE_CER);
 	}
 
 	// Parse and find all matching IAs
@@ -1231,8 +1231,6 @@ static int dhcpv6_calc_refresh_timers(void)
 		t1 = l_t1;
 		t2 = l_t2;
 		t3 = l_t3;
-	} else {
-		t1 = 600;
 	}
 
 	return (int)(ia_pd_entries + ia_na_entries);
@@ -1370,8 +1368,7 @@ int dhcpv6_promote_server_cand(void)
 	size_t cand_len;
 	struct dhcpv6_server_cand *cand = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len);
 	uint16_t hdr[2];
-	int ret = (na_mode == IA_MODE_NONE && pd_mode == IA_MODE_NONE) ?
-			DHCPV6_STATELESS : DHCPV6_STATEFUL;
+	int ret = DHCPV6_STATELESS;
 
 	// Clear lingering candidate state info
 	odhcp6c_clear_state(STATE_SERVER_ID);