Merge pull request #67 from dedeckeh/bugfixes

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

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 5774a4f..74830ac 100644 (file)
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -254,24 +254,21 @@ ssize_t odhcpd_get_interface_addresses(int ifindex,
        return ret;
 }
 
-int odhcpd_get_preferred_interface_address(int ifindex, struct in6_addr *addr)
+int odhcpd_get_linklocal_interface_address(int ifindex, struct in6_addr *lladdr)
 {
-       struct odhcpd_ipaddr ipaddrs[8];
-       ssize_t ip_cnt = odhcpd_get_interface_addresses(ifindex, ipaddrs, ARRAY_SIZE(ipaddrs));
-       uint32_t preferred = 0;
-       int ret = 0;
-
-       for (ssize_t i = 0; i < ip_cnt; i++) {
-               struct odhcpd_ipaddr *ipaddr = &ipaddrs[i];
-
-               if (ipaddr->preferred > preferred || !preferred) {
-                       preferred = ipaddr->preferred;
-                       *addr = ipaddr->addr;
-                       ret = 1;
+               int status = -1;
+               struct sockaddr_in6 addr = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, ifindex};
+               socklen_t alen = sizeof(addr);
+               int sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+
+               if (!connect(sock, (struct sockaddr*)&addr, sizeof(addr)) &&
+                               !getsockname(sock, (struct sockaddr*)&addr, &alen)) {
+                       *lladdr = addr.sin6_addr;
+                       status = 0;
                }
-       }
 
-       return ret;
+               close(sock);
+               return status;
 }
 
 void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
@@ -370,6 +367,15 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
                struct sockaddr_nl nl;
        } addr;
 
+       if (u->error) {
+               int ret = -1;
+               socklen_t ret_len = sizeof(ret);
+               getsockopt(u->fd, SOL_SOCKET, SO_ERROR, &ret, &ret_len);
+               u->error = false;
+               if (e->handle_error)
+                       e->handle_error(ret);
+       }
+
        while (true) {
                struct iovec iov = {data_buf, sizeof(data_buf)};
                struct msghdr msg = {
@@ -449,7 +455,8 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
 int odhcpd_register(struct odhcpd_event *event)
 {
        event->uloop.cb = odhcpd_receive_packets;
-       return uloop_fd_add(&event->uloop, ULOOP_READ);
+       return uloop_fd_add(&event->uloop, ULOOP_READ |
+                       ((event->handle_error) ? ULOOP_ERROR_CB : 0));
 }
 
 void odhcpd_process(struct odhcpd_event *event)