X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4844bbe6135addc1ffdc33ed0576aebea0153e6d..1108cd13922be13921cc6c89f78e4ee3ae88af52:/projects/stargazer/traffcounter_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp index 237799f5..fce47595 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" @@ -59,12 +60,22 @@ tcp = 0, udp, icmp, tcp_udp, all //----------------------------------------------------------------------------- TRAFFCOUNTER_IMPL::TRAFFCOUNTER_IMPL(USERS_IMPL * u, const std::string & fn) : TRAFFCOUNTER(), + rules(), + packets(), + ip2packets(), + dirName(), WriteServLog(GetStgLogger()), rulesFileName(fn), + monitorDir(), monitoring(false), + touchTimeP(stgTime - MONITOR_TIME_DELAY_SEC), users(u), running(false), stopped(true), + mutex(), + thread(), + ipBeforeNotifiers(), + ipAfterNotifiers(), addUserNotifier(*this), delUserNotifier(*this) { @@ -100,13 +111,8 @@ if (ReadRules()) printfd(__FILE__, "TRAFFCOUNTER::Start()\n"); int h = users->OpenSearch(); +assert(h && "USERS::OpenSearch is always correct"); USER_IMPL * u; -if (!h) - { - printfd(__FILE__, "TRAFFCOUNTER_IMPL::Start() - Cannot get users\n"); - WriteServLog("TRAFFCOUNTER: Cannot get users."); - return -1; - } while (users->SearchNext(h, &u) == 0) { @@ -132,11 +138,7 @@ 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_IMPL * u; while (users->SearchNext(h, &u) == 0) @@ -152,16 +154,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; @@ -169,6 +164,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; @@ -205,13 +204,11 @@ 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()); } @@ -295,12 +292,12 @@ void TRAFFCOUNTER_IMPL::FlushAndRemove() { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -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()) { @@ -628,9 +625,7 @@ if (!foundU) if (!foundD) *dirD = DIR_NUM; - -return; -}; +} //----------------------------------------------------------------------------- void TRAFFCOUNTER_IMPL::SetRulesFile(const std::string & fn) { @@ -678,13 +673,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; @@ -743,8 +738,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; } //----------------------------------------------------------------------------- @@ -752,9 +747,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++) { @@ -830,32 +825,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."); @@ -904,13 +899,12 @@ switch (rule.proto) printf("ALL "); break; } -printf("dir=%d \n", rule.dir); -return; +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(); } //-----------------------------------------------------------------------------