adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 17:03:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do all module calls through the macros

Browse Source 
This commit should make sure that all module calls are done through either
MODULECALL, GLOBALMODULECALL or ALLMODULECALL. Also, in the process some module
calls where ("accidentally" ;) ) fixed to set correct values for a global
module's m_pUser during a module call.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2076 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-07-08 16:43:23 +00:00
parent 94ea2c6c42
commit 9ae959b800
5 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
znc.cpp
+8 -28
View File
@@ -104,15 +104,7 @@ CString CZNC::GetUptime() const {
}
bool CZNC::OnBoot() {
if (!GetModules().OnBoot()) {
return false;
}
for (map<CString,CUser*>::iterator it = m_msUsers.begin(); it != m_msUsers.end(); ++it) {
if (!it->second->GetModules().OnBoot()) {
return false;
}
}
ALLMODULECALL(OnBoot(), return false);
return true;
}
@@ -537,9 +529,7 @@ bool CZNC::WriteConfig() {
return false;
}
if (GetModules().OnWriteConfig(m_LockFile)) {
return false;
}
GLOBALMODULECALL(OnWriteConfig(m_LockFile), NULL, NULL, return false);
m_LockFile.Write("AnonIPLimit = " + CString(m_uiAnonIPLimit) + "\n");
m_LockFile.Write("MaxBufferSize= " + CString(m_uiMaxBufferSize) + "\n");
@@ -1002,11 +992,7 @@ bool CZNC::ParseConfig(const CString& sConfig)
bool CZNC::RehashConfig(CString& sError)
{
GetModules().OnPreRehash();
for (map<CString, CUser*>::iterator itb = m_msUsers.begin();
itb != m_msUsers.end(); ++itb) {
itb->second->GetModules().OnPreRehash();
}
ALLMODULECALL(OnPreRehash(), );
// This clears m_msDelUsers
HandleUserDeletion();
@@ -1016,11 +1002,7 @@ bool CZNC::RehashConfig(CString& sError)
m_msUsers.clear();
if (DoRehash(sError)) {
GetModules().OnPostRehash();
for (map<CString, CUser*>::iterator it = m_msUsers.begin();
it != m_msUsers.end(); ++it) {
it->second->GetModules().OnPostRehash();
}
ALLMODULECALL(OnPostRehash(), );
return true;
}
@@ -1717,7 +1699,7 @@ bool CZNC::DoRehash(CString& sError)
if (it->m_pUser) {
MODULECALL(OnConfigLine(it->m_sName, it->m_sValue, it->m_pUser, it->m_pChan), it->m_pUser, NULL, bHandled = true);
} else {
bHandled = GetModules().OnConfigLine(it->m_sName, it->m_sValue, it->m_pUser, it->m_pChan);
GLOBALMODULECALL(OnConfigLine(it->m_sName, it->m_sValue, it->m_pUser, it->m_pChan), it->m_pUser, NULL, bHandled = true);
}
if (!bHandled) {
CUtils::PrintMessage("unhandled global module config line [GM:" + it->m_sName + "] = [" + it->m_sValue + "]");
@@ -1850,11 +1832,11 @@ bool CZNC::AddUser(CUser* pUser, CString& sErrorRet) {
<< sErrorRet << "]");
return false;
}
if (GetModules().OnAddUser(*pUser, sErrorRet)) {
GLOBALMODULECALL(OnAddUser(*pUser, sErrorRet), pUser, NULL,
DEBUG("AddUser [" << pUser->GetUserName() << "] aborted by a module ["
<< sErrorRet << "]");
return false;
}
);
m_msUsers[pUser->GetUserName()] = pUser;
return true;
}
@@ -1951,9 +1933,7 @@ CZNC::TrafficStatsMap CZNC::GetTrafficStats(TrafficStatsPair &Users,
void CZNC::AuthUser(CSmartPtr<CAuthBase> AuthClass) {
// TODO unless the auth module calls it, CUser::IsHostAllowed() is not honoured
if (GetModules().OnLoginAttempt(AuthClass)) {
return;
}
GLOBALMODULECALL(OnLoginAttempt(AuthClass), NULL, NULL, return);
CUser* pUser = FindUser(AuthClass->GetUsername());