Merge branch 'master' into full-month-stats

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

diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp
index ae7f1dfbc1a13ecd2596e452a47df7efb2b1403c..c2088e0f2009cc210b6b0c1e514b163921c5ca6a 100644 (file)
--- a/projects/stargazer/traffcounter_impl.cpp
+++ b/projects/stargazer/traffcounter_impl.cpp
@@ -152,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;


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


@@ -628,9 +625,7 @@ if (!foundU)
 
 if (!foundD)
     *dirD = DIR_NUM;
 
 if (!foundD)
     *dirD = DIR_NUM;

-
-return;
-};
+}

 //-----------------------------------------------------------------------------
 void TRAFFCOUNTER_IMPL::SetRulesFile(const std::string & fn)
 {
 //-----------------------------------------------------------------------------
 void TRAFFCOUNTER_IMPL::SetRulesFile(const std::string & fn)
 {


@@ -678,13 +673,13 @@ while (fgets(str, 1023, f))
     rul.proto = 0xff;
     rul.dir = 0xff;
 
     rul.proto = 0xff;
     rul.dir = 0xff;
 

-    for (int i = 0; i < PROTOMAX; i++)
+    for (size_t i = 0; i < PROTOMAX; i++)

         {
         if (strcasecmp(tp, protoName[i]) == 0)
             rul.proto = i;
         }
 
         {
         if (strcasecmp(tp, protoName[i]) == 0)
             rul.proto = i;
         }
 

-    for (int i = 0; i < DIR_NUM + 1; i++)
+    for (size_t i = 0; i < DIR_NUM + 1; i++)

         {
         if (td == dirName[i])
             rul.dir = i;
         {
         if (td == dirName[i])
             rul.dir = i;


@@ -830,8 +825,8 @@ else
     }
 
 // Convert strings to mask, ports and IP
     }
 
 // Convert strings to mask, ports and IP

-int prt1, prt2, msk;
-unsigned ip;
+uint16_t prt1, prt2, msk;
+struct in_addr ipaddr;

 char *res;
 
 msk = strtol(mask, &res, 10);
 char *res;
 
 msk = strtol(mask, &res, 10);


@@ -846,16 +841,16 @@ prt2 = strtol(port2, &res, 10);
 if (*res != 0)
     return true;
 
 if (*res != 0)
     return true;
 

-int r = inet_aton(addr, (struct in_addr*)&ip);
+int r = inet_aton(addr, &ipaddr);

 if (r == 0)
     return true;
 
 if (r == 0)
     return true;
 

-rule->ip = ip;
+rule->ip = ipaddr.s_addr;

 rule->mask = CalcMask(msk);
 //msk = 1;
 //printfd(__FILE__, "msk=%d mask=%08X   mask=%08X\n", msk, rule->mask, (0xFFffFFff << (32 - msk)));
 
 rule->mask = CalcMask(msk);
 //msk = 1;
 //printfd(__FILE__, "msk=%d mask=%08X   mask=%08X\n", msk, rule->mask, (0xFFffFFff << (32 - msk)));
 

-if ((ip & rule->mask) != ip)
+if ((ipaddr.s_addr & rule->mask) != ipaddr.s_addr)

     {
     printfd(__FILE__, "TRAFFCOUNTER_IMPL::ParseAddress() - Address does'n match mask.\n");
     WriteServLog("Address does'n match mask.");
     {
     printfd(__FILE__, "TRAFFCOUNTER_IMPL::ParseAddress() - Address does'n match mask.\n");
     WriteServLog("Address does'n match mask.");


@@ -904,8 +899,7 @@ switch (rule.proto)
         printf("ALL     ");
         break;
     }
         printf("ALL     ");
         break;
     }

-printf("dir=%d \n", rule.dir);
-return;
+printf("dir=%u \n", static_cast<unsigned>(rule.dir));

 }
 //-----------------------------------------------------------------------------
 void TRAFFCOUNTER_IMPL::SetMonitorDir(const std::string & monitorDir)
 }
 //-----------------------------------------------------------------------------
 void TRAFFCOUNTER_IMPL::SetMonitorDir(const std::string & monitorDir)