From 4174d193b4d43c5e35b306a5439de7f01e287807 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 4 Aug 2020 10:50:57 +0200 Subject: [PATCH] removed exec_command from ClientInterface --- slsReceiverSoftware/src/ClientInterface.cpp | 23 --------------------- slsReceiverSoftware/src/ClientInterface.h | 1 - 2 files changed, 24 deletions(-) diff --git a/slsReceiverSoftware/src/ClientInterface.cpp b/slsReceiverSoftware/src/ClientInterface.cpp index dc20985d1..185c63b40 100644 --- a/slsReceiverSoftware/src/ClientInterface.cpp +++ b/slsReceiverSoftware/src/ClientInterface.cpp @@ -108,7 +108,6 @@ void ClientInterface::startTCPServer() { // clang-format off int ClientInterface::functionTable(){ - flist[F_EXEC_RECEIVER_COMMAND] = &ClientInterface::exec_command; flist[F_LOCK_RECEIVER] = &ClientInterface::lock_receiver; flist[F_GET_LAST_RECEIVER_CLIENT_IP] = &ClientInterface::get_last_client_ip; flist[F_SET_RECEIVER_PORT] = &ClientInterface::set_port; @@ -271,28 +270,6 @@ void ClientInterface::verifyIdle(Interface &socket) { } } -int ClientInterface::exec_command(Interface &socket) { - char cmd[MAX_STR_LENGTH]{}; - char retval[MAX_STR_LENGTH]{}; - socket.Receive(cmd); - LOG(logINFO) << "Executing command (" << cmd << ")"; - const size_t tempsize = 256; - std::array temp{}; - std::string sresult; - std::shared_ptr pipe(popen(cmd, "r"), pclose); - if (!pipe) { - throw RuntimeError("Executing Command failed\n"); - } else { - while (!feof(pipe.get())) { - if (fgets(temp.data(), tempsize, pipe.get()) != nullptr) - sresult += temp.data(); - } - strncpy(retval, sresult.c_str(), MAX_STR_LENGTH); - LOG(logINFO) << "Result of cmd (" << cmd << "):\n" << retval; - } - return socket.sendResult(retval); -} - int ClientInterface::lock_receiver(Interface &socket) { auto lock = socket.Receive(); LOG(logDEBUG1) << "Locking Server to " << lock; diff --git a/slsReceiverSoftware/src/ClientInterface.h b/slsReceiverSoftware/src/ClientInterface.h index effd11dbb..f008a3672 100644 --- a/slsReceiverSoftware/src/ClientInterface.h +++ b/slsReceiverSoftware/src/ClientInterface.h @@ -60,7 +60,6 @@ class ClientInterface : private virtual slsDetectorDefs { void verifyLock(); void verifyIdle(sls::ServerInterface &socket); - int exec_command(sls::ServerInterface &socket); int lock_receiver(sls::ServerInterface &socket); int get_last_client_ip(sls::ServerInterface &socket); int set_port(sls::ServerInterface &socket);