Merge branch 'master' of gitorious.org:stg/stg

[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 a92326085253a66fd90d4a01e15f52c306cba801..e379ea7f7f06261e4cfe64bc2612b83796c2c94b 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;


@@ -65,7 +64,7 @@ public:
                    smux(rvalue.smux), userPtr(rvalue.userPtr) {}
     void     Notify(const std::string &, const std::string &);
 
                    smux(rvalue.smux), userPtr(rvalue.userPtr) {}
     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);


@@ -121,9 +120,9 @@ public:
     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();
 


@@ -137,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);
 


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


@@ -179,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 &)
 {


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

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

 #endif
 #endif