X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=6133d9ee4d2d435966c35af8f8d7b26c31d0990b;hb=1dca8b79edf65c0e5e846cc120f1321fb0a1d15c;hp=17f13bb8a22c22a47fc7e752a30b406b39bcce41;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 17f13bb8a..6133d9ee4 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -45,12 +45,11 @@ 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();
@@ -71,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;
 				}
 			}
@@ -90,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
@@ -146,39 +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();
-}
-
 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));
 	}
 
@@ -186,7 +178,7 @@ std::string irc::sockets::sockaddrs::str() const
 	return "<unknown>";
 }
 
-int irc::sockets::sockaddrs::sa_size() const
+socklen_t irc::sockets::sockaddrs::sa_size() const
 {
 	if (sa.sa_family == AF_INET)
 		return sizeof(in4);
@@ -206,7 +198,7 @@ bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) c
 	return !memcmp(this, &other, sizeof(*this));
 }
 
-static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, int range)
+static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, unsigned char range)
 {
 	const unsigned char* base;
 	unsigned char target_byte;
@@ -247,7 +239,7 @@ static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs
 	}
 }
 
-irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, int range)
+irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, unsigned char range)
 {
 	sa2cidr(*this, sa, range);
 }
@@ -275,7 +267,7 @@ std::string irc::sockets::cidr_mask::str() const
 	irc::sockets::sockaddrs sa;
 	sa.sa.sa_family = type;
 	unsigned char* base;
-	int len;
+	size_t len;
 	if (type == AF_INET)
 	{
 		base = (unsigned char*)&sa.in4.sin_addr;