From daa6cb18a0ff8451a9599905a01d66d6515fdb86 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust.madf@gmail.com>
Date: Thu, 9 Feb 2012 11:19:16 +0200
Subject: [PATCH] Plugin loading order fixed
---
projects/stargazer/plugins/authorization/ao/ao.h | 4 ++--
.../stargazer/plugins/authorization/inetaccess/inetaccess.h | 4 ++--
projects/stargazer/plugins/authorization/stress/stress.cpp | 4 ++--
projects/stargazer/plugins/capture/cap_debug/debug_cap.cpp | 4 ++--
projects/stargazer/plugins/capture/cap_nf/cap_nf.h | 4 ++--
.../stargazer/plugins/capture/divert_freebsd/divert_cap.h | 4 ++--
projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h | 4 ++--
projects/stargazer/plugins/capture/ether_linux/ether_cap.h | 4 ++--
projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h | 4 ++--
.../stargazer/plugins/configuration/rpcconfig/rpcconfig.h | 4 ++--
.../stargazer/plugins/configuration/sgconfig-ng/stgconfig.h | 4 ++--
projects/stargazer/plugins/configuration/sgconfig/stgconfig.h | 4 ++--
.../stargazer/plugins/configuration/sgconfig2/stgconfig.cpp | 4 ++--
.../stargazer/plugins/configuration/xrconfig/xrconfig.cpp | 4 ++--
projects/stargazer/plugins/other/ping/ping.h | 4 ++--
projects/stargazer/plugins/other/radius/radius.h | 4 ++--
projects/stargazer/plugins/other/rscript/rscript.h | 4 ++--
projects/stargazer/plugins/other/smux/smux.h | 4 ++--
projects/stargazer/plugins/other/userstat/userstat.h | 4 ++--
19 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/projects/stargazer/plugins/authorization/ao/ao.h b/projects/stargazer/plugins/authorization/ao/ao.h
index fe267c4e..205ebf5a 100644
--- 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 1158955f..d0f6b5ac 100644
--- 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 7273ed48..39e74b0d 100644
--- 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 595c45fc..85fd602b 100644
--- 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 e6961643..43d6e098 100644
--- 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 65ee87d3..62a78a43 100644
--- 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 8f7e1f2f..ad9ff9f1 100644
--- 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 64560ca4..44c4ae7e 100644
--- 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 308234b4..7c78da89 100644
--- 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 87ef9470..8525f889 100644
--- 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 fd3a9e62..7678c8b0 100644
--- 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 9db9fd93..cdce9668 100644
--- 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 c5864cc4..f08286ca 100644
--- 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 1b9237ca..e23df01d 100644
--- 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 63b86a6e..6c31eb95 100644
--- 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 731753a0..92cfcab2 100644
--- 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 461fcacd..794c4c2b 100644
--- 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 9d0e516d..24f7de32 100644
--- 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 1c5776f8..18b128c1 100644
--- 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>
--
2.44.2