Compilation issues fixed

diff --git a/projects/sgauthstress/main.cpp b/projects/sgauthstress/main.cpp
index 96c58203ec78c5d5463cae2a52eada20232ef723..3460457a6f1d0e67ee4786173f194b044652f4d4 100644 (file)
--- a/projects/sgauthstress/main.cpp
+++ b/projects/sgauthstress/main.cpp
@@ -25,104 +25,45 @@
  */
 
 #include <unistd.h>
  */
 
 #include <unistd.h>

-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>

 
 #include <csignal>
 
 #include <csignal>

-#include <cstdio>
-#include <cstring>

 #include <iostream>
 #include <iostream>

-#include <vector>

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

-#include "web.h"
-#include "settings_impl.h"

 
 

-int mes;
-char infoText[256];
-char messageText[256];
-
-const int winKOI = 0;
-
-IA_CLIENT_PROT * clnp;
-WEB * web = NULL;
-
-using namespace std;
+#include "settings.h"

 
 time_t stgTime;
 
 time_t stgTime;

+bool running;

 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 void Usage()
 {
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 void Usage()
 {

-printf("sgauth <path_to_config>\n");
+std::cout << "sgauth <path_to_config>" << std::endl;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void SetDirName(const vector<string> & dn, void *)
+void StatUpdate(const LOADSTAT &, void *)

 {
 {

-for (int j = 0; j < DIR_NUM; j++)
-    {
-    if (winKOI)
-        {
-        string dir;
-        KOIToWin(dn[j], &dir);
-        if (web)
-            web->SetDirName(dir, j);
-        }
-    else
-        {
-        if (web)
-            web->SetDirName(dn[j], j);
-        }
-    }
-}
-//-----------------------------------------------------------------------------
-void StatUpdate(const LOADSTAT & ls, void *)
-{
-if (web)
-    web->UpdateStat(ls);

 }
 //-----------------------------------------------------------------------------
 void StatusChanged(int, void *)
 {
 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 void StatusChanged(int, void *)
 {
 }
 //-----------------------------------------------------------------------------

-void ShowMessage(const string & message, int i, int, int, void *)
-{
-if (web)
-    web->AddMessage(message, i);
-}
-//-----------------------------------------------------------------------------
-void ShowError(const string & message, int, void *)
+void ShowMessage(const string &, int, int, int, void *)

 {
 {

-if (web)
-     web->AddMessage(message, 0);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void CatchUSR1(int)
+void ShowError(const string &, int, void *)

 {
 {

-if (clnp->GetAuthorized())
-    {
-    cout << "Connect" << endl;
-    clnp->Connect();
-    }
-}
-//-----------------------------------------------------------------------------
-void CatchUSR2(int)
-{
-cout << "Disconnect" << endl;
-clnp->Disconnect();

 }
 //-----------------------------------------------------------------------------
 void CatchTERM(int)
 {
 }
 //-----------------------------------------------------------------------------
 void CatchTERM(int)
 {

-cout << "Terminated" << endl;
-clnp->Disconnect();
-sleep(2);
-exit(0);
+running = false;

 }
 //-----------------------------------------------------------------------------
 static void SetSignalHandlers()
 }
 //-----------------------------------------------------------------------------
 static void SetSignalHandlers()


@@ -144,135 +85,51 @@ newsa.sa_mask = sigmask;
 newsa.sa_flags = 0;
 sigaction(SIGINT, &newsa, &oldsa);
 
 newsa.sa_flags = 0;
 sigaction(SIGINT, &newsa, &oldsa);
 

-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGUSR1);
-newsa.sa_handler = CatchUSR1;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGUSR1, &newsa, &oldsa);
-
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGUSR2);
-newsa.sa_handler = CatchUSR2;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGUSR2, &newsa, &oldsa);
-

 return;
 }
 //-----------------------------------------------------------------------------
 int main(int argc, char *argv[])
 {
 return;
 }
 //-----------------------------------------------------------------------------
 int main(int argc, char *argv[])
 {

-SETTINGS_IMPL settings;
+SETTINGS settings;

 
 if (argc == 2)
     {
     settings.SetConfFile(argv[1]);
     }
 
 if (argc == 2)
     {
     settings.SetConfFile(argv[1]);
     }

-else
-    {
-    // Usage
-    }

 
 if (settings.ReadSettings())
     {
 
 if (settings.ReadSettings())
     {

-    printf("ReadSettingsError\n");
-    printf("%s\n", settings.GetStrError().c_str());
-    exit(-1);
+    std::cerr << "Failed to read settings\n"
+              << settings.GetStrError() << std::endl;
+    Usage();
+    return -1;

     }
     }

-settings.Print();
-
-if (settings.GetDaemon())
-    {
-    switch (fork())
-        {
-        case -1:
-            exit(1);
-            break;

 
 

-        case 0:
-            setsid();
-            break;
-
-        default:
-            exit(0);
-            break;
-        }
-    }
-
-clnp = new IA_CLIENT_PROT(settings.GetServerName(), settings.GetServerPort(), settings.GetLocalPort());
-
-if (!settings.GetNoWeb())
-    {
-    web = new WEB();
-    web->SetRefreshPagePeriod(settings.GetRefreshPeriod());
-    web->SetListenAddr(settings.GetListenWebIP());
-    web->Start();
-    }
-
-clnp->SetLogin(settings.GetLogin());
-clnp->SetPassword(settings.GetPassword());
-
-clnp->SetStatusChangedCb(StatusChanged, NULL);
-clnp->SetInfoCb(ShowMessage, NULL);
-clnp->SetErrorCb(ShowError, NULL);
-clnp->SetDirNameCb(SetDirName, NULL);
-clnp->SetStatChangedCb(StatUpdate, NULL);
-clnp->SetReconnect(settings.GetReconnect());
+SetSignalHandlers();

 
 

-clnp->Start();
+IA_CLIENT_PROT proto(settings.GetServerName(), settings.GetServerPort(), settings.GetLocalPort());

 
 

-SetSignalHandlers();
+proto.SetLogin(settings.GetLogin());
+proto.SetPassword(settings.GetPassword());

 
 

-#ifdef LINUX
-for (int i = 1; i < argc; i++)
-    memset(argv[i], 0, strlen(argv[i]));
+proto.SetStatusChangedCb(StatusChanged, NULL);
+proto.SetInfoCb(ShowMessage, NULL);
+proto.SetErrorCb(ShowError, NULL);
+proto.SetStatChangedCb(StatUpdate, NULL);

 
 

-if(argc > 1)
-    strcpy(argv[1], "Connecting...");
-#endif
+proto.Start();

 
 

-#ifdef FREEBSD
-setproctitle("Connecting...");
-#endif
-clnp->Connect();
+proto.Connect();

 
 

-while (1)
+running = true;
+while (running)

     {
     usleep(200000);
     {
     usleep(200000);

+    }

 
 

-    char state[20];
-
-    if (clnp->GetAuthorized())
-        {
-        if (settings.GetShowPid())
-            sprintf(state, "On %d", getpid());
-        else
-            strcpy(state, "Online");
-        }
-    else
-        {
-        if (settings.GetShowPid())
-            sprintf(state, "Off %d", getpid());
-        else
-            strcpy(state, "Offline");
-        }
-
-    #ifdef LINUX
-    for (int i = 1; i < argc; i++)
-        memset(argv[i], 0, strlen(argv[i]));
-    if(argc > 1)
-        strcpy(argv[1], state);
-    #endif
-
-    #ifdef FREEBSD
-    setproctitle(state);
-    #endif
+proto.Disconnect();

 
 

-    #ifdef FREEBSD_5
-    setproctitle(state);
-    #endif
-    }
+proto.Stop();

 
 return 0;
 }
 
 return 0;
 }

