X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=1ec32742e8fa8bdab8e7017eac3a66df4059d042;hb=c11ec1cd3867fc6759fadb8143df676406b3e3e7;hp=6407b213f848bcfd5553019769034593ddbbf4b0;hpb=425fe205d0c22c3de0af6471f7c8900b70c69133;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 6407b213f..1ec32742e 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -28,7 +28,7 @@ BufferedSocket::BufferedSocket(InspIRCd* SI)
 	this->Timeout = NULL;
 	this->state = I_DISCONNECTED;
 	this->fd = -1;
-	this->Instance = SI;
+	this->ServerInstance = SI;
 }
 
 BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
@@ -37,40 +37,26 @@ BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
 	this->fd = newfd;
 	this->state = I_CONNECTED;
 	strlcpy(this->IP,ip,MAXBUF);
-	this->Instance = SI;
+	this->ServerInstance = SI;
 	if (this->fd > -1)
-		this->Instance->SE->AddFd(this);
+		this->ServerInstance->SE->AddFd(this);
 }
 
 BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
 {
 	this->cbindip = connectbindip;
 	this->fd = -1;
-	this->Instance = SI;
+	this->ServerInstance = SI;
 	strlcpy(host,ipaddr.c_str(),MAXBUF);
 	this->Timeout = NULL;
 
 	strlcpy(this->host,ipaddr.c_str(),MAXBUF);
 	this->port = aport;
 
-	bool ipvalid = true;
-#ifdef IPV6
-	if (strchr(host,':'))
+	irc::sockets::sockaddrs testaddr;
+	if (!irc::sockets::aptosa(host, aport, &testaddr))
 	{
-		in6_addr n;
-		if (inet_pton(AF_INET6, host, &n) < 1)
-			ipvalid = false;
-	}
-	else
-#endif
-	{
-		in_addr n;
-		if (inet_aton(host,&n) < 1)
-			ipvalid = false;
-	}
-	if (!ipvalid)
-	{
-		this->Instance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+		this->ServerInstance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
 		this->OnError(I_ERR_CONNECT);
 		this->Close();
 		this->fd = -1;
@@ -98,11 +84,30 @@ void BufferedSocket::SetQueues()
 	int recvbuf = 32768;
 	if(setsockopt(this->fd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(this->fd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf)))
 	{
-		//this->Instance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd());
+		//this->ServerInstance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd());
 		; // do nothing. I'm a little sick of people trying to interpret this message as a result of why their incorrect setups don't work.
 	}
 }
 
+bool BufferedSocket::DoBindMagic(const std::string &current_ip)
+{
+	irc::sockets::sockaddrs s;
+	if (!irc::sockets::aptosa(current_ip.c_str(), 0, &s))
+	{
+		errno = EADDRNOTAVAIL;
+		return false;
+	}
+
+	if (ServerInstance->SE->Bind(this->fd, &s.sa, sa_size(s)) < 0)
+	{
+		this->state = I_ERROR;
+		this->OnError(I_ERR_BIND);
+		return false;
+	}
+
+	return true;
+}
+
 /* Most irc servers require you to specify the ip you want to bind to.
  * If you dont specify an IP, they rather dumbly bind to the first IP
  * of the box (e.g. INADDR_ANY). In InspIRCd, we scan thought the IP
@@ -111,152 +116,65 @@ void BufferedSocket::SetQueues()
  * This is easier to configure when you have a lot of links and a lot
  * of servers to configure.
  */
-bool BufferedSocket::BindAddr(const std::string &ip)
+bool BufferedSocket::BindAddr(const std::string &ip_to_bind)
 {
-	ConfigReader Conf(this->Instance);
-	socklen_t size = sizeof(sockaddr_in);
-#ifdef IPV6
-	bool v6 = false;
-	/* Are we looking for a binding to fit an ipv6 host? */
-	if ((ip.empty()) || (ip.find(':') != std::string::npos))
-		v6 = true;
-#endif
-	int j = 0;
-	while (j < Conf.Enumerate("bind") || (!ip.empty()))
+	ConfigReader Conf(this->ServerInstance);
+
+	// Case one: If they provided an IP, try bind it
+	if (!ip_to_bind.empty())
 	{
-		std::string sIP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip;
-		if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers")
-		{
-			if (!ip.empty() || ((sIP != "*") && (sIP != "127.0.0.1") && (!sIP.empty()) && (sIP != "::1")))
-			{
-				/* 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* s = new sockaddr[2];
-#ifdef IPV6
-				if (v6)
-				{
-					in6_addr n;
-					if (inet_pton(AF_INET6, sIP.c_str(), &n) > 0)
-					{
-						memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(sockaddr_in6));
-						((sockaddr_in6*)s)->sin6_port = 0;
-						((sockaddr_in6*)s)->sin6_family = AF_INET6;
-						size = sizeof(sockaddr_in6);
-					}
-					else
-					{
-						delete[] s;
-						j++;
-						continue;
-					}
-				}
-				else
-#endif
-				{
-					in_addr n;
-					if (inet_aton(sIP.c_str(), &n) > 0)
-					{
-						((sockaddr_in*)s)->sin_addr = n;
-						((sockaddr_in*)s)->sin_port = 0;
-						((sockaddr_in*)s)->sin_family = AF_INET;
-					}
-					else
-					{
-						delete[] s;
-						j++;
-						continue;
-					}
-				}
+		// And if it fails, don't do anything.
+		return this->DoBindMagic(ip_to_bind);
+	}
 
-				if (Instance->SE->Bind(this->fd, s, size) < 0)
-				{
-					this->state = I_ERROR;
-					this->OnError(I_ERR_BIND);
-					this->fd = -1;
-					delete[] s;
-					return false;
-				}
+	for (int j = 0; j < Conf.Enumerate("bind"); j++)
+	{
+		// We only want to try bind to a server ip.
+		if (Conf.ReadValue("bind","type",j) != "servers")
+			continue;
 
-				delete[] s;
-				return true;
-			}
-		}
-		j++;
+		// set current IP to the <bind> tag
+		std::string current_ip = Conf.ReadValue("bind","address",j);
+
+		// Make sure IP is nothing local
+		if (current_ip == "*" || current_ip == "127.0.0.1" || current_ip.empty() || current_ip == "::1")
+			continue;
+
+		// Try bind, don't fail if it doesn't bind though.
+		if (this->DoBindMagic(current_ip))
+			return true;
 	}
-	Instance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
+
+	// NOTE: You may wonder WTF we are returning *true* here, but that is because there were no custom binds setup, and so we have nothing to do
+	// (remember, outgoing connections without binding are perfectly ok).
+	ServerInstance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
 	return true;
 }
 
 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;
-
-	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))
-			{
-				delete[] addr;
-				return false;
-			}
-		}
-	}
-	else
-#endif
-	{
-		this->fd = socket(AF_INET, SOCK_STREAM, 0);
-		if (this->fd > -1)
-		{
-			if (!this->BindAddr(this->cbindip))
-			{
-				delete[] addr;
-				return false;
-			}
-		}
-	}
+	irc::sockets::sockaddrs addr;
+	irc::sockets::aptosa(this->host, this->port, &addr);
+
+	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)
+	if (!this->BindAddr(this->cbindip))
 	{
-		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
-	{
-		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;
 	}
 
-	Instance->SE->NonBlocking(this->fd);
+	ServerInstance->SE->NonBlocking(this->fd);
 
-	if (Instance->SE->Connect(this, (sockaddr*)addr, size) == -1)
+	if (ServerInstance->SE->Connect(this, &addr.sa, sa_size(addr)) == -1)
 	{
 		if (errno != EINPROGRESS)
 		{
@@ -266,14 +184,14 @@ bool BufferedSocket::DoConnect(unsigned long maxtime)
 			return false;
 		}
 
-		this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, maxtime, this->Instance->Time());
-		this->Instance->Timers->AddTimer(this->Timeout);
+		this->Timeout = new SocketTimeout(this->GetFd(), this->ServerInstance, this, maxtime, this->ServerInstance->Time());
+		this->ServerInstance->Timers->AddTimer(this->Timeout);
 	}
 
 	this->state = I_CONNECTING;
 	if (this->fd > -1)
 	{
-		if (!this->Instance->SE->AddFd(this))
+		if (!this->ServerInstance->SE->AddFd(this))
 		{
 			this->OnError(I_ERR_NOMOREFDS);
 			this->Close();
@@ -283,7 +201,7 @@ bool BufferedSocket::DoConnect(unsigned long maxtime)
 		this->SetQueues();
 	}
 
-	Instance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
+	ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
 	return true;
 }
 
@@ -305,15 +223,15 @@ void BufferedSocket::Close()
 			}
 			catch (CoreException& modexcept)
 			{
-				Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+				ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 			}
 		}
-		Instance->SE->Shutdown(this, 2);
-		if (Instance->SE->Close(this) != -1)
+		ServerInstance->SE->Shutdown(this, 2);
+		if (ServerInstance->SE->Close(this) != -1)
 			this->OnClose();
 
-		if (Instance->SocketCull.find(this) == Instance->SocketCull.end())
-			Instance->SocketCull[this] = this;
+		if (ServerInstance->SocketCull.find(this) == ServerInstance->SocketCull.end())
+			ServerInstance->SocketCull[this] = this;
 	}
 	errno = save;
 }
@@ -325,11 +243,11 @@ std::string BufferedSocket::GetIP()
 
 const char* BufferedSocket::Read()
 {
-	if (!Instance->SE->BoundsCheckFd(this))
+	if (!ServerInstance->SE->BoundsCheckFd(this))
 		return NULL;
 
 	int n = 0;
-	char* ReadBuffer = Instance->GetReadBuffer();
+	char* ReadBuffer = ServerInstance->GetReadBuffer();
 
 	if (this->GetIOHook())
 	{
@@ -337,11 +255,11 @@ const char* BufferedSocket::Read()
 		int MOD_RESULT = 0;
 		try
 		{
-			MOD_RESULT = this->GetIOHook()->OnRawSocketRead(this->fd, ReadBuffer, Instance->Config->NetBufferSize, result2);
+			MOD_RESULT = this->GetIOHook()->OnRawSocketRead(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, result2);
 		}
 		catch (CoreException& modexcept)
 		{
-			Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 		}
 		if (MOD_RESULT < 0)
 		{
@@ -355,7 +273,7 @@ const char* BufferedSocket::Read()
 	}
 	else
 	{
-		n = recv(this->fd, ReadBuffer, Instance->Config->NetBufferSize, 0);
+		n = recv(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
 	}
 
 	/*
@@ -397,7 +315,7 @@ void BufferedSocket::Write(const std::string &data)
 	outbuffer.push_back(data);
 
 	/* Mark ourselves as wanting write */
-	this->Instance->SE->WantWrite(this);
+	this->ServerInstance->SE->WantWrite(this);
 }
 
 bool BufferedSocket::FlushWriteBuffer()
@@ -419,7 +337,7 @@ bool BufferedSocket::FlushWriteBuffer()
 				}
 				catch (CoreException& modexcept)
 				{
-					Instance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 					return true;
 				}
 			}
@@ -432,7 +350,7 @@ bool BufferedSocket::FlushWriteBuffer()
 			while (outbuffer.size() && (errno != EAGAIN))
 			{
 				/* Send a line */
-				int result = Instance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0);
+				int result = ServerInstance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0);
 
 				if (result > 0)
 				{
@@ -459,7 +377,7 @@ bool BufferedSocket::FlushWriteBuffer()
 				}
 				else if (result == 0)
 				{
-					this->Instance->SE->DelFd(this);
+					this->ServerInstance->SE->DelFd(this);
 					this->Close();
 					return true;
 				}
@@ -467,7 +385,7 @@ bool BufferedSocket::FlushWriteBuffer()
 				{
 					this->OnError(I_ERR_WRITE);
 					this->state = I_ERROR;
-					this->Instance->SE->DelFd(this);
+					this->ServerInstance->SE->DelFd(this);
 					this->Close();
 					return true;
 				}
@@ -477,7 +395,7 @@ bool BufferedSocket::FlushWriteBuffer()
 
 	if ((errno == EAGAIN) && (fd > -1))
 	{
-		this->Instance->SE->WantWrite(this);
+		this->ServerInstance->SE->WantWrite(this);
 	}
 
 	return (fd < 0);
@@ -521,14 +439,14 @@ bool BufferedSocket::InternalMarkConnected()
 
 	if (this->GetIOHook())
 	{
-		Instance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
+		ServerInstance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
 		try
 		{
 			this->GetIOHook()->OnRawSocketConnect(this->fd);
 		}
 		catch (CoreException& modexcept)
 		{
-			Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			ServerInstance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 			return false;
 		}
 	}
@@ -562,7 +480,7 @@ BufferedSocket::~BufferedSocket()
 	this->Close();
 	if (Timeout)
 	{
-		Instance->Timers->DelTimer(Timeout);
+		ServerInstance->Timers->DelTimer(Timeout);
 		Timeout = NULL;
 	}
 }
