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

cleanup some, and aggregate common code

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1713 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
imaginos
2010-01-15 20:19:02 +00:00
parent ca1e8d43c3
commit ebbc126b72
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Csocket.cpp
+13 -9
View File
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* $Revision: 1.119 $
* $Revision: 1.121 $
*/
#include "Csocket.h"
@@ -362,6 +362,7 @@ int GetAddrInfo( const CS_STRING & sHostname, Csock *pSock, CSSockAddr & csSockA
bFound = true;
break;
}
pSock->CloseSocksFD();
}
else if( bTryConnect )
{
@@ -620,6 +621,15 @@ Csock::~Csock()
FREE_CTX();
#endif /* HAVE_LIBSSL */
CloseSocksFD();
// delete any left over crons
for( vector<CCron *>::size_type i = 0; i < m_vcCrons.size(); i++ )
CS_Delete( m_vcCrons[i] );
}
void Csock::CloseSocksFD()
{
if ( m_iReadSock != m_iWriteSock )
{
if( m_iReadSock >= 0 )
@@ -631,12 +641,9 @@ Csock::~Csock()
m_iReadSock = CS_INVALID_SOCK;
m_iWriteSock = CS_INVALID_SOCK;
// delete any left over crons
for( vector<CCron *>::size_type i = 0; i < m_vcCrons.size(); i++ )
CS_Delete( m_vcCrons[i] );
}
void Csock::Dereference()
{
m_iWriteSock = m_iReadSock = CS_INVALID_SOCK;
@@ -2166,10 +2173,7 @@ int Csock::GetAddrInfo( const CS_STRING & sHostname, CSSockAddr & csSockAddr )
// the Connect() failed, so throw a retry back in with ipv4, and let it process normally
CS_DEBUG( "Failed ipv6 connection with PF_UNSPEC, falling back to ipv4" );
m_iARESStatus = -1;
if( m_iReadSock != m_iWriteSock )
CS_CLOSE( m_iWriteSock );
CS_CLOSE( m_iReadSock );
m_iReadSock = m_iWriteSock = CS_INVALID_SOCK;
CloseSocksFD();
SetAFRequire( CSSockAddr::RAF_INET );
return( GetAddrInfo( sHostname, csSockAddr ) );
}