X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=7718fe70ae31bc7a5f054fdfacbe5953161d606b;hb=74a515a72f08fc85d8d59cb7207fba9ece51215f;hp=391d7fe82d4367b161a685a661a0ea76214ded98;hpb=349b6b91931f3e5ab03bf5ea085d1928c306afe2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 391d7fe82..7718fe70a 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -170,15 +170,15 @@ bool BufferedSocket::BindAddr(const std::string &ip_to_bind)
 {
 	ConfigReader Conf(this->ServerInstance);
 	bool v6 = false;
-#ifdef IPV6
-	/* Are we looking for a binding to fit an ipv6 host? */
-	if ((ip_to_bind.empty()) || (ip_to_bind.find(':') != std::string::npos))
-		v6 = true;
-#endif
 
 	// Case one: If they provided an IP, try bind it
 	if (!ip_to_bind.empty())
 	{
+#ifdef IPV6
+		// Check whether or not they are binding to an IPv6 IP..
+		if (ip_to_bind.find(':') != std::string::npos)
+			v6 = true;
+#endif
 		// And if it fails, don't do anything.
 		return this->DoBindMagic(ip_to_bind, v6);
 	}
@@ -192,6 +192,14 @@ bool BufferedSocket::BindAddr(const std::string &ip_to_bind)
 		// set current IP to the <bind> tag
 		std::string current_ip = Conf.ReadValue("bind","address",j);
 
+#ifdef IPV6
+		// Check whether this <bind> is for an ipv6 address
+		if (current_ip.find(':') != std::string::npos)
+			v6 = true;
+		else
+			v6 = false;
+#endif
+
 		// Make sure IP is nothing local
 		if (current_ip == "*" || current_ip == "127.0.0.1" || current_ip.empty() || current_ip == "::1")
 			continue;
@@ -209,86 +217,34 @@ bool BufferedSocket::BindAddr(const std::string &ip_to_bind)
 
 bool BufferedSocket::DoConnect(unsigned long maxtime)
 {
-	/* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
-	sockaddr* addr = new sockaddr[2];
-	socklen_t size = sizeof(sockaddr_in);
-#ifdef IPV6
-	bool v6 = false;
-	if ((!*this->host) || strchr(this->host, ':'))
-		v6 = true;
+	irc::sockets::sockaddrs addr;
+	irc::sockets::aptosa(this->host, this->port, &addr);
 
-	if (v6)
-	{
-		this->fd = socket(AF_INET6, SOCK_STREAM, 0);
-		if ((this->fd > -1) && ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP)))
-		{
-			if (!this->BindAddr(this->cbindip))
-			{
-				this->Close();
-				this->fd = -1;
-				delete[] addr;
-				return false;
-			}
-		}
-	}
-	else
-#endif
-	{
-		this->fd = socket(AF_INET, SOCK_STREAM, 0);
-		if (this->fd > -1)
-		{
-			if (!this->BindAddr(this->cbindip))
-			{
-				this->Close();
-				this->fd = -1;
-				delete[] addr;
-				return false;
-			}
-		}
-	}
+	this->fd = socket(addr.sa.sa_family, SOCK_STREAM, 0);
 
 	if (this->fd == -1)
 	{
 		this->state = I_ERROR;
 		this->OnError(I_ERR_SOCKET);
-		delete[] addr;
 		return false;
 	}
 
-#ifdef IPV6
-	if (v6)
-	{
-		in6_addr addy;
-		if (inet_pton(AF_INET6, this->host, &addy) > 0)
-		{
-			((sockaddr_in6*)addr)->sin6_family = AF_INET6;
-			memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy));
-			((sockaddr_in6*)addr)->sin6_port = htons(this->port);
-			size = sizeof(sockaddr_in6);
-		}
-	}
-	else
-#endif
+	if (!this->BindAddr(this->cbindip))
 	{
-		in_addr addy;
-		if (inet_aton(this->host, &addy) > 0)
-		{
-			((sockaddr_in*)addr)->sin_family = AF_INET;
-			((sockaddr_in*)addr)->sin_addr = addy;
-			((sockaddr_in*)addr)->sin_port = htons(this->port);
-		}
+		this->Close();
+		this->fd = -1;
+		return false;
 	}
 
 	ServerInstance->SE->NonBlocking(this->fd);
 
-	if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1)
+	if (ServerInstance->SE->Connect(this, &addr.sa, sa_size(addr)) == -1)
 	{
 		if (errno != EINPROGRESS)
 		{
 			this->OnError(I_ERR_CONNECT);
 			this->Close();
 			this->state = I_ERROR;
-			delete[] addr;
 			return false;
 		}
 
@@ -297,7 +253,6 @@ bool BufferedSocket::DoConnect(unsigned long maxtime)
 	}
 
 	this->state = I_CONNECTING;
-	delete[] addr;
 	if (this->fd > -1)
 	{
 		if (!this->ServerInstance->SE->AddFd(this))