X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=f447fded84bb6b6806c22ec2535ba98bfc306a41;hb=5a2af6ded883d71c6c4c9f1497cca1721f8b0742;hp=e02261badd6446dfe4cc998f3ab3f80d15023002;hpb=b18e6b5556f2deedf6ebf154477c4d69dcf02638;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index e02261bad..f447fded8 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -50,6 +50,12 @@ EventHandler::EventHandler()
 	event_mask = 0;
 }
 
+void EventHandler::SwapInternals(EventHandler& other)
+{
+	std::swap(fd, other.fd);
+	std::swap(event_mask, other.event_mask);
+}
+
 void EventHandler::SetFd(int FD)
 {
 	this->fd = FD;
@@ -71,6 +77,9 @@ void SocketEngine::InitError()
 
 void SocketEngine::LookupMaxFds()
 {
+#if defined _WIN32
+	MaxSetSize = FD_SETSIZE;
+#else
 	struct rlimit limits;
 	if (!getrlimit(RLIMIT_NOFILE, &limits))
 		MaxSetSize = limits.rlim_cur;
@@ -82,6 +91,7 @@ void SocketEngine::LookupMaxFds()
 #endif
 	if (!setrlimit(RLIMIT_NOFILE, &limits))
 		MaxSetSize = limits.rlim_cur;
+#endif
 }
 
 void SocketEngine::ChangeEventMask(EventHandler* eh, int change)
@@ -244,9 +254,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;
 }