*/
#include "config.h"
-#define _XOPEN_SOURCE /* make limits.h #define IOV_MAX */
+#define _XOPEN_SOURCE 500 /* make limits.h #define IOV_MAX */
+#define __EXTENSIONS__ 1 /* make Solaris netinet/in.h know IPv6 */
#include "ircd_osdep.h"
#include "msgq.h"
-
+#include "res.h"
+#include "s_bsd.h"
+#include "sys.h"
+
+/* Include file dependency notes:
+ * FreeBSD requires struct timeval from sys/time.h before struct
+ * rusage in sys/resource.h.
+ * Solaris requires sys/time.h before struct rusage (indirectly) in
+ * netinet/in.h.
+ */
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
-#include <netinet/in.h>
#include <stdio.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/types.h>
+#include <sys/time.h>
+#include <netinet/in.h>
#include <sys/resource.h>
#include <sys/socket.h>
-#include <sys/time.h>
#include <sys/uio.h>
-#if 0
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#define getrusage(a,b) syscall(SYS_GETRUSAGE, a, b)
#endif
+#ifdef IPV6
+#define sockaddr_native sockaddr_in6
+#define sn_family sin6_family
+
+void sockaddr_to_irc(const struct sockaddr_in6 *v6, struct irc_sockaddr *irc)
+{
+ if (v6->sin6_family == AF_INET6) {
+ memcpy(&irc->addr.in6_16[0], &v6->sin6_addr, sizeof(v6->sin6_addr));
+ 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);
+ }
+ else assert(0 && "Unhandled native address family");
+}
+
+int sockaddr_from_irc(struct sockaddr_in6 *v6, const struct irc_sockaddr *irc, int persist)
+{
+ memset(v6, 0, sizeof(*v6));
+ if (!irc) {
+ memset(v6, 0, sizeof(v6));
+ v6->sin6_family = AF_INET6;
+ return sizeof(*v6);
+ }
+ else if (persist && irc_in_addr_is_ipv4(&irc->addr)) {
+ struct sockaddr_in *v4 = (struct sockaddr_in*)v6;
+ v4->sin_family = AF_INET;
+ memcpy(&v4->sin_addr, &irc->addr.in6_16[6], sizeof(v4->sin_addr));
+ v4->sin_port = htons(irc->port);
+ return sizeof(*v4);
+ }
+ else {
+ v6->sin6_family = AF_INET6;
+ memcpy(&v6->sin6_addr, &irc->addr.in6_16[0], sizeof(v6->sin6_addr));
+ v6->sin6_port = htons(irc->port);
+ return sizeof(*v6);
+ }
+}
+
+#else
+#define sockaddr_native sockaddr_in
+#define sn_family sin_family
+
+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 persist)
+{
+ 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)persist;
+ return sizeof(*v4);
+}
+
+#endif
+
/*
* This is part of the STATS replies. There is no offical numeric for this
* since this isnt an official command, in much the same way as HASH isnt.
*/
int os_get_rusage(struct Client *cptr, int uptime, EnumFn enumerator)
{
- char buf[256];
#ifdef HAVE_GETRUSAGE
+ char buf[256];
struct rusage rus;
time_t secs;
secs = 1;
sprintf(buf, "CPU Secs %ld:%ld User %ld:%ld System %ld:%ld",
- secs / 60, secs % 60,
+ (long)(secs / 60), (long)(secs % 60),
rus.ru_utime.tv_sec / 60, rus.ru_utime.tv_sec % 60,
rus.ru_stime.tv_sec / 60, rus.ru_stime.tv_sec % 60);
(*enumerator)(cptr, buf);
sprintf(buf, "Block in %ld out %ld", rus.ru_inblock, rus.ru_oublock);
(*enumerator)(cptr, buf);
-
+
sprintf(buf, "Msg Rcv %ld Send %ld", rus.ru_msgrcv, rus.ru_msgsnd);
(*enumerator)(cptr, buf);
#else /* HAVE_GETRUSAGE */
#if HAVE_TIMES
+ char buf[256];
struct tms tmsbuf;
time_t secs, mins;
int hzz = 1, ticpermin;
int os_set_reuseaddr(int fd)
{
unsigned int opt = 1;
- return (0 == setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
+ return (0 == setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
(const char*) &opt, sizeof(opt)));
}
-int os_set_sockbufs(int fd, unsigned int size)
+int os_set_sockbufs(int fd, unsigned int ssize, unsigned int rsize)
{
- unsigned int opt = size;
- return (0 == setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
- (const char*) &opt, sizeof(opt)) &&
- 0 == setsockopt(fd, SOL_SOCKET, SO_SNDBUF,
- (const char*) &opt, sizeof(opt)));
+ unsigned int sopt = ssize;
+ unsigned int ropt = rsize;
+ return (0 == setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
+ (const char*) &ropt, sizeof(ropt)) &&
+ 0 == setsockopt(fd, SOL_SOCKET, SO_SNDBUF,
+ (const char*) &sopt, sizeof(sopt)));
+}
+
+int os_set_tos(int fd,int tos)
+{
+#if defined(IP_TOS) && defined(IPPROTO_IP)
+ unsigned int opt = tos;
+ return (0 == setsockopt(fd, IPPROTO_IP, IP_TOS, &opt, sizeof(opt)));
+#else
+ return 1;
+#endif
}
int os_disable_options(int fd)
return 0;
}
-IOResult os_recv_nonb(int fd, char* buf, unsigned int length,
+/*
+ * os_recv_nonb - non blocking read of a connection
+ * returns:
+ * 1 if data was read or socket is blocked (recoverable error)
+ * count_out > 0 if data was read
+ *
+ * 0 if socket closed from other end
+ * -1 if an unrecoverable error occurred
+ */
+IOResult os_recv_nonb(int fd, char* buf, unsigned int length,
unsigned int* count_out)
{
int res;
return IO_SUCCESS;
}
else if (res < 0) {
- if (EWOULDBLOCK == errno || EAGAIN == errno)
+ 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;
}
-IOResult os_recvfrom_nonb(int fd, char* buf, unsigned int length,
- unsigned int* length_out, struct sockaddr_in* sin_out)
+IOResult os_recvfrom_nonb(int fd, char* buf, unsigned int length,
+ unsigned int* length_out,
+ struct irc_sockaddr* addr_out)
{
+ struct sockaddr_native addr;
+ unsigned int len = sizeof(addr);
int res;
- unsigned int len = sizeof(struct sockaddr_in);
assert(0 != buf);
assert(0 != length_out);
- assert(0 != sin_out);
+ assert(0 != addr_out);
errno = 0;
+ *length_out = 0;
- res = recvfrom(fd, buf, length, 0, (struct sockaddr*) sin_out, &len);
+ res = recvfrom(fd, buf, length, 0, (struct sockaddr*) &addr, &len);
if (-1 == res) {
- if (EWOULDBLOCK == errno || ENOMEM == errno)
+ if (EWOULDBLOCK == errno || ENOMEM == errno
+#ifdef ENOMEM
+ || ENOMEM == errno
+#endif
+#ifdef ENOBUFS
+ || ENOBUFS == errno
+#endif
+ )
return IO_BLOCKED;
return IO_FAILURE;
}
+ sockaddr_to_irc(&addr, addr_out);
*length_out = res;
return IO_SUCCESS;
}
+/*
+ * os_sendto_nonb - non blocking send to a UDP socket
+ * returns:
+ * 1 if data was written, *count_out contains number of bytes
+ * 0 if sendto call blocked
+ * -1 if an unrecoverable error occurred
+ */
+IOResult os_sendto_nonb(int fd, const char* buf, unsigned int length,
+ unsigned int* count_out, unsigned int flags,
+ const struct irc_sockaddr* peer)
+{
+ struct sockaddr_native addr;
+ int res, size;
+ assert(0 != buf);
+ if (count_out)
+ *count_out = 0;
+ errno = 0;
+
+ size = sockaddr_from_irc(&addr, peer, 1);
+ if (-1 < (res = sendto(fd, buf, length, flags, (struct sockaddr*)&addr, size))) {
+ if (count_out)
+ *count_out = (unsigned) res;
+ return IO_SUCCESS;
+ }
+ else if (EWOULDBLOCK == errno || EAGAIN == errno
+#ifdef ENOMEM
+ || ENOMEM == errno
+#endif
+#ifdef ENOBUFS
+ || ENOBUFS == errno
+#endif
+ )
+ return IO_BLOCKED;
+ return IO_FAILURE;
+}
+
+/*
+ * os_send_nonb - non blocking read of a connection
+ * returns:
+ * 1 if data was written
+ * count_out contains amount written
+ *
+ * 0 if write call blocked, recoverable error
+ * -1 if an unrecoverable error occurred
+ */
IOResult os_send_nonb(int fd, const char* buf, unsigned int length,
unsigned int* count_out)
{
*count_out = (unsigned) res;
return IO_SUCCESS;
}
- else if (EWOULDBLOCK == errno || EAGAIN == errno ||
- ENOMEM == errno || ENOBUFS == errno)
+ else if (EWOULDBLOCK == errno || EAGAIN == errno
+#ifdef ENOMEM
+ || ENOMEM == errno
+#endif
+#ifdef ENOBUFS
+ || ENOBUFS == errno
+#endif
+ )
return IO_BLOCKED;
return IO_FAILURE;
}
*count_out = (unsigned) res;
return IO_SUCCESS;
}
- else if (EWOULDBLOCK == errno || EAGAIN == errno ||
- ENOMEM == errno || ENOBUFS == errno)
+ else if (EWOULDBLOCK == errno || EAGAIN == errno
+#ifdef ENOMEM
+ || ENOMEM == errno
+#endif
+#ifdef ENOBUFS
+ || ENOBUFS == errno
+#endif
+ )
return IO_BLOCKED;
return IO_FAILURE;
}
-int os_connect_nonb(int fd, const struct sockaddr_in* sin)
+int os_socket(const struct irc_sockaddr* local, int type, const char* port_name)
{
- if (connect(fd, (struct sockaddr*) sin, sizeof(struct sockaddr_in))) {
- if (errno != EINPROGRESS)
- return 0;
+ struct sockaddr_native addr;
+ int size, fd;
+
+ size = sockaddr_from_irc(&addr, local, 1);
+ fd = socket(addr.sn_family, type, 0);
+ if (fd < 0) {
+ report_error(SOCKET_ERROR_MSG, port_name, errno);
+ return -1;
}
- return 1;
+ if (fd > MAXCLIENTS - 1) {
+ report_error(CONNLIMIT_ERROR_MSG, port_name, 0);
+ close(fd);
+ return -1;
+ }
+ if (!os_set_reuseaddr(fd)) {
+ report_error(REUSEADDR_ERROR_MSG, port_name, errno);
+ close(fd);
+ return -1;
+ }
+ if (!os_set_nonblocking(fd)) {
+ report_error(NONB_ERROR_MSG, port_name, errno);
+ close(fd);
+ return -1;
+ }
+ if (local) {
+ if (bind(fd, (struct sockaddr*)&addr, size)) {
+ report_error(BIND_ERROR_MSG, port_name, errno);
+ close(fd);
+ return -1;
+ }
+ }
+ return fd;
+}
+
+int os_accept(int fd, struct irc_sockaddr* peer)
+{
+ struct sockaddr_native addr;
+ socklen_t addrlen;
+ int new_fd;
+
+ addrlen = sizeof(addr);
+ new_fd = accept(fd, (struct sockaddr*)&addr, &addrlen);
+ if (new_fd < 0)
+ memset(peer, 0, sizeof(*peer));
+ else
+ sockaddr_to_irc(&addr, peer);
+ return new_fd;
+}
+
+IOResult os_connect_nonb(int fd, const struct irc_sockaddr* sin)
+{
+ struct sockaddr_native addr;
+ int size;
+
+ size = sockaddr_from_irc(&addr, sin, 1);
+ if (connect(fd, (struct sockaddr*) &addr, size))
+ return (errno == EINPROGRESS) ? IO_BLOCKED : IO_FAILURE;
+ return IO_SUCCESS;
}
-
-int os_get_sockname(int fd, struct sockaddr_in* sin_out)
+
+int os_get_sockname(int fd, struct irc_sockaddr* sin_out)
{
- unsigned int len = sizeof(struct sockaddr_in);
+ struct sockaddr_native addr;
+ unsigned int len = sizeof(addr);
+
assert(0 != sin_out);
- return (0 == getsockname(fd, (struct sockaddr*) sin_out, &len));
+ if (getsockname(fd, (struct sockaddr*) &addr, &len))
+ return 0;
+ sockaddr_to_irc(&addr, sin_out);
+ return 1;
}
-int os_get_peername(int fd, struct sockaddr_in* sin_out)
+int os_get_peername(int fd, struct irc_sockaddr* sin_out)
{
- unsigned int len = sizeof(struct sockaddr_in);
+ struct sockaddr_native addr;
+ unsigned int len = sizeof(addr);
+
assert(0 != sin_out);
- return (0 == getpeername(fd, (struct sockaddr*) sin_out, &len));
+ if (getpeername(fd, (struct sockaddr*) &addr, &len))
+ return 0;
+ sockaddr_to_irc(&addr, sin_out);
+ return 1;
}
int os_set_listen(int fd, int backlog)
{
return (0 == listen(fd, backlog));
}
-
-
projects / ircu2.10.12-pk.git / blobdiff