Rename OnUserAttached and OnUserDetached and add OnClientConnect

OnUserAttached is renamed to OnClientLogin and
OnUserDetached to OnClientDisconnect.
This adds some new function with different arguments for the old names to cause
warnings from -Woverloaded-virtual while compiling.

This patch also adds OnClientConnect() which is called when the low-level
raw connection is established. (No SSL-handshake was done at this point yet!)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1266 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2008-10-29 17:26:30 +00:00
parent e85ed684ea
commit db21f88584
12 changed files with 36 additions and 25 deletions
+2 -2
View File
@@ -138,11 +138,11 @@ public:
}
}
virtual void OnUserAttached()
virtual void OnClientLogin()
{
Back(true);
}
virtual void OnUserDetached()
virtual void OnClientDisconnect()
{
Away();
}
+2 -2
View File
@@ -94,11 +94,11 @@ public:
RemTimer("BackNickTimer");
}
virtual void OnUserAttached() {
virtual void OnClientLogin() {
StartBackNickTimer();
}
virtual void OnUserDetached() {
virtual void OnClientDisconnect() {
if (!m_pUser->IsUserAttached()) {
StartAwayNickTimer();
}
+2 -2
View File
@@ -62,14 +62,14 @@ public:
return true;
}
virtual void OnUserAttached()
virtual void OnClientLogin()
{
stringstream s;
s << "You have " << m_ssUidls.size() << " emails.";
PutModule(s.str());
StartTimer();
}
virtual void OnUserDetached()
virtual void OnClientDisconnect()
{
RemTimer("EMAIL::" + m_pUser->GetUserName());
}
+2 -2
View File
@@ -302,8 +302,8 @@ public:
void UnSetUser() { m_pUser = NULL; }
virtual bool OnLoad(const CString & sArgs, CString & sMessage);
virtual void OnUserAttached() { CBNone("OnUserAttached"); }
virtual void OnUserDetached() { CBNone("OnUserDetached"); }
virtual void OnClientLogin() { CBNone("OnClientLogin"); }
virtual void OnClientDisconnect() { CBNone("OnClientDisconnect"); }
virtual void OnIRCDisconnected() { CBNone("OnIRCDisconnected"); }
virtual void OnIRCConnected() { CBNone("OnIRCConnected"); }
+2 -2
View File
@@ -148,7 +148,7 @@ public:
m_spInjectedPrefixes.erase(m_pUser);
}
virtual void OnUserAttached() {
virtual void OnClientLogin() {
if (m_spInjectedPrefixes.find(m_pUser) == m_spInjectedPrefixes.end()) {
m_pClient->PutClient(":" + GetIRCServer(m_pUser) + " 005 " + m_pUser->GetIRCNick().GetNick() + " CHANTYPES=" + m_pUser->GetChanPrefixes() + "~ :are supported by this server.");
}
@@ -193,7 +193,7 @@ public:
}
}
virtual void OnUserDetached() {
virtual void OnClientDisconnect() {
if (!m_pUser->IsUserAttached() && !m_pUser->IsBeingDeleted()) {
for (set<CPartylineChannel*>::iterator it = m_ssChannels.begin(); it != m_ssChannels.end(); it++) {
const set<CString>& ssNicks = (*it)->GetNicks();
+1 -1
View File
@@ -135,7 +135,7 @@ public:
return true;
}
virtual void OnUserAttached()
virtual void OnClientLogin()
{
CString sName = "SCHAT::" + m_pUser->GetUserName();
for (u_int a = 0; a < m_pManager->size(); a++)
+2 -2
View File
@@ -79,11 +79,11 @@ public:
SetAway(false);
}
virtual void OnUserAttached() {
virtual void OnClientLogin() {
SetBack();
}
virtual void OnUserDetached() {
virtual void OnClientDisconnect() {
/* There might still be other clients */
if (!m_pUser->IsUserAttached())
SetAway();
+1 -1
View File
@@ -163,7 +163,7 @@ public:
Process(OpNick, "* " + OpNick.GetNick() + " sets mode: " + sModes + " " + sArgs + " on " + Channel.GetName(), Channel.GetName());
}
virtual void OnUserAttached() {
virtual void OnClientLogin() {
CString sBufLine;
while (m_Buffer.GetNextLine(m_pUser->GetCurNick(), sBufLine)) {
PutUser(sBufLine);