X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fsocket-util.c;h=deecce8a8062da84ead7ec973323d0364ea8e84b;hp=5ef2e2244c0406874fd8b7cbdd067a610c853fb2;hb=02233928a502e46fc125118dba7234ba3e48dc15;hpb=39883f622f392d8579f4428fc5a789a102efbb10 diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c index 5ef2e2244..deecce8a8 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "macro.h" #include "util.h" @@ -324,9 +325,6 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) { if (a->type != b->type) return false; - if (a->size != b->size) - return false; - if (socket_address_family(a) != socket_address_family(b)) return false; @@ -351,14 +349,16 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) { break; case AF_UNIX: - if ((a->sockaddr.un.sun_path[0] == 0) != (b->sockaddr.un.sun_path[0] == 0)) return false; if (a->sockaddr.un.sun_path[0]) { - if (!strneq(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path))) + if (!path_equal_or_files_same(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path)) return false; } else { + if (a->size != b->size) + return false; + if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, a->size) != 0) return false; } @@ -366,7 +366,6 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) { break; case AF_NETLINK: - if (a->protocol != b->protocol) return false; @@ -425,63 +424,47 @@ bool socket_ipv6_is_supported(void) { _cleanup_free_ char *l = NULL; if (access("/sys/module/ipv6", F_OK) != 0) - return 0; + return false; /* If we can't check "disable" parameter, assume enabled */ if (read_one_line_file("/sys/module/ipv6/parameters/disable", &l) < 0) - return 1; + return true; /* If module was loaded with disable=1 no IPv6 available */ return l[0] == '0'; } bool socket_address_matches_fd(const SocketAddress *a, int fd) { - union sockaddr_union sa; - socklen_t salen = sizeof(sa), solen; - int protocol, type; + SocketAddress b; + socklen_t solen; assert(a); assert(fd >= 0); - if (getsockname(fd, &sa.sa, &salen) < 0) + b.size = sizeof(b.sockaddr); + if (getsockname(fd, &b.sockaddr.sa, &b.size) < 0) return false; - if (sa.sa.sa_family != a->sockaddr.sa.sa_family) + if (b.sockaddr.sa.sa_family != a->sockaddr.sa.sa_family) return false; - solen = sizeof(type); - if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &solen) < 0) + solen = sizeof(b.type); + if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &b.type, &solen) < 0) return false; - if (type != a->type) + if (b.type != a->type) return false; if (a->protocol != 0) { - solen = sizeof(protocol); - if (getsockopt(fd, SOL_SOCKET, SO_PROTOCOL, &protocol, &solen) < 0) + solen = sizeof(b.protocol); + if (getsockopt(fd, SOL_SOCKET, SO_PROTOCOL, &b.protocol, &solen) < 0) return false; - if (protocol != a->protocol) + if (b.protocol != a->protocol) return false; } - switch (sa.sa.sa_family) { - - case AF_INET: - return sa.in.sin_port == a->sockaddr.in.sin_port && - sa.in.sin_addr.s_addr == a->sockaddr.in.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; + return socket_address_equal(a, &b); } int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, char **ret) { @@ -574,13 +557,12 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ int getpeername_pretty(int fd, char **ret) { union sockaddr_union sa; - socklen_t salen; + socklen_t salen = sizeof(sa); int r; assert(fd >= 0); assert(ret); - salen = sizeof(sa); if (getpeername(fd, &sa.sa, &salen) < 0) return -errno; @@ -594,7 +576,7 @@ int getpeername_pretty(int fd, char **ret) { if (r < 0) return r; - if (asprintf(ret, "PID %lu/UID %lu", (unsigned long) ucred.pid, (unsigned long) ucred.uid) < 0) + if (asprintf(ret, "PID "PID_FMT"/UID "UID_FMT, ucred.pid, ucred.uid) < 0) return -ENOMEM; return 0; @@ -608,12 +590,11 @@ int getpeername_pretty(int fd, char **ret) { int getsockname_pretty(int fd, char **ret) { union sockaddr_union sa; - socklen_t salen; + socklen_t salen = sizeof(sa); assert(fd >= 0); assert(ret); - salen = sizeof(sa); if (getsockname(fd, &sa.sa, &salen) < 0) return -errno; @@ -625,6 +606,60 @@ int getsockname_pretty(int fd, char **ret) { return sockaddr_pretty(&sa.sa, salen, false, ret); } +int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret) { + int r; + char host[NI_MAXHOST], *ret; + + assert(_ret); + + r = getnameinfo(&sa->sa, salen, host, sizeof(host), NULL, 0, + NI_IDN|NI_IDN_USE_STD3_ASCII_RULES); + if (r != 0) { + int saved_errno = errno; + + r = sockaddr_pretty(&sa->sa, salen, true, &ret); + if (r < 0) + return log_error_errno(r, "sockadd_pretty() failed: %m"); + + log_debug_errno(saved_errno, "getnameinfo(%s) failed: %m", ret); + } else { + ret = strdup(host); + if (!ret) + return log_oom(); + } + + *_ret = ret; + return 0; +} + +int getnameinfo_pretty(int fd, char **ret) { + union sockaddr_union sa; + socklen_t salen = sizeof(sa); + + assert(fd >= 0); + assert(ret); + + if (getsockname(fd, &sa.sa, &salen) < 0) + return log_error_errno(errno, "getsockname(%d) failed: %m", fd); + + return socknameinfo_pretty(&sa, salen, ret); +} + +int socket_address_unlink(SocketAddress *a) { + assert(a); + + if (socket_address_family(a) != AF_UNIX) + return 0; + + if (a->sockaddr.un.sun_path[0] == 0) + return 0; + + if (unlink(a->sockaddr.un.sun_path) < 0) + return -errno; + + return 1; +} + static const char* const netlink_family_table[] = { [NETLINK_ROUTE] = "route", [NETLINK_FIREWALL] = "firewall", @@ -654,3 +689,38 @@ static const char* const socket_address_bind_ipv6_only_table[_SOCKET_ADDRESS_BIN }; DEFINE_STRING_TABLE_LOOKUP(socket_address_bind_ipv6_only, SocketAddressBindIPv6Only); + +bool sockaddr_equal(const union sockaddr_union *a, const union sockaddr_union *b) { + assert(a); + assert(b); + + if (a->sa.sa_family != b->sa.sa_family) + return false; + + if (a->sa.sa_family == AF_INET) + return a->in.sin_addr.s_addr == b->in.sin_addr.s_addr; + + if (a->sa.sa_family == AF_INET6) + return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr)) == 0; + + return false; +} + +char* ether_addr_to_string(const struct ether_addr *addr, char buffer[ETHER_ADDR_TO_STRING_MAX]) { + assert(addr); + assert(buffer); + + /* Like ether_ntoa() but uses %02x instead of %x to print + * ethernet addresses, which makes them look less funny. Also, + * doesn't use a static buffer. */ + + sprintf(buffer, "%02x:%02x:%02x:%02x:%02x:%02x", + addr->ether_addr_octet[0], + addr->ether_addr_octet[1], + addr->ether_addr_octet[2], + addr->ether_addr_octet[3], + addr->ether_addr_octet[4], + addr->ether_addr_octet[5]); + + return buffer; +}