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

added workaround for a canonical name that points to ipv6 and ipv4 ip's, the ipv6 ip is tried first, followed up by a final try on ipv4 in the event the ipv6 connect results in a network unreachable. I wonder what this will break ...

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1712 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
imaginos
2010-01-15 19:45:58 +00:00
parent 4aaa804bea
commit baeb2a666e
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Csocket.cpp
+20
View File
@@ -2154,6 +2154,26 @@ int Csock::GetAddrInfo( const CS_STRING & sHostname, CSSockAddr & csSockAddr )
{ // this means its finished
FreeAres();
#ifdef HAVE_IPV6
if( m_iARESStatus == ARES_SUCCESS && csSockAddr.GetAFRequire() == CSSockAddr::RAF_ANY && GetIPv6() )
{
// this means that ares_host returned an ipv6 host, so try a connect right away
if( CreateSocksFD() && Connect( GetBindHost(), true ) )
{
SetSkipConnect( true );
}
else if( GetSockError() == ENETUNREACH )
{
// 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;
SetAFRequire( CSSockAddr::RAF_INET );
return( GetAddrInfo( sHostname, csSockAddr ) );
}
}
#if ARES_VERSION < CREATE_ARES_VER( 1, 5, 3 )
if( m_iARESStatus != ARES_SUCCESS && csSockAddr.GetAFRequire() == CSSockAddr::RAF_ANY )
{ // this is a workaround for ares < 1.5.3 where the builtin retry on failed AF_INET6 isn't there yet