iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-03 20:12:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2016-11-20 18:01:59 +00:00
parent 2feced63e1 6366430870
commit 5c524df298
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Socket.cpp
View File

@@ -392,6 +392,7 @@ CSockManager::~CSockManager() {}
void CSockManager::Connect(const CString& sHostname, u_short iPort,
const CString& sSockName, int iTimeout, bool bSSL,
const CString& sBindHost, CZNCSock* pcSock) {
m_InFlightDnsSockets[pcSock] = false;
if (pcSock) {
pcSock->SetHostToVerifySSL(sHostname);
}
@@ -423,6 +424,20 @@ void CSockManager::FinishConnect(const CString& sHostname, u_short iPort,
const CString& sSockName, int iTimeout,
bool bSSL, const CString& sBindHost,
CZNCSock* pcSock) {
auto it = m_InFlightDnsSockets.find(pcSock);
if (it != m_InFlightDnsSockets.end()) {
bool bSocketDeletedAlready = it->second;
m_InFlightDnsSockets.erase(it);
if (bSocketDeletedAlready) {
DEBUG("TDNS: Socket ["
<< sSockName
<< "] is deleted already, not proceeding with connection");
return;
}
} else {
// impossible
}
CSConnection C(sHostname, iPort, iTimeout);
C.SetSockName(sSockName);
@@ -439,6 +454,16 @@ void CSockManager::FinishConnect(const CString& sHostname, u_short iPort,
TSocketManager<CZNCSock>::Connect(C, pcSock);
}
void CSockManager::DelSockByAddr(Csock* pcSock) {
auto it = m_InFlightDnsSockets.find(pcSock);
if (it != m_InFlightDnsSockets.end()) {
// The socket is resolving its DNS. When that finishes, let it silently
// die without crash.
it->second = true;
}
TSocketManager<CZNCSock>::DelSockByAddr(pcSock);
}
/////////////////// CSocket ///////////////////
CSocket::CSocket(CModule* pModule) : CZNCSock(), m_pModule(pModule) {
if (m_pModule) m_pModule->AddSocket(this);