X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fsocket-util.h;h=84ebc302feac10c649d6515c2c04050f85ae4ac7;hp=0b9bf2fefc50df0d8c498d9d36e9367d4d181aaa;hb=4de33e7f3238a6fe616e61139ab87e221572e5e5;hpb=175a3d25d0e8596d4ba0759aea3f89ee228e7d6d

diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h
index 0b9bf2fef..84ebc302f 100644
--- a/src/shared/socket-util.h
+++ b/src/shared/socket-util.h
@@ -27,17 +27,19 @@
 #include <net/if.h>
 #include <asm/types.h>
 #include <linux/netlink.h>
+#include <linux/if_packet.h>
 
 #include "macro.h"
 #include "util.h"
 
 union sockaddr_union {
         struct sockaddr sa;
-        struct sockaddr_in in4;
+        struct sockaddr_in in;
         struct sockaddr_in6 in6;
         struct sockaddr_un un;
         struct sockaddr_nl nl;
         struct sockaddr_storage storage;
+        struct sockaddr_ll ll;
 };
 
 typedef struct SocketAddress {
@@ -92,10 +94,14 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) _pure_
 
 const char* socket_address_get_path(const SocketAddress *a);
 
+bool socket_ipv6_is_supported(void);
+
+int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, char **ret);
+int getpeername_pretty(int fd, char **ret);
+int getsockname_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);
-
-bool socket_ipv6_is_supported(void);
+int netlink_family_from_string(const char *s) _pure_;