X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fsocket-util.h;h=718de9ba347ff07a8fd2618fd10a08735ced4423;hp=4c9905494e75580a0fb4ce0b110081637788c54a;hb=a683e1878913969ccf8b0defdec4d955e15ed75a;hpb=bccdfb431a266e7671d518fd5a42362a5ce724c9
diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index 4c9905494..718de9ba3 100644
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#pragma once
/***
@@ -21,9 +19,12 @@
along with systemd; If not, see .
***/
-#include
-#include
#include
+#include
+#include
+#include
+#include
+#include
#include
#include
#include
@@ -41,8 +42,7 @@ union sockaddr_union {
struct sockaddr_ll ll;
};
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
typedef struct SocketAddress {
union sockaddr_union sockaddr;
@@ -66,19 +66,16 @@ typedef enum SocketAddressBindIPv6Only {
} SocketAddressBindIPv6Only;
#define socket_address_family(a) ((a)->sockaddr.sa.sa_family)
-#endif // 0
-// UNNEEDED int socket_address_parse(SocketAddress *a, const char *s);
-// UNNEEDED int socket_address_parse_and_warn(SocketAddress *a, const char *s);
-// UNNEEDED int socket_address_parse_netlink(SocketAddress *a, const char *s);
-// UNNEEDED int socket_address_print(const SocketAddress *a, char **p);
-// UNNEEDED int socket_address_verify(const SocketAddress *a) _pure_;
-// UNNEEDED int socket_address_unlink(SocketAddress *a);
+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);
-// UNNEEDED bool socket_address_can_accept(const SocketAddress *a) _pure_;
+bool socket_address_can_accept(const SocketAddress *a) _pure_;
-/// UNNEEDED by elogind
-#if 0
int socket_address_listen(
const SocketAddress *a,
int flags,
@@ -91,48 +88,81 @@ int socket_address_listen(
mode_t directory_mode,
mode_t socket_mode,
const char *label);
-int make_socket_fd(int log_level, const char* address, int flags);
-#endif // 0
+int make_socket_fd(int log_level, const char* address, int type, int flags);
-// UNNEEDED bool socket_address_is(const SocketAddress *a, const char *s, int type);
-// UNNEEDED bool socket_address_is_netlink(const SocketAddress *a, const char *s);
+bool socket_address_is(const SocketAddress *a, const char *s, int type);
+bool socket_address_is_netlink(const SocketAddress *a, const char *s);
-// UNNEEDED bool socket_address_matches_fd(const SocketAddress *a, int fd);
+bool socket_address_matches_fd(const SocketAddress *a, int fd);
-// UNNEEDED bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) _pure_;
+bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) _pure_;
-// UNNEEDED const char* socket_address_get_path(const SocketAddress *a);
+const char* socket_address_get_path(const SocketAddress *a);
+#endif // 0
bool socket_ipv6_is_supported(void);
-// UNNEEDED int sockaddr_port(const struct sockaddr *_sa) _pure_;
+#if 0 /// UNNEEDED by elogind
+int sockaddr_port(const struct sockaddr *_sa) _pure_;
-// UNNEEDED Sint sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, bool include_port, char **ret);
-// UNNEEDED int getpeername_pretty(int fd, char **ret);
-// UNNEEDED int getsockname_pretty(int fd, char **ret);
+int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, bool include_port, char **ret);
+int getpeername_pretty(int fd, bool include_port, char **ret);
+int getsockname_pretty(int fd, char **ret);
-// UNNEEDED int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret);
-// UNNEEDED int getnameinfo_pretty(int fd, char **ret);
+int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret);
+int getnameinfo_pretty(int fd, char **ret);
-// UNNEEDED const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b) _const_;
-// UNNEEDED SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s) _pure_;
+const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b) _const_;
+SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s) _pure_;
-// UNNEEDED int netlink_family_to_string_alloc(int b, char **s);
-// UNNEEDED int netlink_family_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_;
-// UNNEEDED bool sockaddr_equal(const union sockaddr_union *a, const union sockaddr_union *b);
+bool sockaddr_equal(const union sockaddr_union *a, const union sockaddr_union *b);
+#endif // 0
int fd_inc_sndbuf(int fd, size_t n);
int fd_inc_rcvbuf(int fd, size_t n);
+#if 0 /// UNNEEDED by elogind
+
+int ip_tos_to_string_alloc(int i, char **s);
+int ip_tos_from_string(const char *s);
+#endif // 0
-// UNNEEDED int ip_tos_to_string_alloc(int i, char **s);
-// UNNEEDED int ip_tos_from_string(const char *s);
+bool ifname_valid(const char *p);
int getpeercred(int fd, struct ucred *ucred);
int getpeersec(int fd, char **ret);
-int send_one_fd(int transport_fd, int fd, int flags);
-// UNNEEDED int receive_one_fd(int transport_fd, int flags);
+int send_one_fd_sa(int transport_fd,
+ int fd,
+ const struct sockaddr *sa, socklen_t len,
+ int flags);
+#define send_one_fd(transport_fd, fd, flags) send_one_fd_sa(transport_fd, fd, NULL, 0, flags)
+#if 0 /// UNNEEDED by elogind
+int receive_one_fd(int transport_fd, int flags);
+
+ssize_t next_datagram_size_fd(int fd);
+
+int flush_accept(int fd);
+#endif // 0
#define CMSG_FOREACH(cmsg, mh) \
for ((cmsg) = CMSG_FIRSTHDR(mh); (cmsg); (cmsg) = CMSG_NXTHDR((mh), (cmsg)))
+
+struct cmsghdr* cmsg_find(struct msghdr *mh, int level, int type, socklen_t length);
+
+/* Covers only file system and abstract AF_UNIX socket addresses, but not unnamed socket addresses. */
+#define SOCKADDR_UN_LEN(sa) \
+ ({ \
+ const struct sockaddr_un *_sa = &(sa); \
+ assert(_sa->sun_family == AF_UNIX); \
+ offsetof(struct sockaddr_un, sun_path) + \
+ (_sa->sun_path[0] == 0 ? \
+ 1 + strnlen(_sa->sun_path+1, sizeof(_sa->sun_path)-1) : \
+ strnlen(_sa->sun_path, sizeof(_sa->sun_path))); \
+ })
+
+#if 0 /// UNNEEDED by elogind
+int socket_ioctl_fd(void);
+#endif // 0