More std::jthread stuff.

[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 7748144e1102a5edc4f4b4773de33ff092c3a5f4..a27e2eff4e2de7b37d6485d110fb5cc44cf1b964 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -19,212 +19,163 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-/*
- $Revision: 1.16 $
- $Date: 2010/09/10 06:43:59 $
- $Author: faust $
-*/
+#pragma once

 
 

-#ifndef RSCRIPT_H
-#define RSCRIPT_H
+#include "stg/plugin.h"
+#include "stg/module_settings.h"
+#include "stg/subscriptions.h"
+#include "stg/user.h"
+#include "stg/blowfish.h"
+#include "stg/rs_packets.h"
+#include "stg/logger.h"

 
 

-#include <pthread.h>
+#include "nrmap_parser.h"

 
 

-#include <cstring>

 #include <string>
 #include <list>
 #include <map>
 #include <functional>
 #include <utility>
 #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;

 
 

-#include "plugin.h"
-#include "store.h"
-#include "module_settings.h"
-#include "os_int.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "user.h"
-#include "users.h"
-#include "blowfish.h"
-#include "rs_packets.h"
-#include "nrmap_parser.h"
-
-extern "C" PLUGIN * GetPlugin();
-
-#define RS_DEBUG (1)
+namespace RS
+{

 
 

-#define MAX_SHORT_PCKT  (3)
+using UserPtr = User*;
+class UpdateRouter;

 
 

-class REMOTE_SCRIPT;
-class SETTINGS;
-//-----------------------------------------------------------------------------
-class RS_ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
-public:
-    RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {}
-    virtual ~RS_ADD_USER_NONIFIER() {}
-    void Notify(const USER_PTR & user);
-
-private:
-    REMOTE_SCRIPT & rs;
-};

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

-class RS_DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
-public:
-    RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {}
-    virtual ~RS_DEL_USER_NONIFIER() {}
-    void Notify(const USER_PTR & user);
-
-private:
-    REMOTE_SCRIPT & rs;
-};
-//-----------------------------------------------------------------------------
-template <typename varParamType>
-class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
-public:
-    RS_CHG_AFTER_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u) : user(u), rs(r) {}
-    void Notify(const varParamType & oldValue, const varParamType & newValue);
-    USER_PTR GetUser() {return user; }
-
-private:
-    USER_PTR user;
-    REMOTE_SCRIPT & rs;
-};
-//-----------------------------------------------------------------------------
-struct RS_USER {
-RS_USER();
-RS_USER(const std::vector<uint32_t> & r, USER_PTR it);
-
-time_t lastSentTime;
-USER_PTR user;
-std::vector<uint32_t> routers;
-int shortPacketsCount;
+struct USER
+{
+    USER(const std::vector<uint32_t> & r, UserPtr it)
+        : lastSentTime(0),
+          user(it),
+          routers(r),
+          shortPacketsCount(0),
+          ip(user->GetCurrIP())
+    {}
+
+    time_t lastSentTime;
+    UserPtr user;
+    std::vector<uint32_t> routers;
+    int shortPacketsCount;
+    uint32_t ip;

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

-class RS_SETTINGS {
-public:
-                        RS_SETTINGS();
-    virtual             ~RS_SETTINGS() {}
-    const std::string & GetStrError() const { return errorStr; }
-    int                 ParseSettings(const MODULE_SETTINGS & s)
-    int                 GetSendPeriod() const { return sendPeriod; }
-    int                 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                 ParseIntInRange(const std::string & str, int min, int max, int * val);
-    int                 sendPeriod;
-    uint16_t            port;
-    string              errorStr;
-    std::vector<NET_ROUTER> netRouters;
-    std::vector<string> userParams;
-    string              password;
-    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 PLUGIN {
-public:
-                        REMOTE_SCRIPT();
-    virtual             ~REMOTE_SCRIPT();
+class REMOTE_SCRIPT : public Plugin
+{
+    public:
+                            REMOTE_SCRIPT();

 
 

-    void                SetUsers(USERS * u) { users = u; }
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}
-    void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
-    int                 ParseSettings();
+        void                SetUsers(Users * u) override { users = u; }
+        void                SetSettings(const 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 ModuleSettings & ms) override;
+        bool                IsRunning() override { return isRunning; }

 
 

-    const std::string & GetStrError() const { return errorStr; }
-    const std::string   GetVersion() const { return "Remote script v 0.3"; }
-    uint16_t            GetStartPosition() const { return 20; }
-    uint16_t            GetStopPosition() const { return 20; }
+        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) { UnSetUserNotifier(u); }
-    void                AddUser(USER_PTR u) { SetUserNotifier(u); }
+        void                DelUser(UserPtr u) { UnSetUserNotifiers(u); }
+        void                AddUser(UserPtr u) { SetUserNotifiers(u); }

 
 

-    void                ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP);
+        void                AddRSU(UserPtr user);
+        void                DelRSU(UserPtr user);

 
 

-private:
-    static void *       Run(void *);
-    bool                PrepareNet();
-    bool                FinalizeNet();
+    private:
+        REMOTE_SCRIPT(const REMOTE_SCRIPT & rhs);
+        REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rhs);

 
 

-    bool                Send(uint32_t ip, RS_USER & rsu, bool forceDisconnect = false) const;
-    bool                SendDirect(uint32_t ip, RS_USER & rsu, uint32_t routerIP, bool forceDisconnect = false) const;
-    bool                PreparePacket(char * buf, size_t bufSize, uint32_t ip, RS_USER &rsu, bool forceDisconnect = false) const;
-    void                PeriodicSend();
+        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;
+        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();

 
 

-    void                SetUserNotifier(USER_PTR u);
-    void                UnSetUserNotifier(USER_PTR u);
+        std::vector<uint32_t> IP2Routers(uint32_t ip);
+        bool                GetUsers();

 
 

-    void                InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const;
-    void                Encrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, size_t len8) const;
+        void                SetUserNotifiers(UserPtr u);
+        void                UnSetUserNotifiers(UserPtr u);

 
 

