X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/58024dfd7ad59626cc0c4beaf82f5c27c93ea0e3..77aa0c79adcc95d641fd17a246cfebf0eba56bd0:/projects/stargazer/plugins/other/smux/smux.h?ds=inline diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h index 45f16ea6..3b217eb7 100644 --- a/projects/stargazer/plugins/other/smux/smux.h +++ b/projects/stargazer/plugins/other/smux/smux.h @@ -14,13 +14,13 @@ #include "stg/plugin.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" -extern "C" PLUGIN * GetPlugin(); - class USER; class SETTINGS; class SMUX; @@ -56,38 +56,45 @@ private: //----------------------------------------------------------------------------- class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE { public: - CHG_AFTER_NOTIFIER(SMUX & s, const USER_PTR & u) : smux(s), userPtr(u) {} - void Notify(const std::string &, const std::string &); + CHG_AFTER_NOTIFIER(SMUX & s, const USER_PTR & u) + : PROPERTY_NOTIFIER_BASE(), + smux(s), userPtr(u) {} + CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER & rvalue) + : PROPERTY_NOTIFIER_BASE(), + 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); SMUX & smux; USER_PTR userPtr; }; //----------------------------------------------------------------------------- -class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE { +class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE, private NONCOPYABLE { public: - ADD_DEL_TARIFF_NOTIFIER(SMUX & s) : smux(s) {} - void Notify(const TARIFF_DATA &); + ADD_DEL_TARIFF_NOTIFIER(SMUX & s) + : NOTIFIER_BASE(), smux(s) {} + void Notify(const TARIFF_DATA &); private: SMUX & smux; }; //----------------------------------------------------------------------------- -class ADD_USER_NOTIFIER : public NOTIFIER_BASE { +class ADD_USER_NOTIFIER : public NOTIFIER_BASE, private NONCOPYABLE { public: - ADD_USER_NOTIFIER(SMUX & s) : smux(s) {} - void Notify(const USER_PTR &); + ADD_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE(), smux(s) {} + void Notify(const USER_PTR &); private: SMUX & smux; }; //----------------------------------------------------------------------------- -class DEL_USER_NOTIFIER : public NOTIFIER_BASE { +class DEL_USER_NOTIFIER : public NOTIFIER_BASE, private NONCOPYABLE { public: - DEL_USER_NOTIFIER(SMUX & s) : smux(s) {} - void Notify(const USER_PTR &); + DEL_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE(), smux(s) {} + void Notify(const USER_PTR &); private: SMUX & smux; @@ -109,13 +116,13 @@ public: 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; } - 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(); @@ -123,9 +130,13 @@ public: void UnsetNotifier(USER_PTR userPtr); private: + SMUX(const SMUX & rvalue); + SMUX & operator=(const SMUX & rvalue); + static void * Runner(void * d); void Run(); bool PrepareNet(); + bool Reconnect(); bool DispatchPDUs(const SMUX_PDUs_t * pdus); @@ -156,6 +167,10 @@ private: pthread_mutex_t mutex; bool running; bool stopped; + bool needReconnect; + + time_t lastReconnectTry; + unsigned reconnectTimeout; int sock; @@ -168,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 &) { @@ -191,6 +214,4 @@ smux.UnsetNotifier(userPtr); smux.UpdateTables(); } -extern "C" PLUGIN * GetPlugin(); - #endif