Fix kernel_ll_addresses.

It was completely broken, but compensated with another bug.  No kidding.

kernel.c

@@ -31,35 +31,6 @@ THE SOFTWARE.
 #include "kernel_netlink.c"
 #endif
 
-/* Return an interface's link-local addresses */
-int
-kernel_ll_addresses(char *ifname, int ifindex,
-                    unsigned char (*addresses)[16], int maxaddr)
-{
-    struct kernel_route routes[64];
-    int rc, i, j;
-
-    rc = kernel_addresses(ifname, ifindex, routes, 64);
-    if(rc < 0)
-        return -1;
-
-    j = 0;
-    for(i = 0; i < rc; i++) {
-        unsigned char *prefix;
-        if(j >= maxaddr)
-            break;
-        if(routes[i].ifindex != ifindex)
-            continue;
-        prefix = routes[i].prefix;
-        if(prefix[0] == 0xFE && prefix[1] == 0x80 &&
-           memcmp(prefix + 2, zeroes, 6) == 0) {
-            memcpy(addresses[j], prefix, 16);
-            j++;
-        }
-    }
-    return j;
-}
-
 /* Like gettimeofday, but returns monotonic time.  If POSIX clocks are not
    available, falls back to gettimeofday but enforces monotonicity. */
 int

kernel.h

@@ -61,6 +61,6 @@ int kernel_callback(int (*fn)(int, void*), void *closure);
 int kernel_addresses(char *ifname, int ifindex,
                      struct kernel_route *routes, int maxroutes);
 int kernel_ll_addresses(char *ifname, int ifindex,
-                        unsigned char (*addresses)[16], int maxaddr);
+                        struct kernel_route *routes, int maxroutes);
 int if_eui64(char *ifname, int ifindex, unsigned char *eui);
 int gettime(struct timeval *tv);

kernel_netlink.c

@@ -1182,13 +1182,15 @@ filter_addresses(struct nlmsghdr *nh, void *data)
     struct ifaddrmsg *ifa;
     char ifname[IFNAMSIZ];
     int ifindex = 0;
+    int ll = 0;
 
     if (data) {
         void **args = (void **)data;
         maxroutes = *(int *)args[0];
         routes = (struct kernel_route*)args[1];
         found = (int *)args[2];
-        ifindex = args[3] ? 0 : *(int*)args[3];
+        ifindex = args[3] ? *(int*)args[3] : 0;
+        ll = args[4] ? !!*(int*)args[4] : 0;
     }
 
     len = nh->nlmsg_len;
@@ -1207,7 +1209,7 @@ filter_addresses(struct nlmsghdr *nh, void *data)
     if (rc < 0)
         return 0;
 
-    if (IN6_IS_ADDR_LINKLOCAL(&addr))
+    if (ll == !IN6_IS_ADDR_LINKLOCAL(&addr))
         return 0;
 
     if (ifindex && ifa->ifa_index != ifindex)
@@ -1264,13 +1266,14 @@ filter_netlink(struct nlmsghdr *nh, void *data)
     return 0;
 }
 
-int
-kernel_addresses(char *ifname, int ifindex,
-                 struct kernel_route *routes, int maxroutes)
+static int
+kernel_addresses_internal(char *ifname, int ifindex,
+                          struct kernel_route *routes, int maxroutes,
+                          int ll)
 {
     int maxr = maxroutes;
     int found = 0;
-    void *data[] = { &maxr, routes, &found, &ifindex, NULL};
+    void *data[] = { &maxr, routes, &found, &ifindex, &ll, NULL };
     struct rtgenmsg g;
     int rc;
 
@@ -1304,6 +1307,20 @@ kernel_addresses(char *ifname, int ifindex,
     return found;
 }
 
+int
+kernel_addresses(char *ifname, int ifindex,
+                 struct kernel_route *routes, int maxroutes)
+{
+    return kernel_addresses_internal(ifname, ifindex, routes, maxroutes, 0);
+}
+
+int
+kernel_ll_addresses(char *ifname, int ifindex,
+                    struct kernel_route *routes, int maxroutes)
+{
+    return kernel_addresses_internal(ifname, ifindex, routes, maxroutes, 1);
+}
+
 int
 kernel_callback(int (*fn)(int, void*), void *closure)
 {