From 5a378e8954717c19deaa618fc326164680383505 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Mon, 28 Aug 2017 19:28:53 +0100 Subject: Change FailedPortList to store a sockaddrs/int instead of string. --- src/configreader.cpp | 3 +-- src/inspircd.cpp | 2 +- src/socket.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/configreader.cpp b/src/configreader.cpp index 696035a74..cc478b9b6 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -615,8 +615,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) int j = 1; for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) { - errstr << j << ".\tAddress: " << (i->first.empty() ? "" : i->first.c_str()) << "\tReason: " - << i->second << std::endl; + errstr << j << ".\tAddress: " << i->first.str() << "\tReason: " << strerror(i->second) << std::endl; } } } diff --git a/src/inspircd.cpp b/src/inspircd.cpp index a3be309bf..bc0875502 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -437,7 +437,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : int j = 1; for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) { - std::cout << j << ".\tAddress: " << (i->first.empty() ? "" : i->first) << " \tReason: " << i->second << std::endl; + std::cout << j << ".\tAddress: " << i->first.str() << " \tReason: " << strerror(i->second) << std::endl; } std::cout << std::endl << "Hint: Try using a public IP instead of blank or *" << std::endl; diff --git a/src/socket.cpp b/src/socket.cpp index a5c1c679a..91c7cdeca 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -70,7 +70,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports) } else { - failed_ports.push_back(std::make_pair(bindspec.str(), strerror(errno))); + failed_ports.push_back(std::make_pair(bindspec, errno)); delete ll; } } -- cgit v1.3.1-10-gc9f91