X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fsocket-util.h;h=9883ab0328276a85270b55bf5818a3dc0d676b16;hb=28622e8f5b28412d97bf2f3a5df49c419be1e2c5;hp=25c4a7e4f96a05e996c921e6af167fd7ec08610a;hpb=059f6c42b744a18d0deec0c79a9e0730ec6c1c76;p=elogind.git diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h index 25c4a7e4f..9883ab032 100644 --- a/src/shared/socket-util.h +++ b/src/shared/socket-util.h @@ -41,11 +41,6 @@ union sockaddr_union { struct sockaddr_ll ll; }; -union in_addr_union { - struct in_addr in; - struct in6_addr in6; -}; - typedef struct SocketAddress { union sockaddr_union sockaddr; @@ -106,15 +101,11 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ int getpeername_pretty(int fd, char **ret); int getsockname_pretty(int fd, char **ret); +int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret); +int getnameinfo_pretty(int fd, char **ret); + const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b) _const_; SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s) _pure_; int netlink_family_to_string_alloc(int b, char **s); int netlink_family_from_string(const char *s) _pure_; - -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);