X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/25bc185367ffb0caf3197babf44243d1703895e3..040deac4b8ae0728e3ff7635bb16595ec08d5817:/projects/stargazer/traffcounter_impl.cpp diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp index f39f1248..5223c5c4 100644 --- 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/const.h" // MONITOR_TIME_DELAY_SEC #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), + touchTimeP(stgTime - MONITOR_TIME_DELAY_SEC), users(u), running(false), stopped(true), @@ -95,7 +97,7 @@ pthread_mutex_destroy(&mutex); //----------------------------------------------------------------------------- int TRAFFCOUNTER_IMPL::Start() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (!stopped) return 0; @@ -202,17 +204,15 @@ void TRAFFCOUNTER_IMPL::Process(const RAW_PACKET & 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"; + std::string monFile = monitorDir + "/traffcounter_p"; printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", monitoring, monFile.c_str()); - touchTime = stgTime; + touchTimeP = stgTime; TouchFile(monFile.c_str()); } -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); //printfd(__FILE__, "TRAFFCOUNTER::Process()\n"); //TODO replace find with lower_bound. @@ -290,14 +290,14 @@ if (ed.userUPresent || //----------------------------------------------------------------------------- void TRAFFCOUNTER_IMPL::FlushAndRemove() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&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(); -std::map newPackets; +Packets newPackets; ip2packets.erase(ip2packets.begin(), ip2packets.end()); while (pi != packets.end()) { @@ -377,7 +377,7 @@ printfd(__FILE__, "AddUser: %s\n", user->GetLogin().c_str()); uint32_t uip = user->GetCurrIP(); std::pair pi; -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); // Find all packets with IP belongs to this user pi = ip2packets.equal_range(uip); @@ -414,7 +414,7 @@ void TRAFFCOUNTER_IMPL::DelUser(uint32_t uip) printfd(__FILE__, "DelUser: %s \n", inet_ntostring(uip).c_str()); std::pair pi; -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); pi = ip2packets.equal_range(uip); while (pi.first != pi.second) @@ -566,7 +566,6 @@ while (ln != rules.end()) foundU = true; *dirU = ln->dir; //printfd(__FILE__, "Up rule ok! %d\n", ln->dir); - //PrintRule(ln->rule); } } //if (!foundU) @@ -613,7 +612,6 @@ while (ln != rules.end()) foundD = true; *dirD = ln->dir; //printfd(__FILE__, "Down rule ok! %d\n", ln->dir); - //PrintRule(ln->rule); } } //if (!foundD) @@ -627,11 +625,6 @@ if (!foundD) *dirD = DIR_NUM; } //----------------------------------------------------------------------------- -void TRAFFCOUNTER_IMPL::SetRulesFile(const std::string & fn) -{ -rulesFileName = fn; -} -//----------------------------------------------------------------------------- bool TRAFFCOUNTER_IMPL::ReadRules(bool test) { //printfd(__FILE__, "TRAFFCOUNTER::ReadRules()\n"); @@ -661,7 +654,7 @@ while (fgets(str, 1023, f)) continue; } - r = sscanf(str,"%s %s %s", tp, ta, td); + r = sscanf(str,"%100s %100s %100s", 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); @@ -673,13 +666,13 @@ while (fgets(str, 1023, f)) 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; } - 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; @@ -704,7 +697,6 @@ while (fgets(str, 1023, f)) } if (!test) rules.push_back(rul); - //PrintRule(rul); } fclose(f); @@ -720,14 +712,12 @@ rul.proto = all; if (!test) rules.push_back(rul); -//PrintRule(rul); - return false; } //----------------------------------------------------------------------------- int TRAFFCOUNTER_IMPL::Reload() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (ReadRules(true)) { @@ -738,8 +728,8 @@ if (ReadRules(true)) 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; } //----------------------------------------------------------------------------- @@ -747,9 +737,9 @@ bool TRAFFCOUNTER_IMPL::ParseAddress(const char * ta, RULE * rule) const { char addr[50], mask[20], port1[20], port2[20], ports[40]; -int len = strlen(ta); +size_t len = strlen(ta); char n = 0; -int i, p; +size_t i, p; memset(addr, 0, sizeof(addr)); for (i = 0; i < len; i++) { @@ -825,32 +815,32 @@ else } // 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); +msk = static_cast(strtol(mask, &res, 10)); if (*res != 0) return true; -prt1 = strtol(port1, &res, 10); +prt1 = static_cast(strtol(port1, &res, 10)); if (*res != 0) return true; -prt2 = strtol(port2, &res, 10); +prt2 = static_cast(strtol(port2, &res, 10)); 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; -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))); -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."); @@ -875,36 +865,9 @@ void TRAFFCOUNTER_IMPL::FreeRules() 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=%u \n", static_cast(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(); } //-----------------------------------------------------------------------------