ListenThread now reports the protocol used (IPv4 - IPv6) in its error messages
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1322 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
parent
a4963b69ef
commit
025ee983d4
@ -108,8 +108,8 @@ bool cListenThread::CreateSockets(const AString & a_PortsString)
|
|||||||
const char * FamilyStr = "";
|
const char * FamilyStr = "";
|
||||||
switch (m_Family)
|
switch (m_Family)
|
||||||
{
|
{
|
||||||
case cSocket::IPv4: FamilyStr = "IPv4: "; break;
|
case cSocket::IPv4: FamilyStr = "IPv4"; break;
|
||||||
case cSocket::IPv6: FamilyStr = "IPv6: "; break;
|
case cSocket::IPv6: FamilyStr = "IPv6"; break;
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT(!"Unknown address family");
|
ASSERT(!"Unknown address family");
|
||||||
@ -122,13 +122,13 @@ bool cListenThread::CreateSockets(const AString & a_PortsString)
|
|||||||
int Port = atoi(itr->c_str());
|
int Port = atoi(itr->c_str());
|
||||||
if ((Port <= 0) || (Port > 65535))
|
if ((Port <= 0) || (Port > 65535))
|
||||||
{
|
{
|
||||||
LOGWARNING("Invalid port specified: \"%s\".", itr->c_str());
|
LOGWARNING("%s: Invalid port specified: \"%s\".", FamilyStr, itr->c_str());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
m_Sockets.push_back(cSocket::CreateSocket(m_Family));
|
m_Sockets.push_back(cSocket::CreateSocket(m_Family));
|
||||||
if (!m_Sockets.back().IsValid())
|
if (!m_Sockets.back().IsValid())
|
||||||
{
|
{
|
||||||
LOGERROR("Cannot create listening socket for port %d: \"%s\"", Port, cSocket::GetLastErrorString().c_str());
|
LOGWARNING("%s: Cannot create listening socket for port %d: \"%s\"", FamilyStr, Port, cSocket::GetLastErrorString().c_str());
|
||||||
m_Sockets.pop_back();
|
m_Sockets.pop_back();
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -137,7 +137,7 @@ bool cListenThread::CreateSockets(const AString & a_PortsString)
|
|||||||
{
|
{
|
||||||
if (!m_Sockets.back().SetReuseAddress())
|
if (!m_Sockets.back().SetReuseAddress())
|
||||||
{
|
{
|
||||||
LOG("Port %d cannot reuse addr, syscall failed: \"%s\".", Port, cSocket::GetLastErrorString().c_str());
|
LOG("%s: Port %d cannot reuse addr, syscall failed: \"%s\".", FamilyStr, Port, cSocket::GetLastErrorString().c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -155,19 +155,19 @@ bool cListenThread::CreateSockets(const AString & a_PortsString)
|
|||||||
}
|
}
|
||||||
if (!res)
|
if (!res)
|
||||||
{
|
{
|
||||||
LOGWARNING("Cannot bind port %d: \"%s\".", Port, cSocket::GetLastErrorString().c_str());
|
LOGWARNING("%s: Cannot bind port %d: \"%s\".", FamilyStr, Port, cSocket::GetLastErrorString().c_str());
|
||||||
m_Sockets.pop_back();
|
m_Sockets.pop_back();
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!m_Sockets.back().Listen())
|
if (!m_Sockets.back().Listen())
|
||||||
{
|
{
|
||||||
LOGWARNING("Cannot listen on port %d: \"%s\".", Port, cSocket::GetLastErrorString().c_str());
|
LOGWARNING("%s: Cannot listen on port %d: \"%s\".", FamilyStr, Port, cSocket::GetLastErrorString().c_str());
|
||||||
m_Sockets.pop_back();
|
m_Sockets.pop_back();
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
LOGINFO("%sPort %d is open for connections", FamilyStr, Port);
|
LOGINFO("%s: Port %d is open for connections", FamilyStr, Port);
|
||||||
} // for itr - Ports[]
|
} // for itr - Ports[]
|
||||||
|
|
||||||
return !(m_Sockets.empty());
|
return !(m_Sockets.empty());
|
||||||
|
Loading…
Reference in New Issue
Block a user