X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fdhcpv6.c;h=10f98c5aa8679cd123310ee7ae64bdc5041bf99a;hb=6bbd2b0208fc17b6566595bfdfef2ff1d012d143;hp=5007c24b7ba7ca427b9d5bdae9b915819ca42e28;hpb=33266e4c414085ecf563cc69bcf1af52f594a3d6;p=odhcp6c.git diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 5007c24..10f98c5 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, @@ -1371,8 +1370,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);