Some weird type casts removed

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

diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp
index 83554e277338aa7c4e0f819881446cbf9cb65b87..c2088e0f2009cc210b6b0c1e514b163921c5ca6a 100644 (file)
--- a/projects/stargazer/traffcounter_impl.cpp
+++ b/projects/stargazer/traffcounter_impl.cpp
@@ -29,6 +29,7 @@
  */
 
 /* inet_aton */
  */
 
 /* inet_aton */

+#include <sys/types.h>

 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>


@@ -36,11 +37,13 @@
 #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 "traffcounter_impl.h"
 #include "traffcounter_impl.h"

-#include "common.h"
-#include "stg_locker.h"

 #include "stg_timer.h"
 #include "stg_timer.h"

+#include "users_impl.h"

 
 #define FLUSH_TIME  (10)
 #define REMOVE_TIME  (31)
 
 #define FLUSH_TIME  (10)
 #define REMOVE_TIME  (31)


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


@@ -89,18 +102,15 @@ if (!stopped)
 
 if (ReadRules())
     {
 
 if (ReadRules())
     {

+    printfd(__FILE__, "TRAFFCOUNTER_IMPL::Start() - Cannot read rules\n");

     WriteServLog("TRAFFCOUNTER: Cannot read rules.");
     return -1;
     }
 
 printfd(__FILE__, "TRAFFCOUNTER::Start()\n");
 int h = users->OpenSearch();
     WriteServLog("TRAFFCOUNTER: Cannot read rules.");
     return -1;
     }
 
 printfd(__FILE__, "TRAFFCOUNTER::Start()\n");
 int h = users->OpenSearch();

-USER_PTR u;
-if (!h)
-    {
-    WriteServLog("TRAFFCOUNTER: Cannot get users.");
-    return -1;
-    }
+assert(h && "USERS::OpenSearch is always correct");
+USER_IMPL * u;

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


@@ -111,7 +121,8 @@ users->CloseSearch(h);
 running = true;
 if (pthread_create(&thread, NULL, Run, this))
     {
 running = true;
 if (pthread_create(&thread, NULL, Run, this))
     {

-    WriteServLog("TRAFFCOUNTER: Error: Cannot start thread!");
+    printfd(__FILE__, "TRAFFCOUNTER_IMPL::Start() - Cannot start thread\n");
+    WriteServLog("TRAFFCOUNTER: Error: Cannot start thread.");

     return -1;
     }
 return 0;
     return -1;
     }
 return 0;


@@ -125,13 +136,9 @@ 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_PTR u;
+USER_IMPL * u;

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


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


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


