Add instrumentation.

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

diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp
index 928629ad8b007f48bde0e7b4644cb46208e9fc7a..95699e1068cefd48f79669d1ecbb04a8b0f30cd7 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.cpp
+++ b/projects/stargazer/plugins/other/rscript/rscript.cpp
@@ -19,24 +19,29 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include <sys/time.h>
+#include "rscript.h"

 
 

-#include <csignal>
-#include <cassert>
-#include <cstdlib>
-#include <cerrno>
-#include <cstring>
-#include <algorithm>
+#include "ur_functor.h"

 
 #include "stg/common.h"
 #include "stg/locker.h"
 #include "stg/users.h"
 #include "stg/user_property.h"
 
 #include "stg/common.h"
 #include "stg/locker.h"
 #include "stg/users.h"
 #include "stg/user_property.h"

-#include "stg/plugin_creator.h"

 #include "stg/logger.h"
 #include "stg/logger.h"

-#include "rscript.h"
-#include "ur_functor.h"
-#include "send_functor.h"
+
+#include <algorithm>
+
+#include <csignal>
+#include <cassert>
+#include <cstdlib>
+#include <cerrno>
+#include <cstring>
+
+#include <sys/time.h>
+#include <netinet/ip.h>
+
+#define RS_DEBUG (1)
+#define MAX_SHORT_PCKT  (3)

 
 extern volatile time_t stgTime;
 
 
 extern volatile time_t stgTime;
 


@@ -47,26 +52,18 @@ namespace {
 template<typename T>
 struct USER_IS
 {
 template<typename T>
 struct USER_IS
 {

-    USER_IS(USER_PTR u) : user(u) {}
+    explicit USER_IS(RS::UserPtr u) : user(u) {}

     bool operator()(const T & notifier) { return notifier.GetUser() == user; }
 
     bool operator()(const T & notifier) { return notifier.GetUser() == user; }
 

-    USER_PTR user;
+    RS::UserPtr user;

 };
 
 };
 

-PLUGIN_CREATOR<REMOTE_SCRIPT> rsc;
-

 } // namespace anonymous
 
 } // namespace anonymous
 

