retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a deadlock when rmanager was trying to report an error about its own connection. 

git-svn-id: http://voip.null.ro/svn/yate@6218 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2017-05-17 10:01:47 +00:00
parent d57fe18d4d
commit b04f0162d7
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/rmanager.cpp
View File

@ -245,6 +245,7 @@ public:
{ return m_listener->cfg(); }
void checkTimer(u_int64_t time);
private:
void disconnect();
NamedList m_aliases;
Level m_auth;
bool m_debug;
@ -457,8 +458,16 @@ Connection::~Connection()
s_connList.remove(this,false);
s_mutex.unlock();
Output("Closing connection to %s",m_address.c_str());
delete m_socket;
Socket* tmp = m_socket;
m_socket = 0;
yield();
delete tmp;
}
void Connection::disconnect()
{
if (m_socket)
m_socket->terminate();
}
void Connection::run()
@ -513,18 +522,21 @@ void Connection::run()
Thread::check();
bool readok = false;
bool error = false;
HANDLE sh = m_socket->handle();
if (m_socket->select(&readok,0,&error,10000)) {
// rearm the error beep
m_beeping = false;
if (error) {
Debug("RManager",DebugInfo,"Socket exception condition on %d",m_socket->handle());
disconnect();
Debug("RManager",DebugInfo,"Socket exception condition on %d",sh);
return;
}
if (!readok)
continue;
int readsize = m_socket->readData(buffer,sizeof(buffer));
if (!readsize) {
Debug("RManager",DebugInfo,"Socket condition EOF on %d",m_socket->handle());
disconnect();
Debug("RManager",DebugInfo,"Socket condition EOF on %d",sh);
return;
}
else if (readsize > 0) {
@ -533,12 +545,14 @@ void Connection::run()
return;
}
else if (!m_socket->canRetry()) {
Debug("RManager",DebugWarn,"Socket read error %d on %d",errno,m_socket->handle());
disconnect();
Debug("RManager",DebugWarn,"Socket read error %d on %d",errno,sh);
return;
}
}
else if (!m_socket->canRetry()) {
Debug("RManager",DebugWarn,"socket select error %d on %d",errno,m_socket->handle());
disconnect();
Debug("RManager",DebugWarn,"socket select error %d on %d",errno,sh);
return;
}
}
@ -1804,8 +1818,12 @@ void Connection::writeStr(const char *str, int len)
len = ::strlen(str);
else if (len == 0)
return;
if (!(m_socket && m_socket->valid()))
return;
HANDLE sh = m_socket->handle();
if (int written = m_socket->writeData(str,len) != len) {
Debug("RManager",DebugInfo,"Socket %d wrote only %d out of %d bytes",m_socket->handle(),written,len);
disconnect();
Debug("RManager",DebugInfo,"Socket %d wrote only %d out of %d bytes",sh,written,len);
// Destroy the thread, will kill the connection
cancel();
}
@ -1818,8 +1836,7 @@ void Connection::checkTimer(u_int64_t time)
if (time < m_timeout)
return;
m_timeout = 0;
if (m_socket)
m_socket->terminate();
disconnect();
}