iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-05 04:52:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Csocket to ef6bcb9d5c1aecd778c5a57604eabdcb5e1ee06e

Browse Source
This commit is contained in:
Alexey Sokolov
2014-06-17 23:22:16 +01:00
parent 64fb99a469
commit 93d2eec4db
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Csocket.cpp
View File

@@ -697,6 +697,7 @@ void CCron::StartMaxCycles( double dTimeSequence, u_int iMaxCycles )
gettimeofday( &tNow, NULL );
timeradd( &tNow, &m_tTimeSequence, &m_tTime );
m_iMaxCycles = iMaxCycles;
m_bActive = true;
}
void CCron::StartMaxCycles( const timeval& tTimeSequence, u_int iMaxCycles )
@@ -706,6 +707,7 @@ void CCron::StartMaxCycles( const timeval& tTimeSequence, u_int iMaxCycles )
gettimeofday( &tNow, NULL );
timeradd( &tNow, &m_tTimeSequence, &m_tTime );
m_iMaxCycles = iMaxCycles;
m_bActive = true;
}
void CCron::Start( double dTimeSequence )
@@ -733,6 +735,12 @@ void CCron::UnPause()
m_bPause = false;
}
void CCron::Reset()
{
Stop();
Start(m_tTimeSequence);
}
timeval CCron::GetInterval() const { return( m_tTimeSequence ); }
u_int CCron::GetMaxCycles() const { return( m_iMaxCycles ); }
u_int CCron::GetCyclesLeft() const { return( ( m_iMaxCycles > m_iCycles ? ( m_iMaxCycles - m_iCycles ) : 0 ) ); }
@@ -1867,13 +1875,12 @@ bool Csock::Write( const char *data, size_t len )
#else
cs_ssize_t bytes = write( m_iWriteSock, m_sSend.data() + m_uSendBufferPos, iBytesToSend );
#endif /* _WIN32 */
if( bytes > 0 )
if( bytes == -1 && GetSockError() == ECONNREFUSED )
{
ConnectionRefused();
return( false );
}
if( bytes == -1 && GetSockError() == ECONNREFUSED )
{
ConnectionRefused();
return( false );
}
#ifdef _WIN32
if( bytes <= 0 && GetSockError() != WSAEWOULDBLOCK )