adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 01:13:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest Csocket

Browse Source 
This fixes a busy-loop bug with openssl and adds support for using poll()
instead of select().

Currently, poll() isn't used unless you use
./configure CXXFLAGS="-DCSOCK_USE_POLL".


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2096 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-08-03 11:37:52 +00:00
parent d0e3572afe
commit e48a6be48d
2 changed files with 145 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Csocket.cpp
+2 -9
View File
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* $Revision: 1.138 $
* $Revision: 1.139 $
*/
#include "Csocket.h"
@@ -479,7 +479,7 @@ void SSLErrors( const char *filename, u_int iLineNum )
char szError[512];
memset( (char *) szError, '\0', 512 );
ERR_error_string_n( iSSLError, szError, 511 );
if ( strlen( szError ) > 0 )
if ( *szError )
CS_DEBUG( szError );
}
}
@@ -682,7 +682,6 @@ void Csock::Copy( const Csock & cCopy )
m_bssl = cCopy.m_bssl;
m_bIsConnected = cCopy.m_bIsConnected;
m_bBLOCK = cCopy.m_bBLOCK;
m_bFullsslAccept = cCopy.m_bFullsslAccept;
m_bsslEstablished = cCopy.m_bsslEstablished;
m_bEnableReadLine = cCopy.m_bEnableReadLine;
m_bPauseRead = cCopy.m_bPauseRead;
@@ -1078,12 +1077,9 @@ bool Csock::AcceptSSL()
if ( err == 1 )
{
m_bFullsslAccept = true;
return( true );
}
m_bFullsslAccept = false;
int sslErr = SSL_get_error( m_ssl, err );
if ( ( sslErr == SSL_ERROR_WANT_READ ) || ( sslErr == SSL_ERROR_WANT_WRITE ) )
@@ -1930,7 +1926,6 @@ void Csock::SetSSLMethod( int iMethod ) { m_iMethod = iMethod; }
int Csock::GetSSLMethod() { return( m_iMethod ); }
void Csock::SetSSLObject( SSL *ssl ) { m_ssl = ssl; }
void Csock::SetCTXObject( SSL_CTX *sslCtx ) { m_ssl_ctx = sslCtx; }
void Csock::SetFullSSLAccept() { m_bFullsslAccept = true; }
SSL_SESSION * Csock::GetSSLSession()
{
@@ -1943,7 +1938,6 @@ SSL_SESSION * Csock::GetSSLSession()
const CS_STRING & Csock::GetWriteBuffer() { return( m_sSend ); }
void Csock::ClearWriteBuffer() { m_sSend.clear(); }
bool Csock::FullSSLAccept() { return ( m_bFullsslAccept ); }
bool Csock::SslIsEstablished() { return ( m_bsslEstablished ); }
bool Csock::ConnectInetd( bool bIsSSL, const CS_STRING & sHostname )
@@ -2433,7 +2427,6 @@ void Csock::Init( const CS_STRING & sHostname, u_short uPort, int itimeout )
m_iMaxMilliSeconds = 0;
m_iLastSendTime = 0;
m_iLastSend = 0;
m_bFullsslAccept = false;
m_bsslEstablished = false;
m_bEnableReadLine = false;
m_iMaxStoredBufferLength = 1024;