Fix stargazer compilation errors

diff --git a/projects/stargazer/actions.inl.h b/projects/stargazer/actions.inl.h
index 37c7e86e71ef78c30d0e9b3be30121464c44537a..29dce606502711d63b6c69797727fc323a8e61a0 100644 (file)
--- a/projects/stargazer/actions.inl.h
+++ b/projects/stargazer/actions.inl.h
@@ -3,7 +3,7 @@
 
 #include <algorithm>
 
 
 #include <algorithm>
 

-#include "stg_locker.h"
+#include "stg/stg_locker.h"

 
 // Polymorphick action invocation
 template <class ACTIVE_CLASS, typename DATA_TYPE>
 
 // Polymorphick action invocation
 template <class ACTIVE_CLASS, typename DATA_TYPE>

diff --git a/projects/stargazer/admin_impl.cpp b/projects/stargazer/admin_impl.cpp
index d14bfa7d2c559d3c1b48f68ecd74cd66d0e47fcb..3d5574c742cf9dbc59e0b1ade6f35a26adb9c55b 100644 (file)
--- a/projects/stargazer/admin_impl.cpp
+++ b/projects/stargazer/admin_impl.cpp
@@ -29,7 +29,7 @@
  */
 
 #include "admin_impl.h"
  */
 
 #include "admin_impl.h"

-#include "common.h"
+#include "stg/common.h"

 
 //-----------------------------------------------------------------------------
 ADMIN_IMPL::ADMIN_IMPL()
 
 //-----------------------------------------------------------------------------
 ADMIN_IMPL::ADMIN_IMPL()

