From 51021e706b2726a15383fa850a9df62d44d2fbca Mon Sep 17 00:00:00 2001 From: prozacx Date: Mon, 13 Feb 2006 06:12:38 +0000 Subject: [PATCH] No longer need ipv6 for outgoing connections git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@655 726aef4b-f618-498e-8847-2d620e286838 --- znc.cpp | 9 ++------- znc.h | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/znc.cpp b/znc.cpp index 51fac35a..7f302859 100644 --- a/znc.cpp +++ b/znc.cpp @@ -156,19 +156,14 @@ int CZNC::Loop() { pIRCSock->SetPass(pServer->GetPass()); bool bSSL = false; - bool bIPV6 = false; #ifdef HAVE_LIBSSL if (pServer->IsSSL()) { bSSL = true; pIRCSock->SetPemLocation(GetPemLocation()); } #endif -#ifdef HAVE_IPV6 - if (pServer->IsIPV6()) { - bIPV6 = true; - } -#endif - if (!m_Manager.Connect(pServer->GetName(), pServer->GetPort(), sSockName, 20, bSSL, pUser->GetVHost(), pIRCSock, bIPV6)) { + + if (!m_Manager.Connect(pServer->GetName(), pServer->GetPort(), sSockName, 20, bSSL, pUser->GetVHost(), pIRCSock)) { ReleaseISpoof(); pUser->PutStatus("Unable to connect. (Bad host?)"); } diff --git a/znc.h b/znc.h index 5d8ead48..0b494df5 100644 --- a/znc.h +++ b/znc.h @@ -55,12 +55,11 @@ public: return( ListenRand( sSockName, "", isSSL, iMaxConns, pcSock, iTimeout, bIsIPv6 ) ); } - virtual bool Connect(const CString& sHostname, u_short iPort , const CString& sSockName, int iTimeout = 60, bool isSSL = false, const CString& sBindHost = "", Csock *pcSock = NULL, bool bIsIPv6 = false) { + virtual bool Connect(const CString& sHostname, u_short iPort , const CString& sSockName, int iTimeout = 60, bool isSSL = false, const CString& sBindHost = "", Csock *pcSock = NULL) { CSConnection C(sHostname, iPort, iTimeout); C.SetSockName(sSockName); C.SetIsSSL(isSSL); - C.SetIsIPv6(bIsIPv6); C.SetBindHost(sBindHost); return TSocketManager::Connect(C, pcSock);