X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=91c7cdeca8aa9943a5b0d98bfd7b616994d2523a;hb=b76ff64daeeb1e1081cff93c611f730e5b1b051e;hp=9ec7544f24f67ae440c295d72804b0589da12cf0;hpb=c68baddf6cf05e22dd25a563e35b1e4533ee7047;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 9ec7544f2..91c7cdeca 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -22,59 +22,6 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "socketengine.h"
-using irc::sockets::sockaddrs;
-
-/** This will bind a socket to a port. It works for UDP/TCP.
- * It can only bind to IP addresses, if you wish to bind to hostnames
- * you should first resolve them using class 'Resolver'.
- */
-bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
-{
-	sockaddrs servaddr;
-	int ret;
-
-	if ((*addr == '*' || *addr == '\0') && port == -1)
-	{
-		/* Port -1: Means UDP IPV4 port binding - Special case
-		 * used by DNS engine.
-		 */
-		memset(&servaddr, 0, sizeof(servaddr));
-		servaddr.in4.sin_family = AF_INET;
-	}
-	else if (!irc::sockets::aptosa(addr, port, servaddr))
-		return false;
-
-	ret = SE->Bind(sockfd, servaddr);
-
-	if (ret < 0)
-	{
-		return false;
-	}
-	else
-	{
-		if (dolisten)
-		{
-			if (SE->Listen(sockfd, Config->MaxConn) == -1)
-			{
-				this->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s",strerror(errno));
-				return false;
-			}
-			else
-			{
-				this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d with listen: %s:%d", sockfd, addr, port);
-				SE->NonBlocking(sockfd);
-				return true;
-			}
-		}
-		else
-		{
-			this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d without listen: %s:%d", sockfd, addr, port);
-			return true;
-		}
-	}
-}
 
 int InspIRCd::BindPorts(FailedPortList &failed_ports)
 {
@@ -98,14 +45,15 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
 			irc::sockets::sockaddrs bindspec;
 			if (!irc::sockets::aptosa(Addr, portno, bindspec))
 				continue;
-			std::string bind_readable = bindspec.str();
 
 			bool skip = false;
 			for (std::vector<ListenSocket*>::iterator n = old_ports.begin(); n != old_ports.end(); ++n)
 			{
-				if ((**n).bind_desc == bind_readable)
+				if ((**n).bind_sa == bindspec)
 				{
 					(*n)->bind_tag = tag; // Replace tag, we know addr and port match, but other info (type, ssl) may not
+					(*n)->ResetIOHookProvider();
+
 					skip = true;
 					old_ports.erase(n);
 					break;
@@ -122,7 +70,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
 				}
 				else
 				{
-					failed_ports.push_back(std::make_pair(bind_readable, strerror(errno)));
+					failed_ports.push_back(std::make_pair(bindspec, errno));
 					delete ll;
 				}
 			}
@@ -141,7 +89,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
 		}
 
 		this->Logs->Log("SOCKET", LOG_DEFAULT, "Port binding %s was removed from the config file, closing.",
-			(**n).bind_desc.c_str());
+			(**n).bind_sa.str().c_str());
 		delete *n;
 
 		// this keeps the iterator valid, pointing to the next element
@@ -197,41 +145,32 @@ std::string irc::sockets::sockaddrs::addr() const
 	char addrv[INET6_ADDRSTRLEN+1];
 	if (sa.sa_family == AF_INET)
 	{
-		if (!inet_ntop(AF_INET, &in4.sin_addr, addrv, sizeof(addrv)))
+		if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, addrv, sizeof(addrv)))
 			return "";
 		return addrv;
 	}
 	else if (sa.sa_family == AF_INET6)
 	{
-		if (!inet_ntop(AF_INET6, &in6.sin6_addr, addrv, sizeof(addrv)))
+		if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, addrv, sizeof(addrv)))
 			return "";
 		return addrv;
 	}
 	return "";
 }
 
-bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port)
-{
-	port = sa.port();
-	addr = sa.addr();
-	return !addr.empty();
-}
-
-static const char all_zero[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 };
-
 std::string irc::sockets::sockaddrs::str() const
 {
 	if (sa.sa_family == AF_INET)
 	{
 		char ipaddr[INET_ADDRSTRLEN];
-		inet_ntop(AF_INET, &in4.sin_addr, ipaddr, sizeof(ipaddr));
+		inet_ntop(AF_INET, (void*)&in4.sin_addr, ipaddr, sizeof(ipaddr));
 		return InspIRCd::Format("%s:%u", ipaddr, ntohs(in4.sin_port));
 	}
 
 	if (sa.sa_family == AF_INET6)
 	{
 		char ipaddr[INET6_ADDRSTRLEN];
-		inet_ntop(AF_INET6, &in6.sin6_addr, ipaddr, sizeof(ipaddr));
+		inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ipaddr, sizeof(ipaddr));
 		return InspIRCd::Format("[%s]:%u", ipaddr, ntohs(in6.sin6_port));
 	}
 
@@ -262,35 +201,41 @@ bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) c
 static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, int range)
 {
 	const unsigned char* base;
+	unsigned char target_byte;
 	cidr.type = sa.sa.sa_family;
+
+	memset(cidr.bits, 0, sizeof(cidr.bits));
+
 	if (cidr.type == AF_INET)
 	{
+		target_byte = sizeof(sa.in4.sin_addr);
 		base = (unsigned char*)&sa.in4.sin_addr;
 		if (range > 32)
 			range = 32;
 	}
 	else if (cidr.type == AF_INET6)
 	{
+		target_byte = sizeof(sa.in6.sin6_addr);
 		base = (unsigned char*)&sa.in6.sin6_addr;
 		if (range > 128)
 			range = 128;
 	}
 	else
 	{
-		base = (unsigned char*)"";
-		range = 0;
+		cidr.length = 0;
+		return;
 	}
 	cidr.length = range;
 	unsigned int border = range / 8;
 	unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF;
-	for(unsigned int i=0; i < 16; i++)
+	for(unsigned int i=0; i < target_byte; i++)
 	{
 		if (i < border)
 			cidr.bits[i] = base[i];
 		else if (i == border)
 			cidr.bits[i] = base[i] & bitmask;
 		else
-			cidr.bits[i] = 0;
+			return;
 	}
 }
 
@@ -361,4 +306,3 @@ bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const
 	irc::sockets::cidr_mask tmp(addr, length);
 	return tmp == *this;
 }
-