Ignore deleted users while building new tariffs table

[stg.git] / projects / stargazer / plugins / other / smux / smux.h

diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h
index c5b94d4c822bb190f7216c4aa15ea2fa9385c8d8..1b1ee96e21584c18fd2662f05e1980bcfdbf5f88 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -5,23 +5,29 @@
 
 #include <string>
 #include <map>
+#include <list>
 
-#include "asn1/SMUX-PDUs.h"
-#include "asn1/ObjectSyntax.h"
+#include "stg/SMUX-PDUs.h"
+#include "stg/ObjectSyntax.h"
 
 #include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
-#include "stg/users.h"
-#include "stg/tariffs.h"
 
 #include "sensors.h"
+#include "tables.h"
+#include "types.h"
 
 extern "C" PLUGIN * GetPlugin();
 
 class USER;
 class SETTINGS;
 class SMUX;
+class USERS;
+class TARIFFS;
+class SERVICES;
+class CORPORATIONS;
+class TRAFFCOUNTER;
 
 typedef bool (SMUX::*SMUXPacketHandler)(const SMUX_PDUs_t * pdus);
 typedef bool (SMUX::*PDUsHandler)(const PDUs_t * pdus);
@@ -47,6 +53,27 @@ private:
     std::string password;
 };
 //-----------------------------------------------------------------------------
+class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string> {
+public:
+                CHG_AFTER_NOTIFIER(SMUX & s, const USER_PTR & u) : smux(s), userPtr(u) {}
+    void        Notify(const std::string &, const std::string &);
+
+    USER_PTR    GetUserPtr() { return userPtr; }
+
+private:
+    SMUX & smux;
+    USER_PTR userPtr;
+};
+//-----------------------------------------------------------------------------
+class ADD_DEL_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR> {
+public:
+                ADD_DEL_USER_NOTIFIER(SMUX & s) : smux(s) {}
+    void        Notify(const USER_PTR &);
+
+private:
+    SMUX & smux;
+};
+//-----------------------------------------------------------------------------
 class SMUX : public PLUGIN {
 public:
     SMUX();
@@ -54,10 +81,10 @@ public:
 
     void SetUsers(USERS * u) { users = u; }
     void SetTariffs(TARIFFS * t) { tariffs = t; }
-    void SetAdmins(ADMINS *) {}
-    void SetTraffcounter(TRAFFCOUNTER *) {}
-    void SetStore(STORE *) {}
-    void SetStgSettings(const SETTINGS *) {}
+    void SetAdmins(ADMINS * a) { admins = a; }
+    void SetServices(SERVICES * s) { services = s; }
+    void SetTraffcounter(TRAFFCOUNTER * tc) { traffcounter = tc; }
+    void SetCorporations(CORPORATIONS * c) { corporations = c; }
     void SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int ParseSettings();
 
@@ -67,10 +94,12 @@ public:
     bool IsRunning() { return running && !stopped; }
 
     const std::string & GetStrError() const { return errorStr; }
-    const std::string GetVersion() const { return "Stg SMUX Plugin 1.0"; }
+    const std::string GetVersion() const { return "Stg SMUX Plugin 1.1"; }
     uint16_t GetStartPosition() const { return 100; }
     uint16_t GetStopPosition() const { return 100; }
 
+    bool UpdateTables();
+
 private:
     static void * Runner(void * d);
     void Run();
@@ -80,15 +109,22 @@ private:
 
     bool CloseHandler(const SMUX_PDUs_t * pdus);
     bool RegisterResponseHandler(const SMUX_PDUs_t * pdus);
-    bool PDUsHandler(const SMUX_PDUs_t * pdus);
+    bool PDUsRequestHandler(const SMUX_PDUs_t * pdus);
     bool CommitOrRollbackHandler(const SMUX_PDUs_t * pdus);
 
     bool GetRequestHandler(const PDUs_t * pdus);
     bool GetNextRequestHandler(const PDUs_t * pdus);
     bool SetRequestHandler(const PDUs_t * pdus);
 
+    void SetNotifiers();
+    void ResetNotifiers();
+
     USERS * users;
     TARIFFS * tariffs;
+    ADMINS * admins;
+    SERVICES * services;
+    CORPORATIONS * corporations;
+    TRAFFCOUNTER * traffcounter;
 
     mutable std::string errorStr;
     SMUX_SETTINGS smuxSettings;
@@ -104,7 +140,10 @@ private:
     SMUXHandlers smuxHandlers;
     PDUsHandlers pdusHandlers;
     Sensors sensors;
+    Tables tables;
 
+    std::list<CHG_AFTER_NOTIFIER> notifiers;
+    ADD_DEL_USER_NOTIFIER addDelNotifier;
 };
 //-----------------------------------------------------------------------------