Fixed tests.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / stgconfig.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
index 83ffa59b91991489ca52edf91e36ae8d5232108f..8123899f595fffdb29d9dfbfb97042d168d61d9e 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -1,69 +1,84 @@
-#ifndef STGCONFIG_H
-#define STGCONFIG_H
+/*
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

 
 

-#include <pthread.h>
+/*
+ *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
+ */

 
 

-#include <string>
+#ifndef STGCONFIG_H
+#define STGCONFIG_H

 
 

-#include "plugin.h"
-#include "store.h"

 #include "configproto.h"
 
 #include "configproto.h"
 

-extern "C" PLUGIN * GetPlugin();
+#include "stg/plugin.h"
+#include "stg/logger.h"

 
 

-class STG_CONFIG;
+#include <string>
+
+#include <pthread.h>

 
 class STG_CONFIG_SETTINGS {
 public:
 
 class STG_CONFIG_SETTINGS {
 public:

-                    STG_CONFIG_SETTINGS();
+                    STG_CONFIG_SETTINGS() : errorStr(), port(0) {}

     virtual         ~STG_CONFIG_SETTINGS() {}
     virtual         ~STG_CONFIG_SETTINGS() {}

-    const std::string & GetStrError() const;
+    const std::string & GetStrError() const { return errorStr; }

     int             ParseSettings(const MODULE_SETTINGS & s);
     int             ParseSettings(const MODULE_SETTINGS & s);

-    uint16_t        GetPort() const;
+    uint16_t        GetPort() const { return port; }

 private:
 private:

-    int     ParseIntInRange(const std::string & str, int min, int max, int * val);

     std::string errorStr;
     std::string errorStr;

-    int     port;
+    uint16_t    port;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class STG_CONFIG :public PLUGIN {
+class STG_CONFIG : public PLUGIN {

 public:
     STG_CONFIG();
 public:
     STG_CONFIG();

-    virtual ~STG_CONFIG(){};
+    virtual ~STG_CONFIG(){}

 
 

-    void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS * t);
-    void                SetAdmins(ADMINS * a);
-    void                SetStore(STORE * s);
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStgSettings(const SETTINGS * s);
-    void                SetSettings(const MODULE_SETTINGS & s);
+    void                SetUsers(USERS * users) { config.SetUsers(users); }
+    void                SetTariffs(TARIFFS * tariffs) { config.SetTariffs(tariffs); }
+    void                SetAdmins(ADMINS * admins) { config.SetAdmins(admins); }
+    void                SetStore(STORE * store) { config.SetStore(store); }
+    void                SetStgSettings(const SETTINGS * settings) { config.SetStgSettings(settings); }
+    void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }

     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }
     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }

-    bool                IsRunning();
+    bool                IsRunning() { return isRunning; }

 
 

-    const std::string & GetStrError() const;
-    const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    const std::string & GetStrError() const { return errorStr; }
+    std::string         GetVersion() const { return "Stg Configurator v. 1.0"; }
+    uint16_t            GetStartPosition() const { return 20; }
+    uint16_t            GetStopPosition() const { return 20; }

 
 private:
 
 private:

+    STG_CONFIG(const STG_CONFIG & rvalue);
+    STG_CONFIG & operator=(const STG_CONFIG & rvalue);
+

     static void *       Run(void *);
     static void *       Run(void *);

+

     mutable std::string errorStr;
     STG_CONFIG_SETTINGS stgConfigSettings;
     pthread_t           thread;
     bool                nonstop;
     bool                isRunning;
     mutable std::string errorStr;
     STG_CONFIG_SETTINGS stgConfigSettings;
     pthread_t           thread;
     bool                nonstop;
     bool                isRunning;

+    PLUGIN_LOGGER       logger;

     CONFIGPROTO         config;
     CONFIGPROTO         config;

-    USERS *             users;
-    ADMINS *            admins;
-    TARIFFS *           tariffs;
-    STORE *             store;

     MODULE_SETTINGS     settings;
     MODULE_SETTINGS     settings;

-    const SETTINGS *    stgSettings;

 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------