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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index bac97a6dc..f447fded8 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -21,8 +21,11 @@
  */
 
 
+#include "exitcodes.h"
 #include "inspircd.h"
 
+#include <iostream>
+
 /** Reference table, contains all current handlers
  **/
 std::vector<EventHandler*> SocketEngine::ref;
@@ -47,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;
@@ -60,8 +69,17 @@ void EventHandler::OnEventHandlerError(int errornum)
 {
 }
 
+void SocketEngine::InitError()
+{
+	std::cerr << con_red << "FATAL ERROR!" << con_reset << " Socket engine initialization failed. " << strerror(errno) << '.' << std::endl;
+	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;
@@ -73,6 +91,7 @@ void SocketEngine::LookupMaxFds()
 #endif
 	if (!setrlimit(RLIMIT_NOFILE, &limits))
 		MaxSetSize = limits.rlim_cur;
+#endif
 }
 
 void SocketEngine::ChangeEventMask(EventHandler* eh, int change)
@@ -235,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;
 }
@@ -268,9 +287,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;