aboutsummaryrefslogtreecommitdiff
path: root/src/socket.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-01-01 12:33:10 +0100
committerGravatar Sadie Powell2020-01-01 12:33:10 +0100
commitf856d5ab8af6a0ffd3e5f63a5711e256e8e74267 (patch)
tree941b8135b5183b1d1e48fe108aeaa5bff5678a14 /src/socket.cpp
parentGet rid of UserManager#OperCount and UserManager#UserCount. (diff)
parentUpdate my name and email address. (diff)
Merge branch 'insp3' into master.
Diffstat (limited to 'src/socket.cpp')
-rw-r--r--src/socket.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/socket.cpp b/src/socket.cpp
index 3e7f79756..ec7aba4a7 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -54,9 +54,9 @@ bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::
return true;
}
-int InspIRCd::BindPorts(FailedPortList& failed_ports)
+size_t InspIRCd::BindPorts(FailedPortList& failed_ports)
{
- int bound = 0;
+ size_t bound = 0;
std::vector<ListenSocket*> old_ports(ports.begin(), ports.end());
ConfigTagList tags = ServerInstance->Config->ConfTags("bind");
@@ -86,7 +86,7 @@ int InspIRCd::BindPorts(FailedPortList& failed_ports)
continue;
if (!BindPort(tag, bindspec, old_ports))
- failed_ports.push_back(std::make_pair(bindspec, errno));
+ failed_ports.push_back(FailedPort(errno, bindspec, tag));
else
bound++;
}
@@ -120,7 +120,7 @@ int InspIRCd::BindPorts(FailedPortList& failed_ports)
irc::sockets::untosa(fullpath, bindspec);
if (!BindPort(tag, bindspec, old_ports))
- failed_ports.push_back(std::make_pair(bindspec, errno));
+ failed_ports.push_back(FailedPort(errno, bindspec, tag));
else
bound++;
}