X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=ba35d2b0a632efa68f9677fcdfe7dec0004a8946;hb=146d85b5dea9ecb803a9a47c68b5489905634125;hp=12fb632a756598fbcf0284d248362c3b5c9387e7;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 12fb632a7..ba35d2b0a 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -46,7 +46,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 	else if (!irc::sockets::aptosa(addr, port, servaddr))
 		return false;
 
-	ret = SE->Bind(sockfd, servaddr);
+	ret = SocketEngine::Bind(sockfd, servaddr);
 
 	if (ret < 0)
 	{
@@ -56,7 +56,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 	{
 		if (dolisten)
 		{
-			if (SE->Listen(sockfd, Config->MaxConn) == -1)
+			if (SocketEngine::Listen(sockfd, Config->MaxConn) == -1)
 			{
 				this->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s",strerror(errno));
 				return false;
@@ -64,7 +64,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 			else
 			{
 				this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d with listen: %s:%d", sockfd, addr, port);
-				SE->NonBlocking(sockfd);
+				SocketEngine::NonBlocking(sockfd);
 				return true;
 			}
 		}
@@ -106,6 +106,8 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
 				if ((**n).bind_desc == bind_readable)
 				{
 					(*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;
@@ -221,24 +223,22 @@ 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
 {
-	char buffer[MAXBUF];
 	if (sa.sa_family == AF_INET)
 	{
-		const uint8_t* bits = reinterpret_cast<const uint8_t*>(&in4.sin_addr);
-		sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port));
+		char ipaddr[INET_ADDRSTRLEN];
+		inet_ntop(AF_INET, &in4.sin_addr, ipaddr, sizeof(ipaddr));
+		return InspIRCd::Format("%s:%u", ipaddr, ntohs(in4.sin_port));
 	}
-	else if (sa.sa_family == AF_INET6)
+
+	if (sa.sa_family == AF_INET6)
 	{
-		buffer[0] = '[';
-		if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10))
-			return "<unknown>"; // should never happen, buffer is large enough
-		int len = strlen(buffer);
-		// no need for snprintf, buffer has at least 9 chars left, max short len = 5
-		sprintf(buffer + len, "]:%u", ntohs(in6.sin6_port));
+		char ipaddr[INET6_ADDRSTRLEN];
+		inet_ntop(AF_INET6, &in6.sin6_addr, ipaddr, sizeof(ipaddr));
+		return InspIRCd::Format("[%s]:%u", ipaddr, ntohs(in6.sin6_port));
 	}
-	else
-		return "<unknown>";
-	return std::string(buffer);
+
+	// This should never happen.
+	return "<unknown>";
 }
 
 int irc::sockets::sockaddrs::sa_size() const
@@ -264,35 +264,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;
 	}
 }
 
@@ -363,4 +369,3 @@ bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const
 	irc::sockets::cidr_mask tmp(addr, length);
 	return tmp == *this;
 }
-