]> git.stg.codes - stg.git/commitdiff
Rearranged some headers in sgconfig.
authorMaxim Mamontov <faust.madf@gmail.com>
Fri, 20 Jun 2014 18:19:16 +0000 (21:19 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Fri, 9 Jan 2015 20:24:44 +0000 (22:24 +0200)
Conflicts:
projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
projects/stargazer/plugins/configuration/sgconfig/configproto.h
projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp

projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
projects/stargazer/plugins/configuration/sgconfig/configproto.h
projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
projects/stargazer/plugins/configuration/sgconfig/stgconfig.h

index 015c24602fb5391345a8826ad926cd64293af434..232c57d838f937ec260760a5647d2b7b57ef952c 100644 (file)
  */
 
 
  */
 
 
+#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 "configproto.h"
 #include <unistd.h>
 
 #include "configproto.h"
@@ -122,26 +131,27 @@ CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)
       xmlParser(),
       errorStr()
 {
       xmlParser(),
       errorStr()
 {
-dataParser.push_back(&parserGetServInfo);
+dataParser.push_back(new PARSER_GET_SERVER_INFO);
 
 
-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(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(&parserGetTariffs);
-dataParser.push_back(&parserAddTariff);
-dataParser.push_back(&parserDelTariff);
-dataParser.push_back(&parserChgTariff);
+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(&parserGetAdmins);
-dataParser.push_back(&parserChgAdmin);
-dataParser.push_back(&parserDelAdmin);
-dataParser.push_back(&parserAddAdmin);
+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);
 
@@ -155,6 +165,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);
 }
 //-----------------------------------------------------------------------------
index ccb8a4d723353c08bc6ad09b4e18117bea7ae3e6..2917567ea59167e0d0d05ad5ce8de93c7ece7b74 100644 (file)
 #ifndef CONFIGPROTO_H
 #define CONFIGPROTO_H
 
 #ifndef CONFIGPROTO_H
 #define CONFIGPROTO_H
 
-#include <expat.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <string>
 #include <list>
 #include <string>
 #include <list>
+#include <vector>
 
 
-#include "stg/users.h"
-#include "stg/admins.h"
-#include "stg/tariffs.h"
-#include "stg/logger.h"
-#include "parser.h"
+#include "stg/os_int.h"
 
 
-#include "parser_auth_by.h"
+#include <expat.h>
+#include <pthread.h>
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
 #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:
@@ -100,27 +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_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;
index 2b50f24cd394dcc1f88a4dbea1955a8f7b5549d4..9298e8a1e77a6112249f7ce955b0cae92617796a 100644 (file)
 *
 *******************************************************************/
 
 *
 *******************************************************************/
 
-#include <unistd.h> // close
+#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 <cerrno>
 #include <csignal>
 #include <cstdio> // snprintf
+#include <cstring> // strerror
 
 
-#include "stg/blowfish.h"
-#include "configproto.h"
+#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
index f5687699f31f736c8171abd808feef48ea925fc0..3f6df2193b45265cb2fa8ead5f92089473a1bc0b 100644 (file)
@@ -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;
index 8fa4dc7691abd3584242c306f403c451b9e3f131..a3da389525f553463467e1c29104898329509d80 100644 (file)
 #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) {}