Use "connected" subscription for detecting connection and disconnection.

[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 d1768ee610d85d4c7bd828e44d18019840ad90f4..ebe2556df282c2f007ad6b54fe9f6500cb3fd393 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.cpp
+++ b/projects/stargazer/plugins/other/rscript/rscript.cpp
@@ -19,23 +19,21 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-/*
- $Revision: 1.33 $
- $Date: 2010/04/16 12:30:37 $
- $Author: faust $
-*/
-

 #include <sys/time.h>
 
 #include <csignal>
 #include <cassert>
 #include <cstdlib>
 #include <sys/time.h>
 
 #include <csignal>
 #include <cassert>
 #include <cstdlib>

+#include <cerrno>
+#include <cstring>

 #include <algorithm>
 
 #include "stg/common.h"
 #include "stg/locker.h"
 #include <algorithm>
 
 #include "stg/common.h"
 #include "stg/locker.h"

+#include "stg/users.h"

 #include "stg/user_property.h"
 #include "stg/plugin_creator.h"
 #include "stg/user_property.h"
 #include "stg/plugin_creator.h"

+#include "stg/logger.h"

 #include "rscript.h"
 #include "ur_functor.h"
 #include "send_functor.h"
 #include "rscript.h"
 #include "ur_functor.h"
 #include "send_functor.h"


@@ -44,6 +42,8 @@ extern volatile const time_t stgTime;
 
 #define RS_MAX_ROUTERS  (100)
 
 
 #define RS_MAX_ROUTERS  (100)
 

+using RS::REMOTE_SCRIPT;
+

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


@@ -58,28 +58,46 @@ return rsc.GetPlugin();
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-RS_USER::RS_USER()
+RS::USER::USER(const std::vector<uint32_t> & r, USER_PTR it, REMOTE_SCRIPT & rs)

     : lastSentTime(0),
     : lastSentTime(0),

-      user(NULL),
-      shortPacketsCount(0)
+      user(it),
+      routers(r),
+      shortPacketsCount(0),
+      ip(user->GetCurrIP()),
+      notifier(rs, *this)

 {
 {

+    user->AddConnectedAfterNotifier(&notifier);

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

-RS_USER::RS_USER(const std::vector<uint32_t> & r, USER_PTR it)
-    : lastSentTime(0),
-      user(it),
-      routers(r),
-      shortPacketsCount(0)
+RS::USER::USER(const RS::USER & rhs)
+    : lastSentTime(rhs.lastSentTime),
+      user(rhs.user),
+      routers(rhs.routers),
+      shortPacketsCount(rhs.shortPacketsCount),
+      ip(rhs.ip),
+      notifier(rhs.notifier)
+{
+    user->DelConnectedAfterNotifier(&rhs.notifier);
+    user->AddConnectedAfterNotifier(&notifier);
+}
+//-----------------------------------------------------------------------------
+RS::USER::~USER()

 {
 {

+    user->DelConnectedAfterNotifier(&notifier);

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

-RS_SETTINGS::RS_SETTINGS()
+RS::SETTINGS::SETTINGS()

     : sendPeriod(0),
     : sendPeriod(0),

-      port(0)
+      port(0),
+      errorStr(),
+      netRouters(),
+      userParams(),
+      password(),
+      subnetFile()

 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------

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

 {
 int p;
 PARAM_VALUE pv;
 {
 int p;
 PARAM_VALUE pv;


@@ -150,19 +168,13 @@ subnetFile = pvi->value[0];
 
 NRMapParser nrMapParser;
 
 
 NRMapParser nrMapParser;
 

-if (nrMapParser.ReadFile(subnetFile))
+if (!nrMapParser.ReadFile(subnetFile))

     {
     {

-    errorStr = nrMapParser.GetErrorStr();
-    return -1;
+    netRouters = nrMapParser.GetMap();

     }
     }

-
-netRouters = nrMapParser.GetMap();
-
-if (netRouters.empty())
+else

     {
     {

-    errorStr = "Parameter(s) \'Subnet*\' not found.";
-    printfd(__FILE__, "Parameter(s) 'Subnet*' not found\n");
-    return -1;
+    GetStgLogger()("mod_rscript: error opening subnets file '%s'", subnetFile.c_str());

     }
 
 return 0;
     }
 
 return 0;


@@ -171,14 +183,24 @@ return 0;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 REMOTE_SCRIPT::REMOTE_SCRIPT()
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 REMOTE_SCRIPT::REMOTE_SCRIPT()

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

       halfPeriod(8),
       nonstop(false),
       isRunning(false),
       users(NULL),
       halfPeriod(8),
       nonstop(false),
       isRunning(false),
       users(NULL),

+      netRouters(),
+      thread(),
+      mutex(),

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

-      onDelUserNotifier(*this)
+      onDelUserNotifier(*this),
+      logger(GetPluginLogger(GetStgLogger(), "rscript"))

 {
 pthread_mutex_init(&mutex, NULL);
 }
 {
 pthread_mutex_init(&mutex, NULL);
 }


@@ -190,6 +212,10 @@ pthread_mutex_destroy(&mutex);
 //-----------------------------------------------------------------------------
 void * REMOTE_SCRIPT::Run(void * d)
 {
 //-----------------------------------------------------------------------------
 void * REMOTE_SCRIPT::Run(void * d)
 {

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

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


@@ -222,9 +248,6 @@ netRouters = rsSettings.GetSubnetsMap();
 
 InitEncrypt(&ctx, rsSettings.GetPassword());
 
 
 InitEncrypt(&ctx, rsSettings.GetPassword());
 

-//onAddUserNotifier.SetRemoteScript(this);
-//onDelUserNotifier.SetRemoteScript(this);
-

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


@@ -245,6 +268,7 @@ if (!isRunning)
     if (pthread_create(&thread, NULL, Run, this))
         {
         errorStr = "Cannot create thread.";
     if (pthread_create(&thread, NULL, Run, this))
         {
         errorStr = "Cannot create thread.";

+       logger("Cannot create thread.");

         printfd(__FILE__, "Cannot create thread\n");
         return -1;
         }
         printfd(__FILE__, "Cannot create thread\n");
         return -1;
         }


@@ -274,25 +298,20 @@ if (isRunning)
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && isRunning; i++)
         {
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && isRunning; i++)
         {

-        usleep(200000);
-        }
-
-    //after 5 seconds waiting thread still running. now killing it
-    if (isRunning)
-        {
-        if (pthread_kill(thread, SIGINT))
-            {
-            errorStr = "Cannot kill thread.";
-            printfd(__FILE__, "Cannot kill thread\n");
-            return -1;
-            }
-        printfd(__FILE__, "REMOTE_SCRIPT killed Run\n");
+        struct timespec ts = {0, 200000000};
+        nanosleep(&ts, NULL);

         }
     }
 
 users->DelNotifierUserDel(&onDelUserNotifier);
 users->DelNotifierUserAdd(&onAddUserNotifier);
 
         }
     }
 
 users->DelNotifierUserDel(&onDelUserNotifier);
 users->DelNotifierUserAdd(&onAddUserNotifier);
 

+if (isRunning)
+    {
+    logger("Cannot stop thread.");
+    return -1;
+    }
+

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


@@ -303,6 +322,7 @@ NRMapParser nrMapParser;
 if (nrMapParser.ReadFile(rsSettings.GetMapFileName()))
     {
     errorStr = nrMapParser.GetErrorStr();
 if (nrMapParser.ReadFile(rsSettings.GetMapFileName()))
     {
     errorStr = nrMapParser.GetErrorStr();

+    logger("Map file reading error: %s", errorStr.c_str());

     return -1;
     }
 
     return -1;
     }
 


@@ -328,6 +348,7 @@ sock = socket(AF_INET, SOCK_DGRAM, 0);
 if (sock < 0)
     {
     errorStr = "Cannot create socket.";
 if (sock < 0)
     {
     errorStr = "Cannot create socket.";

+    logger("Canot create a socket: %s", strerror(errno));

     printfd(__FILE__, "Cannot create socket\n");
     return true;
     }
     printfd(__FILE__, "Cannot create socket\n");
     return true;
     }


@@ -345,11 +366,10 @@ void REMOTE_SCRIPT::PeriodicSend()
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

-map<uint32_t, RS_USER>::iterator it(authorizedUsers.begin());
+map<uint32_t, RS::USER>::iterator it(authorizedUsers.begin());

 while (it != authorizedUsers.end())
     {
     if (difftime(stgTime, it->second.lastSentTime) - (rand() % halfPeriod) > sendPeriod)
 while (it != authorizedUsers.end())
     {
     if (difftime(stgTime, it->second.lastSentTime) - (rand() % halfPeriod) > sendPeriod)

-    //if (stgTime - it->second.lastSentTime > sendPeriod)

         {
         Send(it->first, it->second);
         }
         {
         Send(it->first, it->second);
         }


@@ -358,12 +378,12 @@ while (it != authorizedUsers.end())
 }
 //-----------------------------------------------------------------------------
 #ifdef NDEBUG
 }
 //-----------------------------------------------------------------------------
 #ifdef NDEBUG

-bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t, uint32_t ip, RS_USER & rsu, bool forceDisconnect) const
+bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t, uint32_t ip, RS::USER & rsu, bool forceDisconnect) const

 #else
 #else

-bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, uint32_t ip, RS_USER & rsu, bool forceDisconnect) const
+bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, uint32_t ip, RS::USER & rsu, bool forceDisconnect) const

 #endif
 {
 #endif
 {

-RS_PACKET_HEADER packetHead;
+RS::PACKET_HEADER packetHead;

 
 memset(packetHead.padding, 0, sizeof(packetHead.padding));
 strcpy((char*)packetHead.magic, RS_ID);
 
 memset(packetHead.padding, 0, sizeof(packetHead.padding));
 strcpy((char*)packetHead.magic, RS_ID);


@@ -401,7 +421,7 @@ if (packetHead.packetType == RS_ALIVE_PACKET)
     return false;
     }
 
     return false;
     }
 

-RS_PACKET_TAIL packetTail;
+RS::PACKET_TAIL packetTail;

 
 memset(packetTail.padding, 0, sizeof(packetTail.padding));
 strcpy((char*)packetTail.magic, RS_ID);
 
 memset(packetTail.padding, 0, sizeof(packetTail.padding));
 strcpy((char*)packetTail.magic, RS_ID);


@@ -426,7 +446,7 @@ Encrypt(&ctx, buf + sizeof(packetHead), (char *)&packetTail, sizeof(packetTail)
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-bool REMOTE_SCRIPT::Send(uint32_t ip, RS_USER & rsu, bool forceDisconnect) const
+bool REMOTE_SCRIPT::Send(uint32_t ip, RS::USER & rsu, bool forceDisconnect) const

 {
 char buffer[RS_MAX_PACKET_LEN];
 
 {
 char buffer[RS_MAX_PACKET_LEN];
 


@@ -447,7 +467,7 @@ std::for_each(
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-bool REMOTE_SCRIPT::SendDirect(uint32_t ip, RS_USER & rsu, uint32_t routerIP, bool forceDisconnect) const
+bool REMOTE_SCRIPT::SendDirect(uint32_t ip, RS::USER & rsu, uint32_t routerIP, bool forceDisconnect) const

 {
 char buffer[RS_MAX_PACKET_LEN];
 
 {
 char buffer[RS_MAX_PACKET_LEN];
 


@@ -465,6 +485,9 @@ sendAddr.sin_addr.s_addr = routerIP;
 
 int res = sendto(sock, buffer, sizeof(buffer), 0, (struct sockaddr *)&sendAddr, sizeof(sendAddr));
 
 
 int res = sendto(sock, buffer, sizeof(buffer), 0, (struct sockaddr *)&sendAddr, sizeof(sendAddr));
 

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

 return (res != sizeof(buffer));
 }
 //-----------------------------------------------------------------------------
 return (res != sizeof(buffer));
 }
 //-----------------------------------------------------------------------------


@@ -473,12 +496,7 @@ bool REMOTE_SCRIPT::GetUsers()
 USER_PTR u;
 
 int h = users->OpenSearch();
 USER_PTR u;
 
 int h = users->OpenSearch();

-if (!h)
-    {
-    errorStr = "users->OpenSearch() error.";
-    printfd(__FILE__, "OpenSearch() error\n");
-    return true;
-    }
+assert(h && "USERS::OpenSearch is always correct");

 
 while (!users->SearchNext(h, &u))
     {
 
 while (!users->SearchNext(h, &u))
     {


@@ -498,16 +516,16 @@ void REMOTE_SCRIPT::ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP)
  */
 if (newIP)
     {
  */
 if (newIP)
     {

-    RS_USER rsu(IP2Routers(newIP), u);
+    RS::USER rsu(IP2Routers(newIP), u, *this);

     Send(newIP, rsu);
 
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
     Send(newIP, rsu);
 
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-    authorizedUsers[newIP] = rsu;
+    authorizedUsers.insert(std::make_pair(newIP, rsu));

     }
 else
     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
     }
 else
     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-    const map<uint32_t, RS_USER>::iterator it(
+    const map<uint32_t, RS::USER>::iterator it(

             authorizedUsers.find(oldIP)
             );
     if (it != authorizedUsers.end())
             authorizedUsers.find(oldIP)
             );
     if (it != authorizedUsers.end())


@@ -613,19 +631,17 @@ return value;
 //-----------------------------------------------------------------------------
 void REMOTE_SCRIPT::SetUserNotifier(USER_PTR u)
 {
 //-----------------------------------------------------------------------------
 void REMOTE_SCRIPT::SetUserNotifier(USER_PTR u)
 {

-RS_CHG_AFTER_NOTIFIER<uint32_t> afterChgIPNotifier(*this, u);
+ipNotifierList.push_front(RS::IP_NOTIFIER(*this, u));

 
 

-afterChgIPNotifierList.push_front(afterChgIPNotifier);
-
-u->AddCurrIPAfterNotifier(&(*afterChgIPNotifierList.begin()));
+u->AddCurrIPAfterNotifier(&(*ipNotifierList.begin()));

 }
 //-----------------------------------------------------------------------------
 void REMOTE_SCRIPT::UnSetUserNotifier(USER_PTR u)
 {
 }
 //-----------------------------------------------------------------------------
 void REMOTE_SCRIPT::UnSetUserNotifier(USER_PTR u)
 {

-list<RS_CHG_AFTER_NOTIFIER<uint32_t> >::iterator  ipAIter;
-std::list<list<RS_CHG_AFTER_NOTIFIER<uint32_t> >::iterator> toErase;
+list<RS::IP_NOTIFIER>::iterator  ipAIter;
+std::list<list<RS::IP_NOTIFIER>::iterator> toErase;

 
 

-for (ipAIter = afterChgIPNotifierList.begin(); ipAIter != afterChgIPNotifierList.end(); ++ipAIter)
+for (ipAIter = ipNotifierList.begin(); ipAIter != ipNotifierList.end(); ++ipAIter)

     {
     if (ipAIter->GetUser() == u)
         {
     {
     if (ipAIter->GetUser() == u)
         {


@@ -634,20 +650,25 @@ for (ipAIter = afterChgIPNotifierList.begin(); ipAIter != afterChgIPNotifierList
         }
     }
 
         }
     }
 

-std::list<list<RS_CHG_AFTER_NOTIFIER<uint32_t> >::iterator>::iterator eIter;
+std::list<list<RS::IP_NOTIFIER>::iterator>::iterator eIter;

 
 for (eIter = toErase.begin(); eIter != toErase.end(); ++eIter)
     {
 
 for (eIter = toErase.begin(); eIter != toErase.end(); ++eIter)
     {

-    afterChgIPNotifierList.erase(*eIter);
+    ipNotifierList.erase(*eIter);

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

-template <typename varParamType>
-void RS_CHG_AFTER_NOTIFIER<varParamType>::Notify(const varParamType & oldValue, const varParamType & newValue)
+void RS::IP_NOTIFIER::Notify(const uint32_t & oldValue, const uint32_t & newValue)

 {
 rs.ChangedIP(user, oldValue, newValue);
 }
 //-----------------------------------------------------------------------------
 {
 rs.ChangedIP(user, oldValue, newValue);
 }
 //-----------------------------------------------------------------------------

+void RS::CONNECTED_NOTIFIER::Notify(const bool & /*oldValue*/, const bool & newValue)
+{
+if (!newValue)
+    rs.Send(user.ip, user, true);
+}
+//-----------------------------------------------------------------------------

 void REMOTE_SCRIPT::InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const
 {
 unsigned char keyL[PASSWD_LEN];  // Пароль для шифровки
 void REMOTE_SCRIPT::InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const
 {
 unsigned char keyL[PASSWD_LEN];  // Пароль для шифровки