@@ -591,8 +509,8 @@ void BufferedSocket::HandleEvent(EventType et, int errornum)
 					break;
 			}
 
-			if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
-				this->Instance->SocketCull[this] = this;
+			if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+				this->ServerInstance->SocketCull[this] = this;
 			return;
 			break;
 		}
@@ -600,8 +518,8 @@ void BufferedSocket::HandleEvent(EventType et, int errornum)
 		{
 			if (!this->OnDataReady())
 			{
-				if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
-					this->Instance->SocketCull[this] = this;
+				if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+					this->ServerInstance->SocketCull[this] = this;
 				return;
 			}
 			break;
@@ -612,8 +530,8 @@ void BufferedSocket::HandleEvent(EventType et, int errornum)
 			{
 				if (!this->InternalMarkConnected())
 				{
-					if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
-						this->Instance->SocketCull[this] = this;
+					if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+						this->ServerInstance->SocketCull[this] = this;
 					return;
 				}
 				return;
@@ -622,8 +540,8 @@ void BufferedSocket::HandleEvent(EventType et, int errornum)
 			{
 				if (!this->OnWriteReady())
 				{
-					if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
-						this->Instance->SocketCull[this] = this;
+					if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+						this->ServerInstance->SocketCull[this] = this;
 					return;
 				}
 			}