Moved "closing connection" log message to overload of cTBSocket::Close() in

cServerConnection.
This commit is contained in:
Frank Schmirler 2011-11-27 11:32:16 +01:00
parent 9b91301d94
commit 94aef85adc
3 changed files with 12 additions and 3 deletions

View File

@ -237,6 +237,13 @@ bool cServerConnection::Respond(const char *Message, bool Last, ...)
return true;
}
bool cServerConnection::Close()
{
if (IsOpen())
isyslog("streamdev-server: closing %s connection to %s:%d", Protocol(), RemoteIp().c_str(), RemotePort());
return cTBSocket::Close();
}
#if APIVERSNUM >= 10700
static int GetClippedNumProvidedSystems(int AvailableBits, cDevice *Device)
{

View File

@ -103,6 +103,9 @@ public:
/* Will make the socket close after sending all queued output data */
void DeferClose(void) { m_DeferClose = true; }
/* Close the socket */
virtual bool Close(void);
/* Will retrieve an unused device for transmitting data. Receivers have
already been attached from the device if necessary. Use the returned
cDevice in a following call to StartTransfer */

View File

@ -152,9 +152,8 @@ void cStreamdevServer::Action(void)
cServerConnection *next = m_Clients.Next(s);
if (!result) {
isyslog("streamdev: closing streamdev connection to %s:%d",
s->RemoteIp().c_str(), s->RemotePort());
s->Close();
if (s->IsOpen())
s->Close();
Lock();
m_Clients.Del(s);
Unlock();