From 14db93e7cfd4f434731305ef6e8832880f642fc5 Mon Sep 17 00:00:00 2001 From: danieldg Date: Tue, 16 Jun 2009 04:02:21 +0000 Subject: Fix sockaddr length argument, BSD will complain if it doesn't exactly match the expected size git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11414 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/socket.h | 6 ++++++ src/inspsocket.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/socket.h b/include/socket.h index c7b87d583..ddd453ac3 100644 --- a/include/socket.h +++ b/include/socket.h @@ -143,6 +143,12 @@ namespace irc */ CoreExport int OpenTCPSocket(const char* addr, int socktype = SOCK_STREAM); + /** Return the size of the structure for syscall passing */ + int sa_size(irc::sockets::sockaddrs& sa) + { + return sa.sa.sa_family == AF_INET ? sizeof(sa.in4) : sizeof(sa.in6); + } + /** Convert an address-port pair into a binary sockaddr * @param addr The IP address, IPv4 or IPv6 * @param port The port, 0 for unspecified diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 41bce84a7..7718fe70a 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -238,7 +238,7 @@ bool BufferedSocket::DoConnect(unsigned long maxtime) ServerInstance->SE->NonBlocking(this->fd); - if (ServerInstance->SE->Connect(this, &addr.sa, sizeof(addr)) == -1) + if (ServerInstance->SE->Connect(this, &addr.sa, sa_size(addr)) == -1) { if (errno != EINPROGRESS) { -- cgit v1.2.3