X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fos_generic.c;h=9ddb3c40bd686bb83124e62485cc4a2f3581271a;hb=a36ad5e29241b0c89379947b13887cb6930ef3e0;hp=f215c22528a75ad439cb2cf095d7ca9e92e11bc6;hpb=d0202a7cd10f772a202d41d056a0518bbd3c3d47;p=ircu2.10.12-pk.git diff --git a/ircd/os_generic.c b/ircd/os_generic.c index f215c22..9ddb3c4 100644 --- a/ircd/os_generic.c +++ b/ircd/os_generic.c @@ -22,8 +22,22 @@ */ #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" @@ -60,6 +74,10 @@ #include #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 @@ -69,6 +87,17 @@ #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) @@ -108,15 +137,16 @@ void sockaddr_to_irc(const struct sockaddr_in6 *v6, struct irc_sockaddr *irc) * @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)) @@ -145,31 +175,24 @@ int sockaddr_from_irc(struct sockaddr_in6 *v6, const struct irc_sockaddr *irc, i #define sn_family sin_family #define sockaddr_to_irc sockaddr_in_to_irc -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. @@ -262,6 +285,7 @@ int os_get_rusage(struct Client *cptr, int uptime, EnumFn enumerator) #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. @@ -421,31 +445,18 @@ IOResult os_recv_nonb(int fd, char* buf, unsigned int length, 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. @@ -466,25 +477,16 @@ IOResult os_recvfrom_nonb(int fd, char* buf, unsigned int length, 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. @@ -503,27 +505,18 @@ IOResult os_sendto_nonb(int fd, const char* buf, unsigned int length, 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. @@ -539,23 +532,14 @@ IOResult os_send_nonb(int fd, const char* buf, unsigned int length, 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. @@ -577,41 +561,31 @@ IOResult os_sendv_nonb(int fd, struct MsgQ* buf, unsigned int* count_in, 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); @@ -633,6 +607,11 @@ int os_socket(const struct irc_sockaddr* local, int type, const char* port_name) 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); @@ -672,10 +651,13 @@ IOResult os_connect_nonb(int fd, const struct irc_sockaddr* sin) 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. @@ -721,3 +703,12 @@ int os_set_listen(int fd, int backlog) { 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); +}