X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=c426f16e696ea8bdc7b163e228ae05168045b14c;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=35feda01fcc1d33a3f799b5bdb1b2011ba69b3b3;hpb=50eebfeac8ebe501b021ebf62b0b01464fd79a21;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 35feda01f..c426f16e6 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -16,6 +16,7 @@
 #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
@@ -23,49 +24,15 @@
  */
 bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 {
-	/* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
-	sockaddr* servaddr = new sockaddr[2];
-	memset(servaddr,0,sizeof(sockaddr)*2);
-
-	int ret, size;
+	sockaddrs servaddr;
+	int ret;
 
 	if (*addr == '*')
 		addr = "";
 
-#ifdef IPV6
 	if (*addr)
 	{
-		/* There is an address here. Is it ipv6? */
-		if (strchr(addr,':'))
-		{
-			/* Yes it is */
-			in6_addr addy;
-			if (inet_pton(AF_INET6, addr, &addy) < 1)
-			{
-				delete[] servaddr;
-				return false;
-			}
-
-			((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
-			memcpy(&(((sockaddr_in6*)servaddr)->sin6_addr), &addy, sizeof(in6_addr));
-			((sockaddr_in6*)servaddr)->sin6_port = htons(port);
-			size = sizeof(sockaddr_in6);
-		}
-		else
-		{
-			/* No, its not */
-			in_addr addy;
-			if (inet_pton(AF_INET, addr, &addy) < 1)
-			{
-				delete[] servaddr;
-				return false;
-			}
-
-			((sockaddr_in*)servaddr)->sin_family = AF_INET;
-			((sockaddr_in*)servaddr)->sin_addr = addy;
-			((sockaddr_in*)servaddr)->sin_port = htons(port);
-			size = sizeof(sockaddr_in);
-		}
+		irc::sockets::aptosa(addr, port, &servaddr);
 	}
 	else
 	{
@@ -74,45 +41,27 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 			/* Port -1: Means UDP IPV4 port binding - Special case
 			 * used by DNS engine.
 			 */
-			((sockaddr_in*)servaddr)->sin_family = AF_INET;
-			((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
-			((sockaddr_in*)servaddr)->sin_port = 0;
-			size = sizeof(sockaddr_in);
+			servaddr.in4.sin_family = AF_INET;
+			servaddr.in4.sin_addr.s_addr = htonl(INADDR_ANY);
+			servaddr.in4.sin_port = 0;
 		}
 		else
 		{
-			/* Theres no address here, default to ipv6 bind to all */
-			((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
-			memset(&(((sockaddr_in6*)servaddr)->sin6_addr), 0, sizeof(in6_addr));
-			((sockaddr_in6*)servaddr)->sin6_port = htons(port);
-			size = sizeof(sockaddr_in6);
-		}
-	}
+			/* No address */
+#ifdef IPV6
+			/* Default to ipv6 bind to all */
+			servaddr.in6.sin6_family = AF_INET6;
+			servaddr.in6.sin6_port = htons(port);
+			memset(&servaddr.in6.sin6_addr, 0, sizeof(servaddr.in6.sin6_addr));
 #else
-	/* If we aren't built with ipv6, the choice becomes simple */
-	((sockaddr_in*)servaddr)->sin_family = AF_INET;
-	if (*addr)
-	{
-		/* There is an address here. */
-		in_addr addy;
-		if (inet_pton(AF_INET, addr, &addy) < 1)
-		{
-			delete[] servaddr;
-			return false;
+			/* Bind ipv4 to all */
+			servaddr.in4.sin_family = AF_INET;
+			servaddr.in4.sin_addr.s_addr = htonl(INADDR_ANY);
+			servaddr.in4.sin_port = htons(port);
+#endif
 		}
-		((sockaddr_in*)servaddr)->sin_addr = addy;
-	}
-	else
-	{
-		/* Bind ipv4 to all */
-		((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
 	}
-	/* Bind ipv4 port number */
-	((sockaddr_in*)servaddr)->sin_port = htons(port);
-	size = sizeof(sockaddr_in);
-#endif
-	ret = SE->Bind(sockfd, servaddr, size);
-	delete[] servaddr;
+	ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr));
 
 	if (ret < 0)
 	{
@@ -149,37 +98,36 @@ int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
 	int on = 1;
 	addr = addr;
 	struct linger linger = { 0, 0 };
-#ifdef IPV6
 	if (!*addr)
 	{
+#ifdef IPV6
 		sockfd = socket (PF_INET6, socktype, 0);
 		if (sockfd < 0)
+#endif
 			sockfd = socket (PF_INET, socktype, 0);
 	}
 	else if (strchr(addr,':'))
 		sockfd = socket (PF_INET6, socktype, 0);
 	else
 		sockfd = socket (PF_INET, socktype, 0);
+
 	if (sockfd < 0)
-#else
-	if ((sockfd = socket (PF_INET, socktype, 0)) < 0)
-#endif
 	{
 		return ERROR;
 	}
 	else
 	{
-		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
+		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &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, (char*)&linger,sizeof(linger));
+		setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
 		return (sockfd);
 	}
 }
 
 // XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t
-int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
+int InspIRCd::BindPorts(FailedPortList &failed_ports)
 {
 	char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
 	int bound = 0;
@@ -190,11 +138,11 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 	for (std::vector<ListenSocketBase *>::iterator o = ports.begin(); o != 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++)
+	for (int count = 0; count < Config->ConfValueEnum("bind"); count++)
 	{
-		Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
-		Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
-		Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
+		Config->ConfValue("bind", "port", count, configToken, MAXBUF);
+		Config->ConfValue("bind", "address", count, Addr, MAXBUF);
+		Config->ConfValue("bind", "type", count, Type, MAXBUF);
 
 		if (strncmp(Addr, "::ffff:", 7) == 0)
 			this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
@@ -237,7 +185,6 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 					{
 						failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
 					}
-					ports_found++;
 				}
 			}
 		}
@@ -264,19 +211,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 	return bound;
 }
 
-const char* irc::sockets::insp_ntoa(insp_inaddr n)
-{
-	static char buf[1024];
-	inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
-	return buf;
-}
-
-int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
-{
-	return inet_pton(AF_FAMILY, a, n);
-}
-
-int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
 {
 	memset(sa, 0, sizeof(*sa));
 	if (!addr || !*addr)
@@ -305,7 +240,7 @@ int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa
 	return false;
 }
 
-int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
+bool irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
 	char addrv[INET6_ADDRSTRLEN+1];
 	if (sa->sa.sa_family == AF_INET)
 	{