Debug.

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / rpcconfig.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
index d3fdba55576f526cd4f292753fa86ffc5553e870..e84e9a0e1af96c8e9a23acbcef97716e977bbe27 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
@@ -1,8 +1,16 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+
 #include <cstdlib>
 #include <csignal>
-
+#include <cerrno>
+#include <cstring>
 #include <vector>
 #include <algorithm>
+#include <ostream> // xmlrpc-c devs have missed something :)
 
 #include "stg/common.h"
 #include "stg/admin.h"
@@ -17,7 +25,12 @@
 #include "admins_methods.h"
 #include "messages_methods.h"
 
+namespace
+{
 PLUGIN_CREATOR<RPC_CONFIG> rpcc;
+}
+
+extern "C" PLUGIN * GetPlugin();
 
 RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()
     : errorStr(),
@@ -28,11 +41,9 @@ RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()
 
 int RPC_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
-int p;
 PARAM_VALUE pv;
-std::vector<PARAM_VALUE>::const_iterator pvi;
-
 pv.param = "Port";
+std::vector<PARAM_VALUE>::const_iterator pvi;
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 if (pvi == s.moduleParams.end())
     {
@@ -40,13 +51,14 @@ if (pvi == s.moduleParams.end())
     printfd(__FILE__, "Parameter 'Port' not found\n");
     return -1;
     }
+int p;
 if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
     {
     errorStr = "Cannot parse parameter \'Port\': " + errorStr;
     printfd(__FILE__, "Cannot parse parameter 'Port'\n");
     return -1;
     }
-port = p;
+port = static_cast<uint16_t>(p);
 
 pv.param = "CookieTimeout";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
@@ -80,6 +92,7 @@ RPC_CONFIG::RPC_CONFIG()
       tariffs(NULL),
       store(NULL),
       settings(),
+      fd(-1),
       rpcRegistry(),
       rpcServer(NULL),
       running(false),
@@ -87,7 +100,8 @@ RPC_CONFIG::RPC_CONFIG()
       tid(),
       cookies(),
       dayFee(0),
-      dirNames()
+      dirNames(),
+      logger(GetPluginLogger(GetStgLogger(), "conf_rpc"))
 {
 }
 
@@ -107,12 +121,12 @@ if (ret)
 return ret;
 }
 
-void RPC_CONFIG::SetStgSettings(const SETTINGS * settings)
+void RPC_CONFIG::SetStgSettings(const SETTINGS * s)
 {
-    dayFee = settings->GetDayFee();
+    dayFee = s->GetDayFee();
     dirNames.erase(dirNames.begin(), dirNames.end());
     for (size_t i = 0; i < DIR_NUM; ++i) {
-        dirNames.push_back(settings->GetDirName(i));
+        dirNames.push_back(s->GetDirName(i));
     }
 }
 
@@ -120,17 +134,62 @@ int RPC_CONFIG::Start()
 {
 InitiateRegistry();
 running = true;
+
+fd = socket(AF_INET, SOCK_STREAM, 0);
+if (fd < 0)
+    {
+    errorStr = "Failed to create socket";
+    logger("Cannot create a socket: %s", strerror(errno));
+    printfd(__FILE__, "Failed to create listening socket: %s\n", strerror(errno));
+    return -1;
+    }
+
+int flag = 1;
+
+if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag)))
+    {
+    errorStr = "Setsockopt failed.";
+    logger("setsockopt error: %s", strerror(errno));
+    printfd(__FILE__, "Setsockopt failed: %s\n", strerror(errno));
+    return -1;
+    }
+
+struct sockaddr_in addr;
+addr.sin_family = AF_INET;
+addr.sin_port = htons(rpcConfigSettings.GetPort());
+addr.sin_addr.s_addr = inet_addr("0.0.0.0");
+
+if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
+    {
+    logger("Cannot bind the socket: %s", strerror(errno));
+    errorStr = "Failed to bind socket";
+    printfd(__FILE__, "Failed to bind listening socket: %s\n", strerror(errno));
+    return -1;
+    }
+
+if (listen(fd, 10))
+    {
+    logger("Cannot listen the socket: %s", strerror(errno));
+    errorStr = "Failed to listen socket";
+    printfd(__FILE__, "Failed to listen listening socket: %s\n", strerror(errno));
+    return -1;
+    }
+
 rpcServer = new xmlrpc_c::serverAbyss(
-        rpcRegistry,
-        rpcConfigSettings.GetPort(),
-        "/var/log/stargazer_rpc.log"
+        xmlrpc_c::serverAbyss::constrOpt()
+        .registryP(&rpcRegistry)
+        .logFileName("/var/log/stargazer_rpc.log")
+        .socketFd(fd)
         );
+
 if (pthread_create(&tid, NULL, Run, this))
     {
     errorStr = "Failed to create RPC thread";
+    logger("Cannot create RPC thread.");
     printfd(__FILE__, "Failed to crate RPC thread\n");
     return -1;
     }
+
 return 0;
 }
 
@@ -142,31 +201,22 @@ for (int i = 0; i < 5 && !stopped; ++i)
     struct timespec ts = {0, 200000000};
     nanosleep(&ts, NULL);
     }
-//rpcServer->terminate();
+
 if (!stopped)
     {
-    if (pthread_kill(tid, SIGTERM))
-        {
-        errorStr = "Failed to kill thread";
-        printfd(__FILE__, "Failed to kill thread\n");
-        }
-    for (int i = 0; i < 25 && !stopped; ++i)
-        {
-        struct timespec ts = {0, 200000000};
-        nanosleep(&ts, NULL);
-        }
-    if (!stopped)
-        {
-        running = true;
-        printfd(__FILE__, "Failed to stop RPC thread\n");
-        errorStr = "Failed to stop RPC thread";
-        return -1;
-        }
-    else
-        {
-        pthread_join(tid, NULL);
-        }
+    running = true;
+    logger("Cannot stop RPC thread.");
+    printfd(__FILE__, "Failed to stop RPC thread\n");
+    errorStr = "Failed to stop RPC thread";
+    return -1;
     }
+else
+    {
+    pthread_join(tid, NULL);
+    }
+
+close(fd);
+
 return 0;
 }
 
@@ -181,7 +231,8 @@ RPC_CONFIG * config = static_cast<RPC_CONFIG *>(rc);
 config->stopped = false;
 while (config->running)
     {
-    config->rpcServer->runOnce();
+    if (WaitPackets(config->fd))
+        config->rpcServer->runOnce();
     }
 config->stopped = true;
 
@@ -222,6 +273,7 @@ ADMIN * admin = NULL;
 
 if (!admins->Correct(login, password, &admin))
     {
+    logger("Attempt to connect with invalid credentials. Login: %s", login.c_str());
     return true;
     }