Verbose BLOWFISH_CTX failures.

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

diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp
index 424cc09468f949b5ed5c13b87a8a2c1b4eea2b1b..377e388902fd26cb493ee241ff54119d57efbe16 100644 (file)
--- a/projects/stargazer/traffcounter_impl.cpp
+++ b/projects/stargazer/traffcounter_impl.cpp
@@ -37,9 +37,11 @@
 #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 "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"


@@ -47,6 +49,8 @@
 #define FLUSH_TIME  (10)
 #define REMOVE_TIME  (31)
 
 #define FLUSH_TIME  (10)
 #define REMOVE_TIME  (31)
 

+using STG::TraffCounterImpl;
+

 const char protoName[PROTOMAX][8] =
 {"TCP", "UDP", "ICMP", "TCP_UDP", "ALL"};
 
 const char protoName[PROTOMAX][8] =
 {"TCP", "UDP", "ICMP", "TCP_UDP", "ALL"};
 


@@ -56,12 +60,12 @@ tcp = 0, udp, icmp, tcp_udp, all
 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-TRAFFCOUNTER_IMPL::TRAFFCOUNTER_IMPL(USERS_IMPL * u, const std::string & fn)
-    : WriteServLog(GetStgLogger()),
+TraffCounterImpl::TraffCounterImpl(UsersImpl * u, const std::string & fn)
+    : WriteServLog(Logger::get()),

       rulesFileName(fn),
       monitoring(false),
       rulesFileName(fn),
       monitoring(false),

+      touchTimeP(stgTime - MONITOR_TIME_DELAY_SEC),

       users(u),
       users(u),

-      running(false),

       stopped(true),
       addUserNotifier(*this),
       delUserNotifier(*this)
       stopped(true),
       addUserNotifier(*this),
       delUserNotifier(*this)


@@ -73,149 +77,120 @@ dirName[DIR_NUM] = "NULL";
 
 users->AddNotifierUserAdd(&addUserNotifier);
 users->AddNotifierUserDel(&delUserNotifier);
 
 users->AddNotifierUserAdd(&addUserNotifier);
 users->AddNotifierUserDel(&delUserNotifier);

-
-pthread_mutex_init(&mutex, NULL);

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

