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

diff --git a/src/socket.cpp b/src/socket.cpp
index 35feda01f..d18a8f5bc 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -179,7 +179,7 @@ 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;
@@ -190,11 +190,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 +237,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++;
 				}
 			}
 		}