Plugin loading order fixed

diff --git a/projects/stargazer/plugins/authorization/ao/ao.h b/projects/stargazer/plugins/authorization/ao/ao.h
index fe267c4e390f74db626aeaf5bd6d4320c17226c5..205ebf5a841a5eded5e9d1bc40d86faa8c2ce9da 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -94,8 +94,8 @@ public:
     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const { return 70; }
-    uint16_t            GetStopPosition() const { return 70; }
+    uint16_t            GetStartPosition() const { return 30; }
+    uint16_t            GetStopPosition() const { return 30; }
 
     void                AddUser(USER_PTR u);
     void                DelUser(USER_PTR u);

diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
index 1158955fd55fe47333efb17c5cdcbb28f62193d3..d0f6b5ac271691a6cad1b5c8186a8aaf6088a69d 100644 (file)
--- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
+++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
@@ -252,8 +252,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const { return "InetAccess authorization plugin v.1.4"; }
-    uint16_t            GetStartPosition() const { return 50; }
-    uint16_t            GetStopPosition() const { return 50; }
+    uint16_t            GetStartPosition() const { return 30; }
+    uint16_t            GetStopPosition() const { return 30; }
 
     int                 SendMessage(const STG_MSG & msg, uint32_t ip) const;
 

diff --git a/projects/stargazer/plugins/authorization/stress/stress.cpp b/projects/stargazer/plugins/authorization/stress/stress.cpp
index 7273ed483479ede97445007aec28e41836a75f1e..39e74b0d44a18c653030857787ed26907a435021 100644 (file)
--- a/projects/stargazer/plugins/authorization/stress/stress.cpp
+++ b/projects/stargazer/plugins/authorization/stress/stress.cpp
@@ -205,12 +205,12 @@ return isRunning;
 //-----------------------------------------------------------------------------
 uint16_t AUTH_STRESS::GetStartPosition() const
 {
-return 70;
+return 30;
 }
 //-----------------------------------------------------------------------------
 uint16_t AUTH_STRESS::GetStopPosition() const
 {
-return 70;
+return 30;
 }
 //-----------------------------------------------------------------------------
 void AUTH_STRESS::SetUserNotifiers(USER_PTR u)

