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

state bug, from previous fix broken vhost binding

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@995 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
imaginos
2008-03-30 16:28:44 +00:00
parent 1fb0039732
commit fc191e4908
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Csocket.cpp
+6 -6
View File
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* $Revision: 1.70 $
* $Revision: 1.73 $
*/
#include "Csocket.h"
@@ -2060,7 +2060,7 @@ int Csock::DNSLookup( EDNSLType eDNSLType )
if ( m_sBindHost.empty() )
{
if ( m_eConState != CST_OK )
m_eConState = CST_VHOSTDNS;
m_eConState = CST_VHOSTDNS; // skip binding, there is no vhost
return( 0 );
}
@@ -2115,7 +2115,7 @@ int Csock::DNSLookup( EDNSLType eDNSLType )
}
if ( m_eConState != CST_OK )
m_eConState = ( ( eDNSLType == DNS_VHOST ) ? CST_VHOSTDNS : CST_CONNECT );
m_eConState = ( ( eDNSLType == DNS_VHOST ) ? CST_BINDVHOST : CST_CONNECT ); // next step after vhost is to bind
if( !CreateSocksFD() )
return( ETIMEDOUT );
@@ -2154,7 +2154,7 @@ int Csock::DNSLookup( EDNSLType eDNSLType )
if ( iRet == 0 )
{
if ( m_eConState != CST_OK )
m_eConState = ( ( eDNSLType == DNS_VHOST ) ? CST_VHOSTDNS : CST_CONNECT );
m_eConState = ( ( eDNSLType == DNS_VHOST ) ? CST_BINDVHOST : CST_CONNECT );
m_iDNSTryCount = 0;
return( 0 );
}
@@ -2178,7 +2178,7 @@ bool Csock::SetupVHost()
if ( m_sBindHost.empty() )
{
if ( m_eConState != CST_OK )
m_eConState = CST_CONNECT;
m_eConState = CST_VHOSTDNS;
return( true );
}
int iRet = -1;
@@ -2192,7 +2192,7 @@ bool Csock::SetupVHost()
if ( iRet == 0 )
{
if ( m_eConState != CST_OK )
m_eConState = CST_CONNECT;
m_eConState = CST_VHOSTDNS;
return( true );
}
m_iCurBindCount++;