Fixed stupid bug in case conversion functions.

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

diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp
index a02e3b6d520f2c0350cbd9eeec2b200a71088896..fce475952537b598d5f39864d6975fe863d3be67 100644 (file)
--- a/projects/stargazer/traffcounter_impl.cpp
+++ b/projects/stargazer/traffcounter_impl.cpp
@@ -41,6 +41,7 @@
 
 #include "stg/common.h"
 #include "stg/locker.h"
 
 #include "stg/common.h"
 #include "stg/locker.h"

+#include "stg/const.h" // MONITOR_TIME_DELAY_SEC

 #include "traffcounter_impl.h"
 #include "stg_timer.h"
 #include "users_impl.h"
 #include "traffcounter_impl.h"
 #include "stg_timer.h"
 #include "users_impl.h"


@@ -67,6 +68,7 @@ TRAFFCOUNTER_IMPL::TRAFFCOUNTER_IMPL(USERS_IMPL * u, const std::string & fn)
       rulesFileName(fn),
       monitorDir(),
       monitoring(false),
       rulesFileName(fn),
       monitorDir(),
       monitoring(false),

+      touchTimeP(stgTime - MONITOR_TIME_DELAY_SEC),

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


@@ -152,16 +154,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;


@@ -209,13 +204,11 @@ void TRAFFCOUNTER_IMPL::Process(const RAW_PACKET & rawPacket)
 if (!running)
     return;
 
 if (!running)
     return;
 

-static time_t touchTime = stgTime - MONITOR_TIME_DELAY_SEC;
-
-if (monitoring && (touchTime + MONITOR_TIME_DELAY_SEC <= stgTime))
+if (monitoring && (touchTimeP + MONITOR_TIME_DELAY_SEC <= stgTime))

     {
     {

-    static std::string monFile = monitorDir + "/traffcounter_p";
+    std::string monFile = monitorDir + "/traffcounter_p";

     printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", monitoring, monFile.c_str());
     printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", monitoring, monFile.c_str());

-    touchTime = stgTime;
+    touchTimeP = stgTime;

     TouchFile(monFile.c_str());
     }
 
     TouchFile(monFile.c_str());
     }
 


@@ -299,12 +292,12 @@ void TRAFFCOUNTER_IMPL::FlushAndRemove()
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

-int oldPacketsSize = packets.size();
-int oldIp2packetsSize = ip2packets.size();
+Packets::size_type oldPacketsSize = packets.size();
+Index::size_type oldIp2packetsSize = ip2packets.size();

 
 pp_iter pi;
 pi = packets.begin();
 
 pp_iter pi;
 pi = packets.begin();

-std::map<RAW_PACKET, PACKET_EXTRA_DATA> newPackets;
+Packets newPackets;

 ip2packets.erase(ip2packets.begin(), ip2packets.end());
 while (pi != packets.end())
     {
 ip2packets.erase(ip2packets.begin(), ip2packets.end());
 while (pi != packets.end())
     {


@@ -632,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)
 {


@@ -682,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 (uint8_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 (uint32_t i = 0; i < DIR_NUM + 1; i++)

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


@@ -747,8 +738,8 @@ if (ReadRules(true))
 
 FreeRules();
 ReadRules();
 
 FreeRules();
 ReadRules();

-printfd(__FILE__, "TRAFFCOUNTER_IMPL::Reload() -  Reload rules successfull.\n");
-WriteServLog("TRAFFCOUNTER: Reload rules successfull.");
+printfd(__FILE__, "TRAFFCOUNTER_IMPL::Reload() -  Reloaded rules successfully.\n");
+WriteServLog("TRAFFCOUNTER: Reloaded rules successfully.");

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


@@ -756,9 +747,9 @@ bool TRAFFCOUNTER_IMPL::ParseAddress(const char * ta, RULE * rule) const
 {
 char addr[50], mask[20], port1[20], port2[20], ports[40];
 
 {
 char addr[50], mask[20], port1[20], port2[20], ports[40];
 

-int len = strlen(ta);
+size_t len = strlen(ta);

 char n = 0;
 char n = 0;

-int i, p;
+size_t i, p;

 memset(addr, 0, sizeof(addr));
 for (i = 0; i < len; i++)
     {
 memset(addr, 0, sizeof(addr));
 for (i = 0; i < len; i++)
     {


@@ -834,32 +825,32 @@ 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;
 
 char *res;
 

-msk = strtol(mask, &res, 10);
+msk = static_cast<uint16_t>(strtol(mask, &res, 10));

 if (*res != 0)
     return true;
 
 if (*res != 0)
     return true;
 

-prt1 = strtol(port1, &res, 10);
+prt1 = static_cast<uint16_t>(strtol(port1, &res, 10));

 if (*res != 0)
     return true;
 
 if (*res != 0)
     return true;
 

-prt2 = strtol(port2, &res, 10);
+prt2 = static_cast<uint16_t>(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.");


@@ -908,13 +899,12 @@ 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 & dir)

 {
 {

-TRAFFCOUNTER_IMPL::monitorDir = monitorDir;
-monitoring = (monitorDir != "");
+monitorDir = dir;
+monitoring = !monitorDir.empty();

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