X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fin-addr-util.h;h=8da030ceb66b5f5129e746eecd423a373c18819b;hp=6cfdb14a895b94113d35c827cd872cf5018bdf26;hb=60e1651a31c9c0ed1caef1a63f5e3a87156b0b1e;hpb=1716f6dcf54d4c181c2e2558e3d5414f54c8d9ca diff --git a/src/shared/in-addr-util.h b/src/shared/in-addr-util.h index 6cfdb14a8..8da030ceb 100644 --- a/src/shared/in-addr-util.h +++ b/src/shared/in-addr-util.h @@ -31,18 +31,19 @@ union in_addr_union { struct in6_addr in6; }; -int in_addr_null(unsigned family, union in_addr_union *u); -int in_addr_equal(unsigned family, union in_addr_union *a, union in_addr_union *b); -int in_addr_prefix_intersect(unsigned family, const union in_addr_union *a, unsigned aprefixlen, const union in_addr_union *b, unsigned bprefixlen); -int in_addr_prefix_next(unsigned family, union in_addr_union *u, unsigned prefixlen); -int in_addr_to_string(unsigned family, const union in_addr_union *u, char **ret); -int in_addr_from_string(unsigned family, const char *s, union in_addr_union *ret); -int in_addr_from_string_auto(const char *s, unsigned *family, union in_addr_union *ret); +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 in_addr_netmask_to_prefixlen(const struct in_addr *addr); +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); 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_;