From 843a96895993bb56d378c6becbe329e88d96c042 Mon Sep 17 00:00:00 2001 From: orignal Date: Sun, 9 Jan 2022 19:07:10 -0500 Subject: [PATCH] integer uptime --- daemon/I2PControl.cpp | 19 ++++++++++++++++--- daemon/I2PControl.h | 4 ++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/daemon/I2PControl.cpp b/daemon/I2PControl.cpp index 3526de4d..53463a45 100644 --- a/daemon/I2PControl.cpp +++ b/daemon/I2PControl.cpp @@ -1,3 +1,11 @@ +/* +* Copyright (c) 2013-2022, The PurpleI2P Project +* +* This file is part of Purple i2pd project and licensed under BSD3 +* +* See full license text in LICENSE file at top of project tree +*/ + #include #include #include @@ -278,11 +286,16 @@ namespace client ss << "\"" << name << "\":" << value; } - void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, const std::string& value) const + void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, const std::string& value, bool quotes) const { ss << "\"" << name << "\":"; if (value.length () > 0) - ss << "\"" << value << "\""; + { + if (quotes) + ss << "\"" << value << "\""; + else + ss << value; + } else ss << "null"; } @@ -406,7 +419,7 @@ namespace client void I2PControlService::UptimeHandler (std::ostringstream& results) { - InsertParam (results, "i2p.router.uptime", std::to_string (i2p::context.GetUptime ()*1000LL)); + InsertParam (results, "i2p.router.uptime", std::to_string (i2p::context.GetUptime ()*1000LL), false); } void I2PControlService::VersionHandler (std::ostringstream& results) diff --git a/daemon/I2PControl.h b/daemon/I2PControl.h index d731c24e..32b8933c 100644 --- a/daemon/I2PControl.h +++ b/daemon/I2PControl.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2013-2020, The PurpleI2P Project +* Copyright (c) 2013-2022, The PurpleI2P Project * * This file is part of Purple i2pd project and licensed under BSD3 * @@ -65,7 +65,7 @@ namespace client void InsertParam (std::ostringstream& ss, const std::string& name, int value) const; void InsertParam (std::ostringstream& ss, const std::string& name, double value) const; - void InsertParam (std::ostringstream& ss, const std::string& name, const std::string& value) const; + void InsertParam (std::ostringstream& ss, const std::string& name, const std::string& value, bool quotes = true) const; void InsertParam (std::ostringstream& ss, const std::string& name, const boost::property_tree::ptree& value) const; // methods