More clear plugin API

diff --git a/include/stg/plugin.h b/include/stg/plugin.h
index 35a5a4c9fef2d6c7bc866440f346ab6f3d22c203..845a3d153954b6ad8f622edadec96347d8be5d2c 100644 (file)
--- a/include/stg/plugin.h
+++ b/include/stg/plugin.h
@@ -35,6 +35,8 @@
 #include "admins.h"
 #include "users.h"
 #include "tariffs.h"
+#include "services.h"
+#include "corporations.h"
 
 class TRAFFCOUNTER;
 class SETTINGS;
@@ -43,13 +45,15 @@ struct MODULE_SETTINGS;
 
 class PLUGIN : private NONCOPYABLE {
 public:
-    virtual void                SetUsers(USERS * u) = 0;
-    virtual void                SetTariffs(TARIFFS * t) = 0;
-    virtual void                SetAdmins(ADMINS * a) = 0;
-    virtual void                SetTraffcounter(TRAFFCOUNTER * tc) = 0;
-    virtual void                SetStore(STORE * st) = 0;
-    virtual void                SetStgSettings(const SETTINGS * s) = 0;
-    virtual void                SetSettings(const MODULE_SETTINGS & s) = 0;
+    virtual void                SetUsers(USERS *) {}
+    virtual void                SetTariffs(TARIFFS *) {}
+    virtual void                SetAdmins(ADMINS *) {}
+    virtual void                SetServices(SERVICES *) {}
+    virtual void                SetCorporations(CORPORATIONS *) {}
+    virtual void                SetTraffcounter(TRAFFCOUNTER *) {}
+    virtual void                SetStore(STORE *) {}
+    virtual void                SetStgSettings(const SETTINGS *) {}
+    virtual void                SetSettings(const MODULE_SETTINGS &) {}
     virtual int                 ParseSettings() = 0;
 
     virtual int                 Start() = 0;

diff --git a/projects/stargazer/plugins/authorization/ao/ao.h b/projects/stargazer/plugins/authorization/ao/ao.h
index a0c0953d73aa53a767df21b85a9139271b50e540..cac18dfd9a765ce1f16a0398b50a3a6cdceff700 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -73,11 +73,6 @@ public:
     virtual ~AUTH_AO(){};
 
     void                SetUsers(USERS * u) { users = u; }
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}
 
     int                 Start();
     int                 Stop();

diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
index fe55649590990306bbeeee1a87d326b9def40a49..a648ec04db0d3758994f56cc391252c44f5f6741 100644 (file)
--- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
+++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
@@ -204,10 +204,6 @@ public:
     virtual             ~AUTH_IA();
 
     void                SetUsers(USERS * u) { users = u; }
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStore(STORE *) {}
     void                SetStgSettings(const SETTINGS * s) { stgSettings = s; }
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();

diff --git a/projects/stargazer/plugins/authorization/stress/stress.h b/projects/stargazer/plugins/authorization/stress/stress.h
index bfcf56d01c7a0f76f707ca5100f8c2c9f9cd5340..fe9ccd9d090ddf69ac28f46578eb181543ea66d1 100644 (file)
--- a/projects/stargazer/plugins/authorization/stress/stress.h
+++ b/projects/stargazer/plugins/authorization/stress/stress.h
@@ -88,11 +88,6 @@ public:
     virtual ~AUTH_STRESS() {}
 
     void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}
 
     int                 Start();
     int                 Stop();

diff --git a/projects/stargazer/plugins/capture/cap_debug/debug_cap.h b/projects/stargazer/plugins/capture/cap_debug/debug_cap.h
index 207aa40e78d59ebe50dc68e97487f9cc0619090a..5e5e2cf6b0d9aabdc56a25b1ed61a1de27ccdecd 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_debug/debug_cap.h
+++ b/projects/stargazer/plugins/capture/cap_debug/debug_cap.h
@@ -68,18 +68,12 @@ public:
     DEBUG_CAP();
     virtual ~DEBUG_CAP() {}
 
-    void                SetUsers(USERS * u) {}
-    void                SetTariffs(TARIFFS * t) {}
-    void                SetAdmins(ADMINS * a) {}
     void                SetTraffcounter(TRAFFCOUNTER * tc);
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }
     int                 ParseSettings() { return 0; }
-    void                SetSettings(const MODULE_SETTINGS & s) {}
     bool                IsRunning();
     const string &      GetStrError() const;
     const string        GetVersion() const;

diff --git a/projects/stargazer/plugins/capture/cap_nf/cap_nf.h b/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
index 8037343362d739c1bf828171d766999833bda481..ccdd670843e1bc97d12f095c2e5b99f68b56625b 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
+++ b/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
@@ -92,12 +92,7 @@ public:
     NF_CAP();
     ~NF_CAP();
 
-    void            SetUsers(USERS *) {}
-    void            SetTariffs(TARIFFS *) {}
-    void            SetAdmins(ADMINS *) {}
     void            SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
