#include <csignal>
#include <cassert>
#include <cstdio> // fopen and similar
+#include <cstdlib> // strtol
#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"
#define FLUSH_TIME (10)
#define REMOVE_TIME (31)
};
//-----------------------------------------------------------------------------
-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),
+ touchTimeP(stgTime - MONITOR_TIME_DELAY_SEC),
users(u),
running(false),
stopped(true),
+ mutex(),
+ thread(),
+ ipBeforeNotifiers(),
+ ipAfterNotifiers(),
addUserNotifier(*this),
delUserNotifier(*this)
{
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)
{
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;
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);
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;
//-----------------------------------------------------------------------------
void * TRAFFCOUNTER_IMPL::Run(void * data)
{
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
TRAFFCOUNTER_IMPL * tc = static_cast<TRAFFCOUNTER_IMPL *>(data);
tc->stopped = false;
int c = 0;
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__);
-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<RAW_PACKET, PACKET_EXTRA_DATA> newPackets;
+Packets newPackets;
ip2packets.erase(ip2packets.begin(), ip2packets.end());
while (pi != packets.end())
{
}
}
- /*//Removing
- if (stgTime - pi->second.updateTime > REMOVE_TIME)
- {
- // Remove packet and references from ip2packets index
- //printfd(__FILE__, "+++ Removing +++\n");
- pair<ip2p_iter, ip2p_iter> 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<pp_iter, bool> res = newPackets.insert(*pi);
}
//-----------------------------------------------------------------------------
-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();
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);
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<TRF_IP_BEFORE>::iterator bi;
if (!foundD)
*dirD = DIR_NUM;
-
-return;
-};
+}
//-----------------------------------------------------------------------------
void TRAFFCOUNTER_IMPL::SetRulesFile(const std::string & fn)
{
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;
}
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;
}
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;
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);
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);
if (ReadRules(true))
{
+ printfd(__FILE__, "TRAFFCOUNTER_IMPL::Reload() - Failed to reload rules.\n");
WriteServLog("TRAFFCOUNTER: Cannot reload rules. Errors found.");
return -1;
}
FreeRules();
ReadRules();
-WriteServLog("TRAFFCOUNTER: Reload rules successfull.");
+printfd(__FILE__, "TRAFFCOUNTER_IMPL::Reload() - Reloaded rules successfully.\n");
+WriteServLog("TRAFFCOUNTER: Reloaded rules successfully.");
return 0;
}
//-----------------------------------------------------------------------------
{
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++)
{
// 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;
}
}
// 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<uint16_t>(strtol(mask, &res, 10));
if (*res != 0)
return true;
-prt1 = strtol(port1, &res, 10);
+prt1 = static_cast<uint16_t>(strtol(port1, &res, 10));
if (*res != 0)
return true;
-prt2 = strtol(port2, &res, 10);
+prt2 = static_cast<uint16_t>(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.");
return true;
}
printf("ALL ");
break;
}
-printf("dir=%d \n", rule.dir);
-return;
+printf("dir=%u \n", static_cast<unsigned>(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();
}
//-----------------------------------------------------------------------------
git.stg.codes / stg.git / blobdiff