X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/82ede2a92a721d1c8f0e3fd109a2594f2096306e..711da215b0294754409754bccbd920519b07c09d:/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 7ab603df..e379ea7f 100644 --- a/projects/stargazer/plugins/other/smux/smux.h +++ b/projects/stargazer/plugins/other/smux/smux.h @@ -5,6 +5,7 @@ #include #include +#include #include "stg/SMUX-PDUs.h" #include "stg/ObjectSyntax.h" @@ -12,13 +13,14 @@ #include "stg/os_int.h" #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; @@ -26,6 +28,7 @@ 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); @@ -51,6 +54,52 @@ private: std::string password; }; //----------------------------------------------------------------------------- +class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE { +public: + 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() 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, private NONCOPYABLE { +public: + 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, private NONCOPYABLE { +public: + ADD_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE(), smux(s) {} + void Notify(const USER_PTR &); + +private: + SMUX & smux; +}; +//----------------------------------------------------------------------------- +class DEL_USER_NOTIFIER : public NOTIFIER_BASE, private NONCOPYABLE { +public: + DEL_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE(), smux(s) {} + void Notify(const USER_PTR &); + +private: + SMUX & smux; +}; +//----------------------------------------------------------------------------- class SMUX : public PLUGIN { public: SMUX(); @@ -60,27 +109,34 @@ public: void SetTariffs(TARIFFS * t) { tariffs = t; } 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 SetTraffcounter(TRAFFCOUNTER *) {} - void SetStore(STORE *) {} - void SetStgSettings(const SETTINGS *) {} void SetSettings(const MODULE_SETTINGS & s) { settings = s; } int ParseSettings(); int Start(); int Stop(); - int Reload() { return 0; } + int Reload(); 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: + 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); @@ -93,13 +149,15 @@ private: bool GetNextRequestHandler(const PDUs_t * pdus); bool SetRequestHandler(const PDUs_t * pdus); - bool UpdateTables(); + void SetNotifiers(); + void ResetNotifiers(); USERS * users; TARIFFS * tariffs; ADMINS * admins; SERVICES * services; CORPORATIONS * corporations; + TRAFFCOUNTER * traffcounter; mutable std::string errorStr; SMUX_SETTINGS smuxSettings; @@ -109,6 +167,10 @@ private: pthread_mutex_t mutex; bool running; bool stopped; + bool needReconnect; + + time_t lastReconnectTry; + unsigned reconnectTimeout; int sock; @@ -117,9 +179,39 @@ private: Sensors sensors; Tables tables; + std::list 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