diff --git a/projects/stargazer/plugins/capture/cap_debug/debug_cap.cpp b/projects/stargazer/plugins/capture/cap_debug/debug_cap.cpp
index 595c45fc149581321ddf0e9ada35adb6a56ebbd3..85fd602bd18412e165f2ab3dce3143296a75f820 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_debug/debug_cap.cpp
+++ b/projects/stargazer/plugins/capture/cap_debug/debug_cap.cpp
@@ -434,12 +434,12 @@ return NULL;
 //-----------------------------------------------------------------------------
 uint16_t DEBUG_CAP::GetStartPosition() const
 {
-return 0;
+return 40;
 }
 //-----------------------------------------------------------------------------
 uint16_t DEBUG_CAP::GetStopPosition() const
 {
-return 0;
+return 40;
 }
 //-----------------------------------------------------------------------------
 RAW_PACKET MakeTCPPacket(const char * src,

diff --git a/projects/stargazer/plugins/capture/cap_nf/cap_nf.h b/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
index e6961643bde97479382e796375afc0bf807eb478..43d6e0987a77521b82d7b92691e970ccf39ba56a 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
+++ b/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
@@ -39,8 +39,8 @@ $Author: faust $
 #include "stg/module_settings.h"
 
 #define VERSION "CAP_NF v. 0.4"
-#define START_POS 10
-#define STOP_POS 10
+#define START_POS 40
+#define STOP_POS 40
 
 class USERS;
 class USER;

diff --git a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
index 65ee87d39404a1fdccfd28dc50b01891c25d26b4..62a78a439c0430497bc69dfbb6870027c12444d1 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
@@ -59,8 +59,8 @@ public:
     int                 ParseSettings();
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const { return 10; }
-    uint16_t            GetStopPosition() const { return 10; }
+    uint16_t            GetStartPosition() const { return 40; }
+    uint16_t            GetStopPosition() const { return 40; }
 
 private:
     DIVERT_CAP(const DIVERT_CAP & rvalue);

diff --git a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
index 8f7e1f2fdd1693e8954047442b11ad559c9ad4fe..ad9ff9f15ae817f7754dff0d0dc8a6ff7869f27b 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
@@ -107,8 +107,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const { return 10; }
-    uint16_t            GetStopPosition() const { return 10; }
+    uint16_t            GetStartPosition() const { return 40; }
+    uint16_t            GetStopPosition() const { return 40; }
 
 private:
     BPF_CAP(const BPF_CAP & rvalue);

diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
index 64560ca4f657135df1da6ad4b8677ae4f085d857..44c4ae7e7e83cbabf844a94e0ec90360c975b709 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
@@ -59,8 +59,8 @@ public:
     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const { return 10; }
-    uint16_t            GetStopPosition() const { return 10; }
+    uint16_t            GetStartPosition() const { return 40; }
+    uint16_t            GetStopPosition() const { return 40; }
 
 private:
     ETHER_CAP(const ETHER_CAP & rvalue);

diff --git a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
index 308234b474b5acb3f0df11ec89a5809f7b29dddc..7c78da8935345c417d80be6511da1a2dc00ad3c7 100644 (file)
--- a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
+++ b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
@@ -54,8 +54,8 @@ public:
     int  ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     const std::string GetVersion() const;
-    uint16_t GetStartPosition() const { return 10; }
-    uint16_t GetStopPosition() const { return 10; }
+    uint16_t GetStartPosition() const { return 40; }
+    uint16_t GetStopPosition() const { return 40; }
 
 private:
     IPQ_CAP(const IPQ_CAP & rvalue);

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
index 87ef9470ded316ede1a676a85e63791c79c7eb58..8525f8890adf7cae6fc1f36787281495f8d28c65 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -76,8 +76,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const { return RPC_CONFIG_VERSION; }
-    uint16_t            GetStartPosition() const { return 220; }
-    uint16_t            GetStopPosition() const { return 220; }
+    uint16_t            GetStartPosition() const { return 20; }
+    uint16_t            GetStopPosition() const { return 20; }
 
     bool                GetAdminInfo(const std::string & cookie,
                                      ADMIN_INFO * info);

diff --git a/projects/stargazer/plugins/configuration/sgconfig-ng/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig-ng/stgconfig.h
index fd3a9e623844666c78c404f0fa0ae6914409997f..7678c8b069052623836d4f967b244dc38024f11b 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig-ng/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig-ng/stgconfig.h
@@ -40,8 +40,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const { return PLUGIN_VERSION; }
-    uint16_t            GetStartPosition() const { return 220; }
-    uint16_t            GetStopPosition() const { return 220; }
+    uint16_t            GetStartPosition() const { return 20; }
+    uint16_t            GetStopPosition() const { return 20; }
 
 private:
     USERS * users;

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
index 9db9fd933f62ddb22de521a3c88d771c81777ba8..cdce9668bf6931c34ecbdf622b31cbf678e3ff28 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -45,8 +45,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const { return 220; }
-    uint16_t            GetStopPosition() const { return 220; }
+    uint16_t            GetStartPosition() const { return 20; }
+    uint16_t            GetStopPosition() const { return 20; }
 
 private:
     STG_CONFIG(const STG_CONFIG & rvalue);

diff --git a/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.cpp
index c5864cc4c7b3540ef4da0f05a16bb638dc088573..f08286ca7906e015cbfd983b2f945c23e6e82bd6 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.cpp
@@ -155,12 +155,12 @@ return NULL;
 
 uint16_t STG_CONFIG::GetStartPosition() const
 {
-return 220;
+return 20;
 }
 
 uint16_t STG_CONFIG::GetStopPosition() const
 {
-return 220;
+return 20;
 }
 
 bool PrepareNetwork()

diff --git a/projects/stargazer/plugins/configuration/xrconfig/xrconfig.cpp b/projects/stargazer/plugins/configuration/xrconfig/xrconfig.cpp
index 1b9237cacea80256c661bdc0c277cf489dc12905..e23df01da3aad5c558bb60bcaed1ece1a3df1db1 100644 (file)
--- a/projects/stargazer/plugins/configuration/xrconfig/xrconfig.cpp
+++ b/projects/stargazer/plugins/configuration/xrconfig/xrconfig.cpp
@@ -180,12 +180,12 @@ return NULL;
 //-----------------------------------------------------------------------------
 uint16_t XR_CONFIG::GetStartPosition() const
 {
-return 221;
+return 20;
 }
 //-----------------------------------------------------------------------------
 uint16_t XR_CONFIG::GetStopPosition() const
 {
-return 221;
+return 20;
 }
 //-----------------------------------------------------------------------------
 int XR_CONFIG::SetUserCash(const string & admLogin, const string & usrLogin, double cash) const

diff --git a/projects/stargazer/plugins/other/ping/ping.h b/projects/stargazer/plugins/other/ping/ping.h
index 63b86a6e9e5a634ccf0f32e3b277ca26de744a22..6c31eb9589facd72454d132b07fc027b7bc9d456 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.h
+++ b/projects/stargazer/plugins/other/ping/ping.h
@@ -116,8 +116,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string GetVersion() const { return "Pinger v.1.01"; }
-    uint16_t GetStartPosition() const { return 100; }
-    uint16_t GetStopPosition() const { return 100; }
+    uint16_t GetStartPosition() const { return 10; }
+    uint16_t GetStopPosition() const { return 10; }
 
     void AddUser(USER_PTR u);
     void DelUser(USER_PTR u);

diff --git a/projects/stargazer/plugins/other/radius/radius.h b/projects/stargazer/plugins/other/radius/radius.h
index 731753a01596a9b0582e905ab1f7196d4757176f..92cfcab2d157dd16f007b5c7fbf497034b261ea1 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.h
+++ b/projects/stargazer/plugins/other/radius/radius.h
@@ -102,8 +102,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const { return "RADIUS data access plugin v 0.6"; }
-    uint16_t            GetStartPosition() const { return 20; }
-    uint16_t            GetStopPosition() const { return 20; }
+    uint16_t            GetStartPosition() const { return 30; }
+    uint16_t            GetStopPosition() const { return 30; }
 
     int SendMessage(const STG_MSG &, uint32_t) const { return 0; }
 

diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h
index 461fcacdc7e95ff08d9592a121b3d89e830627da..794c4c2b82e8c28e0f6524cc3d3fa548e9c4e013 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -170,8 +170,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const { return "Remote script v 0.3"; }
-    uint16_t            GetStartPosition() const { return 20; }
-    uint16_t            GetStopPosition() const { return 20; }
+    uint16_t            GetStartPosition() const { return 10; }
+    uint16_t            GetStopPosition() const { return 10; }
 
     void                DelUser(USER_PTR u) { UnSetUserNotifier(u); }
     void                AddUser(USER_PTR u) { SetUserNotifier(u); }

diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h
index 9d0e516d064989e957dcd69c4730be78de5a743e..24f7de32a384d9ede2cbc142e5303ef288e99d63 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -122,8 +122,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string GetVersion() const { return "Stg SMUX Plugin 1.1"; }
-    uint16_t GetStartPosition() const { return 100; }
-    uint16_t GetStopPosition() const { return 100; }
+    uint16_t GetStartPosition() const { return 10; }
+    uint16_t GetStopPosition() const { return 10; }
 
     bool UpdateTables();
 

diff --git a/projects/stargazer/plugins/other/userstat/userstat.h b/projects/stargazer/plugins/other/userstat/userstat.h
index 1c5776f80aa15dbb5085d285a62770c417ad5be2..18b128c1f5d5f2fbefd5f7d5d8124ab756bf95dc 100644 (file)
--- a/projects/stargazer/plugins/other/userstat/userstat.h
+++ b/projects/stargazer/plugins/other/userstat/userstat.h
@@ -56,8 +56,8 @@ public:
     virtual bool IsRunning() { return isRunning; }
     virtual const string  & GetStrError() const { return errorStr; }
     virtual const string    GetVersion() const { return version; }
-    virtual uint16_t        GetStartPosition() const { return 0; }
-    virtual uint16_t        GetStopPosition() const { return 0; }
+    virtual uint16_t        GetStartPosition() const { return 10; }
+    virtual uint16_t        GetStopPosition() const { return 10; }
 
 private:
     struct IsDone : public unary_function<DataThread, bool>