Remove extra debug.

[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 24d44763af18c391c46c9dec2a459c2a79e2a759..6c97b59883cb188392867ba847ee9911f83fd238 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -19,95 +19,146 @@
  *    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/notifer.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 "stg/plugin.h"
-#include "stg/store.h"
-#include "stg/module_settings.h"
-#include "stg/os_int.h"
-#include "stg/notifer.h"
-#include "stg/user_ips.h"
-#include "stg/user.h"
-#include "stg/users.h"
-#include "stg/blowfish.h"
-#include "stg/rs_packets.h"
-#include "nrmap_parser.h"
+namespace RS
+{

 
 

-extern "C" PLUGIN * GetPlugin();
+class REMOTE_SCRIPT;
+class UpdateRouter;
+class DisconnectUser;

 
 

-#define RS_DEBUG (1)
+using UserPtr = STG::User*;

 
 

-#define MAX_SHORT_PCKT  (3)
+//-----------------------------------------------------------------------------
+class ADD_USER_NONIFIER: public STG::NotifierBase<UserPtr> {
+public:
+    explicit ADD_USER_NONIFIER(REMOTE_SCRIPT & r)
+        : rs(r) {}
+    void Notify(const UserPtr & user);

 
 

-class REMOTE_SCRIPT;
-class SETTINGS;
+private:
+    ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rhs);
+    ADD_USER_NONIFIER & operator=(const ADD_USER_NONIFIER);
+
+    REMOTE_SCRIPT & rs;
+};

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

-class RS_ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
+class DEL_USER_NONIFIER: public STG::NotifierBase<UserPtr> {

 public:
 public:

-    RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {}
-    virtual ~RS_ADD_USER_NONIFIER() {}
-    void Notify(const USER_PTR & user);
+    explicit DEL_USER_NONIFIER(REMOTE_SCRIPT & r)
+        : rs(r) {}
+    void Notify(const UserPtr & user);

 
 private:
 
 private:

+    DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rhs);
+    DEL_USER_NONIFIER & operator=(const DEL_USER_NONIFIER);
+

     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------

-class RS_DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
+class IP_NOTIFIER: public STG::PropertyNotifierBase<uint32_t> {

 public:
 public:

-    RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {}
-    virtual ~RS_DEL_USER_NONIFIER() {}
-    void Notify(const USER_PTR & user);
+    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:
 
 private:

+
+    UserPtr user;

     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------

-template <typename varParamType>
-class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
+class CONNECTED_NOTIFIER: public STG::PropertyNotifierBase<bool> {

 public:
 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; }
+    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:
 
 private:

-    USER_PTR user;
+
+    UserPtr user;

     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------
     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 {
+class SETTINGS {

 public:
 public:

-                        RS_SETTINGS();
-    virtual             ~RS_SETTINGS() {}
+                        SETTINGS();
+    virtual             ~SETTINGS() {}

     const std::string & GetStrError() const { return errorStr; }
     const std::string & GetStrError() const { return errorStr; }

-    int                 ParseSettings(const MODULE_SETTINGS & s);
+    int                 ParseSettings(const STG::ModuleSettings & s);

     int                 GetSendPeriod() const { return sendPeriod; }
     int                 GetSendPeriod() const { return sendPeriod; }

-    int                 GetPort() const { return port; }
+    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::vector<NET_ROUTER> & GetSubnetsMap() const { return netRouters; }
     const std::vector<std::string> & GetUserParams() const { return userParams; }
     const std::string & GetPassword() const { return password; }


@@ -116,114 +167,112 @@ public:
 private:
     int                 sendPeriod;
     uint16_t            port;
 private:
     int                 sendPeriod;
     uint16_t            port;

-    string              errorStr;
+    std::string         errorStr;

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

-    std::vector<string> userParams;
-    string              password;
-    string              subnetFile;
+    std::vector<std::string> userParams;
+    std::string         password;
+    std::string         subnetFile;

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

-class REMOTE_SCRIPT : public PLUGIN {
+class REMOTE_SCRIPT : public STG::Plugin {

 public:
                         REMOTE_SCRIPT();
 public:
                         REMOTE_SCRIPT();

-    virtual             ~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();
-
-    int                 Start();
-    int                 Stop();
-    int                 Reload();
-    bool                IsRunning() { 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; }
+    void                SetUsers(STG::Users * u) override { users = u; }
+    void                SetSettings(const STG::ModuleSettings & s) override { settings = s; }
+    int                 ParseSettings() override;

 
 

-    void                DelUser(USER_PTR u) { UnSetUserNotifier(u); }
-    void                AddUser(USER_PTR u) { SetUserNotifier(u); }
+    int                 Start() override;
+    int                 Stop() override;
+    int                 Reload(const STG::ModuleSettings & ms) override;
+    bool                IsRunning() override { return isRunning; }

 
 

-    void                ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP);
+    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                AddRSU(UserPtr user);
+    void                DelRSU(UserPtr user);

 
 private:
 
 private:

-    static void *       Run(void *);
+    REMOTE_SCRIPT(const REMOTE_SCRIPT & rhs);
+    REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rhs);
+
+    void                Run(std::stop_token token);

     bool                PrepareNet();
     bool                FinalizeNet();
 
     bool                PrepareNet();
     bool                FinalizeNet();
 

-    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;
+    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();
     void                PeriodicSend();
 
     std::vector<uint32_t> IP2Routers(uint32_t ip);
     bool                GetUsers();

-    std::string         GetUserParam(USER_PTR u, const std::string & paramName) const;

 
 

-    void                SetUserNotifier(USER_PTR u);
-    void                UnSetUserNotifier(USER_PTR u);
+    void                SetUserNotifiers(UserPtr u);
+    void                UnSetUserNotifiers(UserPtr u);

 
 

-    void                InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const;
-    void                Encrypt(BLOWFISH_CTX * ctx, char * dst, const char * 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::list<RS_CHG_AFTER_NOTIFIER<uint32_t> > afterChgIPNotifierList;
-    std::map<uint32_t, RS_USER> authorizedUsers;
+    std::list<IP_NOTIFIER> ipNotifierList;
+    std::list<CONNECTED_NOTIFIER> connNotifierList;
+    std::map<uint32_t, USER> authorizedUsers;

 
     mutable std::string errorStr;
 
     mutable std::string errorStr;

-    RS_SETTINGS         rsSettings;
-    MODULE_SETTINGS     settings;
+    SETTINGS         rsSettings;
+    STG::ModuleSettings     settings;

     int                 sendPeriod;
     int                 halfPeriod;
 
     int                 sendPeriod;
     int                 halfPeriod;
 

-    bool                nonstop;

     bool                isRunning;
 
     bool                isRunning;
 

-    USERS *             users;
+    STG::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;
+    ADD_USER_NONIFIER onAddUserNotifier;
+    DEL_USER_NONIFIER onDelUserNotifier;
+
+    STG::PluginLogger       logger;

 
 

-    friend class UpdateRouter;
-    friend class DisconnectUser;
+    friend class RS::UpdateRouter;
+    friend class RS::DisconnectUser;
+    friend class RS::CONNECTED_NOTIFIER;

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

-class DisconnectUser : public std::unary_function<std::pair<const uint32_t, RS_USER> &, void> {
+class DisconnectUser : public std::unary_function<std::pair<const uint32_t, USER> &, void> {

     public:
     public:

-        DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}
-        void operator()(std::pair<const uint32_t, RS_USER> & p)
+        explicit DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}
+        void operator()(std::pair<const uint32_t, USER> & p)

         {
         {

-            rscript.Send(p.first, p.second, true);
+            rscript.Send(p.second, true);

         }
     private:
         REMOTE_SCRIPT & rscript;
 };
 //-----------------------------------------------------------------------------
         }
     private:
         REMOTE_SCRIPT & rscript;
 };
 //-----------------------------------------------------------------------------

-inline void RS_ADD_USER_NONIFIER::Notify(const USER_PTR & user)
+inline void ADD_USER_NONIFIER::Notify(const UserPtr & user)

 {
 {

-printfd(__FILE__, "ADD_USER_NONIFIER\n");

 rs.AddUser(user);
 }
 //-----------------------------------------------------------------------------
 rs.AddUser(user);
 }
 //-----------------------------------------------------------------------------

-inline void RS_DEL_USER_NONIFIER::Notify(const USER_PTR & user)
+inline void DEL_USER_NONIFIER::Notify(const UserPtr & user)

 {
 {

-printfd(__FILE__, "DEL_USER_NONIFIER\n");

 rs.DelUser(user);
 }
 //-----------------------------------------------------------------------------
 
 rs.DelUser(user);
 }
 //-----------------------------------------------------------------------------
 

-#endif
+} // namespace RS