-TRAFFCOUNTER_IMPL::~TRAFFCOUNTER_IMPL()
+TraffCounterImpl::~TraffCounterImpl()

 {
 {

-pthread_mutex_destroy(&mutex);

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

-int TRAFFCOUNTER_IMPL::Start()
+int TraffCounterImpl::Start()

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 if (!stopped)
     return 0;
 
 if (ReadRules())
     {
 
 if (!stopped)
     return 0;
 
 if (ReadRules())
     {

-    printfd(__FILE__, "TRAFFCOUNTER_IMPL::Start() - Cannot read rules\n");
-    WriteServLog("TRAFFCOUNTER: Cannot read rules.");
+    printfd(__FILE__, "TraffCounterImpl::Start() - Cannot read rules\n");
+    WriteServLog("TraffCounter: Cannot read rules.");

     return -1;
     }
 
     return -1;
     }
 

-printfd(__FILE__, "TRAFFCOUNTER::Start()\n");
+printfd(__FILE__, "TraffCounter::Start()\n");

 int h = users->OpenSearch();
 int h = users->OpenSearch();

-USER_IMPL * u;
-if (!h)
-    {
-    printfd(__FILE__, "TRAFFCOUNTER_IMPL::Start() - Cannot get users\n");
-    WriteServLog("TRAFFCOUNTER: Cannot get users.");
-    return -1;
-    }
+assert(h && "USERS::OpenSearch is always correct");
+UserImpl * u;

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

-    {

     SetUserNotifiers(u);
     SetUserNotifiers(u);

-    }

 users->CloseSearch(h);
 
 users->CloseSearch(h);
 

-running = true;
-if (pthread_create(&thread, NULL, Run, this))
-    {
-    printfd(__FILE__, "TRAFFCOUNTER_IMPL::Start() - Cannot start thread\n");
-    WriteServLog("TRAFFCOUNTER: Error: Cannot start thread.");
-    return -1;
-    }
+m_thread = std::jthread([this](auto token){ Run(std::move(token)); });

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

-int TRAFFCOUNTER_IMPL::Stop()
+int TraffCounterImpl::Stop()

 {
 if (stopped)
     return 0;
 
 {
 if (stopped)
     return 0;
 

-running = false;
+m_thread.request_stop();

 
 int h = users->OpenSearch();
 
 int h = users->OpenSearch();

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

 
 

-USER_IMPL * u;
+UserImpl * u;

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

-    {

     UnSetUserNotifiers(u);
     UnSetUserNotifiers(u);

-    }

 users->CloseSearch(h);
 
 //5 seconds to thread stops itself
 struct timespec ts = {0, 200000000};
 for (int i = 0; i < 25 && !stopped; i++)
 users->CloseSearch(h);
 
 //5 seconds to thread stops itself
 struct timespec ts = {0, 200000000};
 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");
-    }
-printfd(__FILE__, "TRAFFCOUNTER::Stop()\n");
+{
+    m_thread.detach();
+    return -1;
+}
+
+m_thread.join();
+
+printfd(__FILE__, "TraffCounter::Stop()\n");

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

-void * TRAFFCOUNTER_IMPL::Run(void * data)
+void TraffCounterImpl::Run(std::stop_token token)

 {
 {

-TRAFFCOUNTER_IMPL * tc = static_cast<TRAFFCOUNTER_IMPL *>(data);
-tc->stopped = false;
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
+stopped = false;

 int c = 0;
 
 time_t touchTime = stgTime - MONITOR_TIME_DELAY_SEC;
 struct timespec ts = {0, 500000000};
 int c = 0;
 
 time_t touchTime = stgTime - MONITOR_TIME_DELAY_SEC;
 struct timespec ts = {0, 500000000};

-while (tc->running)
+while (!token.stop_requested())

     {
     nanosleep(&ts, 0);
     {
     nanosleep(&ts, 0);

-    if (!tc->running)
+    if (token.stop_requested())

         {
         {

-        tc->FlushAndRemove();
+        FlushAndRemove();

         break;
         }
 
         break;
         }
 

-    if (tc->monitoring && (touchTime + MONITOR_TIME_DELAY_SEC <= stgTime))
+    if (monitoring && (touchTime + MONITOR_TIME_DELAY_SEC <= stgTime))

         {
         {

-        std::string monFile(tc->monitorDir + "/traffcounter_r");
-        printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", tc->monitoring, monFile.c_str());
+        std::string monFile(monitorDir + "/traffcounter_r");
+        printfd(__FILE__, "Monitor=%d file TraffCounter %s\n", monitoring, monFile.c_str());

         touchTime = stgTime;
         touchTime = stgTime;

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

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

-        tc->FlushAndRemove();
+        FlushAndRemove();

     }
 
     }
 

-tc->stopped = true;
-return NULL;
+stopped = true;

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

-void TRAFFCOUNTER_IMPL::Process(const RAW_PACKET & rawPacket)
+void TraffCounterImpl::process(const RawPacket & rawPacket)

 {
 {

-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";
-    printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", monitoring, monFile.c_str());
-    touchTime = stgTime;
-    TouchFile(monFile.c_str());
+    std::string monFile = monitorDir + "/traffcounter_p";
+    printfd(__FILE__, "Monitor=%d file TraffCounter %s\n", monitoring, monFile.c_str());
+    touchTimeP = stgTime;
+    TouchFile(monFile);

     }
 
     }
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 

-//printfd(__FILE__, "TRAFFCOUNTER::Process()\n");
+//printfd(__FILE__, "TraffCounter::Process()\n");

 //TODO replace find with lower_bound.
 
 // Searching a new packet in a tree.
 //TODO replace find with lower_bound.
 
 // Searching a new packet in a tree.


@@ -244,7 +219,7 @@ if (pi != packets.end())
     return;
     }
 
     return;
     }
 

-PACKET_EXTRA_DATA ed;
+PacketExtraData ed;

 
 // Packet not found - add new packet
 
 
 // Packet not found - add new packet
 


@@ -289,16 +264,16 @@ if (ed.userUPresent ||
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void TRAFFCOUNTER_IMPL::FlushAndRemove()
+void TraffCounterImpl::FlushAndRemove()

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 

-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())
     {


@@ -372,13 +347,13 @@ printfd(__FILE__, "FlushAndRemove() packets: %d(rem %d) ip2packets: %d(rem %d)\n
 
 }
 //-----------------------------------------------------------------------------
 
 }
 //-----------------------------------------------------------------------------

-void TRAFFCOUNTER_IMPL::AddUser(USER_IMPL * user)
+void TraffCounterImpl::AddUser(UserImpl * user)

 {
 printfd(__FILE__, "AddUser: %s\n", user->GetLogin().c_str());
 uint32_t uip = user->GetCurrIP();
 std::pair<ip2p_iter, ip2p_iter> pi;
 
 {
 printfd(__FILE__, "AddUser: %s\n", user->GetLogin().c_str());
 uint32_t uip = user->GetCurrIP();
 std::pair<ip2p_iter, ip2p_iter> pi;
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+std::lock_guard<std::mutex> lock(m_mutex);

 // Find all packets with IP belongs to this user
 pi = ip2packets.equal_range(uip);
 
 // Find all packets with IP belongs to this user
 pi = ip2packets.equal_range(uip);
 


@@ -386,7 +361,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");
 


@@ -397,7 +372,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");
 


@@ -410,12 +385,12 @@ while (pi.first != pi.second)
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void TRAFFCOUNTER_IMPL::DelUser(uint32_t uip)
+void TraffCounterImpl::DelUser(uint32_t uip)

 {
 printfd(__FILE__, "DelUser: %s \n", inet_ntostring(uip).c_str());
 std::pair<ip2p_iter, ip2p_iter> pi;
 
 {
 printfd(__FILE__, "DelUser: %s \n", inet_ntostring(uip).c_str());
 std::pair<ip2p_iter, ip2p_iter> pi;
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+std::lock_guard<std::mutex> lock(m_mutex);

 pi = ip2packets.equal_range(uip);
 
 while (pi.first != pi.second)
 pi = ip2packets.equal_range(uip);
 
 while (pi.first != pi.second)


@@ -463,7 +438,7 @@ while (pi.first != pi.second)
 ip2packets.erase(pi.first, pi.second);
 }
 //-----------------------------------------------------------------------------
 ip2packets.erase(pi.first, pi.second);
 }
 //-----------------------------------------------------------------------------

-void TRAFFCOUNTER_IMPL::SetUserNotifiers(USER_IMPL * user)
+void TraffCounterImpl::SetUserNotifiers(UserImpl * 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);


@@ -475,7 +450,7 @@ ipAfterNotifiers.push_front(ipANotifier);
 user->AddCurrIPAfterNotifier(&(*ipAfterNotifiers.begin()));
 }
 //-----------------------------------------------------------------------------
 user->AddCurrIPAfterNotifier(&(*ipAfterNotifiers.begin()));
 }
 //-----------------------------------------------------------------------------

-void TRAFFCOUNTER_IMPL::UnSetUserNotifiers(USER_IMPL * user)
+void TraffCounterImpl::UnSetUserNotifiers(UserImpl * 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;


@@ -506,28 +481,27 @@ while (ai != ipAfterNotifiers.end())
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void TRAFFCOUNTER_IMPL::DeterminateDir(const RAW_PACKET & packet,
+void TraffCounterImpl::DeterminateDir(const RawPacket & 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);
 
 enum { ICMP_RPOTO = 1, TCP_PROTO = 6, UDP_PROTO = 17 };
 
 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);
 
 enum { ICMP_RPOTO = 1, TCP_PROTO = 6, UDP_PROTO = 17 };
 

-std::list<RULE>::const_iterator ln;
+std::list<Rule>::const_iterator ln;

 ln = rules.begin();
 
 while (ln != rules.end())
     {
     if (!foundU)
         {
 ln = rules.begin();
 
 while (ln != rules.end())
     {
     if (!foundU)
         {

-        addrMatchU = false;

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


@@ -567,14 +541,12 @@ while (ln != rules.end())
             foundU = true;
             *dirU = ln->dir;
             //printfd(__FILE__, "Up rule ok! %d\n", ln->dir);
             foundU = true;
             *dirU = ln->dir;
             //printfd(__FILE__, "Up rule ok! %d\n", ln->dir);

-            //PrintRule(ln->rule);

             }
 
         } //if (!foundU)
 
     if (!foundD)
         {
             }
 
         } //if (!foundU)
 
     if (!foundD)
         {

-        addrMatchD = false;

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


@@ -614,7 +586,6 @@ while (ln != rules.end())
             foundD = true;
             *dirD = ln->dir;
             //printfd(__FILE__, "Down rule ok! %d\n", ln->dir);
             foundD = true;
             *dirD = ln->dir;
             //printfd(__FILE__, "Down rule ok! %d\n", ln->dir);

-            //PrintRule(ln->rule);

             }
         } //if (!foundD)
 
             }
         } //if (!foundD)
 


@@ -626,20 +597,13 @@ if (!foundU)
 
 if (!foundD)
     *dirD = DIR_NUM;
 
 if (!foundD)
     *dirD = DIR_NUM;

-
-return;
-};
-//-----------------------------------------------------------------------------
-void TRAFFCOUNTER_IMPL::SetRulesFile(const std::string & fn)
-{
-rulesFileName = fn;

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

-bool TRAFFCOUNTER_IMPL::ReadRules(bool test)
+bool TraffCounterImpl::ReadRules(bool test)

 {
 {

-//printfd(__FILE__, "TRAFFCOUNTER::ReadRules()\n");
+//printfd(__FILE__, "TraffCounter::ReadRules()\n");

 
 

-RULE rul;
+Rule rul;

 FILE * f;
 char str[1024];
 char tp[100];   // protocol
 FILE * f;
 char str[1024];
 char tp[100];   // protocol


@@ -651,7 +615,7 @@ f = fopen(rulesFileName.c_str(), "rt");
 
 if (!f)
     {
 
 if (!f)
     {

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

     WriteServLog("File '%s' cannot be oppened.", rulesFileName.c_str());
     return true;
     }
     WriteServLog("File '%s' cannot be oppened.", rulesFileName.c_str());
     return true;
     }


@@ -664,10 +628,10 @@ while (fgets(str, 1023, f))
         continue;
         }
 
         continue;
         }
 

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

     if (r != 3)
         {
     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);
+        printfd(__FILE__, "TraffCounterImpl::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;
         WriteServLog("Error in file '%s' at line %d. There must be 3 parameters.", rulesFileName.c_str(), lineNumber);
         fclose(f);
         return true;


@@ -676,13 +640,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;


@@ -690,7 +654,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);
+        printfd(__FILE__, "TraffCounterImpl::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);


@@ -699,7 +663,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);
+        printfd(__FILE__, "TraffCounterImpl::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);


@@ -707,7 +671,6 @@ while (fgets(str, 1023, f))
         }
     if (!test)
         rules.push_back(rul);
         }
     if (!test)
         rules.push_back(rul);

-    //PrintRule(rul);

     }
 
 fclose(f);
     }
 
 fclose(f);


@@ -723,36 +686,34 @@ rul.proto = all;
 if (!test)
     rules.push_back(rul);
 
 if (!test)
     rules.push_back(rul);
 

-//PrintRule(rul);
-

 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-int TRAFFCOUNTER_IMPL::Reload()
+int TraffCounterImpl::Reload()

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 if (ReadRules(true))
     {
 
 if (ReadRules(true))
     {

-    printfd(__FILE__, "TRAFFCOUNTER_IMPL::Reload() - Failed to reload rules.\n");
-    WriteServLog("TRAFFCOUNTER: Cannot reload rules. Errors found.");
+    printfd(__FILE__, "TraffCounterImpl::Reload() - Failed to reload rules.\n");
+    WriteServLog("TraffCounter: Cannot reload rules. Errors found.");

     return -1;
     }
 
 FreeRules();
 ReadRules();
     return -1;
     }
 
 FreeRules();
 ReadRules();

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

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

-bool TRAFFCOUNTER_IMPL::ParseAddress(const char * ta, RULE * rule) const
+bool TraffCounterImpl::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++)
     {


@@ -796,7 +757,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");
+        printfd(__FILE__, "TraffCounterImpl::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;
         }


@@ -828,34 +789,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);
 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");
