Replace fake disconnects with real and fix some errors

[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..7d490aefb7f0e49865bd351cae51eaf447e28868 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -1,66 +1,32 @@
-#include <string>
-#include <pthread.h>
-#include "base_plugin.h"
-#include "base_store.h"
-#include "configproto.h"
-//#include "user_ips.h"
-//#include "../../../users.h"
+#ifndef STGCONFIG_H
+#define STGCONFIG_H

 
 

-using namespace std;
+#include <pthread.h>

 
 

-extern "C" BASE_PLUGIN * GetPlugin();
+#include <string>

 
 

-class STG_CONFIG;
+#include "stg/plugin.h"
+#include "stg/store.h"
+#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; }
+extern "C" PLUGIN * GetPlugin();

 
 

-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; }
+class STG_CONFIG;

 
 

-private:
-    USER * user;
-    const AUTH_AO * auth;
-};*/
-//-----------------------------------------------------------------------------
-class STG_CONFIG_SETTINGS
-{
+class STG_CONFIG_SETTINGS {

 public:
                     STG_CONFIG_SETTINGS();
 public:
                     STG_CONFIG_SETTINGS();

-    virtual         ~STG_CONFIG_SETTINGS(){};
-    const string &  GetStrError() const;
+    virtual         ~STG_CONFIG_SETTINGS() {}
+    const std::string & GetStrError() const;

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

-    uint16_t        GetPort();
+    uint16_t        GetPort() const;

 private:
 private:

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

     int     port;
 };
 //-----------------------------------------------------------------------------
     int     port;
 };
 //-----------------------------------------------------------------------------

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

 public:
     STG_CONFIG();
     virtual ~STG_CONFIG(){};
 public:
     STG_CONFIG();
     virtual ~STG_CONFIG(){};


@@ -68,25 +34,25 @@ public:
     void                SetUsers(USERS * u);
     void                SetTariffs(TARIFFS * t);
     void                SetAdmins(ADMINS * a);
     void                SetUsers(USERS * u);
     void                SetTariffs(TARIFFS * t);
     void                SetAdmins(ADMINS * a);

-    void                SetStore(BASE_STORE * s);
-    void                SetTraffcounter(TRAFFCOUNTER *){};
+    void                SetStore(STORE * s);
+    void                SetTraffcounter(TRAFFCOUNTER *) {}

     void                SetStgSettings(const SETTINGS * s);
     void                SetSettings(const MODULE_SETTINGS & s);
     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();
     void                SetStgSettings(const SETTINGS * s);
     void                SetSettings(const MODULE_SETTINGS & s);
     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();

-    int                 Reload() { return 0; };
+    int                 Reload() { return 0; }

     bool                IsRunning();
 
     bool                IsRunning();
 

-    const string      & GetStrError() const;
-    const string        GetVersion() const;
+    const std::string & GetStrError() const;
+    const std::string   GetVersion() const;

     uint16_t            GetStartPosition() const;
     uint16_t            GetStopPosition() const;
 
 private:
     static void *       Run(void *);
     uint16_t            GetStartPosition() const;
     uint16_t            GetStopPosition() const;
 
 private:
     static void *       Run(void *);

-    mutable string      errorStr;
+    mutable std::string errorStr;

     STG_CONFIG_SETTINGS stgConfigSettings;
     pthread_t           thread;
     bool                nonstop;
     STG_CONFIG_SETTINGS stgConfigSettings;
     pthread_t           thread;
     bool                nonstop;


@@ -95,10 +61,10 @@ private:
     USERS *             users;
     ADMINS *            admins;
     TARIFFS *           tariffs;
     USERS *             users;
     ADMINS *            admins;
     TARIFFS *           tariffs;

-    BASE_STORE *        store;
+    STORE *             store;

     MODULE_SETTINGS     settings;
     const SETTINGS *    stgSettings;
 };
 //-----------------------------------------------------------------------------
 
     MODULE_SETTINGS     settings;
     const SETTINGS *    stgSettings;
 };
 //-----------------------------------------------------------------------------
 

-
+#endif