X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4ece75f1e0a9118a6caa1f442d17ad5cd803fd9e..e9bdb5063b52226148212399a017300d5d14baac:/projects/stargazer/traffcounter_impl.cpp?ds=sidebyside

diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp
index a605e284..da64a0b8 100644
--- a/projects/stargazer/traffcounter_impl.cpp
+++ b/projects/stargazer/traffcounter_impl.cpp
@@ -37,11 +37,13 @@
 #include <csignal>
 #include <cassert>
 #include <cstdio> // fopen and similar
+#include <cstdlib> // strtol
 
 #include "stg/common.h"
 #include "stg/locker.h"
 #include "traffcounter_impl.h"
 #include "stg_timer.h"
+#include "users_impl.h"
 
 #define FLUSH_TIME  (10)
 #define REMOVE_TIME  (31)
@@ -55,13 +57,23 @@ tcp = 0, udp, icmp, tcp_udp, all
 };
 
 //-----------------------------------------------------------------------------
-TRAFFCOUNTER_IMPL::TRAFFCOUNTER_IMPL(USERS * u, const TARIFFS *, const std::string & fn)
-    : WriteServLog(GetStgLogger()),
+TRAFFCOUNTER_IMPL::TRAFFCOUNTER_IMPL(USERS_IMPL * u, const std::string & fn)
+    : TRAFFCOUNTER(),
+      rules(),
+      packets(),
+      ip2packets(),
+      dirName(),
+      WriteServLog(GetStgLogger()),
       rulesFileName(fn),
+      monitorDir(),
       monitoring(false),
       users(u),
       running(false),
       stopped(true),
+      mutex(),
+      thread(),
+      ipBeforeNotifiers(),
+      ipAfterNotifiers(),
       addUserNotifier(*this),
       delUserNotifier(*this)
 {
@@ -97,13 +109,8 @@ if (ReadRules())
 
 printfd(__FILE__, "TRAFFCOUNTER::Start()\n");
 int h = users->OpenSearch();
-USER_PTR u;
-if (!h)
-    {
-    printfd(__FILE__, "TRAFFCOUNTER_IMPL::Start() - Cannot get users\n");
-    WriteServLog("TRAFFCOUNTER: Cannot get users.");
-    return -1;
-    }
+assert(h && "USERS::OpenSearch is always correct");
+USER_IMPL * u;
 
 while (users->SearchNext(h, &u) == 0)
     {
@@ -129,13 +136,9 @@ if (stopped)
 running = false;
 
 int h = users->OpenSearch();
-if (!h)
-    {
-    WriteServLog("TRAFFCOUNTER: Fatal error: Cannot get users.");
-    return -1;
-    }
+assert(h && "USERS::OpenSearch is always correct");
 
-USER_PTR u;
+USER_IMPL * u;
 while (users->SearchNext(h, &u) == 0)
     {
     UnSetUserNotifiers(u);
@@ -149,16 +152,9 @@ for (int i = 0; i < 25 && !stopped; i++)
     nanosleep(&ts, NULL);
     }
 
-//after 5 seconds waiting thread still running. now kill it
 if (!stopped)
-    {
-    printfd(__FILE__, "kill TRAFFCOUNTER thread.\n");
-    if (pthread_kill(thread, SIGINT))
-        {
-        return -1;
-        }
-    printfd(__FILE__, "TRAFFCOUNTER killed\n");
-    }
+    return -1;
+
 printfd(__FILE__, "TRAFFCOUNTER::Stop()\n");
 
 return 0;
@@ -166,6 +162,10 @@ return 0;
 //-----------------------------------------------------------------------------
 void * TRAFFCOUNTER_IMPL::Run(void * data)
 {
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
 TRAFFCOUNTER_IMPL * tc = static_cast<TRAFFCOUNTER_IMPL *>(data);
 tc->stopped = false;
 int c = 0;
@@ -351,49 +351,6 @@ while (pi != packets.end())
             }
         }
 
-    /*//Removing
-    if (stgTime - pi->second.updateTime > REMOVE_TIME)
-        {
-        // Remove packet and references from ip2packets index
-        //printfd(__FILE__, "+++ Removing +++\n");
-        pair<ip2p_iter, ip2p_iter> be(
-                ip2packets.equal_range(pi->first.GetSrcIP()));
-        while (be.first != be.second)
-            {
-            // Have a reference to a packet?
-            if (be.first->second == pi)
-                {
-                ip2packets.erase(be.first++);
-                //printfd(__FILE__, "Remove U from ip2packets %s\n", inet_ntostring(pi->first.GetSrcIP()).c_str());
-                }
-            else
-                {
-                ++be.first;
-                }
-            }
-
-        //printfd(__FILE__, "-------------------\n");
-        be = ip2packets.equal_range(pi->first.GetDstIP());
-        while (be.first != be.second)
-            {
-            // Have a reference to a packet?
-            if (be.first->second == pi)
-                {
-                ip2packets.erase(be.first++);
-                //printfd(__FILE__, "Remove D from ip2packets %s\n", inet_ntostring(pi->first.GetDstIP()).c_str());
-                }
-            else
-                {
-                ++be.first;
-                }
-            }
-        //printfd(__FILE__, "Remove packet\n");
-        packets.erase(pi++);
-        }
-    else
-        {
-        ++pi;
-        }*/
     if (stgTime - pi->second.updateTime < REMOVE_TIME)
         {
         std::pair<pp_iter, bool> res = newPackets.insert(*pi);
@@ -414,7 +371,7 @@ printfd(__FILE__, "FlushAndRemove() packets: %d(rem %d) ip2packets: %d(rem %d)\n
 
 }
 //-----------------------------------------------------------------------------
-void TRAFFCOUNTER_IMPL::AddUser(USER_PTR user)
+void TRAFFCOUNTER_IMPL::AddUser(USER_IMPL * user)
 {
 printfd(__FILE__, "AddUser: %s\n", user->GetLogin().c_str());
 uint32_t uip = user->GetCurrIP();
@@ -505,7 +462,7 @@ while (pi.first != pi.second)
 ip2packets.erase(pi.first, pi.second);
 }
 //-----------------------------------------------------------------------------
-void TRAFFCOUNTER_IMPL::SetUserNotifiers(USER_PTR user)
+void TRAFFCOUNTER_IMPL::SetUserNotifiers(USER_IMPL * user)
 {
 // Adding user. Adding notifiers to user.
 TRF_IP_BEFORE ipBNotifier(*this, user);
@@ -517,7 +474,7 @@ ipAfterNotifiers.push_front(ipANotifier);
 user->AddCurrIPAfterNotifier(&(*ipAfterNotifiers.begin()));
 }
 //-----------------------------------------------------------------------------
-void TRAFFCOUNTER_IMPL::UnSetUserNotifiers(USER_PTR user)
+void TRAFFCOUNTER_IMPL::UnSetUserNotifiers(USER_IMPL * user)
 {
 // Removing user. Removing notifiers from user.
 std::list<TRF_IP_BEFORE>::iterator bi;