X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a536658cf9e66cd5b19c428aa40bcdabf8b5ecd2..4a89beb9494451304e34e9a8e226936ac465c536:/projects/stargazer/traffcounter_impl.cpp diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp index 17a786ff..985de593 100644 --- a/projects/stargazer/traffcounter_impl.cpp +++ b/projects/stargazer/traffcounter_impl.cpp @@ -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); @@ -704,7 +697,6 @@ while (fgets(str, 1023, f)) } if (!test) rules.push_back(rul); - //PrintRule(rul); } fclose(f); @@ -720,8 +712,6 @@ rul.proto = all; if (!test) rules.push_back(rul); -//PrintRule(rul); - return false; } //----------------------------------------------------------------------------- @@ -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; } //----------------------------------------------------------------------------- @@ -875,33 +865,6 @@ 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 & dir) { monitorDir = dir;