X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fin-addr-util.c;h=457eedd6d81825f519984f06884cc0c91ab4c6c0;hb=a9169c1c589bf7c7a29e7905d17e350ce7c7c48e;hp=ffbaa74316724f8758095e50e20d8c58a735cd6b;hpb=0dd25fb9f005d8ab7ac4bc10a609d00569f8c56a;p=elogind.git

diff --git a/src/shared/in-addr-util.c b/src/shared/in-addr-util.c
index ffbaa7431..457eedd6d 100644
--- a/src/shared/in-addr-util.c
+++ b/src/shared/in-addr-util.c
@@ -23,7 +23,7 @@
 
 #include "in-addr-util.h"
 
-int in_addr_null(int family, union in_addr_union *u) {
+int in_addr_is_null(int family, const union in_addr_union *u) {
         assert(u);
 
         if (family == AF_INET)
@@ -39,8 +39,19 @@ int in_addr_null(int family, union in_addr_union *u) {
         return -EAFNOSUPPORT;
 }
 
+int in_addr_is_link_local(int family, const union in_addr_union *u) {
+        assert(u);
+
+        if (family == AF_INET)
+                return (be32toh(u->in.s_addr) & 0xFFFF0000) == (169U << 24 | 254U << 16);
+
+        if (family == AF_INET6)
+                return IN6_IS_ADDR_LINKLOCAL(&u->in6);
 
-int in_addr_equal(int family, union in_addr_union *a, union in_addr_union *b) {
+        return -EAFNOSUPPORT;
+}
+
+int in_addr_equal(int family, const union in_addr_union *a, const union in_addr_union *b) {
         assert(a);
         assert(b);
 
@@ -232,14 +243,8 @@ int in_addr_from_string_auto(const char *s, int *family, union in_addr_union *re
         return -EINVAL;
 }
 
-static const char* const family_table[] = {
-        [AF_UNSPEC] = "unspec",
-        [AF_UNIX] = "unix",
-        [AF_INET] = "inet",
-        [AF_INET6] = "inet6",
-        [AF_NETLINK] = "netlink",
-        [AF_PACKET] = "packet",
-        [AF_BLUETOOTH] = "bluetooth",
-        [AF_NFC] = "nfc",
-};
-DEFINE_STRING_TABLE_LOOKUP(family, int);
+unsigned in_addr_netmask_to_prefixlen(const struct in_addr *addr) {
+        assert(addr);
+
+        return 32 - u32ctz(be32toh(addr->s_addr));
+}