X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=9186f2c8c9ce88b78b0314a6357ccf763c39fcd0;hb=635cb9d65f6d7f6758ae8ed874da00c8d94b6e39;hp=58e15af4444bcc936fc353ed164687c3e0ed947f;hpb=d23c030c9a8fd58807438245a004e4aa5b7288ba;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 58e15af44..9186f2c8c 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -1,11 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007 Burlex <???@???>
+ *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014 Adam <Adam@anope.org>
+ *   Copyright (C) 2012, 2014-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008, 2017 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 burlex <burlex@e03df62e-2008-0410-955e-edbf42e46eb7>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -50,6 +55,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;
@@ -66,11 +77,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 +96,7 @@ void SocketEngine::LookupMaxFds()
 #endif
 	if (!setrlimit(RLIMIT_NOFILE, &limits))
 		MaxSetSize = limits.rlim_cur;
+#endif
 }
 
 void SocketEngine::ChangeEventMask(EventHandler* eh, int change)
@@ -165,11 +180,7 @@ EventHandler* SocketEngine::GetRef(int fd)
 
 bool SocketEngine::BoundsCheckFd(EventHandler* eh)
 {
-	if (!eh)
-		return false;
-	if (eh->GetFd() < 0)
-		return false;
-	return true;
+	return eh && eh->HasFd();
 }
 
 
@@ -244,9 +255,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 +288,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;