+    printfd(__FILE__, "TraffCounterImpl::ParseAddress() - Address does'n match mask.\n");

     WriteServLog("Address does'n match mask.");
     return true;
     }
     WriteServLog("Address does'n match mask.");
     return true;
     }


@@ -866,49 +825,21 @@ rule->port2 = prt2;
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-uint32_t TRAFFCOUNTER_IMPL::CalcMask(uint32_t msk) const
+uint32_t TraffCounterImpl::CalcMask(uint32_t msk) const

 {
 if (msk >= 32) return 0xFFffFFff;
 if (msk == 0) return 0;
 return htonl(0xFFffFFff << (32 - msk));
 }
 //---------------------------------------------------------------------------
 {
 if (msk >= 32) return 0xFFffFFff;
 if (msk == 0) return 0;
 return htonl(0xFFffFFff << (32 - msk));
 }
 //---------------------------------------------------------------------------

-void TRAFFCOUNTER_IMPL::FreeRules()
+void TraffCounterImpl::FreeRules()

 {
 rules.clear();
 }
 //-----------------------------------------------------------------------------
 {
 rules.clear();
 }
 //-----------------------------------------------------------------------------

-void TRAFFCOUNTER_IMPL::PrintRule(RULE rule) const
-{
-printf("%15s   ", inet_ntostring(rule.ip).c_str());
-printf("mask=%08X ", rule.mask);
-printf("port1=%5d ", rule.port1);
-printf("port2=%5d ", rule.port2);
-switch (rule.proto)
-    {
-    case 0:
-        printf("TCP     ");
-        break;
-    case 1:
-        printf("UDP     ");
-        break;
-    case 2:
-        printf("ICMP    ");
-        break;
-    case 3:
-        printf("TCP_UDP ");
-        break;
-    case 4:
-        printf("ALL     ");
-        break;
-    }
-printf("dir=%d \n", rule.dir);
-return;
-}
-//-----------------------------------------------------------------------------
-void TRAFFCOUNTER_IMPL::SetMonitorDir(const std::string & monitorDir)
+void TraffCounterImpl::SetMonitorDir(const std::string & dir)

 {
 {

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

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