sys/time.h header added for struct timeval

[stg.git] / projects / stargazer / traffcounter_impl.cpp

diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp
index 424cc09468f949b5ed5c13b87a8a2c1b4eea2b1b..da64a0b8bb2ceb68ee7c26e63f5eb52989eeee28 100644 (file)
--- a/projects/stargazer/traffcounter_impl.cpp
+++ b/projects/stargazer/traffcounter_impl.cpp
@@ -37,6 +37,7 @@
 #include <csignal>
 #include <cassert>
 #include <cstdio> // fopen and similar
 #include <csignal>
 #include <cassert>
 #include <cstdio> // fopen and similar

+#include <cstdlib> // strtol

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


@@ -57,12 +58,22 @@ tcp = 0, udp, icmp, tcp_udp, all
 
 //-----------------------------------------------------------------------------
 TRAFFCOUNTER_IMPL::TRAFFCOUNTER_IMPL(USERS_IMPL * u, const std::string & fn)
 
 //-----------------------------------------------------------------------------
 TRAFFCOUNTER_IMPL::TRAFFCOUNTER_IMPL(USERS_IMPL * u, const std::string & fn)

-    : WriteServLog(GetStgLogger()),
+    : TRAFFCOUNTER(),
+      rules(),
+      packets(),
+      ip2packets(),
+      dirName(),
+      WriteServLog(GetStgLogger()),

       rulesFileName(fn),
       rulesFileName(fn),

+      monitorDir(),

       monitoring(false),
       users(u),
       running(false),
       stopped(true),
       monitoring(false),
       users(u),
       running(false),
       stopped(true),

+      mutex(),
+      thread(),
+      ipBeforeNotifiers(),
+      ipAfterNotifiers(),

       addUserNotifier(*this),
       delUserNotifier(*this)
 {
       addUserNotifier(*this),
       delUserNotifier(*this)
 {


@@ -98,13 +109,8 @@ if (ReadRules())
 
 printfd(__FILE__, "TRAFFCOUNTER::Start()\n");
 int h = users->OpenSearch();
 
 printfd(__FILE__, "TRAFFCOUNTER::Start()\n");
 int h = users->OpenSearch();

+assert(h && "USERS::OpenSearch is always correct");

 USER_IMPL * u;
 USER_IMPL * u;

-if (!h)
-    {
-    printfd(__FILE__, "TRAFFCOUNTER_IMPL::Start() - Cannot get users\n");
-    WriteServLog("TRAFFCOUNTER: Cannot get users.");
-    return -1;
-    }

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


@@ -130,11 +136,7 @@ if (stopped)
 running = false;
 
 int h = users->OpenSearch();
 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_IMPL * u;
 while (users->SearchNext(h, &u) == 0)
 
 USER_IMPL * u;
 while (users->SearchNext(h, &u) == 0)


@@ -150,16 +152,9 @@ for (int i = 0; i < 25 && !stopped; i++)
     nanosleep(&ts, NULL);
     }
 
     nanosleep(&ts, NULL);
     }
 

-//after 5 seconds waiting thread still running. now kill it

 if (!stopped)
 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;
 printfd(__FILE__, "TRAFFCOUNTER::Stop()\n");
 
 return 0;


@@ -167,6 +162,10 @@ return 0;
 //-----------------------------------------------------------------------------
 void * TRAFFCOUNTER_IMPL::Run(void * data)
 {
 //-----------------------------------------------------------------------------
 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;
 TRAFFCOUNTER_IMPL * tc = static_cast<TRAFFCOUNTER_IMPL *>(data);
 tc->stopped = false;
 int c = 0;