Rearranged some headers in sgconfig.

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index ec3e3ee3c86e765a5a048e3fe8fe920e596091b4..421349c7eb6871187f02fa962a6ffd8d8859c58f 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -30,6 +30,15 @@
 
 #include "configproto.h"
 
 
 #include "configproto.h"
 

+#include "parser.h"
+#include "parser_auth_by.h"
+#include "parser_user_info.h"
+
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/tariffs.h"
+#include "stg/logger.h"
+

 #include <unistd.h>
 
 //-----------------------------------------------------------------------------
 #include <unistd.h>
 
 //-----------------------------------------------------------------------------


@@ -96,27 +105,27 @@ CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)
       admins(NULL),
       currParser(NULL)
 {
       admins(NULL),
       currParser(NULL)
 {

-dataParser.push_back(&parserGetServInfo);
-
-dataParser.push_back(&parserGetUsers);
-dataParser.push_back(&parserGetUser);
-dataParser.push_back(&parserChgUser);
-dataParser.push_back(&parserAddUser);
-dataParser.push_back(&parserDelUser);
-dataParser.push_back(&parserCheckUser);
-dataParser.push_back(&parserSendMessage);
-dataParser.push_back(&parserAuthBy);
-dataParser.push_back(&parserUserInfo);
-
-dataParser.push_back(&parserGetTariffs);
-dataParser.push_back(&parserAddTariff);
-dataParser.push_back(&parserDelTariff);
-dataParser.push_back(&parserChgTariff);
-
-dataParser.push_back(&parserGetAdmins);
-dataParser.push_back(&parserChgAdmin);
-dataParser.push_back(&parserDelAdmin);
-dataParser.push_back(&parserAddAdmin);
+dataParser.push_back(new PARSER_GET_SERVER_INFO);
+
+dataParser.push_back(new PARSER_GET_USERS);
+dataParser.push_back(new PARSER_GET_USER);
+dataParser.push_back(new PARSER_CHG_USER);
+dataParser.push_back(new PARSER_ADD_USER);
+dataParser.push_back(new PARSER_DEL_USER);
+dataParser.push_back(new PARSER_CHECK_USER);
+dataParser.push_back(new PARSER_SEND_MESSAGE);
+dataParser.push_back(new PARSER_AUTH_BY);
+dataParser.push_back(new PARSER_USER_INFO);
+
+dataParser.push_back(new PARSER_GET_TARIFFS);
+dataParser.push_back(new PARSER_ADD_TARIFF);
+dataParser.push_back(new PARSER_DEL_TARIFF);
+dataParser.push_back(new PARSER_CHG_TARIFF);
+
+dataParser.push_back(new PARSER_GET_ADMINS);
+dataParser.push_back(new PARSER_CHG_ADMIN);
+dataParser.push_back(new PARSER_DEL_ADMIN);
+dataParser.push_back(new PARSER_ADD_ADMIN);

 
 xmlParser = XML_ParserCreate(NULL);
 
 
 xmlParser = XML_ParserCreate(NULL);
 


@@ -130,6 +139,8 @@ if (!xmlParser)
 //-----------------------------------------------------------------------------
 CONFIGPROTO::~CONFIGPROTO()
 {
 //-----------------------------------------------------------------------------
 CONFIGPROTO::~CONFIGPROTO()
 {

+for (size_t i = 0; i < dataParser.size(); ++i)
+    delete dataParser[i];

 XML_ParserFree(xmlParser);
 }
 //-----------------------------------------------------------------------------
 XML_ParserFree(xmlParser);
 }
 //-----------------------------------------------------------------------------

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
index 4adba09758afae9345de7104f1e4236160a55de9..d73498ff22eaacdc19976f901a8f3b26854e1427 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@ -28,21 +28,14 @@
 #ifndef CONFIGPROTO_H
 #define CONFIGPROTO_H
 
 #ifndef CONFIGPROTO_H
 #define CONFIGPROTO_H
 

-#include "parser_auth_by.h"
-#include "parser_user_info.h"
-
-#include "stg/users.h"
-#include "stg/admins.h"
-#include "stg/tariffs.h"
-#include "stg/logger.h"
-#include "parser.h"
-

 #include <string>
 #include <list>
 #include <string>
 #include <list>

+#include <vector>
+
+#include "stg/os_int.h"

 
 #include <expat.h>
 
 #include <expat.h>

-#include <sys/types.h>
-#include <sys/socket.h>
+#include <pthread.h>

 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"


@@ -52,6 +45,15 @@
 #define  OK_LOGINS      "OKLS"
 #define  ERR_LOGINS     "ERLS"
 
 #define  OK_LOGINS      "OKLS"
 #define  ERR_LOGINS     "ERLS"
 

+class BASE_PARSER;
+class USERS;
+class ADMINS;
+class ADMIN;
+class TARIFFS;
+class PLUGIN_LOGGER;
+class STORE;
+class SETTINGS;
+

 //-----------------------------------------------------------------------------
 class CONFIGPROTO {
 public:
 //-----------------------------------------------------------------------------
 class CONFIGPROTO {
 public:


@@ -101,28 +103,6 @@ private:
 
     int                         listenSocket;
 
 
     int                         listenSocket;
 

-    PARSER_GET_SERVER_INFO      parserGetServInfo;
-
-    PARSER_GET_USERS            parserGetUsers;
-    PARSER_GET_USER             parserGetUser;
-    PARSER_CHG_USER             parserChgUser;
-    PARSER_ADD_USER             parserAddUser;
-    PARSER_DEL_USER             parserDelUser;
-    PARSER_CHECK_USER           parserCheckUser;
-    PARSER_SEND_MESSAGE         parserSendMessage;
-    PARSER_AUTH_BY              parserAuthBy;
-    PARSER_USER_INFO            parserUserInfo;
-
-    PARSER_GET_ADMINS           parserGetAdmins;
-    PARSER_ADD_ADMIN            parserAddAdmin;
-    PARSER_DEL_ADMIN            parserDelAdmin;
-    PARSER_CHG_ADMIN            parserChgAdmin;
-
-    PARSER_GET_TARIFFS          parserGetTariffs;
-    PARSER_ADD_TARIFF           parserAddTariff;
-    PARSER_DEL_TARIFF           parserDelTariff;
-    PARSER_CHG_TARIFF           parserChgTariff;
-

     ADMINS *                    admins;
 
     BASE_PARSER *               currParser;
     ADMINS *                    admins;
 
     BASE_PARSER *               currParser;

diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
index 929f0bfe2cb17b00dc3b66696c152336ad0cc8fb..6eb2b4249f6329ec45ab6496dda624051c675826 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -28,13 +28,21 @@
 
 #include "configproto.h"
 
 
 #include "configproto.h"
 

+#include "stg/admins.h"
+#include "stg/logger.h"
+#include "stg/common.h"

 #include "stg/blowfish.h"
 
 #include <cerrno>
 #include <csignal>
 #include <cstdio> // snprintf
 #include "stg/blowfish.h"
 
 #include <cerrno>
 #include <csignal>
 #include <cstdio> // snprintf

+#include <cstring> // strerror

 
 #include <unistd.h> // close
 
 #include <unistd.h> // close

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

 
 #ifndef ENODATA
 // FreeBSD 4.* - suxx
 
 #ifndef ENODATA
 // FreeBSD 4.* - suxx

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index f5687699f31f736c8171abd808feef48ea925fc0..3f6df2193b45265cb2fa8ead5f92089473a1bc0b 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -119,8 +119,7 @@ if (!isRunning)
 config.Stop();
 
 //5 seconds to thread stops itself
 config.Stop();
 
 //5 seconds to thread stops itself

-int i;
-for (i = 0; i < 25; i++)
+for (int i = 0; i < 25; i++)

     {
     if (!isRunning)
         break;
     {
     if (!isRunning)
         break;

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
index 8fa4dc7691abd3584242c306f403c451b9e3f131..a3da389525f553463467e1c29104898329509d80 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -10,10 +10,6 @@
 #include "stg/logger.h"
 #include "configproto.h"
 
 #include "stg/logger.h"
 #include "configproto.h"
 

-extern "C" PLUGIN * GetPlugin();
-
-class STG_CONFIG;
-

 class STG_CONFIG_SETTINGS {
 public:
                     STG_CONFIG_SETTINGS() : errorStr(), port(0) {}
 class STG_CONFIG_SETTINGS {
 public:
                     STG_CONFIG_SETTINGS() : errorStr(), port(0) {}