-extern "C" PLUGIN * GetPlugin();
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
+extern "C" STG::Plugin* GetPlugin()

 {
 {

-return rsc.GetPlugin();
+    static REMOTE_SCRIPT plugin;
+    return &plugin;

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -77,11 +74,11 @@ RS::SETTINGS::SETTINGS()
 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------

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

 {
 int p;
 {
 int p;

-PARAM_VALUE pv;
-std::vector<PARAM_VALUE>::const_iterator pvi;
+STG::ParamValue pv;
+std::vector<STG::ParamValue>::const_iterator pvi;

 netRouters.clear();
 ///////////////////////////
 pv.param = "Port";
 netRouters.clear();
 ///////////////////////////
 pv.param = "Port";


@@ -154,7 +151,7 @@ if (!nrMapParser.ReadFile(subnetFile))
     }
 else
     {
     }
 else
     {

-    GetStgLogger()("mod_rscript: error opening subnets file '%s'", subnetFile.c_str());
+        STG::PluginLogger::get("rscript")("mod_rscript: error opening subnets file '%s'", subnetFile.c_str());

     }
 
 return 0;
     }
 
 return 0;


@@ -163,52 +160,36 @@ return 0;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 REMOTE_SCRIPT::REMOTE_SCRIPT()
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 REMOTE_SCRIPT::REMOTE_SCRIPT()

-    : ctx(),
-      ipNotifierList(),
-      connNotifierList(),
-      authorizedUsers(),
-      errorStr(),
-      rsSettings(),
-      settings(),
-      sendPeriod(15),
+    : sendPeriod(15),

       halfPeriod(8),
       halfPeriod(8),

-      nonstop(false),

       isRunning(false),
       users(NULL),
       isRunning(false),
       users(NULL),

-      netRouters(),
-      thread(),
-      mutex(),

       sock(0),
       onAddUserNotifier(*this),
       onDelUserNotifier(*this),
       sock(0),
       onAddUserNotifier(*this),
       onDelUserNotifier(*this),

-      logger(GetPluginLogger(GetStgLogger(), "rscript"))
+      logger(STG::PluginLogger::get("rscript"))

 {
 {

-pthread_mutex_init(&mutex, NULL);

 }
 //-----------------------------------------------------------------------------
 REMOTE_SCRIPT::~REMOTE_SCRIPT()
 {
 }
 //-----------------------------------------------------------------------------
 REMOTE_SCRIPT::~REMOTE_SCRIPT()
 {

-pthread_mutex_destroy(&mutex);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void * REMOTE_SCRIPT::Run(void * d)
+void REMOTE_SCRIPT::Run(std::stop_token token)

 {
 sigset_t signalSet;
 sigfillset(&signalSet);
 pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 
 {
 sigset_t signalSet;
 sigfillset(&signalSet);
 pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 

-REMOTE_SCRIPT * rs = static_cast<REMOTE_SCRIPT *>(d);
+isRunning = true;

 
 

-rs->isRunning = true;
-
-while (rs->nonstop)
+while (!token.stop_requested())

     {
     {

-    rs->PeriodicSend();
+    PeriodicSend();

     sleep(2);
     }
 
     sleep(2);
     }
 

-rs->isRunning = false;
-return NULL;
+isRunning = false;

 }
 //-----------------------------------------------------------------------------
 int REMOTE_SCRIPT::ParseSettings()
 }
 //-----------------------------------------------------------------------------
 int REMOTE_SCRIPT::ParseSettings()


@@ -227,13 +208,11 @@ int REMOTE_SCRIPT::Start()
 {
 netRouters = rsSettings.GetSubnetsMap();
 
 {
 netRouters = rsSettings.GetSubnetsMap();
 

-InitEncrypt(&ctx, rsSettings.GetPassword());
+InitEncrypt(rsSettings.GetPassword());

 
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 
 
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 

-nonstop = true;
-

 if (GetUsers())
     {
     return -1;
 if (GetUsers())
     {
     return -1;


@@ -246,13 +225,7 @@ if (PrepareNet())
 
 if (!isRunning)
     {
 
 if (!isRunning)
     {

-    if (pthread_create(&thread, NULL, Run, this))
-        {
-        errorStr = "Cannot create thread.";
-       logger("Cannot create thread.");
-        printfd(__FILE__, "Cannot create thread\n");
-        return -1;
-        }
+    m_thread = std::jthread([this](auto token){ Run(token); });

     }
 
 errorStr = "";
     }
 
 errorStr = "";


@@ -264,7 +237,7 @@ int REMOTE_SCRIPT::Stop()
 if (!IsRunning())
     return 0;
 
 if (!IsRunning())
     return 0;
 

-nonstop = false;
+m_thread.request_stop();

 
 std::for_each(
         authorizedUsers.begin(),
 
 std::for_each(
         authorizedUsers.begin(),


@@ -290,13 +263,15 @@ users->DelNotifierUserAdd(&onAddUserNotifier);
 if (isRunning)
     {
     logger("Cannot stop thread.");
 if (isRunning)
     {
     logger("Cannot stop thread.");

-    return -1;
+    m_thread.detach();

     }
     }

+else
+    m_thread.join();

 
 return 0;
 }
 //-----------------------------------------------------------------------------
 
 return 0;
 }
 //-----------------------------------------------------------------------------

-int REMOTE_SCRIPT::Reload()
+int REMOTE_SCRIPT::Reload(const STG::ModuleSettings & /*ms*/)

 {
 NRMapParser nrMapParser;
 
 {
 NRMapParser nrMapParser;
 


@@ -308,7 +283,7 @@ if (nrMapParser.ReadFile(rsSettings.GetMapFileName()))
     }
 
     {
     }
 
     {

-    STG_LOCKER lock(&mutex);
+    std::lock_guard lock(m_mutex);

 
     printfd(__FILE__, "REMOTE_SCRIPT::Reload()\n");
 
 
     printfd(__FILE__, "REMOTE_SCRIPT::Reload()\n");
 


@@ -348,7 +323,7 @@ return false;
 //-----------------------------------------------------------------------------
 void REMOTE_SCRIPT::PeriodicSend()
 {
 //-----------------------------------------------------------------------------
 void REMOTE_SCRIPT::PeriodicSend()
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);

 
 std::map<uint32_t, RS::USER>::iterator it(authorizedUsers.begin());
 while (it != authorizedUsers.end())
 
 std::map<uint32_t, RS::USER>::iterator it(authorizedUsers.begin());
 while (it != authorizedUsers.end())


@@ -370,7 +345,7 @@ bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, RS::USER & rsu, bo
 RS::PACKET_HEADER packetHead;
 
 memset(packetHead.padding, 0, sizeof(packetHead.padding));
 RS::PACKET_HEADER packetHead;
 
 memset(packetHead.padding, 0, sizeof(packetHead.padding));

-strcpy((char*)packetHead.magic, RS_ID);
+memcpy(packetHead.magic, RS_ID, sizeof(RS_ID));

 packetHead.protoVer[0] = '0';
 packetHead.protoVer[1] = '2';
 if (forceDisconnect)
 packetHead.protoVer[0] = '0';
 packetHead.protoVer[1] = '2';
 if (forceDisconnect)


@@ -404,7 +379,7 @@ rsu.lastSentTime = stgTime;
 
 packetHead.ip = htonl(rsu.ip);
 packetHead.id = htonl(rsu.user->GetID());
 
 packetHead.ip = htonl(rsu.ip);
 packetHead.id = htonl(rsu.user->GetID());

-strncpy((char*)packetHead.login, rsu.user->GetLogin().c_str(), RS_LOGIN_LEN);
+strncpy(reinterpret_cast<char*>(packetHead.login), rsu.user->GetLogin().c_str(), RS_LOGIN_LEN);

 packetHead.login[RS_LOGIN_LEN - 1] = 0;
 
 memcpy(buf, &packetHead, sizeof(packetHead));
 packetHead.login[RS_LOGIN_LEN - 1] = 0;
 
 memcpy(buf, &packetHead, sizeof(packetHead));


@@ -417,7 +392,7 @@ if (packetHead.packetType == RS_ALIVE_PACKET)
 RS::PACKET_TAIL packetTail;
 
 memset(packetTail.padding, 0, sizeof(packetTail.padding));
 RS::PACKET_TAIL packetTail;
 
 memset(packetTail.padding, 0, sizeof(packetTail.padding));

-strcpy((char*)packetTail.magic, RS_ID);
+memcpy(packetTail.magic, RS_ID, sizeof(RS_ID));

 std::vector<std::string>::const_iterator it;
 std::string params;
 for(it = rsSettings.GetUserParams().begin();
 std::vector<std::string>::const_iterator it;
 std::string params;
 for(it = rsSettings.GetUserParams().begin();


@@ -432,12 +407,12 @@ for(it = rsSettings.GetUserParams().begin();
     }
     params += parameter + " ";
     }
     }
     params += parameter + " ";
     }

-strncpy((char *)packetTail.params, params.c_str(), RS_PARAMS_LEN);
+strncpy(reinterpret_cast<char*>(packetTail.params), params.c_str(), RS_PARAMS_LEN);

 packetTail.params[RS_PARAMS_LEN - 1] = 0;
 
 assert(sizeof(packetHead) + sizeof(packetTail) <= bufSize && "Insufficient buffer space");
 
 packetTail.params[RS_PARAMS_LEN - 1] = 0;
 
 assert(sizeof(packetHead) + sizeof(packetTail) <= bufSize && "Insufficient buffer space");
 

-Encrypt(&ctx, buf + sizeof(packetHead), (char *)&packetTail, sizeof(packetTail) / 8);
+Encrypt(buf + sizeof(packetHead), reinterpret_cast<char *>(&packetTail), sizeof(packetTail) / 8);

 
 return false;
 }
 
 return false;
 }


@@ -454,11 +429,16 @@ if (PreparePacket(buffer, sizeof(buffer), rsu, forceDisconnect))
     return true;
     }
 
     return true;
     }
 

-std::for_each(
-        rsu.routers.begin(),
-        rsu.routers.end(),
-        PacketSender(sock, buffer, sizeof(buffer), static_cast<uint16_t>(htons(rsSettings.GetPort())))
-        );
+for (const auto& ip : rsu.routers)
+{
+    struct sockaddr_in sendAddr;
+
+    sendAddr.sin_family = AF_INET;
+    sendAddr.sin_port = htons(rsSettings.GetPort());
+    sendAddr.sin_addr.s_addr = ip;
+
+    return sendto(sock, buffer, sizeof(buffer), 0, reinterpret_cast<struct sockaddr*>(&sendAddr), sizeof(sendAddr));
+}

 
 return false;
 }
 
 return false;
 }


@@ -476,10 +456,10 @@ if (PreparePacket(buffer, sizeof(buffer), rsu, forceDisconnect))
 struct sockaddr_in sendAddr;
 
 sendAddr.sin_family = AF_INET;
 struct sockaddr_in sendAddr;
 
 sendAddr.sin_family = AF_INET;

-sendAddr.sin_port = static_cast<uint16_t>(htons(rsSettings.GetPort()));
+sendAddr.sin_port = htons(rsSettings.GetPort());

 sendAddr.sin_addr.s_addr = routerIP;
 
 sendAddr.sin_addr.s_addr = routerIP;
 

-ssize_t res = sendto(sock, buffer, sizeof(buffer), 0, (struct sockaddr *)&sendAddr, sizeof(sendAddr));
+ssize_t res = sendto(sock, buffer, sizeof(buffer), 0, reinterpret_cast<struct sockaddr *>(&sendAddr), sizeof(sendAddr));

 
 if (res < 0)
     logger("sendto error: %s", strerror(errno));
 
 if (res < 0)
     logger("sendto error: %s", strerror(errno));


@@ -489,7 +469,7 @@ return (res != sizeof(buffer));
 //-----------------------------------------------------------------------------
 bool REMOTE_SCRIPT::GetUsers()
 {
 //-----------------------------------------------------------------------------
 bool REMOTE_SCRIPT::GetUsers()
 {

-USER_PTR u;
+UserPtr u;

 
 int h = users->OpenSearch();
 assert(h && "USERS::OpenSearch is always correct");
 
 int h = users->OpenSearch();
 assert(h && "USERS::OpenSearch is always correct");


@@ -505,7 +485,7 @@ return false;
 //-----------------------------------------------------------------------------
 std::vector<uint32_t> REMOTE_SCRIPT::IP2Routers(uint32_t ip)
 {
 //-----------------------------------------------------------------------------
 std::vector<uint32_t> REMOTE_SCRIPT::IP2Routers(uint32_t ip)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);

 for (size_t i = 0; i < netRouters.size(); ++i)
     {
     if ((ip & netRouters[i].subnetMask) == (netRouters[i].subnetIP & netRouters[i].subnetMask))
 for (size_t i = 0; i < netRouters.size(); ++i)
     {
     if ((ip & netRouters[i].subnetMask) == (netRouters[i].subnetIP & netRouters[i].subnetMask))


@@ -516,13 +496,13 @@ for (size_t i = 0; i < netRouters.size(); ++i)
 return std::vector<uint32_t>();
 }
 //-----------------------------------------------------------------------------
 return std::vector<uint32_t>();
 }
 //-----------------------------------------------------------------------------

-void REMOTE_SCRIPT::SetUserNotifiers(USER_PTR u)
+void REMOTE_SCRIPT::SetUserNotifiers(UserPtr u)

 {
 ipNotifierList.push_front(RS::IP_NOTIFIER(*this, u));
 connNotifierList.push_front(RS::CONNECTED_NOTIFIER(*this, u));
 }
 //-----------------------------------------------------------------------------
 {
 ipNotifierList.push_front(RS::IP_NOTIFIER(*this, u));
 connNotifierList.push_front(RS::CONNECTED_NOTIFIER(*this, u));
 }
 //-----------------------------------------------------------------------------

-void REMOTE_SCRIPT::UnSetUserNotifiers(USER_PTR u)
+void REMOTE_SCRIPT::UnSetUserNotifiers(UserPtr u)

 {
 ipNotifierList.erase(std::remove_if(ipNotifierList.begin(),
                                     ipNotifierList.end(),
 {
 ipNotifierList.erase(std::remove_if(ipNotifierList.begin(),
                                     ipNotifierList.end(),


@@ -535,18 +515,18 @@ connNotifierList.erase(std::remove_if(connNotifierList.begin(),
 
 }
 //-----------------------------------------------------------------------------
 
 }
 //-----------------------------------------------------------------------------

-void REMOTE_SCRIPT::AddRSU(USER_PTR user)
+void REMOTE_SCRIPT::AddRSU(UserPtr user)

 {
 RS::USER rsu(IP2Routers(user->GetCurrIP()), user);
 Send(rsu);
 
 {
 RS::USER rsu(IP2Routers(user->GetCurrIP()), user);
 Send(rsu);
 

-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);

 authorizedUsers.insert(std::make_pair(user->GetCurrIP(), rsu));
 }
 //-----------------------------------------------------------------------------
 authorizedUsers.insert(std::make_pair(user->GetCurrIP(), rsu));
 }
 //-----------------------------------------------------------------------------

-void REMOTE_SCRIPT::DelRSU(USER_PTR user)
+void REMOTE_SCRIPT::DelRSU(UserPtr user)

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);

 std::map<uint32_t, RS::USER>::iterator it(authorizedUsers.begin());
 while (it != authorizedUsers.end())
     {
 std::map<uint32_t, RS::USER>::iterator it(authorizedUsers.begin());
 while (it != authorizedUsers.end())
     {


@@ -584,19 +564,19 @@ else
     rs.DelRSU(user);
 }
 //-----------------------------------------------------------------------------
     rs.DelRSU(user);
 }
 //-----------------------------------------------------------------------------

-void REMOTE_SCRIPT::InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password) const
+void REMOTE_SCRIPT::InitEncrypt(const std::string & password) const

 {
 unsigned char keyL[PASSWD_LEN];  // Пароль для шифровки
 memset(keyL, 0, PASSWD_LEN);
 {
 unsigned char keyL[PASSWD_LEN];  // Пароль для шифровки
 memset(keyL, 0, PASSWD_LEN);

-strncpy((char *)keyL, password.c_str(), PASSWD_LEN);
-Blowfish_Init(ctx, keyL, PASSWD_LEN);
+strncpy(reinterpret_cast<char*>(keyL), password.c_str(), PASSWD_LEN);
+Blowfish_Init(&ctx, keyL, PASSWD_LEN);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void REMOTE_SCRIPT::Encrypt(BLOWFISH_CTX * ctx, void * dst, const void * src, size_t len8) const
+void REMOTE_SCRIPT::Encrypt(void * dst, const void * src, size_t len8) const

 {
 if (dst != src)
     memcpy(dst, src, len8 * 8);
 for (size_t i = 0; i < len8; ++i)
 {
 if (dst != src)
     memcpy(dst, src, len8 * 8);
 for (size_t i = 0; i < len8; ++i)

-    Blowfish_Encrypt(ctx, static_cast<uint32_t *>(dst) + i * 2, static_cast<uint32_t *>(dst) + i * 2 + 1);
+    Blowfish_Encrypt(&ctx, static_cast<uint32_t *>(dst) + i * 2, static_cast<uint32_t *>(dst) + i * 2 + 1);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------