X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fsocket-util.c;h=954686f974e8561ba65484a09ace623ba064e993;hb=275b39fe4bf19f244114dbefa58e0d77047eff4a;hp=42ea545917da025099f67c0b255a3ede0e4c921a;hpb=8520cfa5845274f4c0312a6c3f3313195e8a5119;p=elogind.git diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c index 42ea54591..954686f97 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -38,6 +38,7 @@ #include "path-util.h" #include "socket-util.h" #include "missing.h" +#include "fileio.h" int socket_address_parse(SocketAddress *a, const char *s) { int r; @@ -67,7 +68,7 @@ int socket_address_parse(SocketAddress *a, const char *s) { errno = 0; if (inet_pton(AF_INET6, n, &a->sockaddr.in6.sin6_addr) <= 0) { free(n); - return errno != 0 ? -errno : -EINVAL; + return errno > 0 ? -errno : -EINVAL; } free(n); @@ -203,7 +204,7 @@ int socket_address_parse_netlink(SocketAddress *a, const char *s) { errno = 0; if (sscanf(s, "%ms %u", &sfamily, &group) < 1) - return errno ? -errno : -EINVAL; + return errno > 0 ? -errno : -EINVAL; family = netlink_family_from_string(sfamily); if (family < 0) @@ -299,7 +300,8 @@ int socket_address_print(const SocketAddress *a, char **p) { case AF_INET: { char *ret; - if (!(ret = new(char, INET_ADDRSTRLEN+1+5+1))) + ret = new(char, INET_ADDRSTRLEN+1+5+1); + if (!ret) return -ENOMEM; if (!inet_ntop(AF_INET, &a->sockaddr.in4.sin_addr, ret, INET_ADDRSTRLEN)) { @@ -315,7 +317,8 @@ int socket_address_print(const SocketAddress *a, char **p) { case AF_INET6: { char *ret; - if (!(ret = new(char, 1+INET6_ADDRSTRLEN+2+5+1))) + ret = new(char, 1+INET6_ADDRSTRLEN+2+5+1); + if (!ret) return -ENOMEM; ret[0] = '['; @@ -333,8 +336,8 @@ int socket_address_print(const SocketAddress *a, char **p) { char *ret; if (a->size <= offsetof(struct sockaddr_un, sun_path)) { - - if (!(ret = strdup(""))) + ret = strdup(""); + if (!ret) return -ENOMEM; } else if (a->sockaddr.un.sun_path[0] == 0) { @@ -345,7 +348,8 @@ int socket_address_print(const SocketAddress *a, char **p) { * more than one NUL byte. That is * actually an invalid assumption */ - if (!(ret = new(char, sizeof(a->sockaddr.un.sun_path)+1))) + ret = new(char, sizeof(a->sockaddr.un.sun_path)+1); + if (!ret) return -ENOMEM; ret[0] = '@'; @@ -353,8 +357,8 @@ int socket_address_print(const SocketAddress *a, char **p) { ret[sizeof(a->sockaddr.un.sun_path)] = 0; } else { - - if (!(ret = strdup(a->sockaddr.un.sun_path))) + ret = strdup(a->sockaddr.un.sun_path); + if (!ret) return -ENOMEM; } @@ -363,7 +367,7 @@ int socket_address_print(const SocketAddress *a, char **p) { } case AF_NETLINK: { - char _cleanup_free_ *sfamily = NULL; + _cleanup_free_ char *sfamily = NULL; r = netlink_family_to_string_alloc(a->protocol, &sfamily); if (r < 0) @@ -432,7 +436,7 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) { return false; if (a->sockaddr.un.sun_path[0]) { - if (strncmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path)) != 0) + if (!strneq(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path))) return false; } else { if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, a->size) != 0) @@ -485,16 +489,16 @@ bool socket_address_is_netlink(const SocketAddress *a, const char *s) { return socket_address_equal(a, &b); } -bool socket_address_needs_mount(const SocketAddress *a, const char *prefix) { +const char* socket_address_get_path(const SocketAddress *a) { assert(a); if (socket_address_family(a) != AF_UNIX) - return false; + return NULL; if (a->sockaddr.un.sun_path[0] == 0) - return false; + return NULL; - return path_startswith(a->sockaddr.un.sun_path, prefix); + return a->sockaddr.un.sun_path; } bool socket_ipv6_is_supported(void) { @@ -515,6 +519,94 @@ bool socket_ipv6_is_supported(void) { return enabled; } +bool socket_address_matches_fd(const SocketAddress *a, int fd) { + union sockaddr_union sa; + socklen_t salen = sizeof(sa), solen; + int protocol, type; + + assert(a); + assert(fd >= 0); + + if (getsockname(fd, &sa.sa, &salen) < 0) + return false; + + if (sa.sa.sa_family != a->sockaddr.sa.sa_family) + return false; + + solen = sizeof(type); + if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &solen) < 0) + return false; + + if (type != a->type) + return false; + + if (a->protocol != 0) { + solen = sizeof(protocol); + if (getsockopt(fd, SOL_SOCKET, SO_PROTOCOL, &protocol, &solen) < 0) + return false; + + if (protocol != a->protocol) + return false; + } + + switch (sa.sa.sa_family) { + + case AF_INET: + return sa.in4.sin_port == a->sockaddr.in4.sin_port && + sa.in4.sin_addr.s_addr == a->sockaddr.in4.sin_addr.s_addr; + + case AF_INET6: + return sa.in6.sin6_port == a->sockaddr.in6.sin6_port && + memcmp(&sa.in6.sin6_addr, &a->sockaddr.in6.sin6_addr, sizeof(struct in6_addr)) == 0; + + case AF_UNIX: + return salen == a->size && + memcmp(sa.un.sun_path, a->sockaddr.un.sun_path, salen - offsetof(struct sockaddr_un, sun_path)) == 0; + + } + + return false; +} + +int make_socket_fd(const char* address, int flags) { + SocketAddress a; + int fd, r; + _cleanup_free_ char *p = NULL; + + r = socket_address_parse(&a, address); + if (r < 0) { + log_error("failed to parse socket: %s", strerror(-r)); + return r; + } + + fd = socket(socket_address_family(&a), flags, 0); + if (fd < 0) { + log_error("socket(): %m"); + return -errno; + } + + r = socket_address_print(&a, &p); + if (r < 0) { + log_error("socket_address_print(): %s", strerror(-r)); + return r; + } + log_info("Listening on %s", p); + + r = bind(fd, &a.sockaddr.sa, a.size); + if (r < 0) { + log_error("bind to %s: %m", address); + return -errno; + } + + r = listen(fd, SOMAXCONN); + if (r < 0) { + log_error("listen on %s: %m", address); + return -errno; + } + + return fd; +} + static const char* const netlink_family_table[] = { [NETLINK_ROUTE] = "route", [NETLINK_FIREWALL] = "firewall",