Ticket 37. The object tariff definition moved into the if(newTariff)

[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 08e23c38faf6617c385ef811729122a33a4d3c5b..3b217eb72878cafba22aa532bb129c7e8bbb75e0 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"


@@ -12,18 +13,22 @@
 #include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 #include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"

-#include "stg/users.h"
-#include "stg/tariffs.h"
+#include "stg/notifer.h"
+#include "stg/noncopyable.h"
+#include "stg/logger.h"

 
 #include "sensors.h"
 #include "tables.h"
 #include "types.h"
 
 
 #include "sensors.h"
 #include "tables.h"
 #include "types.h"
 

-extern "C" PLUGIN * GetPlugin();
-

 class USER;
 class SETTINGS;
 class SMUX;
 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);
 
 typedef bool (SMUX::*SMUXPacketHandler)(const SMUX_PDUs_t * pdus);
 typedef bool (SMUX::*PDUsHandler)(const PDUs_t * pdus);


@@ -49,6 +54,52 @@ 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)
+                 : PROPERTY_NOTIFIER_BASE<std::string>(),
+                   smux(s), userPtr(u) {}
+             CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER & rvalue)
+                 : PROPERTY_NOTIFIER_BASE<std::string>(),
+                   smux(rvalue.smux), userPtr(rvalue.userPtr) {}
+    void     Notify(const std::string &, const std::string &);
+
+    USER_PTR GetUserPtr() const { return userPtr; }
+
+private:
+    CHG_AFTER_NOTIFIER & operator=(const CHG_AFTER_NOTIFIER & rvalue);
+    SMUX & smux;
+    USER_PTR userPtr;
+};
+//-----------------------------------------------------------------------------
+class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE<TARIFF_DATA>, private NONCOPYABLE {
+public:
+         ADD_DEL_TARIFF_NOTIFIER(SMUX & s)
+             : NOTIFIER_BASE<TARIFF_DATA>(), smux(s) {}
+    void Notify(const TARIFF_DATA &);
+
+private:
+    SMUX & smux;
+};
+//-----------------------------------------------------------------------------
+class ADD_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
+public:
+         ADD_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}
+    void Notify(const USER_PTR &);
+
+private:
+    SMUX & smux;
+};
+//-----------------------------------------------------------------------------
+class DEL_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
+public:
+         DEL_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}
+    void Notify(const USER_PTR &);
+
+private:
+    SMUX & smux;
+};
+//-----------------------------------------------------------------------------

 class SMUX : public PLUGIN {
 public:
     SMUX();
 class SMUX : public PLUGIN {
 public:
     SMUX();


@@ -56,27 +107,36 @@ public:
 
     void SetUsers(USERS * u) { users = u; }
     void SetTariffs(TARIFFS * t) { tariffs = t; }
 
     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();
 
     int Start();
     int Stop();
     void SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int ParseSettings();
 
     int Start();
     int Stop();

-    int Reload() { return 0; }
+    int Reload(const MODULE_SETTINGS & ms);

     bool IsRunning() { return running && !stopped; }
 
     const std::string & GetStrError() const { return errorStr; }
     bool IsRunning() { return running && !stopped; }
 
     const std::string & GetStrError() const { return errorStr; }

-    const std::string GetVersion() const { return "Stg SMUX Plugin 1.1"; }
-    uint16_t GetStartPosition() const { return 100; }
-    uint16_t GetStopPosition() const { return 100; }
+    std::string GetVersion() const { return "Stg SMUX Plugin 1.1"; }
+    uint16_t GetStartPosition() const { return 10; }
+    uint16_t GetStopPosition() const { return 10; }
+
+    bool UpdateTables();
+
+    void SetNotifier(USER_PTR userPtr);
+    void UnsetNotifier(USER_PTR userPtr);

 
 private:
 
 private:

+    SMUX(const SMUX & rvalue);
+    SMUX & operator=(const SMUX & rvalue);
+

     static void * Runner(void * d);
     void Run();
     bool PrepareNet();
     static void * Runner(void * d);
     void Run();
     bool PrepareNet();

+    bool Reconnect();

 
     bool DispatchPDUs(const SMUX_PDUs_t * pdus);
 
 
     bool DispatchPDUs(const SMUX_PDUs_t * pdus);
 


@@ -89,10 +149,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;
 
     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;


@@ -102,6 +167,10 @@ private:
     pthread_mutex_t mutex;
     bool running;
     bool stopped;
     pthread_mutex_t mutex;
     bool running;
     bool stopped;

+    bool needReconnect;
+
+    time_t lastReconnectTry;
+    unsigned reconnectTimeout;

 
     int sock;
 
 
     int sock;
 


@@ -110,9 +179,39 @@ private:
     Sensors sensors;
     Tables tables;
 
     Sensors sensors;
     Tables tables;
 

+    std::list<CHG_AFTER_NOTIFIER> notifiers;
+    ADD_USER_NOTIFIER addUserNotifier;
+    DEL_USER_NOTIFIER delUserNotifier;
+    ADD_DEL_TARIFF_NOTIFIER addDelTariffNotifier;
+
+    PLUGIN_LOGGER logger;

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

-extern "C" PLUGIN * GetPlugin();
+inline
+void CHG_AFTER_NOTIFIER::Notify(const std::string &, const std::string &)
+{
+smux.UpdateTables();
+}
+
+inline
+void ADD_DEL_TARIFF_NOTIFIER::Notify(const TARIFF_DATA &)
+{
+smux.UpdateTables();
+}
+
+inline
+void ADD_USER_NOTIFIER::Notify(const USER_PTR & userPtr)
+{
+smux.SetNotifier(userPtr);
+smux.UpdateTables();
+}
+
+inline
+void DEL_USER_NOTIFIER::Notify(const USER_PTR & userPtr)
+{
+smux.UnsetNotifier(userPtr);
+smux.UpdateTables();
+}

 
 #endif
 
 #endif