diff --git a/src/sockaddr.cc b/src/sockaddr.cc index 76e7fba..5297e79 100644 --- a/src/sockaddr.cc +++ b/src/sockaddr.cc @@ -114,11 +114,23 @@ bool SockAddr::set_host(const SockAddr &other) return false; } -bool SockAddr::set_host(const ucred &peercred) +#if defined(SO_PEERCRED) +#define PEERCRED_TYPE ucred +#define PEERCRED_PID peercred.pid +#define PEERCRED_GID peercred.gid +#define PEERCRED_UID peercred.uid +#else +#define PEERCRED_TYPE xucred +#define PEERCRED_PID peercred.cr_pid +#define PEERCRED_GID peercred.cr_gid +#define PEERCRED_UID peercred.cr_uid +#endif + +bool SockAddr::set_host(const PEERCRED_TYPE &peercred) { if (this->is_inet4()) { this->cast4()->sin_addr.s_addr = - htonl(static_cast(peercred.pid)); + htonl(static_cast(PEERCRED_PID)); return true; } @@ -128,12 +140,15 @@ bool SockAddr::set_host(const ucred &peercred) addr->sin6_addr.s6_addr[1] = 0x80; addr->sin6_addr.s6_addr[2] = 0x00; addr->sin6_addr.s6_addr[3] = 0x00; - uint32_t part = htonl(static_cast(peercred.uid)); + uint32_t part = htonl(static_cast(PEERCRED_UID)); memcpy(addr->sin6_addr.s6_addr + 4, &part, 4); - part = htonl(static_cast(peercred.gid)); +// XXX! +#if defined(SO_PEERCRED) + part = htonl(static_cast(PEERCRED_GID)); memcpy(addr->sin6_addr.s6_addr + 8, &part, 4); - part = htonl(static_cast(peercred.pid)); + part = htonl(static_cast(PEERCRED_PID)); memcpy(addr->sin6_addr.s6_addr + 12, &part, 4); +#endif return true; } diff --git a/src/sockaddr.hh b/src/sockaddr.hh index 753fb90..82285c6 100644 --- a/src/sockaddr.hh +++ b/src/sockaddr.hh @@ -13,6 +13,10 @@ #include #include +#if defined(__APPLE__) +#include +#endif + struct sockaddr_in6; struct sockaddr_in; @@ -27,7 +31,11 @@ struct SockAddr std::optional get_host(void) const; bool set_host(const std::string&); +#if defined(SO_PEERCRED) bool set_host(const ucred&); +#else + bool set_host(const xucred&); +#endif bool set_host(const SockAddr&); bool set_random_host(void); diff --git a/src/socket.cc b/src/socket.cc index 7858553..f8f0d5b 100644 --- a/src/socket.cc +++ b/src/socket.cc @@ -15,6 +15,10 @@ #include #include +#if defined(__APPLE__) +#include +#endif + std::optional Socket::find(int fd) { using itype = decltype(Socket::registry)::const_iterator; @@ -272,10 +276,19 @@ bool Socket::create_binding(const SockAddr &addr) if (!local.set_host(addr)) return false; } else { +#if defined(SO_PEERCRED) ucred local_cred; local_cred.uid = getuid(); local_cred.gid = getgid(); local_cred.pid = getpid(); +#else + xucred local_cred; + local_cred.cr_uid = getuid(); + /* XXX! + local_cred.cr_gid = getgid(); + local_cred.cr_pid = getpid(); + */ +#endif // Our local sockaddr, which we only need if we didn't have a // bind() before our connect. @@ -460,11 +473,20 @@ int Socket::accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) } else { // We use SO_PEERCRED to get uid, gid and pid in order to generate // unique IP addresses. +#if defined(SO_PEERCRED) ucred peercred; socklen_t len = sizeof peercred; if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &peercred, &len) == -1) return -1; +#else + xucred peercred; + socklen_t len = sizeof peercred; + + if (getsockopt(sockfd, SOL_LOCAL, LOCAL_PEERCRED, &peercred, + &len) == -1) + return -1; +#endif if (!peer.set_host(peercred)) { errno = EINVAL;