#ifndef __SMUX_H__
#define __SMUX_H__
-#include <pthread.h>
-
#include <string>
#include <map>
#include <list>
+#include <mutex>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
+#include <cstdint>
#include "stg/SMUX-PDUs.h"
#include "stg/ObjectSyntax.h"
-#include "stg/os_int.h"
#include "stg/plugin.h"
#include "stg/module_settings.h"
#include "stg/notifer.h"
#include "tables.h"
#include "types.h"
-class USER;
-class SETTINGS;
+namespace STG
+{
+struct User;
+struct Settings;
+struct Users;
+struct Tariffs;
+struct Services;
+struct Corporations;
+struct TraffCounter;
+}
+
class SMUX;
-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);
typedef std::map<SMUX_PDUs_PR, SMUXPacketHandler> SMUXHandlers;
typedef std::map<PDUs_PR, PDUsHandler> PDUsHandlers;
+
+using UserPtr = STG::User*;
//-----------------------------------------------------------------------------
class SMUX_SETTINGS {
public:
SMUX_SETTINGS();
virtual ~SMUX_SETTINGS() {}
const std::string & GetStrError() const { return errorStr; }
- int ParseSettings(const MODULE_SETTINGS & s);
+ int ParseSettings(const STG::ModuleSettings & s);
uint32_t GetIP() const { return ip; }
uint16_t GetPort() const { return port; }
std::string password;
};
//-----------------------------------------------------------------------------
-class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string> {
+class CHG_AFTER_NOTIFIER : public STG::PropertyNotifierBase<std::string> {
public:
- CHG_AFTER_NOTIFIER(SMUX & s, const USER_PTR & u)
- : PROPERTY_NOTIFIER_BASE<std::string>(),
+ CHG_AFTER_NOTIFIER(SMUX & s, const UserPtr & u)
+ : STG::PropertyNotifierBase<std::string>(),
smux(s), userPtr(u) {}
CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER & rvalue)
- : PROPERTY_NOTIFIER_BASE<std::string>(),
+ : STG::PropertyNotifierBase<std::string>(),
smux(rvalue.smux), userPtr(rvalue.userPtr) {}
void Notify(const std::string &, const std::string &);
- USER_PTR GetUserPtr() const { return userPtr; }
+ UserPtr GetUserPtr() const { return userPtr; }
private:
CHG_AFTER_NOTIFIER & operator=(const CHG_AFTER_NOTIFIER & rvalue);
SMUX & smux;
- USER_PTR userPtr;
+ UserPtr userPtr;
};
//-----------------------------------------------------------------------------
-class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE<TARIFF_DATA>, private NONCOPYABLE {
+class ADD_DEL_TARIFF_NOTIFIER : public STG::NotifierBase<STG::TariffData> {
public:
- ADD_DEL_TARIFF_NOTIFIER(SMUX & s)
- : NOTIFIER_BASE<TARIFF_DATA>(), smux(s) {}
- void Notify(const TARIFF_DATA &);
+ explicit ADD_DEL_TARIFF_NOTIFIER(SMUX & s)
+ : STG::NotifierBase<STG::TariffData>(), smux(s) {}
+ void Notify(const STG::TariffData &);
private:
SMUX & smux;
};
//-----------------------------------------------------------------------------
-class ADD_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
+class ADD_USER_NOTIFIER : public STG::NotifierBase<UserPtr> {
public:
- ADD_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}
- void Notify(const USER_PTR &);
+ explicit ADD_USER_NOTIFIER(SMUX & s) : STG::NotifierBase<STG::User*>(), smux(s) {}
+ void Notify(const UserPtr &);
private:
SMUX & smux;
};
//-----------------------------------------------------------------------------
-class DEL_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
+class DEL_USER_NOTIFIER : public STG::NotifierBase<UserPtr> {
public:
- DEL_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}
- void Notify(const USER_PTR &);
+ explicit DEL_USER_NOTIFIER(SMUX & s) : STG::NotifierBase<UserPtr>(), smux(s) {}
+ void Notify(const UserPtr &);
private:
SMUX & smux;
};
//-----------------------------------------------------------------------------
-class SMUX : public PLUGIN {
+class SMUX : public STG::Plugin {
public:
SMUX();
virtual ~SMUX();
- void SetUsers(USERS * u) { users = u; }
- 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 SetSettings(const MODULE_SETTINGS & s) { settings = s; }
+ void SetUsers(STG::Users * u) { users = u; }
+ void SetTariffs(STG::Tariffs * t) { tariffs = t; }
+ void SetAdmins(STG::Admins * a) { admins = a; }
+ void SetServices(STG::Services * s) { services = s; }
+ void SetTraffcounter(STG::TraffCounter * tc) { traffcounter = tc; }
+ void SetCorporations(STG::Corporations * c) { corporations = c; }
+ void SetSettings(const STG::ModuleSettings & s) { settings = s; }
int ParseSettings();
int Start();
int Stop();
- int Reload(const MODULE_SETTINGS & ms);
- bool IsRunning() { return running && !stopped; }
+ int Reload(const STG::ModuleSettings & ms);
+ bool IsRunning() { return m_thread.joinable() && !stopped; }
const std::string & GetStrError() const { return errorStr; }
std::string GetVersion() const { return "Stg SMUX Plugin 1.1"; }
bool UpdateTables();
- void SetNotifier(USER_PTR userPtr);
- void UnsetNotifier(USER_PTR userPtr);
+ void SetNotifier(UserPtr userPtr);
+ void UnsetNotifier(UserPtr userPtr);
private:
SMUX(const SMUX & rvalue);
SMUX & operator=(const SMUX & rvalue);
- static void * Runner(void * d);
- void Run();
+ void Run(std::stop_token token);
bool PrepareNet();
bool Reconnect();
void SetNotifiers();
void ResetNotifiers();
- USERS * users;
- TARIFFS * tariffs;
- ADMINS * admins;
- SERVICES * services;
- CORPORATIONS * corporations;
- TRAFFCOUNTER * traffcounter;
+ STG::Users * users;
+ STG::Tariffs * tariffs;
+ STG::Admins * admins;
+ STG::Services * services;
+ STG::Corporations * corporations;
+ STG::TraffCounter * traffcounter;
mutable std::string errorStr;
SMUX_SETTINGS smuxSettings;
- MODULE_SETTINGS settings;
+ STG::ModuleSettings settings;
- pthread_t thread;
- pthread_mutex_t mutex;
- bool running;
+ std::jthread m_thread;
+ std::mutex m_mutex;
bool stopped;
bool needReconnect;
DEL_USER_NOTIFIER delUserNotifier;
ADD_DEL_TARIFF_NOTIFIER addDelTariffNotifier;
- PLUGIN_LOGGER logger;
+ STG::PluginLogger logger;
};
//-----------------------------------------------------------------------------
}
inline
-void ADD_DEL_TARIFF_NOTIFIER::Notify(const TARIFF_DATA &)
+void ADD_DEL_TARIFF_NOTIFIER::Notify(const STG::TariffData &)
{
smux.UpdateTables();
}
inline
-void ADD_USER_NOTIFIER::Notify(const USER_PTR & userPtr)
+void ADD_USER_NOTIFIER::Notify(const UserPtr & userPtr)
{
smux.SetNotifier(userPtr);
smux.UpdateTables();
}
inline
-void DEL_USER_NOTIFIER::Notify(const USER_PTR & userPtr)
+void DEL_USER_NOTIFIER::Notify(const UserPtr & userPtr)
{
smux.UnsetNotifier(userPtr);
smux.UpdateTables();
git.stg.codes / stg.git / blobdiff