X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/bccb08f374dba862369712669c4ca73ccbfb2170..e9bdb5063b52226148212399a017300d5d14baac:/projects/stargazer/traffcounter_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp index 83554e27..da64a0b8 100644 --- a/projects/stargazer/traffcounter_impl.cpp +++ b/projects/stargazer/traffcounter_impl.cpp @@ -29,6 +29,7 @@ */ /* inet_aton */ +#include #include #include #include @@ -36,11 +37,13 @@ #include #include #include // fopen and similar +#include // strtol +#include "stg/common.h" +#include "stg/locker.h" #include "traffcounter_impl.h" -#include "common.h" -#include "stg_locker.h" #include "stg_timer.h" +#include "users_impl.h" #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), + monitorDir(), monitoring(false), users(u), running(false), stopped(true), + mutex(), + thread(), + ipBeforeNotifiers(), + ipAfterNotifiers(), addUserNotifier(*this), delUserNotifier(*this) { @@ -89,18 +102,15 @@ if (!stopped) 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(); -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) { @@ -111,7 +121,8 @@ users->CloseSearch(h); 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; @@ -125,13 +136,9 @@ if (stopped) 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); @@ -145,16 +152,9 @@ for (int i = 0; i < 25 && !stopped; i++) nanosleep(&ts, NULL); } -//after 5 seconds waiting thread still running. now kill it 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; @@ -162,6 +162,10 @@ return 0; //----------------------------------------------------------------------------- void * TRAFFCOUNTER_IMPL::Run(void * data) { +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + TRAFFCOUNTER_IMPL * tc = static_cast(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 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 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(); @@ -501,7 +462,7 @@ while (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); @@ -513,7 +474,7 @@ ipAfterNotifiers.push_front(ipANotifier); 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::iterator bi; @@ -689,7 +650,8 @@ f = fopen(rulesFileName.c_str(), "rt"); 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; } @@ -704,7 +666,8 @@ while (fgets(str, 1023, f)) 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; } @@ -726,6 +689,7 @@ while (fgets(str, 1023, f)) 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); @@ -734,6 +698,7 @@ while (fgets(str, 1023, f)) 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); @@ -768,12 +733,14 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__); if (ReadRules(true)) { + printfd(__FILE__, "TRAFFCOUNTER_IMPL::Reload() - Failed to reload rules.\n"); 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; } @@ -828,6 +795,7 @@ if (n == ':') // 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; } @@ -886,6 +854,7 @@ rule->mask = CalcMask(msk); if ((ip & rule->mask) != ip) { + printfd(__FILE__, "TRAFFCOUNTER_IMPL::ParseAddress() - Address does'n match mask.\n"); WriteServLog("Address does'n match mask."); return true; }