From 67e0e32b86885df705a92cdc971a6085c4a7c1ba Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Wed, 16 Apr 2014 13:20:39 +0200
Subject: m_spanningtree Add ServerCommand::ExtractTS() to convert string to
 raw TS

Throws a ProtocolException if the input is invalid
---
 src/modules/m_spanningtree/uid.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/modules/m_spanningtree/uid.cpp')

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 206f79a48..51f7026dd 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -31,8 +31,8 @@ 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];
 
@@ -40,10 +40,6 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 	if (params[0].length() != UIDGenerator::UUID_LENGTH || params[0].substr(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");
 
-- 
cgit v1.3.1-10-gc9f91