iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix deletion of users which are connecting.

Browse Source 
Close #1342
This commit is contained in:
Alexey Sokolov
2016-11-20 17:52:26 +00:00
parent a76a9db369
commit 6366430870
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Socket.cpp
View File

@@ -349,12 +349,16 @@ CSockManager::CSockManager() {
CSockManager::~CSockManager() {
}
// It's here to not break ABI of 1.6; in 1.7 this should be a data member of CSockManager.
static std::map<Csock*, bool /* deleted */> g_InFlightDnsSockets;
void CSockManager::Connect(const CString& sHostname, u_short iPort, const CString& sSockName, int iTimeout, bool bSSL, const CString& sBindHost, CZNCSock *pcSock) {
g_InFlightDnsSockets[pcSock] = false;
if (pcSock) {
pcSock->SetHostToVerifySSL(sHostname);
}
#ifdef HAVE_THREADED_DNS
DEBUG("TDNS: initiating resolving of [" << sHostname << "] and bindhost [" << sBindHost << "]");
DEBUG("TDNS: initiating resolving of [" << sHostname << "] and bindhost [" << sBindHost << "] for [" << sSockName << "]");
TDNSTask* task = new TDNSTask;
task->sHostname = sHostname;
task->iPort = iPort;
@@ -380,6 +384,18 @@ void CSockManager::Connect(const CString& sHostname, u_short iPort, const CStrin
}
void CSockManager::FinishConnect(const CString& sHostname, u_short iPort, const CString& sSockName, int iTimeout, bool bSSL, const CString& sBindHost, CZNCSock *pcSock) {
auto it = g_InFlightDnsSockets.find(pcSock);
if (it != g_InFlightDnsSockets.end()) {
bool bSocketDeletedAlready = it->second;
g_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);
@@ -396,6 +412,15 @@ void CSockManager::FinishConnect(const CString& sHostname, u_short iPort, const
TSocketManager<CZNCSock>::Connect(C, pcSock);
}
void CSockManager::DelSockByAddr(Csock* pcSock) {
auto it = g_InFlightDnsSockets.find(pcSock);
if (it != g_InFlightDnsSockets.end()) {
// Then 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() {