adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-09 10:23:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest Csocket

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1335 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2009-01-18 10:32:16 +00:00
parent 3a2772eafa
commit 9210bdc97e
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Csocket.cpp
+5 -1
View File
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* $Revision: 1.90 $
* $Revision: 1.92 $
*/
#include "Csocket.h"
@@ -562,6 +562,7 @@ void Csock::Dereference()
#endif /* HAVE_LIBSSL */
m_vcCrons.clear();
Close( CLT_DEREFERENCE );
}
void Csock::Copy( const Csock & cCopy )
@@ -1029,6 +1030,8 @@ bool Csock::SSLClientSetup()
if ( !m_ssl_ctx )
return( false );
SSL_CTX_set_default_verify_paths( m_ssl_ctx );
if ( !m_sPemFile.empty() )
{ // are we sending a client cerificate ?
SSL_CTX_set_default_passwd_cb( m_ssl_ctx, PemPassCB );
@@ -1117,6 +1120,7 @@ bool Csock::SSLServerSetup()
m_ssl_ctx = SSL_CTX_new ( m_ssl_method );
if ( !m_ssl_ctx )
return( false );
SSL_CTX_set_default_verify_paths( m_ssl_ctx );
// set the pemfile password
SSL_CTX_set_default_passwd_cb( m_ssl_ctx, PemPassCB );
Csocket.h
+13 -8
View File
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* $Revision: 1.200 $
* $Revision: 1.202 $
*/
// note to compile with win32 need to link to winsock2, using gcc its -lws2_32
@@ -473,7 +473,8 @@ public:
{
CLT_DONT = 0, //! don't close DER
CLT_NOW = 1, //! close immediatly
CLT_AFTERWRITE = 2 //! close after finishing writing the buffer
CLT_AFTERWRITE = 2, //! close after finishing writing the buffer
CLT_DEREFERENCE = 3 //! used after copy in Csock::Dereference() to cleanup a sock thats being shutdown
};
Csock & operator<<( const CS_STRING & s );
@@ -1726,11 +1727,14 @@ public:
T * pSock = (*this)[iPos];
if ( pSock->IsConnected() )
pSock->Disconnected(); // only call disconnected event if connected event was called (IE IsConnected was set)
if( pSock->GetCloseType() != T::CLT_DEREFERENCE )
{
if ( pSock->IsConnected() )
pSock->Disconnected(); // only call disconnected event if connected event was called (IE IsConnected was set)
m_iBytesRead += pSock->GetBytesRead();
m_iBytesWritten += pSock->GetBytesWritten();
m_iBytesRead += pSock->GetBytesRead();
m_iBytesWritten += pSock->GetBytesWritten();
}
CS_Delete( pSock );
this->erase( this->begin() + iPos );
@@ -1753,8 +1757,8 @@ public:
Csock *pSock = (*this)[iOrginalSockIdx];
pNewSock->Copy( *pSock );
pSock->Dereference();
CS_Delete( pSock );
(*this)[iOrginalSockIdx] = (T *)pNewSock;
this->push_back( (T *)pSock ); // this allows it to get cleaned up
return( true );
}
@@ -1825,7 +1829,8 @@ 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]->GetCloseType() == T::CLT_NOW ) || ( ( (*this)[i]->GetCloseType() == T::CLT_AFTERWRITE ) && ( (*this)[i]->GetWriteBuffer().empty() ) ) )
Csock::ECloseType eCloseType = (*this)[i]->GetCloseType();
if( eCloseType == T::CLT_NOW || eCloseType == T::CLT_DEREFERENCE || ( eCloseType == 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