diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-11-03 18:23:04 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-11-03 18:23:04 +0000 |
| commit | ab4b307b744f3602512fd2ab126c5f4f4a2173db (patch) | |
| tree | b977b10bf472449483655e626c6f820968cfc221 /src/modules/m_spanningtree/treesocket1.cpp | |
| parent | e27b8377a0c2ae6855d680f6b2eb44dc093813fc (diff) | |
Clean up duplicated link snomask messages on errors
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11999 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_spanningtree/treesocket1.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/treesocket1.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 9d3de187d..fcd6871e1 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -72,19 +72,19 @@ found: TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) : BufferedSocket(newfd), Utils(Util) { - int dummy; - irc::sockets::satoap(*client, IP, dummy); + IP = client->addr(); age = ServerInstance->Time(); LinkState = WAIT_AUTH_1; capab_phase = 0; proto_version = 0; + myhost = "inbound from " + IP; FOREACH_MOD(I_OnHookIO, OnHookIO(this, via)); if (GetIOHook()) GetIOHook()->OnStreamSocketAccept(this, client, server); SendCapabilities(1); - Utils->timeoutlist[this] = std::pair<std::string, int>("inbound from " + IP, 30); + Utils->timeoutlist[this] = std::pair<std::string, int>(myhost, 30); } ServerState TreeSocket::GetLinkState() @@ -155,8 +155,6 @@ void TreeSocket::SendError(const std::string &errormessage) { WriteLine("ERROR :"+errormessage); SetError(errormessage); - /* Display the error locally as well as sending it remotely */ - ServerInstance->SNO->WriteGlobalSno('l', "Sent \2ERROR\2 to %s: %s", (this->InboundServerName.empty() ? this->IP.c_str() : this->InboundServerName.c_str()), errormessage.c_str()); } /** This function forces this server to quit, removing this server |