* Author : Maxim Mamontov <faust@stargazer.dp.ua>
*/
-#ifndef RSCRIPT_H
-#define RSCRIPT_H
-
-#include <pthread.h>
-
-#include <string>
-#include <list>
-#include <map>
-#include <functional>
-#include <utility>
+#pragma once
#include "stg/plugin.h"
#include "stg/module_settings.h"
-#include "stg/os_int.h"
#include "stg/notifer.h"
#include "stg/user.h"
#include "stg/blowfish.h"
#include "nrmap_parser.h"
-extern "C" PLUGIN * GetPlugin();
-
-#define RS_DEBUG (1)
-
-#define MAX_SHORT_PCKT (3)
-
-class SETTINGS;
-class USERS;
+#include <string>
+#include <list>
+#include <map>
+#include <functional>
+#include <utility>
+#include <mutex>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
+#include <cstdint>
+
+namespace STG
+{
+struct Settings;
+struct Settings;
+}
namespace RS
{
class UpdateRouter;
class DisconnectUser;
+using UserPtr = STG::User*;
+
//-----------------------------------------------------------------------------
-class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
+class ADD_USER_NONIFIER: public STG::NotifierBase<UserPtr> {
public:
- ADD_USER_NONIFIER(REMOTE_SCRIPT & r)
- : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
- virtual ~ADD_USER_NONIFIER() {}
- void Notify(const USER_PTR & user);
+ explicit ADD_USER_NONIFIER(REMOTE_SCRIPT & r)
+ : rs(r) {}
+ void Notify(const UserPtr & user);
private:
ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rhs);
REMOTE_SCRIPT & rs;
};
//-----------------------------------------------------------------------------
-class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
+class DEL_USER_NONIFIER: public STG::NotifierBase<UserPtr> {
public:
- DEL_USER_NONIFIER(REMOTE_SCRIPT & r)
- : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
- virtual ~DEL_USER_NONIFIER() {}
- void Notify(const USER_PTR & user);
+ explicit DEL_USER_NONIFIER(REMOTE_SCRIPT & r)
+ : rs(r) {}
+ void Notify(const UserPtr & user);
private:
DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rhs);
REMOTE_SCRIPT & rs;
};
//-----------------------------------------------------------------------------
-class IP_NOTIFIER: public PROPERTY_NOTIFIER_BASE<uint32_t> {
+class IP_NOTIFIER: public STG::PropertyNotifierBase<uint32_t> {
public:
- IP_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u)
- : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(u), rs(r) { user->AddCurrIPAfterNotifier(this); }
+ IP_NOTIFIER(REMOTE_SCRIPT & r, UserPtr u)
+ : user(u), rs(r) { user->AddCurrIPAfterNotifier(this); }
IP_NOTIFIER(const IP_NOTIFIER & rhs)
- : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(rhs.user), rs(rhs.rs) { user->AddCurrIPAfterNotifier(this); }
+ : user(rhs.user), rs(rhs.rs) { user->AddCurrIPAfterNotifier(this); }
~IP_NOTIFIER() { user->DelCurrIPAfterNotifier(this); }
IP_NOTIFIER & operator=(const IP_NOTIFIER & rhs)
}
void Notify(const uint32_t & oldValue, const uint32_t & newValue);
- USER_PTR GetUser() const { return user; }
+ UserPtr GetUser() const { return user; }
private:
- USER_PTR user;
+ UserPtr user;
REMOTE_SCRIPT & rs;
};
//-----------------------------------------------------------------------------
-class CONNECTED_NOTIFIER: public PROPERTY_NOTIFIER_BASE<bool> {
+class CONNECTED_NOTIFIER: public STG::PropertyNotifierBase<bool> {
public:
- CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u)
- : PROPERTY_NOTIFIER_BASE<bool>(), user(u), rs(r) { user->AddConnectedAfterNotifier(this); }
+ CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, UserPtr u)
+ : user(u), rs(r) { user->AddConnectedAfterNotifier(this); }
CONNECTED_NOTIFIER(const CONNECTED_NOTIFIER & rhs)
- : PROPERTY_NOTIFIER_BASE<bool>(), user(rhs.user), rs(rhs.rs) { user->AddConnectedAfterNotifier(this); }
+ : user(rhs.user), rs(rhs.rs) { user->AddConnectedAfterNotifier(this); }
~CONNECTED_NOTIFIER() { user->DelConnectedAfterNotifier(this); }
CONNECTED_NOTIFIER & operator=(const CONNECTED_NOTIFIER & rhs)
}
void Notify(const bool & oldValue, const bool & newValue);
- USER_PTR GetUser() const { return user; }
+ UserPtr GetUser() const { return user; }
private:
- USER_PTR user;
+ UserPtr user;
REMOTE_SCRIPT & rs;
};
//-----------------------------------------------------------------------------
struct USER {
- USER(const std::vector<uint32_t> & r, USER_PTR it)
- : user(it),
+ USER(const std::vector<uint32_t> & r, UserPtr it)
+ : lastSentTime(0),
+ user(it),
routers(r),
+ shortPacketsCount(0),
ip(user->GetCurrIP())
{}
time_t lastSentTime;
- USER_PTR user;
+ UserPtr user;
std::vector<uint32_t> routers;
int shortPacketsCount;
uint32_t ip;
SETTINGS();
virtual ~SETTINGS() {}
const std::string & GetStrError() const { return errorStr; }
- int ParseSettings(const MODULE_SETTINGS & s);
+ int ParseSettings(const STG::ModuleSettings & s);
int GetSendPeriod() const { return sendPeriod; }
uint16_t GetPort() const { return port; }
const std::vector<NET_ROUTER> & GetSubnetsMap() const { return netRouters; }
std::string subnetFile;
};
//-----------------------------------------------------------------------------
-class REMOTE_SCRIPT : public PLUGIN {
+class REMOTE_SCRIPT : public STG::Plugin {
public:
REMOTE_SCRIPT();
- virtual ~REMOTE_SCRIPT();
- void SetUsers(USERS * u) { users = u; }
- void SetSettings(const MODULE_SETTINGS & s) { settings = s; }
- int ParseSettings();
+ void SetUsers(STG::Users * u) override { users = u; }
+ void SetSettings(const STG::ModuleSettings & s) override { settings = s; }
+ int ParseSettings() override;
- int Start();
- int Stop();
- int Reload();
- bool IsRunning() { return isRunning; }
+ int Start() override;
+ int Stop() override;
+ int Reload(const STG::ModuleSettings & ms) override;
+ bool IsRunning() override { return isRunning; }
- const std::string & GetStrError() const { return errorStr; }
- std::string GetVersion() const { return "Remote script v 0.3"; }
- uint16_t GetStartPosition() const { return 10; }
- uint16_t GetStopPosition() const { return 10; }
+ const std::string & GetStrError() const override { return errorStr; }
+ std::string GetVersion() const override { return "Remote script v 0.3"; }
+ uint16_t GetStartPosition() const override { return 10; }
+ uint16_t GetStopPosition() const override { return 10; }
- void DelUser(USER_PTR u) { UnSetUserNotifiers(u); }
- void AddUser(USER_PTR u) { SetUserNotifiers(u); }
+ void DelUser(UserPtr u) { UnSetUserNotifiers(u); }
+ void AddUser(UserPtr u) { SetUserNotifiers(u); }
- void AddRSU(USER_PTR user);
- void DelRSU(USER_PTR user);
+ void AddRSU(UserPtr user);
+ void DelRSU(UserPtr user);
private:
REMOTE_SCRIPT(const REMOTE_SCRIPT & rhs);
REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rhs);
- static void * Run(void *);
+ void Run(std::stop_token token);
bool PrepareNet();
bool FinalizeNet();
std::vector<uint32_t> IP2Routers(uint32_t ip);
bool GetUsers();
-// std::string GetUserParam(USER_PTR u, const std::string & paramName) const;
- void SetUserNotifiers(USER_PTR u);
- void UnSetUserNotifiers(USER_PTR u);
+ void SetUserNotifiers(UserPtr u);
+ void UnSetUserNotifiers(UserPtr u);
- void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password) const;
- void Encrypt(BLOWFISH_CTX * ctx, void * dst, const void * src, size_t len8) const;
+ void InitEncrypt(const std::string & password) const;
+ void Encrypt(void * dst, const void * src, size_t len8) const;
mutable BLOWFISH_CTX ctx;
mutable std::string errorStr;
SETTINGS rsSettings;
- MODULE_SETTINGS settings;
+ STG::ModuleSettings settings;
int sendPeriod;
int halfPeriod;
- bool nonstop;
bool isRunning;
- USERS * users;
+ STG::Users * users;
std::vector<NET_ROUTER> netRouters;
- pthread_t thread;
- pthread_mutex_t mutex;
+ std::jthread m_thread;
+ std::mutex m_mutex;
int sock;
ADD_USER_NONIFIER onAddUserNotifier;
DEL_USER_NONIFIER onDelUserNotifier;
- PLUGIN_LOGGER logger;
+ STG::PluginLogger logger;
friend class RS::UpdateRouter;
friend class RS::DisconnectUser;
//-----------------------------------------------------------------------------
class DisconnectUser : public std::unary_function<std::pair<const uint32_t, USER> &, void> {
public:
- DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}
+ explicit DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}
void operator()(std::pair<const uint32_t, USER> & p)
{
rscript.Send(p.second, true);
REMOTE_SCRIPT & rscript;
};
//-----------------------------------------------------------------------------
-inline void ADD_USER_NONIFIER::Notify(const USER_PTR & user)
+inline void ADD_USER_NONIFIER::Notify(const UserPtr & user)
{
rs.AddUser(user);
}
//-----------------------------------------------------------------------------
-inline void DEL_USER_NONIFIER::Notify(const USER_PTR & user)
+inline void DEL_USER_NONIFIER::Notify(const UserPtr & user)
{
rs.DelUser(user);
}
//-----------------------------------------------------------------------------
} // namespace RS
-
-#endif
git.stg.codes / stg.git / blobdiff