X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=b28414d4a7960073cc605f3e1d05d12f147ac7c9;hb=b7e299c2e10d915d5e59df4cb3f54951c8daa999;hp=a828d1ece8d4d5b943ebf74d19ed22f7f2088381;hpb=bfcaef8623bb3f8faf1141eb7b3805ab75ae97dd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index a828d1ece..b28414d4a 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <string>
 #include "configreader.h"
 #include "socket.h"
-#include "inspircd.h"
 #include "socketengine.h"
 #include "wildcard.h"
 
@@ -25,7 +25,7 @@ using namespace irc::sockets;
  * ((-1) << (8 - (mask % 8)))
  * But imho, it sucks in comparison to a nice neat lookup table.
  */
-const char inverted_bits[8] = {	0x00, /* 00000000 - 0 bits - never actually used */
+const unsigned char inverted_bits[8] = {	0x00, /* 00000000 - 0 bits - never actually used */
 				0x80, /* 10000000 - 1 bits */
 				0xC0, /* 11000000 - 2 bits */
 				0xE0, /* 11100000 - 3 bits */
@@ -47,10 +47,8 @@ ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerIns
 		if ((!*addr) || (strchr(addr,':')))
 			this->family = AF_INET6;
 		else
-			this->family = AF_INET;
-#else
-		this->family = AF_INET;
 #endif
+		this->family = AF_INET;
 		Instance->SE->AddFd(this);
 	}
 }
@@ -81,17 +79,17 @@ void ListenSocket::HandleEvent(EventType et, int errornum)
 		length = sizeof(sockaddr_in6);
 	}
 	else
+#endif
 	{
 		uslen = sizeof(sockaddr_in);
 		length = sizeof(sockaddr_in);
 	}
-#else
-	uslen = sizeof(sockaddr_in);
-	length = sizeof(sockaddr_in);
-#endif
-	incomingSockfd = accept (this->GetFd(), (sockaddr*)client, &length);
 
-	if ((incomingSockfd > -1) && (!getsockname(incomingSockfd, sock_us, &uslen)))
+	void* m_acceptEvent = NULL;
+	GetExt("windows_acceptevent", m_acceptEvent);
+	incomingSockfd = _accept (this->GetFd(), (sockaddr*)client, &length);
+
+	if ((incomingSockfd > -1) && (!_getsockname(incomingSockfd, sock_us, &uslen)))
 	{
 		char buf[MAXBUF];
 #ifdef IPV6
@@ -101,14 +99,12 @@ void ListenSocket::HandleEvent(EventType et, int errornum)
 			in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
 		}
 		else
+#endif
 		{
 			inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
 			in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
 		}
-#else
-		inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
-		in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
-#endif
+
 		NonBlocking(incomingSockfd);
 		if (ServerInstance->Config->GetIOHook(in_port))
 		{
@@ -303,14 +299,24 @@ bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool ma
 
 void irc::sockets::Blocking(int s)
 {
+#ifndef WIN32
 	int flags = fcntl(s, F_GETFL, 0);
 	fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
+#else
+	unsigned long opt = 0;
+	ioctlsocket(s, FIONBIO, &opt);
+#endif
 }
 
 void irc::sockets::NonBlocking(int s)
 {
+#ifndef WIN32
 	int flags = fcntl(s, F_GETFL, 0);
 	fcntl(s, F_SETFL, flags | O_NONBLOCK);
+#else
+	unsigned long opt = 1;
+	ioctlsocket(s, FIONBIO, &opt);
+#endif
 }
 
 /** This will bind a socket to a port. It works for UDP/TCP.
@@ -458,20 +464,25 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype)
 	}
 	else
 	{
-		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
 		/* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
 		linger.l_onoff = 1;
 		linger.l_linger = 1;
-		setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger,sizeof(linger));
+		setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger,sizeof(linger));
 		return (sockfd);
 	}
 }
 
-/* XXX: Probably belongs in class InspIRCd */
 int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
 {
 	char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
 	int bound = 0;
+	bool started_with_nothing = (Config->ports.size() == 0);
+	std::vector<std::pair<std::string, int> > old_ports;
+
+	/* XXX: Make a copy of the old ip/port pairs here */
+	for (std::vector<ListenSocket*>::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o)
+		old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort()));
 
 	for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
 	{
@@ -490,8 +501,21 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port
 
 				bool skip = false;
 				for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+				{
 					if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
+					{
 						skip = true;
+						/* XXX: Here, erase from our copy of the list */
+						for (std::vector<std::pair<std::string, int> >::iterator k = old_ports.begin(); k != old_ports.end(); ++k)
+						{
+							if ((k->first == Addr) && (k->second == portno))
+							{
+								old_ports.erase(k);
+								break;
+							}
+						}
+					}
+				}
 				if (!skip)
 				{
 					ListenSocket* ll = new ListenSocket(this, portno, Addr);
@@ -509,6 +533,25 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port
 			}
 		}
 	}
+
+	/* XXX: Here, anything left in our copy list, close as removed */
+	if (!started_with_nothing)
+	{
+		for (size_t k = 0; k < old_ports.size(); ++k)
+		{
+			for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+			{
+				if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
+				{
+					this->Log(DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
+					delete *n;
+					Config->ports.erase(n);
+					break;
+				}
+			}
+		}
+	}
+
 	return bound;
 }