Fix the cloaking module on C++98 compilers.

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

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 05d85aa67fa287b605daff0b6d9e34e1e011925e..60bd3ec8a2ba0bb55e09afe9e2810fe8ce541ad1 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -1,12 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2007-2008, 2012 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008, 2012 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -155,17 +158,17 @@ void TreeSocket::ProcessLine(std::string &line)
                        }
                        else if (command == "BURST")
                        {
-                               if (params.size())
+                               if (!params.empty())
                                {
                                        time_t them = ConvToNum<time_t>(params[0]);
                                        time_t delta = them - ServerInstance->Time();
-                                       if ((delta < -600) || (delta > 600))
+                                       if ((delta < -60) || (delta > 60))
                                        {
-                                               ServerInstance->SNO->WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by %ld seconds (this is more than five minutes). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", labs((long)delta));
-                                               SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
+                                               ServerInstance->SNO->WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by %ld seconds (this is more than one minute). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", labs((long)delta));
+                                               SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than one minute). Link aborted, PLEASE SYNC YOUR CLOCKS!");
                                                return;
                                        }
-                                       else if ((delta < -30) || (delta > 30))
+                                       else if ((delta < -15) || (delta > 15))
                                        {
                                                ServerInstance->SNO->WriteGlobalSno('l', "\002WARNING\002: Your clocks are off by %ld seconds. Please consider syncing your clocks.", labs((long)delta));
                                        }
@@ -333,7 +336,7 @@ void TreeSocket::ProcessConnectedLine(std::string& taglist, std::string& prefix,
        }
 
        // Translate commands coming from servers using an older protocol
-       if (proto_version < ProtocolVersion)
+       if (proto_version < PROTO_NEWEST)
        {
                if (!PreProcessOldProtocolMessage(who, command, params))
                        return;
@@ -404,7 +407,7 @@ void TreeSocket::OnTimeout()
 
 void TreeSocket::Close()
 {
-       if (fd < 0)
+       if (!HasFd())
                return;
 
        ServerInstance->GlobalCulls.AddItem(this);
@@ -413,16 +416,16 @@ void TreeSocket::Close()
 
        // Connection closed.
        // If the connection is fully up (state CONNECTED)
-       // then propogate a netsplit to all peers.
+       // then propagate a netsplit to all peers.
        if (MyRoot)
-               MyRoot->SQuit(getError());
+               MyRoot->SQuit(getError(), true);
 
        ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed.", linkID.c_str());
 
        time_t server_uptime = ServerInstance->Time() - this->age;
        if (server_uptime)
        {
-               std::string timestr = ModuleSpanningTree::TimeToStr(server_uptime);
+               std::string timestr = InspIRCd::DurationString(server_uptime);
                ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' was established for %s", linkID.c_str(), timestr.c_str());
        }
 }