Removed "alpha" from version.

[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 57241c637f26049264235eb7823dfd4fef88cbbf..287c3813a87a109473aa7c21565eb4888b7d6906 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -1,104 +1,88 @@
-#include <string>
-#include <pthread.h>
-#include "base_plugin.h"
-#include "base_store.h"
-#include "configproto.h"
-//#include "user_ips.h"
-//#include "../../../users.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
+ */

 
 

-using namespace std;
+/*
+ *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
+ */

 
 

-extern "C" BASE_PLUGIN * GetPlugin();
+#ifndef STGCONFIG_H
+#define STGCONFIG_H

 
 

-class STG_CONFIG;
+#include "configproto.h"

 
 

-//-----------------------------------------------------------------------------
-/*template <typename varParamType>
-class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
-public:
-    void Notify(const varParamType & oldValue, const varParamType & newValue)
-        {
-        auth->Unauthorize(user);
-        }
-    void SetUser(USER * u) { user = u; }
-    void SetAuthorizaror(const AUTH_AO * a) { auth = a; }
+#include "stg/plugin.h"
+#include "stg/logger.h"

 
 

-private:
-    USER * user;
-    const AUTH_AO * auth;
-};
-//-----------------------------------------------------------------------------
-template <typename varParamType>
-class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
-public:
-    void Notify(const varParamType & oldValue, const varParamType & newValue)
-        {
-        auth->UpdateUserAuthorization(user);
-        }
-    void SetUser(USER * u) { user = u; }
-    void SetAuthorizaror(const AUTH_AO * a) { auth = a; }
+#include <string>
+
+#include <pthread.h>

 
 

-private:
-    USER * user;
-    const AUTH_AO * auth;
-};*/
-//-----------------------------------------------------------------------------

 class STG_CONFIG_SETTINGS
 {
 class STG_CONFIG_SETTINGS
 {

-public:
-                    STG_CONFIG_SETTINGS();
-    virtual         ~STG_CONFIG_SETTINGS(){};
-    const string &  GetStrError() const;
-    int             ParseSettings(const MODULE_SETTINGS & s);
-    uint16_t        GetPort();
-private:
-    int     ParseIntInRange(const string & str, int min, int max, int * val);
-    string  errorStr;
-    int     port;
+    public:
+        STG_CONFIG_SETTINGS() : m_port(0), m_bindAddress("0.0.0.0") {}
+        virtual ~STG_CONFIG_SETTINGS() {}
+        const std::string & GetStrError() const { return errorStr; }
+        bool ParseSettings(const MODULE_SETTINGS & s);
+        uint16_t GetPort() const { return m_port; }
+        const std::string & GetBindAddress() const { return m_bindAddress; }
+    private:
+        std::string errorStr;
+        uint16_t m_port;
+        std::string m_bindAddress;

 };
 };

-//-----------------------------------------------------------------------------
-class STG_CONFIG :public BASE_PLUGIN
+
+class STG_CONFIG : public PLUGIN

 {
 {

-public:
-    STG_CONFIG();
-    virtual ~STG_CONFIG(){};
+    public:
+        STG_CONFIG();
+
+        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 * s) { config.SetSettings(s); }
+        void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
+        int                 ParseSettings();

 
 

-    void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS * t);
-    void                SetAdmins(ADMINS * a);
-    void                SetStore(BASE_STORE * s);
-    void                SetTraffcounter(TRAFFCOUNTER *){};
-    void                SetStgSettings(const SETTINGS * s);
-    void                SetSettings(const MODULE_SETTINGS & s);
-    int                 ParseSettings();
+        int                 Start();
+        int                 Stop();
+        int                 Reload() { return 0; }
+        bool                IsRunning() { return isRunning; }

 
 

-    int                 Start();
-    int                 Stop();
-    int                 Reload() { return 0; };
-    bool                IsRunning();
+        const std::string & GetStrError() const { return errorStr; }
+        std::string         GetVersion() const { return "Stg Configurator v. 2.0"; }
+        uint16_t            GetStartPosition() const { return 20; }
+        uint16_t            GetStopPosition() const { return 20; }

 
 

-    const string      & GetStrError() const;
-    const string        GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    private:
+        STG_CONFIG(const STG_CONFIG & rvalue);
+        STG_CONFIG & operator=(const STG_CONFIG & rvalue);

 
 

-private:
-    static void *       Run(void *);
-    mutable string      errorStr;
-    STG_CONFIG_SETTINGS stgConfigSettings;
-    pthread_t           thread;
-    bool                nonstop;
-    bool                isRunning;
-    CONFIGPROTO         config;
-    USERS *             users;
-    ADMINS *            admins;
-    TARIFFS *           tariffs;
-    BASE_STORE *        store;
-    MODULE_SETTINGS     settings;
-    const SETTINGS *    stgSettings;
+        static void *       Run(void *);
+
+        mutable std::string errorStr;
+        STG_CONFIG_SETTINGS stgConfigSettings;
+        pthread_t           thread;
+        bool                nonstop;
+        bool                isRunning;
+        PLUGIN_LOGGER       logger;
+        CONFIGPROTO         config;
+        MODULE_SETTINGS     settings;

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

-
+#endif