Unify kernel_*_addresses into kernel_addresses.

kernel.h

@@ -58,9 +58,7 @@ int kernel_route(int operation, const unsigned char *dest, unsigned short plen,
                  unsigned int newmetric);
 int kernel_routes(struct kernel_route *routes, int maxroutes);
 int kernel_callback(int (*fn)(int, void*), void *closure);
-int kernel_addresses(char *ifname, int ifindex,
+int kernel_addresses(char *ifname, int ifindex, int ll,
                      struct kernel_route *routes, int maxroutes);
-int kernel_ll_addresses(char *ifname, int ifindex,
-                        struct kernel_route *routes, int maxroutes);
 int if_eui64(char *ifname, int ifindex, unsigned char *eui);
 int gettime(struct timeval *tv);

kernel_netlink.c

@@ -1266,10 +1266,9 @@ filter_netlink(struct nlmsghdr *nh, void *data)
     return 0;
 }
 
-static int
-kernel_addresses_internal(char *ifname, int ifindex,
-                          struct kernel_route *routes, int maxroutes,
-                          int ll)
+int
+kernel_addresses(char *ifname, int ifindex, int ll,
+                 struct kernel_route *routes, int maxroutes)
 {
     int maxr = maxroutes;
     int found = 0;
@@ -1307,20 +1306,6 @@ kernel_addresses_internal(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)
 {

kernel_socket.c

@@ -609,21 +609,13 @@ socket_read(int sock)
 }
 
 int
-kernel_addresses(char *ifname, int ifindex,
+kernel_addresses(char *ifname, int ifindex, int ll,
                  struct kernel_route *routes, int maxroutes)
 {
     errno = ENOSYS;
     return -1;
 }
 
-int
-kernel_ll_addresses(char *ifname, int ifindex,
-                    struct kernel_route *routes, int maxroutes)
-{
-    errno = ENOSYS;
-    return -1;
-}
-
 int
 kernel_callback(int (*fn)(int, void*), void *closure)
 {

network.c

@@ -317,7 +317,7 @@ network_up(struct network *net, int up)
             free(net->ll);
         net->numll = 0;
         net->ll = NULL;
-        rc = kernel_ll_addresses(net->ifname, net->ifindex, ll, 32);
+        rc = kernel_addresses(net->ifname, net->ifindex, 1, ll, 32);
         if(rc < 0) {
             perror("kernel_ll_addresses");
         } else if(rc > 0) {

xroute.c

@@ -135,7 +135,7 @@ check_xroutes(int send_updates)
     if(routes == NULL)
         return -1;
 
-    rc = kernel_addresses(NULL, 0, routes, maxroutes);
+    rc = kernel_addresses(NULL, 0, 0, routes, maxroutes);
     if(rc < 0) {
         perror("kernel_addresses");
         numroutes = 0;