@@ -347,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);
     if (stgTime - pi->second.updateTime < REMOVE_TIME)
         {
         std::pair<pp_iter, bool> res = newPackets.insert(*pi);


@@ -410,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();
 {
 printfd(__FILE__, "AddUser: %s\n", user->GetLogin().c_str());
 uint32_t uip = user->GetCurrIP();


@@ -501,7 +462,7 @@ while (pi.first != pi.second)
 ip2packets.erase(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);
 {
 // Adding user. Adding notifiers to user.
 TRF_IP_BEFORE ipBNotifier(*this, user);


@@ -513,7 +474,7 @@ ipAfterNotifiers.push_front(ipANotifier);
 user->AddCurrIPAfterNotifier(&(*ipAfterNotifiers.begin()));
 }
 //-----------------------------------------------------------------------------
 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;
 {
 // Removing user. Removing notifiers from user.
 std::list<TRF_IP_BEFORE>::iterator bi;


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


@@ -689,7 +648,8 @@ f = fopen(rulesFileName.c_str(), "rt");
 
 if (!f)
     {
 
 if (!f)
     {

-    WriteServLog("File %s cannot be oppened.", rulesFileName.c_str());
+    printfd(__FILE__, "TRAFFCOUNTER_IMPL::ReadRules() - File '%s' cannot be opened.\n", rulesFileName.c_str());
+    WriteServLog("File '%s' cannot be oppened.", rulesFileName.c_str());

     return true;
     }
 
     return true;
     }
 


@@ -704,7 +664,8 @@ while (fgets(str, 1023, f))
     r = sscanf(str,"%s %s %s", tp, ta, td);
     if (r != 3)
         {
     r = sscanf(str,"%s %s %s", tp, ta, td);
     if (r != 3)
         {

-        WriteServLog("Error in file %s. There must be 3 parameters. Line %d.", rulesFileName.c_str(), lineNumber);
+        printfd(__FILE__, "TRAFFCOUNTER_IMPL::ReadRules() - Error in file '%s' at line %d. There must be 3 parameters.\n", rulesFileName.c_str(), lineNumber);
+        WriteServLog("Error in file '%s' at line %d. There must be 3 parameters.", rulesFileName.c_str(), lineNumber);

         fclose(f);
         return true;
         }
         fclose(f);
         return true;
         }


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


@@ -726,6 +687,7 @@ while (fgets(str, 1023, f))
 
     if (rul.dir == 0xff || rul.proto == 0xff)
         {
 
     if (rul.dir == 0xff || rul.proto == 0xff)
         {

+        printfd(__FILE__, "TRAFFCOUNTER_IMPL::ReadRules() - Error in file '%s' at line %d.\n", rulesFileName.c_str(), lineNumber);

         WriteServLog("Error in file %s. Line %d.",
                      rulesFileName.c_str(), lineNumber);
         fclose(f);
         WriteServLog("Error in file %s. Line %d.",
                      rulesFileName.c_str(), lineNumber);
         fclose(f);


@@ -734,6 +696,7 @@ while (fgets(str, 1023, f))
 
     if (ParseAddress(ta, &rul) != 0)
         {
 
     if (ParseAddress(ta, &rul) != 0)
         {

+        printfd(__FILE__, "TRAFFCOUNTER_IMPL::ReadRules() - Error in file '%s' at line %d. Error in adress.\n", rulesFileName.c_str(), lineNumber);

         WriteServLog("Error in file %s. Error in adress. Line %d.",
                      rulesFileName.c_str(), lineNumber);
         fclose(f);
         WriteServLog("Error in file %s. Error in adress. Line %d.",
                      rulesFileName.c_str(), lineNumber);
         fclose(f);


@@ -768,12 +731,14 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 if (ReadRules(true))
     {
 
 if (ReadRules(true))
     {

+    printfd(__FILE__, "TRAFFCOUNTER_IMPL::Reload() - Failed to reload rules.\n");

     WriteServLog("TRAFFCOUNTER: Cannot reload rules. Errors found.");
     return -1;
     }
 
 FreeRules();
 ReadRules();
     WriteServLog("TRAFFCOUNTER: Cannot reload rules. Errors found.");
     return -1;
     }
 
 FreeRules();
 ReadRules();

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

 WriteServLog("TRAFFCOUNTER: Reload rules successfull.");
 return 0;
 }
 WriteServLog("TRAFFCOUNTER: Reload rules successfull.");
 return 0;
 }


@@ -828,6 +793,7 @@ if (n == ':')
     // port
     if (!(rule->proto == tcp || rule->proto == udp || rule->proto == tcp_udp))
         {
     // port
     if (!(rule->proto == tcp || rule->proto == udp || rule->proto == tcp_udp))
         {

+        printfd(__FILE__, "TRAFFCOUNTER_IMPL::ParseAddress() - No ports specified for this protocol.\n");

         WriteServLog("No ports specified for this protocol.");
         return true;
         }
         WriteServLog("No ports specified for this protocol.");
         return true;
         }


@@ -859,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);


@@ -875,17 +841,18 @@ 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.");
     return true;
     }
     WriteServLog("Address does'n match mask.");
     return true;
     }


@@ -932,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)