From 1e3b73c7b2f77861e4a80c0a00284ccd7fa753f6 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Thu, 8 Sep 2011 09:57:16 +0200 Subject: [PATCH] Make the debug output for raw query line up This adds the network name to stuff sent to clients. Signed-off-by: Uli Schlachter --- Client.cpp | 16 ++++++++++++---- Client.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Client.cpp b/Client.cpp index 64664817..dc7e3408 100644 --- a/Client.cpp +++ b/Client.cpp @@ -74,7 +74,7 @@ void CClient::ReadLine(const CString& sData) { sLine.TrimRight("\n\r"); - DEBUG("(" << ((m_pUser) ? m_pUser->GetUserName() : GetRemoteIP()) << ((m_pNetwork) ? ("/" + m_pNetwork->GetName()) : "") << ") CLI -> ZNC [" << sLine << "]"); + DEBUG("(" << GetFullName() << ") CLI -> ZNC [" << sLine << "]"); if (IsAttached()) { MODULECALL(OnUserRaw(sLine), m_pUser, m_pNetwork, this, return); @@ -707,8 +707,16 @@ void CClient::PutIRC(const CString& sLine) { } } +CString CClient::GetFullName() { + if (!m_pUser) + return GetRemoteIP(); + if (!m_pNetwork) + return m_pUser->GetUserName(); + return m_pUser->GetUserName() + "/" + m_pNetwork->GetName(); +} + void CClient::PutClient(const CString& sLine) { - DEBUG("(" << ((m_pUser) ? m_pUser->GetUserName() : GetRemoteIP()) << ") ZNC -> CLI [" << sLine << "]"); + DEBUG("(" << GetFullName() << ") ZNC -> CLI [" << sLine << "]"); Write(sLine + "\r\n"); } @@ -733,7 +741,7 @@ void CClient::PutModNotice(const CString& sModule, const CString& sLine) { return; } - DEBUG("(" << m_pUser->GetUserName() << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in NOTICE " << GetNick() << " :" << sLine << "]"); + DEBUG("(" << GetFullName() << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in NOTICE " << GetNick() << " :" << sLine << "]"); Write(":" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in NOTICE " + GetNick() + " :" + sLine + "\r\n"); } @@ -742,7 +750,7 @@ void CClient::PutModule(const CString& sModule, const CString& sLine) { return; } - DEBUG("(" << m_pUser->GetUserName() << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in PRIVMSG " << GetNick() << " :" << sLine << "]"); + DEBUG("(" << GetFullName() << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in PRIVMSG " << GetNick() << " :" << sLine << "]"); Write(":" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in PRIVMSG " + GetNick() + " :" + sLine + "\r\n"); } diff --git a/Client.h b/Client.h index 2560679d..ab80e866 100644 --- a/Client.h +++ b/Client.h @@ -135,6 +135,7 @@ public: vector& GetClients(); const CIRCSock* GetIRCSock() const; CIRCSock* GetIRCSock(); + CString GetFullName(); private: void HandleCap(const CString& sLine); void RespondCap(const CString& sResponse);