Clean up duplicated link snomask messages on errors

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket1.cpp

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 7e62d6a2c69988ae4789ce32e2865794e114874c..fcd6871e1a06533b182221512070eb729ffdb7b6 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -48,7 +48,7 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, const std::string& shost, in
                                std::string name = (**i).ModuleSourceFile;
                                int a = name.rfind('_');
                                int b = name.rfind('.');
-                               name = name.substr(a, b-a-1);
+                               name = name.substr(a+1, b-a-1);
                                if (name == hook)
                                {
                                        AddIOHook(*i);
@@ -69,23 +69,22 @@ found:
  * we must associate it with a socket without creating a new
  * connection. This constructor is used for this purpose.
  */
-TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocketBase* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+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);
 
-       /* Fix by Brain - inbound sockets need a timeout, too. 30 secs should be pleanty */
-       Utils->timeoutlist[this] = std::pair<std::string, int>("<from " + IP + ">", 30);
+       Utils->timeoutlist[this] = std::pair<std::string, int>(myhost, 30);
 }
 
 ServerState TreeSocket::GetLinkState()
@@ -103,7 +102,7 @@ void TreeSocket::CleanNegotiationInfo()
        OutboundPass.clear();
 }
 
-bool TreeSocket::cull()
+CullResult TreeSocket::cull()
 {
        Utils->timeoutlist.erase(this);
        if (myautoconnect)
@@ -131,7 +130,7 @@ void TreeSocket::OnConnected()
                        Link* x = *i;
                        if (x->Name == this->myhost)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('l', "Connection to \2%s\2[%s] started.", myhost.c_str(), (x->HiddenFromStats ? "<hidden>" : this->IP.c_str()));
+                               ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", myhost.c_str(), (x->HiddenFromStats ? "<hidden>" : this->IP.c_str()));
                                this->OutboundPass = x->SendPass;
                                this->SendCapabilities(1);
                                return;
@@ -143,39 +142,17 @@ void TreeSocket::OnConnected()
         * If that happens the connection hangs here until it's closed. Unlikely
         * and rather harmless.
         */
-       ServerInstance->SNO->WriteToSnoMask('l', "Connection to \2%s\2 lost link tag(!)", myhost.c_str());
+       ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2 lost link tag(!)", myhost.c_str());
 }
 
 void TreeSocket::OnError(BufferedSocketError e)
 {
-       switch (e)
-       {
-               case I_ERR_CONNECT:
-                       ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: Connection to \002%s\002 refused", myhost.c_str());
-               break;
-               case I_ERR_SOCKET:
-                       ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: Could not create socket (%s)", strerror(errno));
-               break;
-               case I_ERR_BIND:
-                       ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: Error binding socket to address or port (%s)", strerror(errno));
-               break;
-               case I_ERR_WRITE:
-                       ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: I/O error on connection (%s)", errno ? strerror(errno) : "Connection closed unexpectedly");
-               break;
-               case I_ERR_NOMOREFDS:
-                       ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: Operating system is out of file descriptors!");
-               break;
-               default:
-                       if ((errno) && (errno != EINPROGRESS) && (errno != EAGAIN))
-                               ServerInstance->SNO->WriteToSnoMask('l', "Connection to \002%s\002 failed with OS error: %s", myhost.c_str(), strerror(errno));
-               break;
-       }
+       ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002 failed with error: %s",
+               myhost.c_str(), getError().c_str());
 }
 
 void TreeSocket::SendError(const std::string &errormessage)
 {
-       /* Display the error locally as well as sending it remotely */
-       ServerInstance->SNO->WriteToSnoMask('l', "Sent \2ERROR\2 to %s: %s", (this->InboundServerName.empty() ? this->IP.c_str() : this->InboundServerName.c_str()), errormessage.c_str());
        WriteLine("ERROR :"+errormessage);
        SetError(errormessage);
 }
@@ -222,12 +199,12 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
                Utils->DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName());
                if (Current->GetParent() == Utils->TreeRoot)
                {
-                       ServerInstance->SNO->WriteToSnoMask('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
+                       ServerInstance->SNO->WriteGlobalSno('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
                        LocalSquit = true;
                }
                else
                {
-                       ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason);
+                       ServerInstance->SNO->WriteGlobalSno('L', "Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason);
                }
                num_lost_servers = 0;
                num_lost_users = 0;
@@ -235,11 +212,12 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
                SquitServer(from, Current);
                Current->Tidy();
                Current->GetParent()->DelChild(Current);
+               Current->cull();
                delete Current;
                if (LocalSquit)
-                       ServerInstance->SNO->WriteToSnoMask('l', "Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers);
+                       ServerInstance->SNO->WriteToSnoMask('l', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.", num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");
                else
-                       ServerInstance->SNO->WriteToSnoMask('L', "Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers);
+                       ServerInstance->SNO->WriteToSnoMask('L', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.", num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");
        }
        else
                ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Squit from unknown server");