X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/324028b1d412ab7308d2be18be2b8e4e30310d27..df9f528d8ea5b3ba19bebcaf0324c3282edeffcc:/projects/stargazer/plugins/other/smux/smux.h?ds=sidebyside diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h index a9232608..e379ea7f 100644 --- 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/logger.h" #include "sensors.h" #include "tables.h" #include "types.h" -extern "C" PLUGIN * GetPlugin(); - 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 &); - USER_PTR GetUserPtr() { return userPtr; } + USER_PTR GetUserPtr() const { return userPtr; } 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; } - 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(); @@ -137,6 +136,7 @@ private: static void * Runner(void * d); void Run(); bool PrepareNet(); + bool Reconnect(); bool DispatchPDUs(const SMUX_PDUs_t * pdus); @@ -167,6 +167,10 @@ private: pthread_mutex_t mutex; bool running; bool stopped; + bool needReconnect; + + time_t lastReconnectTry; + unsigned reconnectTimeout; int sock; @@ -179,9 +183,17 @@ private: 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 &) { @@ -202,6 +214,4 @@ smux.UnsetNotifier(userPtr); smux.UpdateTables(); } -extern "C" PLUGIN * GetPlugin(); - #endif