Remove current time parameter of the Timer constructor

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

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 206f79a483170dacbc221525f23660ddac087de8..1b17ca6e7d71442e1fa39b39c7bd3e2c3669c1ab 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -31,19 +31,15 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
         *      0    1    2    3    4    5        6        7     8        9       (n-1)
         * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :gecos
         */
-       time_t age_t = ConvToInt(params[1]);
-       time_t signon = ConvToInt(params[7]);
+       time_t age_t = ServerCommand::ExtractTS(params[1]);
+       time_t signon = ServerCommand::ExtractTS(params[7]);
        std::string empty;
        const std::string& modestr = params[8];
 
        /* Is this a valid UID, and not misrouted? */
-       if (params[0].length() != UIDGenerator::UUID_LENGTH || params[0].substr(0, 3) != remoteserver->GetID())
+       if (params[0].length() != UIDGenerator::UUID_LENGTH || params[0].compare(0, 3, remoteserver->GetID()))
                throw ProtocolException("Bogus UUID");
        /* Check parameters for validity before introducing the client, discovered by dmb */
-       if (!age_t)
-               return CMD_INVALID;
-       if (!signon)
-               return CMD_INVALID;
        if (modestr[0] != '+')
                throw ProtocolException("Invalid mode string");
 
@@ -75,7 +71,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
        _new->host = params[3];
        _new->dhost = params[4];
        _new->ident = params[5];
-       _new->fullname = params[params.size() - 1];
+       _new->fullname = params.back();
        _new->registered = REG_ALL;
        _new->signon = signon;
        _new->age = age_t;