#include <sys/msg.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <sys/stat.h>
+#include <sys/stat.h> // S_IRUSR
+#include <fcntl.h> // create
#include <csignal>
#include <cerrno>
#include <set>
#include <list>
+#include "stg/user.h"
+#include "stg/common.h"
+#include "stg/plugin.h"
+#include "stg/logger.h"
+#include "stg/scriptexecuter.h"
+#include "stg/conffiles.h"
+#include "stg/version.h"
+#include "stg/pinger.h"
+#include "stg_timer.h"
#include "settings_impl.h"
-#include "user.h"
#include "users_impl.h"
#include "admins_impl.h"
#include "tariffs_impl.h"
-#include "common.h"
#include "traffcounter_impl.h"
-#include "plugin.h"
-#include "stg_logger.h"
-#include "stg_timer.h"
#include "plugin_runner.h"
-#include "script_executer.h"
-#include "conffiles.h"
-#include "version.h"
#include "store_loader.h"
#include "pidfile.h"
#include "eventloop.h"
set<pid_t> executersPid;
static pid_t stgChildPid;
-#include "pinger.h"
//-----------------------------------------------------------------------------
bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
tariffs = new TARIFFS_IMPL(dataStore);
admins = new ADMINS_IMPL(dataStore);
users = new USERS_IMPL(settings, dataStore, tariffs, admins->GetSysAdmin());
-traffCnt = new TRAFFCOUNTER_IMPL(users, tariffs, settings->GetRulesFileName());
+traffCnt = new TRAFFCOUNTER_IMPL(users, settings->GetRulesFileName());
traffCnt->SetMonitorDir(settings->GetMonitorDir());
modSettings = settings->GetModulesSettings();