-    mutable BLOWFISH_CTX ctx;
+        void                InitEncrypt(const std::string & password) const;
+        void                Encrypt(void * dst, const void * src, size_t len8) const;

 
 

-    std::list<RS_CHG_AFTER_NOTIFIER<uint32_t> > afterChgIPNotifierList;
-    std::map<uint32_t, RS_USER> authorizedUsers;
+        mutable BLOWFISH_CTX ctx;
+        std::map<uint32_t, USER> authorizedUsers;

 
 

-    mutable std::string errorStr;
-    RS_SETTINGS         rsSettings;
-    MODULE_SETTINGS     settings;
-    int                 sendPeriod;
-    int                 halfPeriod;
+        mutable std::string errorStr;
+        SETTINGS         rsSettings;
+        ModuleSettings     settings;
+        int                 sendPeriod;
+        int                 halfPeriod;

 
 

-    bool                nonstop;
-    bool                isRunning;
+        bool                isRunning;

 
 

-    USERS *             users;
+        Users *             users;

 
 

-    std::vector<NET_ROUTER> netRouters;
+        std::vector<NET_ROUTER> netRouters;

 
 

-    pthread_t           thread;
-    pthread_mutex_t     mutex;
+        std::jthread        m_thread;
+        std::mutex          m_mutex;

 
 

-    int                 sock;
+        int                 sock;

 
 

-    RS_ADD_USER_NONIFIER onAddUserNotifier;
-    RS_DEL_USER_NONIFIER onDelUserNotifier;
+        ScopedConnection m_onAddUserConn;
+        ScopedConnection m_onDelUserConn;

 
 

-    friend class UpdateRouter;
-    friend class DisconnectUser;
-};
-//-----------------------------------------------------------------------------
-class DisconnectUser : public std::unary_function<std::pair<const uint32_t, RS_USER> &, void> {
-    public:
-        DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}
-        void operator()(std::pair<const uint32_t, RS_USER> & p)
-        {
-            rscript.Send(p.first, p.second, true);
-        }
-    private:
-        REMOTE_SCRIPT & rscript;
+        void addDelUser(UserPtr user, bool toAdd);
+
+        using ConnHolder = std::tuple<int, ScopedConnection, ScopedConnection>;
+        std::vector<ConnHolder> m_conns;
+
+        PluginLogger       logger;
+
+        friend class RS::UpdateRouter;

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

-inline void RS_ADD_USER_NONIFIER::Notify(const USER_PTR & user)
-{
-printfd(__FILE__, "ADD_USER_NONIFIER\n");
-rs.AddUser(user);
-}
-//-----------------------------------------------------------------------------
-inline void RS_DEL_USER_NONIFIER::Notify(const USER_PTR & user)
-{
-printfd(__FILE__, "DEL_USER_NONIFIER\n");
-rs.DelUser(user);
-}
-//-----------------------------------------------------------------------------

 
 

-#endif
+} // namespace RS
+}