socket: rework things to have only one sockaddr formatter

[elogind.git] / src / shared / socket-util.h

diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h
index a5a9463f183fcbde3b62451acace1e8b912fea48..d42a2fee318d05e6a5050fa0bf95986ce89a0cdd 100644 (file)
--- a/src/shared/socket-util.h
+++ b/src/shared/socket-util.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foosocketutilhfoo
-#define foosocketutilhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -34,7 +33,7 @@
 
 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;
@@ -68,12 +67,13 @@ typedef enum SocketAddressBindIPv6Only {
 int socket_address_parse(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);
+int socket_address_verify(const SocketAddress *a) _pure_;
 
-bool socket_address_can_accept(const SocketAddress *a);
+bool socket_address_can_accept(const SocketAddress *a) _pure_;
 
 int socket_address_listen(
                 const SocketAddress *a,
+                int flags,
                 int backlog,
                 SocketAddressBindIPv6Only only,
                 const char *bind_to_device,
@@ -81,22 +81,25 @@ int socket_address_listen(
                 bool transparent,
                 mode_t directory_mode,
                 mode_t socket_mode,
-                const char *label,
-                int *ret);
+                const char *label);
 
 bool socket_address_is(const SocketAddress *a, const char *s, int type);
 bool socket_address_is_netlink(const SocketAddress *a, const char *s);
 
-bool socket_address_equal(const SocketAddress *a, const SocketAddress *b);
+bool socket_address_matches_fd(const SocketAddress *a, int fd);
 
-bool socket_address_needs_mount(const SocketAddress *a, const char *prefix);
+bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) _pure_;
 
-const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b);
-SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s);
-
-const char* netlink_family_to_string(int b);
-int netlink_family_from_string(const char *s);
+const char* socket_address_get_path(const SocketAddress *a);
 
 bool socket_ipv6_is_supported(void);
 
-#endif
+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) _pure_;