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=6b0ce7836f599bd957c4bfd24c571da9caaa0234;hp=13566f96917e614148abb3b7b138e17408ba318c;hb=2054442fa4eaef0d904bcbbe1b98f57386ceb87d;hpb=8569a77629949b7818d00eba8eea1d05e2d1fc32

diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h
index 13566f969..6b0ce7836 100644
--- a/src/shared/socket-util.h
+++ b/src/shared/socket-util.h
@@ -23,21 +23,22 @@
 
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <netinet/ether.h>
 #include <sys/un.h>
-#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 {
@@ -65,9 +66,11 @@ typedef enum SocketAddressBindIPv6Only {
 #define socket_address_family(a) ((a)->sockaddr.sa.sa_family)
 
 int socket_address_parse(SocketAddress *a, const char *s);
+int socket_address_parse_and_warn(SocketAddress *a, const char *s);
 int socket_address_parse_netlink(SocketAddress *a, const char *s);
 int socket_address_print(const SocketAddress *a, char **p);
 int socket_address_verify(const SocketAddress *a) _pure_;
+int socket_address_unlink(SocketAddress *a);
 
 bool socket_address_can_accept(const SocketAddress *a) _pure_;
 
@@ -77,11 +80,13 @@ int socket_address_listen(
                 int backlog,
                 SocketAddressBindIPv6Only only,
                 const char *bind_to_device,
+                bool reuse_port,
                 bool free_bind,
                 bool transparent,
                 mode_t directory_mode,
                 mode_t socket_mode,
                 const char *label);
+int make_socket_fd(int log_level, const char* address, int flags);
 
 bool socket_address_is(const SocketAddress *a, const char *s, int type);
 bool socket_address_is_netlink(const SocketAddress *a, const char *s);
@@ -92,12 +97,25 @@ 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_port(const struct sockaddr *_sa) _pure_;
+
+int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, bool include_port, char **ret);
+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);
+int netlink_family_from_string(const char *s) _pure_;
 
-bool socket_ipv6_is_supported(void);
+bool sockaddr_equal(const union sockaddr_union *a, const union sockaddr_union *b);
 
-int getpeername_pretty(int fd, char **ret);
+#define ETHER_ADDR_TO_STRING_MAX (3*6)
+
+char* ether_addr_to_string(const struct ether_addr *addr, char buffer[ETHER_ADDR_TO_STRING_MAX]);