diff --git a/projects/sgauthstress/settings.cpp b/projects/sgauthstress/settings.cpp
index 9055ceed24df59e9b11190f92a79ca2782653ed1..ce8fe8644ec36868b1d93c4cfb6e0b7997e90c3a 100644 (file)
--- a/projects/sgauthstress/settings.cpp
+++ b/projects/sgauthstress/settings.cpp
@@ -35,7 +35,7 @@ SETTINGS::SETTINGS()
 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------

-int ParseYesNo(const string & value, bool * val)
+int ParseYesNo(const std::string & value, bool * val)

 {
 if (0 == strcasecmp(value.c_str(), "yes"))
     {
 {
 if (0 == strcasecmp(value.c_str(), "yes"))
     {


@@ -51,7 +51,7 @@ if (0 == strcasecmp(value.c_str(), "no"))
 return -1;
 }
 //-----------------------------------------------------------------------------
 return -1;
 }
 //-----------------------------------------------------------------------------

-int ParseInt(const string & value, int * val)
+int ParseInt(const std::string & value, int * val)

 {
 if (str2x<int>(value, *val))
     return -1;
 {
 if (str2x<int>(value, *val))
     return -1;


@@ -59,7 +59,7 @@ if (str2x<int>(value, *val))
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int ParseUnsigned(const string & value, unsigned * val)
+int ParseUnsigned(const std::string & value, unsigned * val)

 {
 if (str2x<unsigned>(value, *val))
     return -1;
 {
 if (str2x<unsigned>(value, *val))
     return -1;


@@ -67,7 +67,7 @@ if (str2x<unsigned>(value, *val))
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int ParseIntInRange(const string & value, int min, int max, int * val)
+int ParseIntInRange(const std::string & value, int min, int max, int * val)

 {
 if (ParseInt(value, val) != 0)
     return -1;
 {
 if (ParseInt(value, val) != 0)
     return -1;


@@ -78,7 +78,7 @@ if (*val < min || *val > max)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int ParseUnsignedInRange(const string & value, unsigned min, unsigned max, unsigned * val)
+int ParseUnsignedInRange(const std::string & value, unsigned min, unsigned max, unsigned * val)

 {
 if (ParseUnsigned(value, val) != 0)
     return -1;
 {
 if (ParseUnsigned(value, val) != 0)
     return -1;


@@ -99,6 +99,7 @@ while (childNode)
     PARAM_VALUE pv;
     pv.param = childNode->getName();
     int i = 0;
     PARAM_VALUE pv;
     pv.param = childNode->getName();
     int i = 0;

+    const char * value;

     while ((value = childNode->getValue(i++)) != NULL)
         pv.value.push_back(value);
     params->push_back(pv);
     while ((value = childNode->getValue(i++)) != NULL)
         pv.value.push_back(value);
     params->push_back(pv);


@@ -116,7 +117,7 @@ const char * requiredOptions[] = {
     "Login",
     "Password",
     "ServerName",
     "Login",
     "Password",
     "ServerName",

-    "ServerPort"
+    "ServerPort",

     NULL
     };
 
     NULL
     };
 


@@ -144,19 +145,23 @@ while (node)
     else if (strcasecmp(node->getName(), "ServerName") == 0)
         serverName = node->getValue(0);
     else if (strcasecmp(node->getName(), "ServerPort") == 0)
     else if (strcasecmp(node->getName(), "ServerName") == 0)
         serverName = node->getValue(0);
     else if (strcasecmp(node->getName(), "ServerPort") == 0)

+        {

         if (ParseIntInRange(node->getValue(0), 1, 65535, &port))
             {
             strError = "Parameter 'ServerPort' is not valid.";
             printfd(__FILE__, "SETTINGS::ReadSettings() - %s\n", strError.c_str());
             return -1;
             }
         if (ParseIntInRange(node->getValue(0), 1, 65535, &port))
             {
             strError = "Parameter 'ServerPort' is not valid.";
             printfd(__FILE__, "SETTINGS::ReadSettings() - %s\n", strError.c_str());
             return -1;
             }

+        }

     else if (strcasecmp(node->getName(), "LocalPort") == 0)
     else if (strcasecmp(node->getName(), "LocalPort") == 0)

+        {

         if (ParseIntInRange(node->getValue(0), 0, 65535, &localPort))
             {
             strError = "Parameter 'LocalPort' is not valid.";
             printfd(__FILE__, "SETTINGS::ReadSettings() - %s\n", strError.c_str());
             return -1;
             }
         if (ParseIntInRange(node->getValue(0), 0, 65535, &localPort))
             {
             strError = "Parameter 'LocalPort' is not valid.";
             printfd(__FILE__, "SETTINGS::ReadSettings() - %s\n", strError.c_str());
             return -1;
             }

+        }

     else if (strcasecmp(node->getName(), "StoreModule") == 0)
         {
         if (node->getValue(1))
     else if (strcasecmp(node->getName(), "StoreModule") == 0)
         {
         if (node->getValue(1))

diff --git a/projects/sgauthstress/settings.h b/projects/sgauthstress/settings.h
index b933fa74f389e36f4c136aceedec01c8afafb4ac..01542086cb28601baf3b5614b99bf77e52cf497f 100644 (file)
--- a/projects/sgauthstress/settings.h
+++ b/projects/sgauthstress/settings.h
@@ -24,8 +24,8 @@
 #include <string>
 
 #include "stg/os_int.h"
 #include <string>
 
 #include "stg/os_int.h"

+#include "stg/module_settings.h"

 
 

-struct MODULE_SETTINGS;

 class DOTCONFDocumentNode;
 
 class SETTINGS {
 class DOTCONFDocumentNode;
 
 class SETTINGS {

diff --git a/projects/sgauthstress/store_loader.cpp b/projects/sgauthstress/store_loader.cpp
index c54bdb361cc2e0b0dfb9884ce1f080dcfa873fc3..ab7291e2893c8189382272af5a9d25739e59ae5e 100644 (file)
--- a/projects/sgauthstress/store_loader.cpp
+++ b/projects/sgauthstress/store_loader.cpp
@@ -31,17 +31,18 @@
 #include <dlfcn.h>
 
 #include "stg/common.h"
 #include <dlfcn.h>
 
 #include "stg/common.h"

+#include "stg/module_settings.h"

 #include "stg/store.h"
 #include "store_loader.h"
 #include "stg/store.h"
 #include "store_loader.h"

-#include "settings_impl.h"

 
 

-STORE_LOADER::STORE_LOADER(const SETTINGS_IMPL & settings)
+STORE_LOADER::STORE_LOADER(const std::string & modulesPath,
+                           const MODULE_SETTINGS & settings)

     : isLoaded(false),
       handle(NULL),
       plugin(NULL),
       errorStr(),
     : isLoaded(false),
       handle(NULL),
       plugin(NULL),
       errorStr(),

-      storeSettings(settings.GetStoreModuleSettings()),
-      pluginFileName(settings.GetModulesPath() + "/mod_" + storeSettings.moduleName + ".so")
+      storeSettings(settings),
+      pluginFileName(modulesPath + "/mod_" + storeSettings.moduleName + ".so")

 {
 }
 
 {
 }
 

diff --git a/projects/sgauthstress/store_loader.h b/projects/sgauthstress/store_loader.h
index c7911eead81adc97044f0b06cf45f42fd89cb00c..91d6e7cf618b0a6ee3ace4aa3eb6a0c81d5454a7 100644 (file)
--- a/projects/sgauthstress/store_loader.h
+++ b/projects/sgauthstress/store_loader.h
@@ -37,11 +37,12 @@
 #include "stg/noncopyable.h"
 
 class STORE;
 #include "stg/noncopyable.h"
 
 class STORE;

-class SETTINGS_IMPL;
+class MODULE_SETTINGS;

 
 class STORE_LOADER : private NONCOPYABLE {
 public:
 
 class STORE_LOADER : private NONCOPYABLE {
 public:

-    STORE_LOADER(const SETTINGS_IMPL & settings);
+    STORE_LOADER(const std::string & modulesPath,
+                 const MODULE_SETTINGS & settings);

     ~STORE_LOADER();
 
     bool Load();
     ~STORE_LOADER();
 
     bool Load();