summaryrefslogtreecommitdiff
path: root/src/nss-myhostname/ifconf.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-07-10 19:55:53 +0200
committerLennart Poettering <lennart@poettering.net>2014-07-10 20:12:34 +0200
commit5502f0d97185218b93f01f9fe979a71bae38e213 (patch)
tree45e7cc3d9ccceecfdf8f75d119ccdaa7393f3c9a /src/nss-myhostname/ifconf.h
parent096b6773886bd7a0c8c97aa684b0b67dfae58355 (diff)
nss-myhostname: various modernizations
Diffstat (limited to 'src/nss-myhostname/ifconf.h')
-rw-r--r--src/nss-myhostname/ifconf.h32
1 files changed, 4 insertions, 28 deletions
diff --git a/src/nss-myhostname/ifconf.h b/src/nss-myhostname/ifconf.h
index cd598d2b43..92f03b261a 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);