iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pulled in changes for graceful Close()

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@494 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2005-09-15 04:11:41 +00:00
parent 58edca82f8
commit e41a7f46f9
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Csocket.cpp
View File

@@ -1357,8 +1357,10 @@ u_short Csock::GetLocalPort()
u_short Csock::GetPort() { return( m_iport ); }
void Csock::SetPort( u_short iPort ) { m_iport = iPort; }
void Csock::Close() { m_bClosed = true; }
bool Csock::isClosed() { return( m_bClosed ); }
void Csock::Close( ECloseType eCloseType )
{
m_eCloseType = eCloseType;
}
void Csock::BlockIO( bool bBLOCK ) { m_bBLOCK = bBLOCK; }
void Csock::NonBlockingIO()
@@ -1786,7 +1788,7 @@ void Csock::Init( const CS_STRING & sHostname, u_short iport, int itimeout )
m_shostname = sHostname;
m_iTcount = 0;
m_sbuffer.clear();
m_bClosed = false;
m_eCloseType = CLT_DONT;
m_bBLOCK = true;
m_iMethod = SSL23;
m_sCipherType = "ALL";

19
Csocket.h
View File

@@ -395,6 +395,13 @@ public:
CST_OK = 4
};
enum ECloseType
{
CLT_DONT = 0, //! don't close DER
CLT_NOW = 1, //! close immediatly
CLT_AFTERWRITE = 2 //! close after finishing writing the buffer
};
Csock & operator<<( const CS_STRING & s );
Csock & operator<<( std::ostream & ( *io )( std::ostream & ) );
Csock & operator<<( int i );
@@ -593,9 +600,10 @@ public:
void SetPort( u_short iPort );
//! just mark us as closed, the parent can pick it up
void Close();
//! returns true if the socket is closed
bool isClosed();
void Close( ECloseType eCloseType = CLT_NOW );
//! returns int of type to close @see ECloseType
ECloseType GetCloseType() { return( m_eCloseType ); }
bool IsClosed() { return( GetCloseType() != CLT_DONT ); }
//! Set rather to NON Blocking IO on this socket, default is true
void BlockIO( bool bBLOCK );
@@ -820,10 +828,11 @@ public:
private:
u_short m_iport, m_iRemotePort, m_iLocalPort;
int m_iReadSock, m_iWriteSock, m_itimeout, m_iConnType, m_iTcount, m_iMethod;
bool m_bssl, m_bIsConnected, m_bClosed, m_bBLOCK, m_bFullsslAccept;
bool m_bssl, m_bIsConnected, m_bBLOCK, m_bFullsslAccept;
bool m_bsslEstablished, m_bEnableReadLine, m_bRequireClientCert, m_bPauseRead;
CS_STRING m_shostname, m_sbuffer, m_sSockName, m_sPemFile, m_sCipherType, m_sParentName;
CS_STRING m_sSend, m_sSSLBuffer, m_sPemPass, m_sLocalIP, m_sRemoteIP;
ECloseType m_eCloseType;
unsigned long long m_iMaxMilliSeconds, m_iLastSendTime, m_iBytesRead, m_iBytesWritten, m_iStartTime;
unsigned int m_iMaxBytes, m_iLastSend, m_iMaxStoredBufferLength, m_iTimeoutType;
@@ -1417,7 +1426,7 @@ private:
// before we go any further, Process work needing to be done on the job
for( unsigned int i = 0; i < this->size(); i++ )
{
if ( (*this)[i]->isClosed() )
if ( ( (*this)[i]->GetCloseType() == T::CLT_NOW ) || ( ( (*this)[i]->GetCloseType() == T::CLT_AFTERWRITE ) && ( (*this)[i]->GetWriteBuffer().empty() ) ) )
DelSock( i-- ); // close any socks that have requested it
else
(*this)[i]->Cron(); // call the Cron handler here