Fix conversion issues by replacing ConvToInt with ConvToNum<T>.

[user/henk/code/inspircd.git] / src / socketengine.cpp

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 58e15af4444bcc936fc353ed164687c3e0ed947f..df6ff5a0206d0471b41d962ffe115a9add91ab1f 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -66,11 +66,14 @@ void EventHandler::OnEventHandlerError(int errornum)
 void SocketEngine::InitError()
 {
        std::cerr << con_red << "FATAL ERROR!" << con_reset << " Socket engine initialization failed. " << strerror(errno) << '.' << std::endl;
-       ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
+       exit(EXIT_STATUS_SOCKETENGINE);
 }
 
 void SocketEngine::LookupMaxFds()
 {
+#if defined _WIN32
+       MaxSetSize = FD_SETSIZE;
+#else
        struct rlimit limits;
        if (!getrlimit(RLIMIT_NOFILE, &limits))
                MaxSetSize = limits.rlim_cur;
@@ -82,6 +85,7 @@ void SocketEngine::LookupMaxFds()
 #endif
        if (!setrlimit(RLIMIT_NOFILE, &limits))
                MaxSetSize = limits.rlim_cur;
+#endif
 }
 
 void SocketEngine::ChangeEventMask(EventHandler* eh, int change)
@@ -244,9 +248,9 @@ int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
        return nbRecvd;
 }
 
-int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen)
+int SocketEngine::SendTo(EventHandler* fd, const void* buf, size_t len, int flags, const irc::sockets::sockaddrs& address)
 {
-       int nbSent = sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen);
+       int nbSent = sendto(fd->GetFd(), (const char*)buf, len, flags, &address.sa, address.sa_size());
        stats.UpdateWriteCounters(nbSent);
        return nbSent;
 }
@@ -277,9 +281,9 @@ int SocketEngine::WriteV(EventHandler* fd, const iovec* iovec, int count)
 }
 #endif
 
-int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen)
+int SocketEngine::Connect(EventHandler* fd, const irc::sockets::sockaddrs& address)
 {
-       int ret = connect(fd->GetFd(), serv_addr, addrlen);
+       int ret = connect(fd->GetFd(), &address.sa, address.sa_size());
 #ifdef _WIN32
        if ((ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEWOULDBLOCK))
                errno = EINPROGRESS;