1 files changed, 16 insertions, 70 deletions

diff --git a/src/socket.cpp b/src/socket.cpp
index e73d01af9..17f13bb8a 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",DEFAULT,"ERROR in listen(): %s",strerror(errno));
-				return false;
-			}
-			else
-			{
-				this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
-				SE->NonBlocking(sockfd);
-				return true;
-			}
-		}
-		else
-		{
-			this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
-			return true;
-		}
-	}
-}
 
 int InspIRCd::BindPorts(FailedPortList &failed_ports)
 {
@@ -89,7 +36,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
 		std::string Addr = tag->getString("address");
 
 		if (strncasecmp(Addr.c_str(), "::ffff:", 7) == 0)
-			this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
+			this->Logs->Log("SOCKET", LOG_DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
 
 		irc::portparser portrange(porttag, false);
 		int portno = -1;
@@ -106,6 +53,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;
@@ -136,11 +85,11 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
 			n++;
 		if (n == ports.end())
 		{
-			this->Logs->Log("SOCKET",DEFAULT,"Port bindings slipped out of vector, aborting close!");
+			this->Logs->Log("SOCKET", LOG_DEFAULT, "Port bindings slipped out of vector, aborting close!");
 			break;
 		}
 
-		this->Logs->Log("SOCKET",DEFAULT, "Port binding %s was removed from the config file, closing.",
+		this->Logs->Log("SOCKET", LOG_DEFAULT, "Port binding %s was removed from the config file, closing.",
 			(**n).bind_desc.c_str());
 		delete *n;
 
@@ -219,24 +168,22 @@ bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr,
 
 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
@@ -367,4 +314,3 @@ bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const
 	irc::sockets::cidr_mask tmp(addr, length);
 	return tmp == *this;
 }
-