Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/cc/XMRigd.cpp

src/App.cpp

@@ -41,6 +41,8 @@
 #include "Summary.h"
 #include "workers/Workers.h"
 #include "cc/CCClient.h"
+#include "net/Url.h"
+
 
 #ifdef HAVE_SYSLOG_H
 #   include "log/SysLog.h"
@@ -157,6 +159,10 @@ int App::start()
         uv_async_init(uv_default_loop(), &m_async, App::onCommandReceived);
 
         m_ccclient = new CCClient(m_options, &m_async);
+
+        if (! m_options->pools().front()->isValid()) {
+            LOG_WARN("No pool URL supplied, but CC server configured. Trying.");
+        }
     } else {
         LOG_WARN("Please configure CC-Url and restart. CC feature is now deactivated.");
     }
@@ -164,7 +170,9 @@ int App::start()
 
     Workers::start(m_options->affinity(), m_options->priority());
 
-    m_network->connect();
+    if (m_options->pools().front()->isValid()) {
+        m_network->connect();
+    }
 
     const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
     uv_loop_close(uv_default_loop());

src/App_unix.cpp

@@ -41,4 +41,4 @@ void App::background()
                        : "\nBackground mode is not supported by %s on *nix Systems. Please use screen/tmux or systemd service instead.\n",
                        APP_NAME);
     }
-}
+}

src/Options.cpp

@@ -328,8 +328,8 @@ Options::Options(int argc, char **argv) :
         parseConfig(Platform::defaultConfigName());
     }
 
-    if (!m_pools[0]->isValid()) {
-        fprintf(stderr, "No pool URL supplied. Exiting.\n");
+    if (!m_pools[0]->isValid() && (!m_ccHost || m_ccPort == 0)) {
+        fprintf(stderr, "Neither pool nor CCServer URL supplied. Exiting.\n");
         return;
     }
 

src/cc/Service.cpp

@@ -22,6 +22,7 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <chrono>
 #include <cstring>
 #include <sstream>
 #include <fstream>
@@ -39,6 +40,7 @@
 uv_mutex_t Service::m_mutex;
 std::map<std::string, ControlCommand> Service::m_clientCommand;
 std::map<std::string, ClientStatus> Service::m_clientStatus;
+int Service::m_currentServerTime = 0;
 
 bool Service::start()
 {
@@ -195,6 +197,10 @@ unsigned Service::getClientStatusList(std::string& resp)
         clientStatusList.PushBack(clientStatusEntry, allocator);
     }
 
+    auto time_point = std::chrono::system_clock::now();
+    m_currentServerTime = std::chrono::system_clock::to_time_t(time_point);
+
+    document.AddMember("current_server_time", m_currentServerTime, allocator);
     document.AddMember("current_version", rapidjson::StringRef(Version::string().c_str()), allocator);
     document.AddMember("client_status_list", clientStatusList, allocator);
 

src/cc/Service.h

@@ -58,6 +58,8 @@ private:
     static std::string getClientConfigFileName(const Options *options, const std::string &clientId);
 
 private:
+    static int m_currentServerTime;
+
     static std::map<std::string, ClientStatus> m_clientStatus;
     static std::map<std::string, ControlCommand> m_clientCommand;
 

src/cc/XMRigd.cpp

@@ -32,7 +32,7 @@
 	#include <chrono>
 	#include <thread>
 #else
-#include <sys/wait.h>
+    #include <sys/wait.h>
 #endif
 
 int main(int argc, char **argv) {
@@ -49,7 +49,7 @@ int main(int argc, char **argv) {
 
     std::string xmrigMinerPath = ownPath.substr(0, pos+1) + xmrigMiner;
 
-#ifdef WIN32
+#if defined(_WIN32) || defined(WIN32)
     xmrigMinerPath = "\"" + xmrigMinerPath + "\"";
 #endif
 
@@ -64,7 +64,7 @@ int main(int argc, char **argv) {
 
     do {
         status = system(xmrigMinerPath.c_str());
-#ifdef WIN32
+#if defined(_WIN32) || defined(WIN32)
     } while (status == EINTR);
 
 	if (status == EINVAL) {