Keep stglibs headers and libraries "at home"

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

diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp
index ff18a5e2f17c36ee4e17adaccf3cba80793063c9..da64a0b8bb2ceb68ee7c26e63f5eb52989eeee28 100644 (file)
--- a/projects/stargazer/traffcounter_impl.cpp
+++ b/projects/stargazer/traffcounter_impl.cpp
@@ -59,12 +59,21 @@ tcp = 0, udp, icmp, tcp_udp, all
 //-----------------------------------------------------------------------------
 TRAFFCOUNTER_IMPL::TRAFFCOUNTER_IMPL(USERS_IMPL * u, const std::string & fn)
     : TRAFFCOUNTER(),
 //-----------------------------------------------------------------------------
 TRAFFCOUNTER_IMPL::TRAFFCOUNTER_IMPL(USERS_IMPL * u, const std::string & fn)
     : TRAFFCOUNTER(),

+      rules(),
+      packets(),
+      ip2packets(),
+      dirName(),

       WriteServLog(GetStgLogger()),
       rulesFileName(fn),
       WriteServLog(GetStgLogger()),
       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)
 {


@@ -143,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;


@@ -160,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;