1 files changed, 23 insertions, 15 deletions

diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index 531c080de..cb96b37b6 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -45,6 +45,7 @@
 #include "daemon/command_server.h"
 #include "daemon/command_server.h"
 #include "daemon/command_line_args.h"
+#include "net/net_ssl.h"
 #include "version.h"
 
 using namespace epee;
@@ -104,6 +105,7 @@ t_daemon::t_daemon(
 {
   zmq_rpc_bind_port = command_line::get_arg(vm, daemon_args::arg_zmq_rpc_bind_port);
   zmq_rpc_bind_address = command_line::get_arg(vm, daemon_args::arg_zmq_rpc_bind_ip);
+  zmq_rpc_disabled = command_line::get_arg(vm, daemon_args::arg_zmq_rpc_disabled);
 }
 
 t_daemon::~t_daemon() = default;
@@ -163,32 +165,37 @@ bool t_daemon::run(bool interactive)
     if (interactive && mp_internals->rpcs.size())
     {
       // The first three variables are not used when the fourth is false
-      rpc_commands.reset(new daemonize::t_command_server(0, 0, boost::none, false, mp_internals->rpcs.front()->get_server()));
+      rpc_commands.reset(new daemonize::t_command_server(0, 0, boost::none, epee::net_utils::ssl_support_t::e_ssl_support_disabled, false, mp_internals->rpcs.front()->get_server()));
       rpc_commands->start_handling(std::bind(&daemonize::t_daemon::stop_p2p, this));
     }
 
     cryptonote::rpc::DaemonHandler rpc_daemon_handler(mp_internals->core.get(), mp_internals->p2p.get());
     cryptonote::rpc::ZmqServer zmq_server(rpc_daemon_handler);
 
-    if (!zmq_server.addTCPSocket(zmq_rpc_bind_address, zmq_rpc_bind_port))
+    if (!zmq_rpc_disabled)
     {
-      LOG_ERROR(std::string("Failed to add TCP Socket (") + zmq_rpc_bind_address
-          + ":" + zmq_rpc_bind_port + ") to ZMQ RPC Server");
+      if (!zmq_server.addTCPSocket(zmq_rpc_bind_address, zmq_rpc_bind_port))
+      {
+        LOG_ERROR(std::string("Failed to add TCP Socket (") + zmq_rpc_bind_address
+            + ":" + zmq_rpc_bind_port + ") to ZMQ RPC Server");
 
-      if (rpc_commands)
-        rpc_commands->stop_handling();
+        if (rpc_commands)
+          rpc_commands->stop_handling();
 
-      for(auto& rpc : mp_internals->rpcs)
-        rpc->stop();
+        for(auto& rpc : mp_internals->rpcs)
+          rpc->stop();
 
-      return false;
-    }
+        return false;
+      }
 
-    MINFO("Starting ZMQ server...");
-    zmq_server.run();
+      MINFO("Starting ZMQ server...");
+      zmq_server.run();
 
-    MINFO(std::string("ZMQ server started at ") + zmq_rpc_bind_address
-          + ":" + zmq_rpc_bind_port + ".");
+      MINFO(std::string("ZMQ server started at ") + zmq_rpc_bind_address
+            + ":" + zmq_rpc_bind_port + ".");
+    }
+    else
+      MINFO("ZMQ server disabled");
 
     if (public_rpc_port > 0)
     {
@@ -201,7 +208,8 @@ bool t_daemon::run(bool interactive)
     if (rpc_commands)
       rpc_commands->stop_handling();
 
-    zmq_server.stop();
+    if (!zmq_rpc_disabled)
+      zmq_server.stop();
 
     for(auto& rpc : mp_internals->rpcs)
       rpc->stop();