diff --git a/Server.cpp b/Server.cpp index 579ed21b..20d4d385 100644 --- a/Server.cpp +++ b/Server.cpp @@ -8,12 +8,11 @@ #include "Server.h" -CServer::CServer(const CString& sName, unsigned short uPort, const CString& sPass, bool bSSL, bool bIPV6) { +CServer::CServer(const CString& sName, unsigned short uPort, const CString& sPass, bool bSSL) { m_sName = sName; m_uPort = (uPort) ? uPort : 6667; m_sPass = sPass; m_bSSL = bSSL; - m_bIPV6 = bIPV6; } CServer::~CServer() {} @@ -38,7 +37,6 @@ const CString& CServer::GetName() const { return m_sName; } unsigned short CServer::GetPort() const { return m_uPort; } const CString& CServer::GetPass() const { return m_sPass; } bool CServer::IsSSL() const { return m_bSSL; } -bool CServer::IsIPV6() const { return m_bIPV6; } CString CServer::GetString() const { return m_sName + " " + CString(m_bSSL ? "+" : "") + CString(m_uPort) + CString(m_sPass.empty() ? "" : " " + m_sPass); diff --git a/Server.h b/Server.h index 116b26db..839a440a 100644 --- a/Server.h +++ b/Server.h @@ -13,14 +13,13 @@ class CServer { public: - CServer(const CString& sName, unsigned short uPort = 6667, const CString& sPass = "", bool bSSL = false, bool bIPV6 = false); + CServer(const CString& sName, unsigned short uPort = 6667, const CString& sPass = "", bool bSSL = false); virtual ~CServer(); const CString& GetName() const; unsigned short GetPort() const; const CString& GetPass() const; bool IsSSL() const; - bool IsIPV6() const; CString GetString() const; static bool IsValidHostName(const CString& sHostName); private: @@ -29,7 +28,6 @@ protected: unsigned short m_uPort; CString m_sPass; bool m_bSSL; - bool m_bIPV6; }; #endif // !_SERVER_H diff --git a/User.cpp b/User.cpp index cda6ba5b..7e0420d9 100644 --- a/User.cpp +++ b/User.cpp @@ -730,7 +730,7 @@ bool CUser::DelServer(const CString& sName) { return false; } -bool CUser::AddServer(const CString& sName, bool bIPV6) { +bool CUser::AddServer(const CString& sName) { if (sName.empty()) { return false; } @@ -750,22 +750,16 @@ bool CUser::AddServer(const CString& sName, bool bIPV6) { unsigned short uPort = strtoul(sPort.c_str(), NULL, 10); CString sPass = sLine.Token(2, true); - return AddServer(sHost, uPort, sPass, bSSL, bIPV6); + return AddServer(sHost, uPort, sPass, bSSL); } -bool CUser::AddServer(const CString& sName, unsigned short uPort, const CString& sPass, bool bSSL, bool bIPV6) { +bool CUser::AddServer(const CString& sName, unsigned short uPort, const CString& sPass, bool bSSL) { #ifndef HAVE_LIBSSL if (bSSL) { return false; } #endif -#ifndef HAVE_IPV6 - if (bIPV6) { - return false; - } -#endif - if (sName.empty()) { return false; } @@ -774,7 +768,7 @@ bool CUser::AddServer(const CString& sName, unsigned short uPort, const CString& uPort = 6667; } - CServer* pServer = new CServer(sName, uPort, sPass, bSSL, bIPV6); + CServer* pServer = new CServer(sName, uPort, sPass, bSSL); m_vServers.push_back(pServer); CheckIRCConnect(); diff --git a/User.h b/User.h index 948d5fbc..3b575829 100644 --- a/User.h +++ b/User.h @@ -43,8 +43,8 @@ public: void JoinChans(); CServer* FindServer(const CString& sName) const; bool DelServer(const CString& sName); - bool AddServer(const CString& sName, bool bIPV6 = false); - bool AddServer(const CString& sName, unsigned short uPort, const CString& sPass = "", bool bSSL = false, bool bIPV6 = false); + bool AddServer(const CString& sName); + bool AddServer(const CString& sName, unsigned short uPort, const CString& sPass = "", bool bSSL = false); CServer* GetNextServer(); CServer* GetCurrentServer() const; bool CheckPass(const CString& sPass) const;