iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-09 06:44:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change ConnectDelay to be server specific and not global.

Browse Source 
This way users that connect to different servers can connect faster.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1702 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
silverleo
2010-01-10 12:32:34 +00:00
parent e43fbc1712
commit 3ef2b20e87
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
znc.cpp
+9 -4
View File
@@ -35,7 +35,6 @@ CZNC::CZNC() {
m_pModules = new CGlobalModules();
#endif
m_pISpoofLockFile = NULL;
m_uiConnectDelay = 30;
m_uiAnonIPLimit = 10;
SetISpoofFormat(""); // Set ISpoofFormat to default
m_uBytesRead = 0;
@@ -43,6 +42,7 @@ CZNC::CZNC() {
m_pConnectUserTimer = NULL;
m_eConfigState = ECONFIG_NOTHING;
m_TimeStarted = time(NULL);
m_sConnectThrottle.SetTTL(30000);
}
CZNC::~CZNC() {
@@ -146,12 +146,17 @@ bool CZNC::ConnectUser(CUser *pUser) {
if (!pServer)
return false;
if (m_sConnectThrottle.GetItem(pServer->GetName()))
return false;
if (!WriteISpoof(pUser)) {
DEBUG("ISpoof could not be written");
pUser->PutStatus("ISpoof could not be written, retrying...");
return true;
}
m_sConnectThrottle.AddItem(pServer->GetName());
DEBUG("User [" << pUser->GetUserName() << "] is connecting to [" << pServer->GetName() << ":" << pServer->GetPort() << "] ...");
pUser->PutStatus("Attempting to connect to [" + pServer->GetName() + ":" + CString(pServer->GetPort()) + "] ...");
@@ -556,7 +561,7 @@ bool CZNC::WriteConfig() {
m_LockFile.Write("Listen" + s6 + " = " + sHostPortion + CString((pListener->IsSSL()) ? "+" : "") + CString(pListener->GetPort()) + "\n");
}
m_LockFile.Write("ConnectDelay = " + CString(m_uiConnectDelay) + "\n");
m_LockFile.Write("ConnectDelay = " + CString(m_sConnectThrottle.GetTTL()/1000) + "\n");
if (!m_sISpoofFile.empty()) {
m_LockFile.Write("ISpoofFile = " + m_sISpoofFile.FirstLine() + "\n");
@@ -1535,7 +1540,7 @@ bool CZNC::DoRehash(CString& sError)
m_sStatusPrefix = sValue;
continue;
} else if (sName.Equals("ConnectDelay")) {
m_uiConnectDelay = sValue.ToUInt();
m_sConnectThrottle.SetTTL(sValue.ToUInt()*1000);
continue;
} else if (sName.Equals("AnonIPLimit")) {
m_uiAnonIPLimit = sValue.ToUInt();
@@ -1901,7 +1906,7 @@ void CZNC::EnableConnectUser() {
if (m_pConnectUserTimer != NULL)
return;
m_pConnectUserTimer = new CConnectUserTimer(m_uiConnectDelay);
m_pConnectUserTimer = new CConnectUserTimer(3);
GetManager().AddCron(m_pConnectUserTimer);
}