Prep v220: Apply "Fixes to user and session saving"

[elogind.git] / src / shared / in-addr-util.h

diff --git a/src/shared/in-addr-util.h b/src/shared/in-addr-util.h
index d76ea9dc30c1472f51e0f8e6ecc3ab6a73d8e7ca..51af08868cda48af0db4681613a5be4b853234ac 100644 (file)
--- a/src/shared/in-addr-util.h
+++ b/src/shared/in-addr-util.h
@@ -31,18 +31,23 @@ union in_addr_union {
         struct in6_addr in6;
 };
 
-int in_addr_null(int family, union in_addr_union *u);
-int in_addr_equal(int family, union in_addr_union *a, union in_addr_union *b);
+int in_addr_is_null(int family, const union in_addr_union *u);
+int in_addr_is_link_local(int family, const union in_addr_union *u);
+int in_addr_equal(int family, const union in_addr_union *a, const union in_addr_union *b);
 int in_addr_prefix_intersect(int family, const union in_addr_union *a, unsigned aprefixlen, const union in_addr_union *b, unsigned bprefixlen);
 int in_addr_prefix_next(int family, union in_addr_union *u, unsigned prefixlen);
 int in_addr_to_string(int family, const union in_addr_union *u, char **ret);
 int in_addr_from_string(int family, const char *s, union in_addr_union *ret);
 int in_addr_from_string_auto(const char *s, int *family, union in_addr_union *ret);
+unsigned char in_addr_netmask_to_prefixlen(const struct in_addr *addr);
+struct in_addr* in_addr_prefixlen_to_netmask(struct in_addr *addr, unsigned char prefixlen);
+int in_addr_default_prefixlen(const struct in_addr *addr, unsigned char *prefixlen);
+int in_addr_default_subnet_mask(const struct in_addr *addr, struct in_addr *mask);
+int in_addr_mask(int family, union in_addr_union *addr, unsigned char prefixlen);
 
 static inline size_t FAMILY_ADDRESS_SIZE(int family) {
         assert(family == AF_INET || family == AF_INET6);
         return family == AF_INET6 ? 16 : 4;
 }
 
-const char* family_to_string(int i) _const_;
-int family_from_string(const char *s) _pure_;
+#define IN_ADDR_NULL ((union in_addr_union) {})