X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=d18a8f5bc97c81c29fa053a04715d8ec2b4dbaa7;hb=6cfd6ad816d597a88abcbe6c6dc9d3e507aa539c;hp=cdf62432165e29ff2a6d6e2ec5c78353e3d8e3b4;hpb=5fc80b5ad45fd3b70ad54dc72f721ef5bf2a0ed1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index cdf624321..d18a8f5bc 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -179,22 +179,22 @@ int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
 }
 
 // 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;
-	bool started_with_nothing = (Config->ports.size() == 0);
+	bool started_with_nothing = (ports.size() == 0);
 	std::vector<std::pair<std::string, int> > old_ports;
 
 	/* XXX: Make a copy of the old ip/port pairs here */
-	for (std::vector<ListenSocketBase *>::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o)
+	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.");
@@ -209,7 +209,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 					*Addr = 0;
 
 				bool skip = false;
-				for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+				for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
 				{
 					if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
 					{
@@ -231,13 +231,12 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 					if (ll->GetFd() > -1)
 					{
 						bound++;
-						Config->ports.push_back(ll);
+						ports.push_back(ll);
 					}
 					else
 					{
 						failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
 					}
-					ports_found++;
 				}
 			}
 		}
@@ -248,13 +247,13 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 	{
 		for (size_t k = 0; k < old_ports.size(); ++k)
 		{
-			for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+			for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
 			{
 				if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
 				{
 					this->Logs->Log("SOCKET",DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
 					delete *n;
-					Config->ports.erase(n);
+					ports.erase(n);
 					break;
 				}
 			}