X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnss-myhostname%2Fifconf.h;h=92f03b261a7e87b051c44025f02b46539705a74b;hp=cd598d2b43db7c9fbaf8e1d9b8a316995022497a;hb=5502f0d97185218b93f01f9fe979a71bae38e213;hpb=096b6773886bd7a0c8c97aa684b0b67dfae58355

diff --git a/src/nss-myhostname/ifconf.h b/src/nss-myhostname/ifconf.h
index cd598d2b4..92f03b261 100644
--- a/src/nss-myhostname/ifconf.h
+++ b/src/nss-myhostname/ifconf.h
@@ -26,43 +26,19 @@
 #include <assert.h>
 #include <sys/socket.h>
 
+#include "socket-util.h"
+
 struct address {
         unsigned char family;
-        uint8_t address[16];
+        union in_addr_union address;
         unsigned char scope;
         int ifindex;
 };
 
-#define _public_ __attribute__ ((visibility("default")))
-#define _hidden_ __attribute__ ((visibility("hidden")))
-
-int ifconf_acquire_addresses(struct address **_list, unsigned *_n_list) _hidden_;
-
 static inline size_t PROTO_ADDRESS_SIZE(int proto) {
         assert(proto == AF_INET || proto == AF_INET6);
 
         return proto == AF_INET6 ? 16 : 4;
 }
 
-static inline int address_compare(const void *_a, const void *_b) {
-        const struct address *a = _a, *b = _b;
-
-        /* Order lowest scope first, IPv4 before IPv6, lowest interface index first */
-
-        if (a->scope < b->scope)
-                return -1;
-        if (a->scope > b->scope)
-                return 1;
-
-        if (a->family == AF_INET && b->family == AF_INET6)
-                return -1;
-        if (a->family == AF_INET6 && b->family == AF_INET)
-                return 1;
-
-        if (a->ifindex < b->ifindex)
-                return -1;
-        if (a->ifindex > b->ifindex)
-                return 1;
-
-        return 0;
-}
+int ifconf_acquire_addresses(struct address **_list, unsigned *_n_list);