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 5230a85cd3c02f6b78fb72e339bc31d6dda012cb..1b1ee96e21584c18fd2662f05e1980bcfdbf5f88 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -5,6 +5,7 @@
 
 #include <string>
 #include <map>
 
 #include <string>
 #include <map>

+#include <list>

 
 #include "stg/SMUX-PDUs.h"
 #include "stg/ObjectSyntax.h"
 
 #include "stg/SMUX-PDUs.h"
 #include "stg/ObjectSyntax.h"


@@ -26,6 +27,7 @@ class USERS;
 class TARIFFS;
 class SERVICES;
 class CORPORATIONS;
 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);
 
 typedef bool (SMUX::*SMUXPacketHandler)(const SMUX_PDUs_t * pdus);
 typedef bool (SMUX::*PDUsHandler)(const PDUs_t * pdus);


@@ -51,6 +53,27 @@ private:
     std::string password;
 };
 //-----------------------------------------------------------------------------
     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();
 class SMUX : public PLUGIN {
 public:
     SMUX();


@@ -60,6 +83,7 @@ public:
     void SetTariffs(TARIFFS * t) { tariffs = t; }
     void SetAdmins(ADMINS * a) { admins = a; }
     void SetServices(SERVICES * s) { services = s; }
     void SetTariffs(TARIFFS * t) { tariffs = t; }
     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();
     void SetCorporations(CORPORATIONS * c) { corporations = c; }
     void SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int ParseSettings();


@@ -74,6 +98,8 @@ public:
     uint16_t GetStartPosition() const { return 100; }
     uint16_t GetStopPosition() const { return 100; }
 
     uint16_t GetStartPosition() const { return 100; }
     uint16_t GetStopPosition() const { return 100; }
 

+    bool UpdateTables();
+

 private:
     static void * Runner(void * d);
     void Run();
 private:
     static void * Runner(void * d);
     void Run();


@@ -90,13 +116,15 @@ private:
     bool GetNextRequestHandler(const PDUs_t * pdus);
     bool SetRequestHandler(const PDUs_t * pdus);
 
     bool GetNextRequestHandler(const PDUs_t * pdus);
     bool SetRequestHandler(const PDUs_t * pdus);
 

-    bool UpdateTables();
+    void SetNotifiers();
+    void ResetNotifiers();

 
     USERS * users;
     TARIFFS * tariffs;
     ADMINS * admins;
     SERVICES * services;
     CORPORATIONS * corporations;
 
     USERS * users;
     TARIFFS * tariffs;
     ADMINS * admins;
     SERVICES * services;
     CORPORATIONS * corporations;

+    TRAFFCOUNTER * traffcounter;

 
     mutable std::string errorStr;
     SMUX_SETTINGS smuxSettings;
 
     mutable std::string errorStr;
     SMUX_SETTINGS smuxSettings;


@@ -114,6 +142,8 @@ private:
     Sensors sensors;
     Tables tables;
 
     Sensors sensors;
     Tables tables;
 

+    std::list<CHG_AFTER_NOTIFIER> notifiers;
+    ADD_DEL_USER_NOTIFIER addDelNotifier;

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