chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a few more typos
[elogind.git]
/
src
/
shared
/
in-addr-util.c
diff --git
a/src/shared/in-addr-util.c
b/src/shared/in-addr-util.c
index ff008bd26fb9ab591810b05db5637f54d070841f..457eedd6d81825f519984f06884cc0c91ab4c6c0 100644
(file)
--- a/
src/shared/in-addr-util.c
+++ b/
src/shared/in-addr-util.c
@@
-23,7
+23,7
@@
#include "in-addr-util.h"
#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)
assert(u);
if (family == AF_INET)
@@
-39,8
+39,19
@@
int in_addr_null(int family, union in_addr_union *u) {
return -EAFNOSUPPORT;
}
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);
-int in_addr_equal(int family, union in_addr_union *a, union in_addr_union *b) {
+ if (family == AF_INET6)
+ return IN6_IS_ADDR_LINKLOCAL(&u->in6);
+
+ return -EAFNOSUPPORT;
+}
+
+int in_addr_equal(int family, const union in_addr_union *a, const union in_addr_union *b) {
assert(a);
assert(b);
assert(a);
assert(b);
@@
-231,3
+242,9
@@
int in_addr_from_string_auto(const char *s, int *family, union in_addr_union *re
return -EINVAL;
}
return -EINVAL;
}
+
+unsigned in_addr_netmask_to_prefixlen(const struct in_addr *addr) {
+ assert(addr);
+
+ return 32 - u32ctz(be32toh(addr->s_addr));
+}