*/
#include "config.h"
-#define _XOPEN_SOURCE 600 /**< make limits.h #define IOV_MAX */
-#define __EXTENSIONS__ 1 /**< make Solaris netinet/in.h know IPv6 */
+#ifdef IRCU_SOLARIS
+/* Solaris requires C99 support for SUSv3, but C99 support breaks other
+ * parts of the build. So fall back to SUSv2, but request IPv6 support
+ * by defining __EXTENSIONS__.
+ */
+#define _XOPEN_SOURCE 500
+#define __EXTENSIONS__ 1
+#elif defined(__FreeBSD__) && __FreeBSD__ >= 5
+/* FreeBSD 6.0 requires SUSv3 to support IPv6 -- but if you ask for
+ * that specifically (by defining _XOPEN_SOURCE to anything at all),
+ * they cleverly hide IPPROTO_IPV6. If you don't ask for anything,
+ * they give you everything.
+ */
+#else
+#define _XOPEN_SOURCE 600
+#endif
#include "ircd_osdep.h"
#include "msgq.h"
#include <unistd.h>
#endif
+#if defined(IPV6_BINDV6ONLY) &&!defined(IPV6_V6ONLY)
+# define IPV6_V6ONLY IPV6_BINDV6ONLY
+#endif
+
#ifndef IOV_MAX
#define IOV_MAX 16 /**< minimum required length of an iovec array */
#endif
#define getrusage(a,b) syscall(SYS_GETRUSAGE, a, b)
#endif
+static int is_blocked(int error)
+{
+ return EWOULDBLOCK == error
+#ifdef ENOMEM
+ || ENOMEM == error
+#endif
+#ifdef ENOBUFS
+ || ENOBUFS == error
+#endif
+ || EAGAIN == error;
+}
+
+static void sockaddr_in_to_irc(const struct sockaddr_in *v4,
+ struct irc_sockaddr *irc)
+{
+ memset(&irc->addr, 0, 5*sizeof(int16_t));
+ irc->addr.in6_16[5] = 0xffff;
+ memcpy(&irc->addr.in6_16[6], &v4->sin_addr, sizeof(v4->sin_addr));
+ irc->port = ntohs(v4->sin_port);
+}
+
+
#ifdef IPV6
/** Native socket address type. */
#define sockaddr_native sockaddr_in6
irc->port = ntohs(v6->sin6_port);
}
else if (v6->sin6_family == AF_INET) {
- const struct sockaddr_in *v4 = (const struct sockaddr_in*)v6;
- memset(&irc->addr, 0, 5*sizeof(int16_t));
- irc->addr.in6_16[5] = 0xffff;
- memcpy(&irc->addr.in6_16[6], &v4->sin_addr, sizeof(v4->sin_addr));
- irc->port = ntohs(v4->sin_port);
+ sockaddr_in_to_irc((struct sockaddr_in *)v6, irc);
}
else assert(0 && "Unhandled native address family");
}
* @param[in] compat_fd If non-negative, an FD specifying address family.
* @return Length of address written to \a v6.
*/
-int sockaddr_from_irc(struct sockaddr_in6 *v6, const struct irc_sockaddr *irc, int compat_fd)
+int sockaddr_from_irc(struct sockaddr_in6 *v6, const struct irc_sockaddr *irc, int compat_fd, int family)
{
struct sockaddr_in6 sin6;
socklen_t slen;
- int family;
assert(irc != 0);
slen = sizeof(sin6);
- if ((0 <= compat_fd)
+ if (family) {
+ /* accept whatever user specified */
+ } else if ((0 <= compat_fd)
&& (0 == getsockname(compat_fd, (struct sockaddr*)&sin6, &slen)))
family = sin6.sin6_family;
else if ((irc == &VirtualHost_v4) || irc_in_addr_is_ipv4(&irc->addr))
#else
#define sockaddr_native sockaddr_in
#define sn_family sin_family
+#define sockaddr_to_irc sockaddr_in_to_irc
-void sockaddr_to_irc(const struct sockaddr_in *v4, struct irc_sockaddr *irc)
-{
- assert(v4->sin_family == AF_INET);
- memset(&irc->addr, 0, 6*sizeof(irc->addr.in6_16[0]));
- memcpy(&irc->addr.in6_16[6], &v4->sin_addr, sizeof(v4->sin_addr));
- irc->port = ntohs(v4->sin_port);
-}
-
-int sockaddr_from_irc(struct sockaddr_in *v4, const struct irc_sockaddr *irc, int compat_fd)
+int sockaddr_from_irc(struct sockaddr_in *v4, const struct irc_sockaddr *irc, int compat_fd, int family)
{
assert(irc != 0);
+ memset(v4, 0, sizeof(*v4));
v4->sin_family = AF_INET;
if (irc) {
assert(!irc->addr.in6_16[0] && !irc->addr.in6_16[1] && !irc->addr.in6_16[2] && !irc->addr.in6_16[3] && !irc->addr.in6_16[4] && (!irc->addr.in6_16[5] || irc->addr.in6_16[5] == 0xffff));
memcpy(&v4->sin_addr, &irc->addr.in6_16[6], sizeof(v4->sin_addr));
v4->sin_port = htons(irc->port);
- } else{
- memset(&v4, 0, sizeof(v4));
}
- (void)compat_fd;
+ (void)compat_fd; (void)family;
return sizeof(*v4);
}
#endif
-/*
- * This is part of the STATS replies. There is no official numeric for this
- * since this isn't an official command, in much the same way as HASH isn't.
- * It is also possible that some systems wont support this call or have
- * different field names for "struct rusage".
- * -avalon
- */
-/** Send resource usage information to a client.
+#ifdef DEBUGMODE
+/** Send resource usage information to an enumerator function.
* @param[in] cptr Client requesting information.
* @param[in] uptime Wall time in seconds since the server started.
* @param[in] enumerator Function to call to send a line to \a cptr.
#endif /* HAVE_GETRUSAGE */
return 1;
}
+#endif
/** Look up the most recent socket error for a socket file descriptor.
* @param[in] fd File descriptor to check.
int res;
assert(0 != buf);
assert(0 != count_out);
- *count_out = 0;
- errno = 0;
if (0 < (res = recv(fd, buf, length, 0))) {
*count_out = (unsigned) res;
return IO_SUCCESS;
+ } else if (res == 0) {
+ *count_out = 0;
+ errno = 0; /* or ECONNRESET? */
+ return IO_FAILURE;
+ } else {
+ *count_out = 0;
+ return is_blocked(errno) ? IO_BLOCKED : IO_FAILURE;
}
- else if (res < 0) {
- if (EWOULDBLOCK == errno || EAGAIN == errno
-#ifdef ENOMEM
- || ENOMEM == errno
-#endif
-#ifdef ENOBUFS
- || ENOBUFS == errno
-#endif
- )
- return IO_BLOCKED;
- else
- return IO_FAILURE;
- }
- /*
- * 0 == client closed the connection
- * < 1 == error
- */
- return IO_FAILURE;
}
/** Attempt to read from a non-blocking UDP socket.
assert(0 != buf);
assert(0 != length_out);
assert(0 != addr_out);
- errno = 0;
- *length_out = 0;
res = recvfrom(fd, buf, length, 0, (struct sockaddr*) &addr, &len);
- if (-1 == res) {
- if (EWOULDBLOCK == errno || ENOMEM == errno
-#ifdef ENOMEM
- || ENOMEM == errno
-#endif
-#ifdef ENOBUFS
- || ENOBUFS == errno
-#endif
- )
- return IO_BLOCKED;
- return IO_FAILURE;
+ if (-1 < res) {
+ sockaddr_to_irc(&addr, addr_out);
+ *length_out = res;
+ return IO_SUCCESS;
+ } else {
+ *length_out = 0;
+ return is_blocked(errno) ? IO_BLOCKED : IO_FAILURE;
}
- sockaddr_to_irc(&addr, addr_out);
- *length_out = res;
- return IO_SUCCESS;
}
/** Attempt to write on a non-blocking UDP socket.
struct sockaddr_native addr;
int res, size;
assert(0 != buf);
- if (count_out)
- *count_out = 0;
- errno = 0;
- size = sockaddr_from_irc(&addr, peer, fd);
+ size = sockaddr_from_irc(&addr, peer, fd, 0);
assert((addr.sn_family == AF_INET) == irc_in_addr_is_ipv4(&peer->addr));
if (-1 < (res = sendto(fd, buf, length, flags, (struct sockaddr*)&addr, size))) {
if (count_out)
*count_out = (unsigned) res;
return IO_SUCCESS;
+ } else {
+ if (count_out)
+ *count_out = 0;
+ return is_blocked(errno) ? IO_BLOCKED : IO_FAILURE;
}
- else if (EWOULDBLOCK == errno || EAGAIN == errno
-#ifdef ENOMEM
- || ENOMEM == errno
-#endif
-#ifdef ENOBUFS
- || ENOBUFS == errno
-#endif
- )
- return IO_BLOCKED;
- return IO_FAILURE;
}
/** Attempt to write on a connected socket.
int res;
assert(0 != buf);
assert(0 != count_out);
- *count_out = 0;
- errno = 0;
if (-1 < (res = send(fd, buf, length, 0))) {
*count_out = (unsigned) res;
return IO_SUCCESS;
+ } else {
+ *count_out = 0;
+ return is_blocked(errno) ? IO_BLOCKED : IO_FAILURE;
}
- else if (EWOULDBLOCK == errno || EAGAIN == errno
-#ifdef ENOMEM
- || ENOMEM == errno
-#endif
-#ifdef ENOBUFS
- || ENOBUFS == errno
-#endif
- )
- return IO_BLOCKED;
- return IO_FAILURE;
}
/** Attempt a vectored write on a connected socket.
assert(0 != count_out);
*count_in = 0;
- *count_out = 0;
- errno = 0;
-
count = msgq_mapiov(buf, iov, IOV_MAX, count_in);
if (-1 < (res = writev(fd, iov, count))) {
*count_out = (unsigned) res;
return IO_SUCCESS;
+ } else {
+ *count_out = 0;
+ return is_blocked(errno) ? IO_BLOCKED : IO_FAILURE;
}
- else if (EWOULDBLOCK == errno || EAGAIN == errno
-#ifdef ENOMEM
- || ENOMEM == errno
-#endif
-#ifdef ENOBUFS
- || ENOBUFS == errno
-#endif
- )
- return IO_BLOCKED;
-
- return IO_FAILURE;
}
/** Open a TCP or UDP socket on a particular address.
* @param[in] local Local address to bind to.
* @param[in] type SOCK_STREAM or SOCK_DGRAM.
* @param[in] port_name Port name (used in error diagnostics).
+ * @param[in] family A specific address family to use, or 0 for automatic.
* @return Bound descriptor, or -1 on error.
*/
-int os_socket(const struct irc_sockaddr* local, int type, const char* port_name)
+int os_socket(const struct irc_sockaddr* local, int type, const char* port_name, int family)
{
struct sockaddr_native addr;
int size, fd;
assert(local != 0);
- size = sockaddr_from_irc(&addr, local, -1);
+ size = sockaddr_from_irc(&addr, local, -1, family);
fd = socket(addr.sn_family, type, 0);
if (fd < 0) {
report_error(SOCKET_ERROR_MSG, port_name, errno);
return -1;
}
if (local) {
+#if defined(IPV6_V6ONLY)
+ int on = 1;
+ if (family == AF_INET6 && irc_in_addr_unspec(&local->addr))
+ setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
+#endif
if (bind(fd, (struct sockaddr*)&addr, size)) {
report_error(BIND_ERROR_MSG, port_name, errno);
close(fd);
struct sockaddr_native addr;
int size;
- size = sockaddr_from_irc(&addr, sin, fd);
- if (connect(fd, (struct sockaddr*) &addr, size))
- return (errno == EINPROGRESS) ? IO_BLOCKED : IO_FAILURE;
- return IO_SUCCESS;
+ size = sockaddr_from_irc(&addr, sin, fd, 0);
+ if (0 == connect(fd, (struct sockaddr*) &addr, size))
+ return IO_SUCCESS;
+ else if (errno == EINPROGRESS)
+ return IO_BLOCKED;
+ else
+ return IO_FAILURE;
}
/** Get local address of a socket.
{
return (0 == listen(fd, backlog));
}
+
+/** Allocate a connected pair of local sockets.
+ * @param[out] sv Array of two file descriptors.
+ * @return Zero on success; non-zero number on error.
+ */
+int os_socketpair(int sv[2])
+{
+ return socketpair(AF_UNIX, SOCK_STREAM, 0, sv);
+}
projects / ircu2.10.12-pk.git / blobdiff