Use std::lock_guard instead of STG_LOCKER.

[stg.git] / projects / stargazer / plugins / other / rscript / rscript.h

diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h
index e734227c48e67d50b72fd985abe1eed248ef0e3f..a27e2eff4e2de7b37d6485d110fb5cc44cf1b964 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -23,7 +23,7 @@
 
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 
 #include "stg/plugin.h"
 #include "stg/module_settings.h"

-#include "stg/notifer.h"
+#include "stg/subscriptions.h"

 #include "stg/user.h"
 #include "stg/blowfish.h"
 #include "stg/rs_packets.h"
 #include "stg/user.h"
 #include "stg/blowfish.h"
 #include "stg/rs_packets.h"


@@ -36,103 +36,27 @@
 #include <map>
 #include <functional>
 #include <utility>
 #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>
 
 #include <cstdint>
 

-#include <pthread.h>
-

 namespace STG
 {
 struct Settings;
 struct Settings;
 namespace STG
 {
 struct Settings;
 struct Settings;

-}

 
 namespace RS
 {
 
 
 namespace RS
 {
 

-class REMOTE_SCRIPT;
+using UserPtr = User*;

 class UpdateRouter;
 class UpdateRouter;

-class DisconnectUser;
-
-using UserPtr = STG::User*;
-
-//-----------------------------------------------------------------------------
-class ADD_USER_NONIFIER: public STG::NotifierBase<UserPtr> {
-public:
-    explicit ADD_USER_NONIFIER(REMOTE_SCRIPT & r)
-        : rs(r) {}
-    void Notify(const UserPtr & user);
-
-private:
-    ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rhs);
-    ADD_USER_NONIFIER & operator=(const ADD_USER_NONIFIER);
-
-    REMOTE_SCRIPT & rs;
-};
-//-----------------------------------------------------------------------------
-class DEL_USER_NONIFIER: public STG::NotifierBase<UserPtr> {
-public:
-    explicit DEL_USER_NONIFIER(REMOTE_SCRIPT & r)
-        : rs(r) {}
-    void Notify(const UserPtr & user);
-
-private:
-    DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rhs);
-    DEL_USER_NONIFIER & operator=(const DEL_USER_NONIFIER);

 
 

-    REMOTE_SCRIPT & rs;
-};
-//-----------------------------------------------------------------------------
-class IP_NOTIFIER: public STG::PropertyNotifierBase<uint32_t> {
-public:
-    IP_NOTIFIER(REMOTE_SCRIPT & r, UserPtr u)
-        : user(u), rs(r) { user->AddCurrIPAfterNotifier(this); }
-    IP_NOTIFIER(const IP_NOTIFIER & rhs)
-        : user(rhs.user), rs(rhs.rs) { user->AddCurrIPAfterNotifier(this); }
-    ~IP_NOTIFIER() { user->DelCurrIPAfterNotifier(this); }
-
-    IP_NOTIFIER & operator=(const IP_NOTIFIER & rhs)
-    {
-        user->DelCurrIPAfterNotifier(this);
-        user = rhs.user;
-        user->AddCurrIPAfterNotifier(this);
-        return *this;
-    }
-
-    void Notify(const uint32_t & oldValue, const uint32_t & newValue);
-    UserPtr GetUser() const { return user; }
-
-private:
-
-    UserPtr user;
-    REMOTE_SCRIPT & rs;
-};

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-class CONNECTED_NOTIFIER: public STG::PropertyNotifierBase<bool> {
-public:
-    CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, UserPtr u)
-        : user(u), rs(r) { user->AddConnectedAfterNotifier(this); }
-    CONNECTED_NOTIFIER(const CONNECTED_NOTIFIER & rhs)
-        : user(rhs.user), rs(rhs.rs) { user->AddConnectedAfterNotifier(this); }
-    ~CONNECTED_NOTIFIER() { user->DelConnectedAfterNotifier(this); }
-
-    CONNECTED_NOTIFIER & operator=(const CONNECTED_NOTIFIER & rhs)
-    {
-        user->DelConnectedAfterNotifier(this);
-        user = rhs.user;
-        user->AddConnectedAfterNotifier(this);
-        return *this;
-    }
-
-    void Notify(const bool & oldValue, const bool & newValue);
-    UserPtr GetUser() const { return user; }
-
-private:
-
-    UserPtr user;
-    REMOTE_SCRIPT & rs;
-};
-//-----------------------------------------------------------------------------
-struct USER {
+struct USER
+{

     USER(const std::vector<uint32_t> & r, UserPtr it)
         : lastSentTime(0),
           user(it),
     USER(const std::vector<uint32_t> & r, UserPtr it)
         : lastSentTime(0),
           user(it),


@@ -148,130 +72,110 @@ struct USER {
     uint32_t ip;
 };
 //-----------------------------------------------------------------------------
     uint32_t ip;
 };
 //-----------------------------------------------------------------------------

-class SETTINGS {
-public:
-                        SETTINGS();
-    virtual             ~SETTINGS() {}
-    const std::string & GetStrError() const { return errorStr; }
-    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; }
-    const std::vector<std::string> & GetUserParams() const { return userParams; }
-    const std::string & GetPassword() const { return password; }
-    const std::string & GetMapFileName() const { return subnetFile; }
-
-private:
-    int                 sendPeriod;
-    uint16_t            port;
-    std::string         errorStr;
-    std::vector<NET_ROUTER> netRouters;
-    std::vector<std::string> userParams;
-    std::string         password;
-    std::string         subnetFile;
+class SETTINGS
+{
+    public:
+                            SETTINGS();
+        virtual             ~SETTINGS() {}
+        const std::string & GetStrError() const { return errorStr; }
+        int                 ParseSettings(const ModuleSettings & s);
+        int                 GetSendPeriod() const { return sendPeriod; }
+        uint16_t            GetPort() const { return port; }
+        const std::vector<NET_ROUTER> & GetSubnetsMap() const { return netRouters; }
+        const std::vector<std::string> & GetUserParams() const { return userParams; }
+        const std::string & GetPassword() const { return password; }
+        const std::string & GetMapFileName() const { return subnetFile; }
+
+    private:
+        int                 sendPeriod;
+        uint16_t            port;
+        std::string         errorStr;
+        std::vector<NET_ROUTER> netRouters;
+        std::vector<std::string> userParams;
+        std::string         password;
+        std::string         subnetFile;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class REMOTE_SCRIPT : public STG::Plugin {
-public:
-                        REMOTE_SCRIPT();
-                        ~REMOTE_SCRIPT() override;
+class REMOTE_SCRIPT : public Plugin
+{
+    public:
+                            REMOTE_SCRIPT();

 
 

-    void                SetUsers(STG::Users * u) override { users = u; }
-    void                SetSettings(const STG::ModuleSettings & s) override { settings = s; }
-    int                 ParseSettings() override;
+        void                SetUsers(Users * u) override { users = u; }
+        void                SetSettings(const ModuleSettings & s) override { settings = s; }
+        int                 ParseSettings() override;

 
 

-    int                 Start() override;
-    int                 Stop() override;
-    int                 Reload(const STG::ModuleSettings & ms) override;
-    bool                IsRunning() override { return isRunning; }
+        int                 Start() override;
+        int                 Stop() override;
+        int                 Reload(const ModuleSettings & ms) override;
+        bool                IsRunning() override { return isRunning; }

 
 

-    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; }
+        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(UserPtr u) { UnSetUserNotifiers(u); }
-    void                AddUser(UserPtr u) { SetUserNotifiers(u); }
+        void                DelUser(UserPtr u) { UnSetUserNotifiers(u); }
+        void                AddUser(UserPtr u) { SetUserNotifiers(u); }

 
 

-    void                AddRSU(UserPtr user);
-    void                DelRSU(UserPtr user);
+        void                AddRSU(UserPtr user);
+        void                DelRSU(UserPtr user);

 
 

-private:
-    REMOTE_SCRIPT(const REMOTE_SCRIPT & rhs);
-    REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rhs);
+    private:
+        REMOTE_SCRIPT(const REMOTE_SCRIPT & rhs);
+        REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rhs);

 
 

-    static void *       Run(void *);
-    bool                PrepareNet();
-    bool                FinalizeNet();
+        void                Run(std::stop_token token);
+        bool                PrepareNet();
+        bool                FinalizeNet();

 
 

-    bool                Send(USER & rsu, bool forceDisconnect = false) const;
-    bool                SendDirect(USER & rsu, uint32_t routerIP, bool forceDisconnect = false) const;
-    bool                PreparePacket(char * buf, size_t bufSize, USER &rsu, bool forceDisconnect = false) const;
-    void                PeriodicSend();
+        bool                Send(USER & rsu, bool forceDisconnect = false) const;
+        bool                SendDirect(USER & rsu, uint32_t routerIP, bool forceDisconnect = false) const;
+        bool                PreparePacket(char * buf, size_t bufSize, USER &rsu, bool forceDisconnect = false) const;
+        void                PeriodicSend();

 
 

-    std::vector<uint32_t> IP2Routers(uint32_t ip);
-    bool                GetUsers();
+        std::vector<uint32_t> IP2Routers(uint32_t ip);
+        bool                GetUsers();

 
 

-    void                SetUserNotifiers(UserPtr u);
-    void                UnSetUserNotifiers(UserPtr 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 BLOWFISH_CTX ctx;
+        std::map<uint32_t, USER> authorizedUsers;

 
 

-    std::list<IP_NOTIFIER> ipNotifierList;
-    std::list<CONNECTED_NOTIFIER> connNotifierList;
-    std::map<uint32_t, USER> authorizedUsers;
+        mutable std::string errorStr;
+        SETTINGS         rsSettings;
+        ModuleSettings     settings;
+        int                 sendPeriod;
+        int                 halfPeriod;

 
 

-    mutable std::string errorStr;
-    SETTINGS         rsSettings;
-    STG::ModuleSettings     settings;
-    int                 sendPeriod;
-    int                 halfPeriod;
+        bool                isRunning;

 
 

-    bool                nonstop;
-    bool                isRunning;
+        Users *             users;

 
 

-    STG::Users *             users;
+        std::vector<NET_ROUTER> netRouters;

 
 

-    std::vector<NET_ROUTER> netRouters;
+        std::jthread        m_thread;
+        std::mutex          m_mutex;

 
 

-    pthread_t           thread;
-    pthread_mutex_t     mutex;
+        int                 sock;

 
 

-    int                 sock;
+        ScopedConnection m_onAddUserConn;
+        ScopedConnection m_onDelUserConn;

 
 

-    ADD_USER_NONIFIER onAddUserNotifier;
-    DEL_USER_NONIFIER onDelUserNotifier;
+        void addDelUser(UserPtr user, bool toAdd);

 
 

-    STG::PluginLogger       logger;
+        using ConnHolder = std::tuple<int, ScopedConnection, ScopedConnection>;
+        std::vector<ConnHolder> m_conns;

 
 

-    friend class RS::UpdateRouter;
-    friend class RS::DisconnectUser;
-    friend class RS::CONNECTED_NOTIFIER;
-};
-//-----------------------------------------------------------------------------
-class DisconnectUser : public std::unary_function<std::pair<const uint32_t, USER> &, void> {
-    public:
-        explicit DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}
-        void operator()(std::pair<const uint32_t, USER> & p)
-        {
-            rscript.Send(p.second, true);
-        }
-    private:
-        REMOTE_SCRIPT & rscript;
+        PluginLogger       logger;
+
+        friend class RS::UpdateRouter;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-inline void ADD_USER_NONIFIER::Notify(const UserPtr & user)
-{
-rs.AddUser(user);
-}
-//-----------------------------------------------------------------------------
-inline void DEL_USER_NONIFIER::Notify(const UserPtr & user)
-{
-rs.DelUser(user);
-}
-//-----------------------------------------------------------------------------

 
 } // namespace RS
 
 } // namespace RS

+}