Ticket 37. In the TariffChangeIsAllowed() function return "" added and

[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 7337deaff6a558ddf0c42b3a8dd915a6c8d84db6..3b217eb72878cafba22aa532bb129c7e8bbb75e0 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -15,13 +15,12 @@
 #include "stg/module_settings.h"
 #include "stg/notifer.h"
 #include "stg/noncopyable.h"
 #include "stg/module_settings.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;


@@ -57,11 +56,15 @@ private:
 //-----------------------------------------------------------------------------
 class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string> {
 public:
 //-----------------------------------------------------------------------------
 class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string> {
 public:

-             CHG_AFTER_NOTIFIER(SMUX & s, const USER_PTR & u) : smux(s), userPtr(u) {}
-             CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER & rvalue) : smux(rvalue.smux), userPtr(rvalue.userPtr) {}
+             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 &);
 
     void     Notify(const std::string &, const std::string &);
 

-    USER_PTR GetUserPtr() { return userPtr; }
+    USER_PTR GetUserPtr() const { return userPtr; }

 
 private:
     CHG_AFTER_NOTIFIER & operator=(const CHG_AFTER_NOTIFIER & rvalue);
 
 private:
     CHG_AFTER_NOTIFIER & operator=(const CHG_AFTER_NOTIFIER & rvalue);


@@ -71,7 +74,8 @@ private:
 //-----------------------------------------------------------------------------
 class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE<TARIFF_DATA>, private NONCOPYABLE {
 public:
 //-----------------------------------------------------------------------------
 class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE<TARIFF_DATA>, private NONCOPYABLE {
 public:

-         ADD_DEL_TARIFF_NOTIFIER(SMUX & s) : smux(s) {}
+         ADD_DEL_TARIFF_NOTIFIER(SMUX & s)
+             : NOTIFIER_BASE<TARIFF_DATA>(), smux(s) {}

     void Notify(const TARIFF_DATA &);
 
 private:
     void Notify(const TARIFF_DATA &);
 
 private:


@@ -80,7 +84,7 @@ private:
 //-----------------------------------------------------------------------------
 class ADD_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
 public:
 //-----------------------------------------------------------------------------
 class ADD_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
 public:

-         ADD_USER_NOTIFIER(SMUX & s) : smux(s) {}
+         ADD_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}

     void Notify(const USER_PTR &);
 
 private:
     void Notify(const USER_PTR &);
 
 private:


@@ -89,7 +93,7 @@ private:
 //-----------------------------------------------------------------------------
 class DEL_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
 public:
 //-----------------------------------------------------------------------------
 class DEL_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
 public:

-         DEL_USER_NOTIFIER(SMUX & s) : smux(s) {}
+         DEL_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}

     void Notify(const USER_PTR &);
 
 private:
     void Notify(const USER_PTR &);
 
 private:


@@ -112,13 +116,13 @@ public:
 
     int Start();
     int Stop();
 
     int Start();
     int Stop();

-    int Reload();
+    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();
 
 
     bool UpdateTables();
 


@@ -132,6 +136,7 @@ private:
     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);
 


@@ -162,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;
 


@@ -174,9 +183,17 @@ private:
     ADD_USER_NOTIFIER addUserNotifier;
     DEL_USER_NOTIFIER delUserNotifier;
     ADD_DEL_TARIFF_NOTIFIER addDelTariffNotifier;
     ADD_USER_NOTIFIER addUserNotifier;
     DEL_USER_NOTIFIER delUserNotifier;
     ADD_DEL_TARIFF_NOTIFIER addDelTariffNotifier;

+
+    PLUGIN_LOGGER logger;

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

+inline
+void CHG_AFTER_NOTIFIER::Notify(const std::string &, const std::string &)
+{
+smux.UpdateTables();
+}
+

 inline
 void ADD_DEL_TARIFF_NOTIFIER::Notify(const TARIFF_DATA &)
 {
 inline
 void ADD_DEL_TARIFF_NOTIFIER::Notify(const TARIFF_DATA &)
 {


@@ -197,6 +214,4 @@ smux.UnsetNotifier(userPtr);
 smux.UpdateTables();
 }
 
 smux.UpdateTables();
 }
 

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

 #endif
 #endif