Ticket 37. The if-else construction and conf.ReadString() function call added for

[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 d4419b40e84c528e690816ec516acae8c5db5831..3b28ddd809f1ac4cbc2d52c321fc1b97bbe9ccf8 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
@@ -2,6 +2,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

+#include <unistd.h>

 
 #include <cstdlib>
 #include <csignal>
 
 #include <cstdlib>
 #include <csignal>


@@ -9,6 +10,7 @@
 #include <cstring>
 #include <vector>
 #include <algorithm>
 #include <cstring>
 #include <vector>
 #include <algorithm>

+#include <ostream> // xmlrpc-c devs have missed something :)

 
 #include "stg/common.h"
 #include "stg/admin.h"
 
 #include "stg/common.h"
 #include "stg/admin.h"


@@ -23,40 +25,43 @@
 #include "admins_methods.h"
 #include "messages_methods.h"
 
 #include "admins_methods.h"
 #include "messages_methods.h"
 

+namespace
+{

 PLUGIN_CREATOR<RPC_CONFIG> rpcc;
 PLUGIN_CREATOR<RPC_CONFIG> rpcc;

+}
+
+extern "C" PLUGIN * GetPlugin();

 
 RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()
 
 RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()

-    : errorStr(),
-      port(0),
+    : port(0),

       cookieTimeout(0)
 {
 }
 
 int RPC_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
       cookieTimeout(0)
 {
 }
 
 int RPC_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {

-int p;

 PARAM_VALUE pv;
 PARAM_VALUE pv;

-std::vector<PARAM_VALUE>::const_iterator pvi;
-

 pv.param = "Port";
 pv.param = "Port";

+std::vector<PARAM_VALUE>::const_iterator pvi;

 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);

-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())

     {
     errorStr = "Parameter \'Port\' not found.";
     printfd(__FILE__, "Parameter 'Port' not found\n");
     return -1;
     }
     {
     errorStr = "Parameter \'Port\' not found.";
     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;
     }
 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);
 
 pv.param = "CookieTimeout";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);

-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())

     {
     cookieTimeout = 1800; // 30 * 60
     }
     {
     cookieTimeout = 1800; // 30 * 60
     }


@@ -79,22 +84,16 @@ return rpcc.GetPlugin();
 }
 
 RPC_CONFIG::RPC_CONFIG()
 }
 
 RPC_CONFIG::RPC_CONFIG()

-    : errorStr(),
-      rpcConfigSettings(),
-      users(NULL),
+    : users(NULL),

       admins(NULL),
       tariffs(NULL),
       store(NULL),
       admins(NULL),
       tariffs(NULL),
       store(NULL),

-      settings(),

       fd(-1),
       fd(-1),

-      rpcRegistry(),

       rpcServer(NULL),
       running(false),
       stopped(true),
       rpcServer(NULL),
       running(false),
       stopped(true),

-      tid(),
-      cookies(),

       dayFee(0),
       dayFee(0),

-      dirNames()
+      logger(GetPluginLogger(GetStgLogger(), "conf_rpc"))

 {
 }
 
 {
 }
 


@@ -114,12 +113,12 @@ if (ret)
 return 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.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));

     }
 }
 
     }
 }
 


@@ -132,6 +131,7 @@ fd = socket(AF_INET, SOCK_STREAM, 0);
 if (fd < 0)
     {
     errorStr = "Failed to create socket";
 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;
     }
     printfd(__FILE__, "Failed to create listening socket: %s\n", strerror(errno));
     return -1;
     }


@@ -141,6 +141,7 @@ int flag = 1;
 if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag)))
     {
     errorStr = "Setsockopt failed.";
 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;
     }
     printfd(__FILE__, "Setsockopt failed: %s\n", strerror(errno));
     return -1;
     }


@@ -152,6 +153,7 @@ addr.sin_addr.s_addr = inet_addr("0.0.0.0");
 
 if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
     {
 
 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;
     errorStr = "Failed to bind socket";
     printfd(__FILE__, "Failed to bind listening socket: %s\n", strerror(errno));
     return -1;


@@ -159,6 +161,7 @@ if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
 
 if (listen(fd, 10))
     {
 
 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;
     errorStr = "Failed to listen socket";
     printfd(__FILE__, "Failed to listen listening socket: %s\n", strerror(errno));
     return -1;


@@ -174,6 +177,7 @@ rpcServer = new xmlrpc_c::serverAbyss(
 if (pthread_create(&tid, NULL, Run, this))
     {
     errorStr = "Failed to create RPC thread";
 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;
     }
     printfd(__FILE__, "Failed to crate RPC thread\n");
     return -1;
     }


@@ -193,6 +197,7 @@ for (int i = 0; i < 5 && !stopped; ++i)
 if (!stopped)
     {
     running = true;
 if (!stopped)
     {
     running = true;

+    logger("Cannot stop RPC thread.");

     printfd(__FILE__, "Failed to stop RPC thread\n");
     errorStr = "Failed to stop RPC thread";
     return -1;
     printfd(__FILE__, "Failed to stop RPC thread\n");
     errorStr = "Failed to stop RPC thread";
     return -1;


@@ -260,6 +265,7 @@ ADMIN * admin = NULL;
 
 if (!admins->Correct(login, password, &admin))
     {
 
 if (!admins->Correct(login, password, &admin))
     {

+    logger("Attempt to connect with invalid credentials. Login: %s", login.c_str());

     return true;
     }
 
     return true;
     }
 


@@ -459,5 +465,11 @@ xmlrpc_c::methodPtr const methodGetOnlinIPsPtr(new METHOD_GET_ONLINE_IPS(
             users
             ));
 rpcRegistry.addMethod("stargazer.get_online_ips", methodGetOnlinIPsPtr);
             users
             ));
 rpcRegistry.addMethod("stargazer.get_online_ips", methodGetOnlinIPsPtr);

+
+xmlrpc_c::methodPtr const methodGetUserAuthByPtr(new METHOD_GET_USER_AUTH_BY(
+            this,
+            users
+            ));
+rpcRegistry.addMethod("stargazer.get_user_auth_by", methodGetUserAuthByPtr);

 }
 
 }