MySQL custom port implemented

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

diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp
index 5223c5c4c8bfa7e8739c844ad23620b5ac91285c..cd3244eb54f0064cb4d7def50e5f57bb61221cbd 100644 (file)
--- a/projects/stargazer/traffcounter_impl.cpp
+++ b/projects/stargazer/traffcounter_impl.cpp
@@ -59,23 +59,13 @@ 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)

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

       rulesFileName(fn),
       rulesFileName(fn),

-      monitorDir(),

       monitoring(false),
       touchTimeP(stgTime - MONITOR_TIME_DELAY_SEC),
       users(u),
       running(false),
       stopped(true),
       monitoring(false),
       touchTimeP(stgTime - MONITOR_TIME_DELAY_SEC),
       users(u),
       running(false),
       stopped(true),

-      mutex(),
-      thread(),
-      ipBeforeNotifiers(),
-      ipAfterNotifiers(),

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


@@ -115,9 +105,7 @@ 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)

-    {

     SetUserNotifiers(u);
     SetUserNotifiers(u);

-    }

 users->CloseSearch(h);
 
 running = true;
 users->CloseSearch(h);
 
 running = true;


@@ -142,9 +130,7 @@ 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)

-    {

     UnSetUserNotifiers(u);
     UnSetUserNotifiers(u);

-    }

 users->CloseSearch(h);
 
 //5 seconds to thread stops itself
 users->CloseSearch(h);
 
 //5 seconds to thread stops itself


@@ -188,7 +174,7 @@ while (tc->running)
         std::string monFile(tc->monitorDir + "/traffcounter_r");
         printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", tc->monitoring, monFile.c_str());
         touchTime = stgTime;
         std::string monFile(tc->monitorDir + "/traffcounter_r");
         printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", tc->monitoring, monFile.c_str());
         touchTime = stgTime;

-        TouchFile(monFile.c_str());
+        TouchFile(monFile);

         }
 
     if (++c % FLUSH_TIME == 0)
         }
 
     if (++c % FLUSH_TIME == 0)


@@ -209,7 +195,7 @@ if (monitoring && (touchTimeP + MONITOR_TIME_DELAY_SEC <= stgTime))
     std::string monFile = monitorDir + "/traffcounter_p";
     printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", monitoring, monFile.c_str());
     touchTimeP = stgTime;
     std::string monFile = monitorDir + "/traffcounter_p";
     printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", monitoring, monFile.c_str());
     touchTimeP = stgTime;

-    TouchFile(monFile.c_str());
+    TouchFile(monFile);

     }
 
 STG_LOCKER lock(&mutex);
     }
 
 STG_LOCKER lock(&mutex);


@@ -385,7 +371,7 @@ while (pi.first != pi.second)
     {
     if (pi.first->second->first.GetSrcIP() == uip)
         {
     {
     if (pi.first->second->first.GetSrcIP() == uip)
         {

-        assert((!pi.first->second->second.userUPresent || 
+        assert((!pi.first->second->second.userUPresent ||

                  pi.first->second->second.userU == user) &&
                "U user present but it's not current user");
 
                  pi.first->second->second.userU == user) &&
                "U user present but it's not current user");
 


@@ -396,7 +382,7 @@ while (pi.first != pi.second)
 
     if (pi.first->second->first.GetDstIP() == uip)
         {
 
     if (pi.first->second->first.GetDstIP() == uip)
         {

-        assert((!pi.first->second->second.userDPresent || 
+        assert((!pi.first->second->second.userDPresent ||

                  pi.first->second->second.userD == user) &&
                "D user present but it's not current user");
 
                  pi.first->second->second.userD == user) &&
                "D user present but it's not current user");
 


@@ -509,10 +495,10 @@ void TRAFFCOUNTER_IMPL::DeterminateDir(const RAW_PACKET & packet,
                                        int * dirU, // Direction for incoming packet
                                        int * dirD) const // Direction for outgoing packet
 {
                                        int * dirU, // Direction for incoming packet
                                        int * dirD) const // Direction for outgoing packet
 {

-bool addrMatchU;
-bool portMatchU;
-bool addrMatchD;
-bool portMatchD;
+bool addrMatchU = false;
+bool portMatchU = false;
+bool addrMatchD = false;
+bool portMatchD = false;

 bool foundU = false; // Was rule for U found ?
 bool foundD = false; // Was rule for D found ?
 //printfd(__FILE__, "foundU=%d, foundD=%d\n", foundU, foundD);
 bool foundU = false; // Was rule for U found ?
 bool foundD = false; // Was rule for D found ?
 //printfd(__FILE__, "foundU=%d, foundD=%d\n", foundU, foundD);


@@ -526,7 +512,6 @@ while (ln != rules.end())
     {
     if (!foundU)
         {
     {
     if (!foundU)
         {

-        addrMatchU = false;

         portMatchU = false;
 
         switch (ln->proto)
         portMatchU = false;
 
         switch (ln->proto)


@@ -572,7 +557,6 @@ while (ln != rules.end())
 
     if (!foundD)
         {
 
     if (!foundD)
         {

-        addrMatchD = false;

         portMatchD = false;
 
         switch (ln->proto)
         portMatchD = false;
 
         switch (ln->proto)


@@ -654,7 +638,7 @@ while (fgets(str, 1023, f))
         continue;
         }
 
         continue;
         }
 

-    r = sscanf(str,"%100s %100s %100s", tp, ta, td);
+    r = sscanf(str,"%99s %99s %99s", tp, ta, td);

     if (r != 3)
         {
         printfd(__FILE__, "TRAFFCOUNTER_IMPL::ReadRules() - Error in file '%s' at line %d. There must be 3 parameters.\n", rulesFileName.c_str(), lineNumber);
     if (r != 3)
         {
         printfd(__FILE__, "TRAFFCOUNTER_IMPL::ReadRules() - Error in file '%s' at line %d. There must be 3 parameters.\n", rulesFileName.c_str(), lineNumber);


@@ -837,8 +821,6 @@ if (r == 0)
 
 rule->ip = ipaddr.s_addr;
 rule->mask = CalcMask(msk);
 
 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)));

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