router: don't announce prefixes with valid lifetime equal to 0

[project/odhcpd.git] / src / dhcpv6.c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 7302d5d..81eae06 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -18,6 +18,7 @@
 #include <stddef.h>
 #include <resolv.h>
 #include <sys/timerfd.h>
+#include <arpa/inet.h>
 
 #include "odhcpd.h"
 #include "dhcpv6.h"
@@ -51,7 +52,7 @@ int setup_dhcpv6_interface(struct interface *iface, bool enable)
        }
 
        // Configure multicast settings
-       if (enable && iface->dhcpv6 && !iface->master) {
+       if (enable && iface->dhcpv6) {
                int sock = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
                if (sock < 0) {
                        syslog(LOG_ERR, "Failed to create DHCPv6 server socket: %s",
@@ -228,7 +229,7 @@ static void handle_client_request(void *addr, void *data, size_t len,
        size_t dns_cnt = iface->dns_cnt;
 
        if ((dns_cnt == 0) &&
-               odhcpd_get_preferred_interface_address(iface->ifindex, &dns_addr)) {
+               !odhcpd_get_linklocal_interface_address(iface->ifindex, &dns_addr)) {
                dns_addr_ptr = &dns_addr;
                dns_cnt = 1;
        }
@@ -460,7 +461,7 @@ static void relay_server_response(uint8_t *data, size_t len)
                size_t rewrite_cnt = iface->dns_cnt;
 
                if (rewrite_cnt == 0) {
-                       if (odhcpd_get_preferred_interface_address(iface->ifindex, &addr) < 1)
+                       if (odhcpd_get_linklocal_interface_address(iface->ifindex, &addr))
                                return; // Unable to get interface address
 
                        rewrite = &addr;
@@ -532,5 +533,5 @@ static void relay_client_request(struct sockaddr_in6 *source,
        struct sockaddr_in6 dhcpv6_servers = {AF_INET6,
                        htons(DHCPV6_SERVER_PORT), 0, ALL_DHCPV6_SERVERS, 0};
        struct iovec iov[2] = {{&hdr, sizeof(hdr)}, {(void*)data, len}};
-       odhcpd_send(iface->dhcpv6_event.uloop.fd, &dhcpv6_servers, iov, 2, master);
+       odhcpd_send(master->dhcpv6_event.uloop.fd, &dhcpv6_servers, iov, 2, master);
 }