-    void            SetStore(STORE *) {}
-    void            SetStgSettings(const SETTINGS *) {}
     void            SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int             ParseSettings();
 

diff --git a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
index f5bb432b96b171ae70c9152f1fc2d6852e4fc894..432ee4b1a27ea55c37a0d18aaed7bb52fe3b77e7 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
@@ -48,12 +48,7 @@ public:
     DIVERT_CAP();
     virtual ~DIVERT_CAP() {}
 
-    void                SetUsers(USERS *) {}
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
     void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}
 
     int                 Start();
     int                 Stop();

diff --git a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
index 05357212b78c5dbb33e52241cf8c3489719aaa42..b51cc56d72329431a9a8bf1e39a2adf2f4c8e086 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
@@ -95,12 +95,7 @@ public:
                         BPF_CAP();
     virtual             ~BPF_CAP() {}
 
-    void                SetUsers(USERS *) {}
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
     void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}
 
     int                 Start();
     int                 Stop();

diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
index ed7ba29924e33f7eba522c6d38763019913d67ac..c03a6066a6092b0ac48b768f5c76724984d6fb12 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
@@ -49,19 +49,13 @@ public:
     ETHER_CAP();
     virtual ~ETHER_CAP() {}
 
-    void                SetUsers(USERS *) {}
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
     void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }
     bool                IsRunning() { return isRunning; }
 
-    void                SetSettings(const MODULE_SETTINGS &) {}
     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const;

diff --git a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
index 6253fe3a21ab10cc26574f7f9d6dd0bc8987368a..990aae3b1372b2a66c6e19f330edb1845049644c 100644 (file)
--- a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
+++ b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
@@ -44,19 +44,13 @@ public:
     IPQ_CAP();
     virtual ~IPQ_CAP() {}
 
-    void SetUsers(USERS *) {}
-    void SetTariffs(TARIFFS *) {}
-    void SetAdmins(ADMINS *) {}
     void SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
-    void SetStore(STORE *) {}
-    void SetStgSettings(const SETTINGS *) {}
 
     int Start();
     int Stop();
     int Reload() { return 0; }
     bool IsRunning() { return isRunning; }
 
-    void  SetSettings(const MODULE_SETTINGS &) {}
     int  ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     const std::string GetVersion() const;

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
index 1213f7d310223ec9a024a9ca8a2c0d957d13e1f2..1095dd73b3e6bd2c71c3a65099eb99563a97d471 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -58,7 +58,6 @@ public:
     void                SetTariffs(TARIFFS * t) { tariffs = t; }
     void                SetAdmins(ADMINS * a) { admins = a; }
     void                SetStore(STORE * s) { store = s; }
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
     void                SetStgSettings(const SETTINGS * s);
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();

diff --git a/projects/stargazer/plugins/configuration/sgconfig-ng/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig-ng/stgconfig.h
index 329a114cf7c186ae2fe1302f81564929dfc0f094..fd3a9e623844666c78c404f0fa0ae6914409997f 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig-ng/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig-ng/stgconfig.h
@@ -29,7 +29,6 @@ public:
     void                SetTariffs(TARIFFS * t) { tariffs = t; }
     void                SetAdmins(ADMINS * a) { admins = a; }
     void                SetStore(STORE * s) { store = s; }
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
     void                SetStgSettings(const SETTINGS * s) { stgSettings = s; }
     void                SetSettings(const MODULE_SETTINGS & s) { modSettings = s; }
     int                 ParseSettings();

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
index ce1c3af86193a28e261aa488d9c50a9e7f0a82b6..d1506ea800afd29d45249e8b8fbb7bf9c86a3761 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -34,7 +34,6 @@ public:
     void                SetTariffs(TARIFFS * t) { tariffs = t; }
     void                SetAdmins(ADMINS * a) { admins = a; }
     void                SetStore(STORE * s) { store = s; }
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
     void                SetStgSettings(const SETTINGS * s) { stgSettings = s; }
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();

diff --git a/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.h
index 1c8743d15c2b4606b2e1017ccfee98e8be1b7946..52d7801851c056400fb0866d15183314854374bc 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.h
@@ -35,7 +35,6 @@ public:
     void                SetTariffs(TARIFFS * t) { tariffs = t; }
     void                SetAdmins(ADMINS * a) { admins = a; }
     void                SetStore(STORE * s) { store = s; }
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
     void                SetStgSettings(const SETTINGS * s) { stgConfigSettings = s; }
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();

diff --git a/projects/stargazer/plugins/configuration/xrconfig/xrconfig.h b/projects/stargazer/plugins/configuration/xrconfig/xrconfig.h
index 4630edb421bea2ca5949e0f586000ad5db53bd1d..219f8d22ad18bf3408b47b8f03978910ad3179e5 100644 (file)
--- a/projects/stargazer/plugins/configuration/xrconfig/xrconfig.h
+++ b/projects/stargazer/plugins/configuration/xrconfig/xrconfig.h
@@ -34,7 +34,6 @@ public:
     void                SetTariffs(TARIFFS * t);
     void                SetAdmins(ADMINS * a);
     void                SetStore(BASE_STORE * s);