diff --git a/projects/stargazer/admin_impl.h b/projects/stargazer/admin_impl.h
index 8dd8a898893acb85aedd81f99232e2e46b5ceec0..69f384201f9a9440f31539c025b8f74075c8e9e1 100644 (file)
--- a/projects/stargazer/admin_impl.h
+++ b/projects/stargazer/admin_impl.h
@@ -33,10 +33,10 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "admin.h"
-#include "os_int.h"
-#include "admin_conf.h"
-#include "stg_logger.h"
+#include "stg/admin.h"
+#include "stg/os_int.h"
+#include "stg/admin_conf.h"
+#include "stg/stg_logger.h"

 
 class ADMIN_IMPL : public ADMIN {
 public:
 
 class ADMIN_IMPL : public ADMIN {
 public:

diff --git a/projects/stargazer/admins_impl.cpp b/projects/stargazer/admins_impl.cpp
index 38d2cec0a26b73c75d500d49daf425a5142cb5fb..0179910ea12bdac511baaa23387df8ac24995156 100644 (file)
--- a/projects/stargazer/admins_impl.cpp
+++ b/projects/stargazer/admins_impl.cpp
@@ -32,11 +32,11 @@
 #include <cassert>
 #include <algorithm>
 
 #include <cassert>
 #include <algorithm>
 

+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/common.h"

 #include "admins_impl.h"
 #include "admins_impl.h"

-#include "admins.h"
-#include "admin.h"

 #include "admin_impl.h"
 #include "admin_impl.h"

-#include "common.h"

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index b481e25ff120681484e457240054627deec3a54a..9ca571e38b979a242c265d05ba53b0cebc7b3da7 100644 (file)
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -36,12 +36,12 @@
 #include <list>
 #include <map>
 
 #include <list>
 #include <map>
 

-#include "admins.h"
-#include "admin.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/stg_locker.h"
+#include "stg/store.h"
+#include "stg/noncopyable.h"

 #include "admin_impl.h"
 #include "admin_impl.h"

-#include "stg_locker.h"
-#include "store.h"
-#include "noncopyable.h"

 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:
 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:

diff --git a/projects/stargazer/eventloop.cpp b/projects/stargazer/eventloop.cpp
index 4cd6074bcbdabdd6618f83ac59ad5b988cb2c42b..96c1ca4ff0fe9ccaf8dfe7d42be00612835bd6a0 100644 (file)
--- a/projects/stargazer/eventloop.cpp
+++ b/projects/stargazer/eventloop.cpp
@@ -1,9 +1,9 @@
 #include <cerrno>
 #include <cstring>
 
 #include <cerrno>
 #include <cstring>
 

+#include "stg/stg_locker.h"
+#include "stg/common.h"

 #include "eventloop.h"
 #include "eventloop.h"

-#include "stg_locker.h"
-#include "common.h"

 
 EVENT_LOOP::EVENT_LOOP()
     : ACTIONS_LIST()
 
 EVENT_LOOP::EVENT_LOOP()
     : ACTIONS_LIST()

diff --git a/projects/stargazer/eventloop.h b/projects/stargazer/eventloop.h
index e1b7f6aac8da02efc512e39e9a53737e4bf2a7d7..71602795626fdc82b40e703781e955eb9f4fcb3d 100644 (file)
--- a/projects/stargazer/eventloop.h
+++ b/projects/stargazer/eventloop.h
@@ -3,7 +3,7 @@
 
 #include <pthread.h>
 
 
 #include <pthread.h>
 

-#include "noncopyable.h"
+#include "stg/noncopyable.h"

 #include "actions.h"
 
 class EVENT_LOOP : private NONCOPYABLE,
 #include "actions.h"
 
 class EVENT_LOOP : private NONCOPYABLE,

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 6bbd7b9d6b62393026356f3bcad728494130fd2a..3ba9ccf376aa93406b72ce3eee75f20480af0845 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -40,20 +40,21 @@
 #include <set>
 #include <list>
 
 #include <set>
 #include <list>
 

+#include "stg/user.h"
+#include "stg/common.h"
+#include "stg/plugin.h"
+#include "stg/stg_logger.h"
+#include "stg/script_executer.h"
+#include "stg/conffiles.h"
+#include "stg/version.h"
+#include "stg/pinger.h"
+#include "stg_timer.h"

 #include "settings_impl.h"
 #include "settings_impl.h"

-#include "user.h"

 #include "users_impl.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"
 #include "users_impl.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"

-#include "common.h"

 #include "traffcounter_impl.h"
 #include "traffcounter_impl.h"

-#include "plugin.h"
-#include "stg_logger.h"
-#include "stg_timer.h"

 #include "plugin_runner.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"
 #include "store_loader.h"
 #include "pidfile.h"
 #include "eventloop.h"


@@ -74,7 +75,6 @@ static bool childExited = false;
 set<pid_t> executersPid;
 static pid_t stgChildPid;
 
 set<pid_t> executersPid;
 static pid_t stgChildPid;
 

-#include "pinger.h"

 
 //-----------------------------------------------------------------------------
 bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
 
 //-----------------------------------------------------------------------------
 bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)

diff --git a/projects/stargazer/plugin_runner.cpp b/projects/stargazer/plugin_runner.cpp
index be43e1ec0fa83097c00053ba603aacb99d565029..b93d6d0a45d3cd1d67d75c60ccade79e4d26a92e 100644 (file)
--- a/projects/stargazer/plugin_runner.cpp
+++ b/projects/stargazer/plugin_runner.cpp
@@ -27,13 +27,13 @@
 #include <dlfcn.h>
 #include <unistd.h>
 
 #include <dlfcn.h>
 #include <unistd.h>
 

+#include "stg/common.h"
+#include "stg/traffcounter.h"

 #include "plugin_runner.h"
 #include "plugin_runner.h"

-#include "common.h"

 #include "settings_impl.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"
 #include "users_impl.h"
 #include "settings_impl.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"
 #include "users_impl.h"

-#include "traffcounter.h"

 
 //-----------------------------------------------------------------------------
 PLUGIN_RUNNER::PLUGIN_RUNNER(const std::string & pFileName,
 
 //-----------------------------------------------------------------------------
 PLUGIN_RUNNER::PLUGIN_RUNNER(const std::string & pFileName,

diff --git a/projects/stargazer/plugin_runner.h b/projects/stargazer/plugin_runner.h
index ba90306c6915d8e41546c5ea4d2ba770de559727..412c51413361d7a7e93cb39b4c9e08749704dffc 100644 (file)
--- a/projects/stargazer/plugin_runner.h
+++ b/projects/stargazer/plugin_runner.h
@@ -29,9 +29,9 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "module_settings.h"
-#include "plugin.h"
-#include "os_int.h"
+#include "stg/module_settings.h"
+#include "stg/plugin.h"
+#include "stg/os_int.h"

 
 class SETTINGS_IMPL;
 class ADMINS_IMPL;
 
 class SETTINGS_IMPL;
 class ADMINS_IMPL;

diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp
index 14609647c18e5066f3ce84db3fc954a30bbc7218..361993c9fe8acaba1365362e081e5947b5da7b7d 100644 (file)
--- a/projects/stargazer/settings_impl.cpp
+++ b/projects/stargazer/settings_impl.cpp
@@ -32,9 +32,9 @@ $Author: faust $
 #include <cerrno>
 #include <string>
 
 #include <cerrno>
 #include <string>
 

+#include "stg/stg_logger.h"
+#include "stg/dotconfpp.h"

 #include "settings_impl.h"
 #include "settings_impl.h"

-#include "stg_logger.h"
-#include "dotconfpp.h"

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index a5722a90daf5401e677ed0113bf61c0191e656e2..f7ded85385cad37d4ec5ad848cd54e49429a8977 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -40,10 +40,10 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-#include "settings.h"
-#include "common.h"
-#include "stg_logger.h"
-#include "module_settings.h"
+#include "stg/settings.h"
+#include "stg/common.h"
+#include "stg/stg_logger.h"
+#include "stg/module_settings.h"

 
 //-----------------------------------------------------------------------------
 enum DETAIL_STAT_PERIOD {
 
 //-----------------------------------------------------------------------------
 enum DETAIL_STAT_PERIOD {

diff --git a/projects/stargazer/stg_timer.cpp b/projects/stargazer/stg_timer.cpp
index 6d2b4b0cdd245a28a33db648ba631befa64f123a..fff79a3918de7ae93e1bb2258e7ebbd942919413 100644 (file)
--- a/projects/stargazer/stg_timer.cpp
+++ b/projects/stargazer/stg_timer.cpp
@@ -3,7 +3,7 @@
 #include <ctime>
 #include <cstring>
 
 #include <ctime>
 #include <cstring>
 

-#include "common.h"
+#include "stg/common.h"

 
 static int nonstop;
 static pthread_t thrStgTimer;
 
 static int nonstop;
 static pthread_t thrStgTimer;

diff --git a/projects/stargazer/store_loader.cpp b/projects/stargazer/store_loader.cpp
index dbb6d36edc8ddd0a0153e17c332813635a9567f8..0dceb81da785eeb8999388810094c80994a9d953 100644 (file)
--- a/projects/stargazer/store_loader.cpp
+++ b/projects/stargazer/store_loader.cpp
@@ -30,9 +30,9 @@
 
 #include <dlfcn.h>
 
 
 #include <dlfcn.h>
 

+#include "stg/common.h"
+#include "stg/store.h"

 #include "store_loader.h"
 #include "store_loader.h"

-#include "common.h"
-#include "store.h"

 #include "settings_impl.h"
 
 STORE_LOADER::STORE_LOADER(const SETTINGS_IMPL & settings)
 #include "settings_impl.h"
 
 STORE_LOADER::STORE_LOADER(const SETTINGS_IMPL & settings)

diff --git a/projects/stargazer/store_loader.h b/projects/stargazer/store_loader.h
index a9bb3a449d8b6cabe33a8048895b06ce2eed9a54..c7911eead81adc97044f0b06cf45f42fd89cb00c 100644 (file)
--- a/projects/stargazer/store_loader.h
+++ b/projects/stargazer/store_loader.h
@@ -33,8 +33,8 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "module_settings.h"
-#include "noncopyable.h"
+#include "stg/module_settings.h"
+#include "stg/noncopyable.h"

 
 class STORE;
 class SETTINGS_IMPL;
 
 class STORE;
 class SETTINGS_IMPL;

diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp
index bfae5215885a0e5671d09d9fa0ada7f98023ab36..63164a27bd634f7bf8dd2d48d2a17553f09d3406 100644 (file)
--- a/projects/stargazer/tariff_impl.cpp
+++ b/projects/stargazer/tariff_impl.cpp
@@ -31,9 +31,9 @@
 #include <ctime>
 #include <algorithm> // std::max
 
 #include <ctime>
 #include <algorithm> // std::max
 

+#include "stg/common.h"

 #include "tariff_impl.h"
 #include "stg_timer.h"
 #include "tariff_impl.h"
 #include "stg_timer.h"

-#include "common.h"

 
 //-----------------------------------------------------------------------------
 TARIFF & TARIFF_IMPL::operator=(const TARIFF_DATA & td)
 
 //-----------------------------------------------------------------------------
 TARIFF & TARIFF_IMPL::operator=(const TARIFF_DATA & td)

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index aaa6a3b9ba545360b73326100245506a73f219f9..b8d0a776d729407a206cebe5d5110b1ab99933a6 100644 (file)
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -36,9 +36,9 @@
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>
 

-#include "tariff.h"
-#include "os_int.h"
-#include "tariff_conf.h"
+#include "stg/tariff.h"
+#include "stg/os_int.h"
+#include "stg/tariff_conf.h"

 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1

diff --git a/projects/stargazer/tariffs_impl.cpp b/projects/stargazer/tariffs_impl.cpp
index e0ef68e1ba49be0be3db4e17b5e7a950ceeb89ee..c244cb692ac8907bd73c4ff5f37403467282be1b 100644 (file)
--- a/projects/stargazer/tariffs_impl.cpp
+++ b/projects/stargazer/tariffs_impl.cpp
@@ -32,11 +32,11 @@
 #include <algorithm>
 #include <vector>
 
 #include <algorithm>
 #include <vector>
 

+#include "stg/stg_locker.h"
+#include "stg/stg_logger.h"
+#include "stg/store.h"
+#include "stg/admin.h"

 #include "tariffs_impl.h"
 #include "tariffs_impl.h"

-#include "stg_locker.h"
-#include "stg_logger.h"
-#include "store.h"
-#include "admin.h"

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index 5778945dc4e77546c4a8bf1a62c2eb0c89ffb31a..b8aac298bf03788394f99dd7a641a917bd8d4e19 100644 (file)
--- a/projects/stargazer/tariffs_impl.h
+++ b/projects/stargazer/tariffs_impl.h
@@ -41,10 +41,10 @@
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>
 

-#include "tariff.h"
+#include "stg/tariff.h"
+#include "stg/tariffs.h"
+#include "stg/tariff_conf.h"

 #include "tariff_impl.h"
 #include "tariff_impl.h"

-#include "tariffs.h"
-#include "tariff_conf.h"

 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1

diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp
index e056a7a66879822e1cbc756699ec0a8f02f9684f..45ba883e93da3dc955fdab1bacf20c0058a1e2f6 100644 (file)
--- a/projects/stargazer/traffcounter_impl.cpp
+++ b/projects/stargazer/traffcounter_impl.cpp
@@ -38,9 +38,9 @@
 #include <cassert>
 #include <cstdio> // fopen and similar
 
 #include <cassert>
 #include <cstdio> // fopen and similar
 

+#include "stg/common.h"
+#include "stg/stg_locker.h"

 #include "traffcounter_impl.h"
 #include "traffcounter_impl.h"

-#include "common.h"
-#include "stg_locker.h"

 #include "stg_timer.h"
 
 #define FLUSH_TIME  (10)
 #include "stg_timer.h"
 
 #define FLUSH_TIME  (10)

diff --git a/projects/stargazer/traffcounter_impl.h b/projects/stargazer/traffcounter_impl.h
index feeb7a3ddc4e0a11a4b7a5dad481b82ad6e9649d..27e7c03c637ee48fc5a03c9b9d57c810e050833b 100644 (file)
--- a/projects/stargazer/traffcounter_impl.h
+++ b/projects/stargazer/traffcounter_impl.h
@@ -35,13 +35,13 @@
 #include <map>
 #include <string>
 
 #include <map>
 #include <string>
 

-#include "traffcounter.h"
-#include "os_int.h"
-#include "stg_logger.h"
-#include "raw_ip_packet.h"
-#include "users.h"
+#include "stg/traffcounter.h"
+#include "stg/os_int.h"
+#include "stg/stg_logger.h"
+#include "stg/raw_ip_packet.h"
+#include "stg/users.h"
+#include "stg/noncopyable.h"

 #include "actions.h"
 #include "actions.h"

-#include "noncopyable.h"

 #include "eventloop.h"
 
 #define PROTOMAX    (5)
 #include "eventloop.h"
 
 #define PROTOMAX    (5)

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index d720ffe50f18b3a623099994b4add849f18675dc..8d648d4f5cb8b1492f69281022ab2923ed879115 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -38,14 +38,14 @@
 #include <cassert>
 #include <cstdlib>
 
 #include <cassert>
 #include <cstdlib>
 

+#include "stg/users.h"
+#include "stg/common.h"
+#include "stg/script_executer.h"
+#include "stg/tariff.h"
+#include "stg/tariffs.h"
+#include "stg/admin.h"

 #include "user_impl.h"
 #include "user_impl.h"

-#include "users.h"
-#include "common.h"

 #include "settings_impl.h"
 #include "settings_impl.h"

-#include "script_executer.h"
-#include "tariff.h"
-#include "tariffs.h"
-#include "admin.h"

 
 USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
            const STORE * st,
 
 USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
            const STORE * st,

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index e9c9f98667691722569f1d43dbd57a1c15c82c85..935dcd0e0a90368c8c0f897667df0f963af189bf 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -32,16 +32,16 @@
 #include <string>
 #include <set>
 
 #include <string>
 #include <set>
 

-#include "user.h"
-#include "os_int.h"
-#include "stg_const.h"
-#include "user_stat.h"
-#include "user_conf.h"
-#include "user_ips.h"
-#include "user_property.h"
-#include "auth.h"
-#include "stg_message.h"
-#include "noncopyable.h"
+#include "stg/user.h"
+#include "stg/os_int.h"
+#include "stg/stg_const.h"
+#include "stg/user_stat.h"
+#include "stg/user_conf.h"
+#include "stg/user_ips.h"
+#include "stg/user_property.h"
+#include "stg/auth.h"
+#include "stg/stg_message.h"
+#include "stg/noncopyable.h"

 
 //-----------------------------------------------------------------------------
 class TARIFF;
 
 //-----------------------------------------------------------------------------
 class TARIFF;

diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp
index 46990fd472a7b1afe5de0c79a0189e35c4525f9c..06a4901a6c02d7a5c1f92462267ec7d0e9d7abe8 100644 (file)
--- a/projects/stargazer/user_property.cpp
+++ b/projects/stargazer/user_property.cpp
@@ -1,4 +1,4 @@
-#include "user_property.h"
+#include "stg/user_property.h"

 
 //-----------------------------------------------------------------------------
 USER_PROPERTIES::USER_PROPERTIES(const std::string & sd)
 
 //-----------------------------------------------------------------------------
 USER_PROPERTIES::USER_PROPERTIES(const std::string & sd)

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 249551875b3beb4ea44276849197bf63f23744d4..c139e65c535eba07ea478bd566d1ffbe9262d176 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -40,9 +40,9 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-#include "settings.h"
+#include "stg/settings.h"
+#include "stg/common.h"

 #include "users_impl.h"
 #include "users_impl.h"

-#include "common.h"

 #include "stg_timer.h"
 
 using namespace std;
 #include "stg_timer.h"
 
 using namespace std;

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index 7a2fc0f920af4f114932b4106205a1068c5f3728..37edef7a22483ef0a3d78bb878a6562cdfbcdca2 100644 (file)
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -36,19 +36,18 @@ $Author: faust $
 #include <list>
 #include <set>
 
 #include <list>
 #include <set>
 

-#include "os_int.h"
-
-#include "store.h"
-#include "settings_impl.h"
-#include "users.h"
-#include "user.h"
-#include "user_impl.h"
-#include "tariffs.h"
-#include "stg_logger.h"
-#include "notifer.h"
+#include "stg/os_int.h"
+#include "stg/store.h"
+#include "stg/users.h"
+#include "stg/user.h"
+#include "stg/tariffs.h"
+#include "stg/stg_logger.h"
+#include "stg/notifer.h"
+#include "stg/noncopyable.h"

 #include "actions.h"
 #include "actions.h"

-#include "noncopyable.h"

 #include "eventloop.h"
 #include "eventloop.h"

+#include "settings_impl.h"
+#include "user_impl.h"

 
 const int userDeleteDelayTime = 120;
 
 
 const int userDeleteDelayTime = 120;