diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/inspsocket.cpp | 10 | ||||
| -rw-r--r-- | src/socketengine.cpp | 27 |
2 files changed, 28 insertions, 9 deletions
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index ee5287e5f..db005b1a1 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -25,14 +25,6 @@ #include "inspircd.h" #include "iohook.h" -#ifndef DISABLE_WRITEV -#include <sys/uio.h> -#endif - -#ifndef IOV_MAX -#define IOV_MAX 1024 -#endif - BufferedSocket::BufferedSocket() { Timeout = NULL; @@ -348,7 +340,7 @@ void StreamSocket::DoWrite() iovecs[i].iov_len = sendq[i].length(); rv_max += sendq[i].length(); } - rv = writev(fd, iovecs, bufcount); + rv = SocketEngine::WriteV(this, iovecs, bufcount); } if (rv == (int)sendq_len) diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 1c91ccdea..eadfc73d3 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -224,6 +224,33 @@ int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flag return nbSent; } +int SocketEngine::WriteV(EventHandler* fd, const IOVector* iovec, int count) +{ + int sent = writev(fd->GetFd(), iovec, count); + if (sent > 0) + stats.Update(0, sent); + return sent; +} + +#ifdef _WIN32 +int SocketEngine::WriteV(EventHandler* fd, const iovec* iovec, int count) +{ + // On Windows the fields in iovec are not in the order required by the Winsock API; IOVector has + // the fields in the correct order. + // Create temporary IOVectors from the iovecs and pass them to the WriteV() method that accepts the + // platform's native struct. + IOVector wiovec[128]; + count = std::min(count, static_cast<int>(sizeof(wiovec) / sizeof(IOVector))); + + for (int i = 0; i < count; i++) + { + wiovec[i].iov_len = iovec[i].iov_len; + wiovec[i].iov_base = reinterpret_cast<char*>(iovec[i].iov_base); + } + return WriteV(fd, wiovec, count); +} +#endif + int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen) { int ret = connect(fd->GetFd(), serv_addr, addrlen); |