-    void                SetTraffcounter(TRAFFCOUNTER * tc){};
     void                SetStgSettings(const SETTINGS * s);
     void                SetSettings(const MODULE_SETTINGS & s);
     int                 ParseSettings();

diff --git a/projects/stargazer/plugins/other/ping/ping.h b/projects/stargazer/plugins/other/ping/ping.h
index aecbfb1559a4902284331b32993faa013b7263b8..618ecc73bb5e9e5404c8ad3a93b184a3c84cb84d 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.h
+++ b/projects/stargazer/plugins/other/ping/ping.h
@@ -88,11 +88,6 @@ public:
     virtual ~PING();
 
     void SetUsers(USERS * u);
-    void SetTariffs(TARIFFS *) {}
-    void SetAdmins(ADMINS *) {}
-    void SetTraffcounter(TRAFFCOUNTER *) {}
-    void SetStore(STORE *) {}
-    void SetStgSettings(const SETTINGS *) {}
     void SetSettings(const MODULE_SETTINGS & s);
     int ParseSettings();
 

diff --git a/projects/stargazer/plugins/other/radius/radius.h b/projects/stargazer/plugins/other/radius/radius.h
index 70c904ae965b479dfba0cbeeceb83093620d4430..2a60f1172591d2ba04620dda09f05461a3343e33 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.h
+++ b/projects/stargazer/plugins/other/radius/radius.h
@@ -86,9 +86,6 @@ public:
     virtual             ~RADIUS() {};
 
     void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
     void                SetStore(STORE * );
     void                SetStgSettings(const SETTINGS * s);
     void                SetSettings(const MODULE_SETTINGS & s);

diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h
index 24d44763af18c391c46c9dec2a459c2a79e2a759..649970e913964c7d1cc508dd0449495af49cbb98 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -129,11 +129,6 @@ public:
     virtual             ~REMOTE_SCRIPT();
 
     void                SetUsers(USERS * u) { users = u; }
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
 

diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h
index 7ab603dfd095b9c53f41a85e0d33f2aed54d10ad..5230a85cd3c02f6b78fb72e339bc31d6dda012cb 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -61,9 +61,6 @@ public:
     void SetAdmins(ADMINS * a) { admins = a; }
     void SetServices(SERVICES * s) { services = s; }
     void SetCorporations(CORPORATIONS * c) { corporations = c; }
-    void SetTraffcounter(TRAFFCOUNTER *) {}
-    void SetStore(STORE *) {}
-    void SetStgSettings(const SETTINGS *) {}
     void SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int ParseSettings();
 

diff --git a/projects/stargazer/plugins/other/userstat/userstat.h b/projects/stargazer/plugins/other/userstat/userstat.h
index 9dd01f2524e6a6a38ef7afe52c3b8b4244f708e9..1c5776f80aa15dbb5085d285a62770c417ad5be2 100644 (file)
--- a/projects/stargazer/plugins/other/userstat/userstat.h
+++ b/projects/stargazer/plugins/other/userstat/userstat.h
@@ -46,27 +46,23 @@ public:
     USERSTAT();
     ~USERSTAT();
 
-    virtual void SetUsers(USERS * u) { users = u; };
-    virtual void SetTariffs(TARIFFS * t) {};
-    virtual void SetAdmins(ADMINS * a) {};
-    virtual void SetTraffcounter(TRAFFCOUNTER * tc) {};
-    virtual void SetStore(BASE_STORE * st) { store = st; };
-    virtual void SetStgSettings(const SETTINGS * s) {};
-    virtual void SetSettings(const MODULE_SETTINGS & s) { settings = s; };
+    virtual void SetUsers(USERS * u) { users = u; }
+    virtual void SetStore(BASE_STORE * st) { store = st; }
+    virtual void SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     virtual int  ParseSettings();
 
     virtual int  Start();
     virtual int  Stop();
-    virtual bool IsRunning() { return isRunning; };
-    virtual const string  & GetStrError() const { return errorStr; };
-    virtual const string    GetVersion() const { return version; };
-    virtual uint16_t        GetStartPosition() const { return 0; };
-    virtual uint16_t        GetStopPosition() const { return 0; };
+    virtual bool IsRunning() { return isRunning; }
+    virtual const string  & GetStrError() const { return errorStr; }
+    virtual const string    GetVersion() const { return version; }
+    virtual uint16_t        GetStartPosition() const { return 0; }
+    virtual uint16_t        GetStopPosition() const { return 0; }
 
 private:
     struct IsDone : public unary_function<DataThread, bool>
     {
-        bool operator()(const DataThread & info) { return info.IsDone(); };
+        bool operator()(const DataThread & info) { return info.IsDone(); }
     };
     struct ToLower : public unary_function<char, char>
     {