git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimized sending answers in sgconfig.
[stg.git]
/
projects
/
stargazer
/
plugins
/
authorization
/
stress
/
stress.h
diff --git
a/projects/stargazer/plugins/authorization/stress/stress.h
b/projects/stargazer/plugins/authorization/stress/stress.h
index 1caf3a47db69bdbf8cfb776dd1637dc4fb530247..83ab3231d5c75fc9b2a5e0fb1d823bdda6d2680d 100644
(file)
--- a/
projects/stargazer/plugins/authorization/stress/stress.h
+++ b/
projects/stargazer/plugins/authorization/stress/stress.h
@@
-28,121
+28,117
@@
#ifndef STRESS_H
#define STRESS_H
#ifndef STRESS_H
#define STRESS_H
-#include <string>
#include <pthread.h>
#include <pthread.h>
-#include "base_auth.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "../../../users.h"
-using namespace std;
+#include <string>
+#include <list>
+
+#include "stg/auth.h"
+#include "stg/notifer.h"
+#include "stg/user_ips.h"
+#include "stg/users.h"
+#include "stg/module_settings.h"
-extern "C"
BASE_
PLUGIN * GetPlugin();
+extern "C" PLUGIN * GetPlugin();
class AUTH_STRESS;
//-----------------------------------------------------------------------------
template <typename varParamType>
class AUTH_STRESS;
//-----------------------------------------------------------------------------
template <typename varParamType>
-class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
+class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
public:
public:
+ CHG_BEFORE_NOTIFIER() : auth(NULL) {}
void Notify(const varParamType & oldValue, const varParamType & newValue);
void Notify(const varParamType & oldValue, const varParamType & newValue);
- void SetUser(
user_iter
u) { user = u; }
-
user_iter
GetUser() {return user; }
+ void SetUser(
USER_PTR
u) { user = u; }
+
USER_PTR
GetUser() {return user; }
void SetAuthorizator(const AUTH_STRESS * a) { auth = a; }
private:
void SetAuthorizator(const AUTH_STRESS * a) { auth = a; }
private:
-
user_iter
user;
+
USER_PTR
user;
const AUTH_STRESS * auth;
};
//-----------------------------------------------------------------------------
template <typename varParamType>
const AUTH_STRESS * auth;
};
//-----------------------------------------------------------------------------
template <typename varParamType>
-class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
+class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
public:
public:
+ CHG_AFTER_NOTIFIER() : auth(NULL) {}
void Notify(const varParamType & oldValue, const varParamType & newValue);
void Notify(const varParamType & oldValue, const varParamType & newValue);
- void SetUser(
user_iter
u) { user = u; }
-
user_iter
GetUser() {return user; }
+ void SetUser(
USER_PTR
u) { user = u; }
+
USER_PTR
GetUser() {return user; }
void SetAuthorizator(const AUTH_STRESS * a) { auth = a; }
private:
void SetAuthorizator(const AUTH_STRESS * a) { auth = a; }
private:
-
user_iter
user;
+
USER_PTR
user;
const AUTH_STRESS * auth;
};
//-----------------------------------------------------------------------------
const AUTH_STRESS * auth;
};
//-----------------------------------------------------------------------------
-class AUTH_STRESS_SETTINGS
-{
+class AUTH_STRESS_SETTINGS {
public:
AUTH_STRESS_SETTINGS();
public:
AUTH_STRESS_SETTINGS();
- const st
ring&
GetStrError() const { return errorStr; }
+ const st
d::string &
GetStrError() const { return errorStr; }
int ParseSettings(const MODULE_SETTINGS & s);
int GetAverageOnlineTime() const;
private:
int ParseSettings(const MODULE_SETTINGS & s);
int GetAverageOnlineTime() const;
private:
- int ParseIntInRange(const string & str, int min, int max, int * val);
int averageOnlineTime;
int averageOnlineTime;
- st
ring
errorStr;
+ st
d::string
errorStr;
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
-class AUTH_STRESS :public BASE_AUTH
-{
+class AUTH_STRESS :public AUTH {
+friend class CHG_BEFORE_NOTIFIER<USER_IPS>;
+friend class CHG_AFTER_NOTIFIER<USER_IPS>;
public:
AUTH_STRESS();
public:
AUTH_STRESS();
- virtual ~AUTH_STRESS()
{};
+ virtual ~AUTH_STRESS()
{}
void SetUsers(USERS * u);
void SetUsers(USERS * u);
- void SetTariffs(TARIFFS * t){};
- void SetAdmins(ADMINS * a){};
- void SetTraffcounter(TRAFFCOUNTER * tc){};
- void SetStore(BASE_STORE * ){};
- void SetStgSettings(const SETTINGS *){};
int Start();
int Stop();
int Start();
int Stop();
+ int Reload() { return 0; }
bool IsRunning();
void SetSettings(const MODULE_SETTINGS & s);
int ParseSettings();
bool IsRunning();
void SetSettings(const MODULE_SETTINGS & s);
int ParseSettings();
- const st
ring
& GetStrError() const;
- const st
ring
GetVersion() const;
+ const st
d::string
& GetStrError() const;
+ const st
d::string
GetVersion() const;
uint16_t GetStartPosition() const;
uint16_t GetStopPosition() const;
uint16_t GetStartPosition() const;
uint16_t GetStopPosition() const;
- void AddUser(user_iter u);
- void DelUser(user_iter u);
-
- void Authorize(user_iter u) const;
- void Unauthorize(user_iter u) const;
-
int SendMessage(const STG_MSG & msg, uint32_t ip) const;
private:
void GetUsers();
int SendMessage(const STG_MSG & msg, uint32_t ip) const;
private:
void GetUsers();
- void SetUserNotifiers(
user_iter
u);
- void UnSetUserNotifiers(
user_iter
u);
+ void SetUserNotifiers(
USER_PTR
u);
+ void UnSetUserNotifiers(
USER_PTR
u);
- bool nonstop;
+ void AddUser(USER_PTR u);
+ void DelUser(USER_PTR u);
+
+ void Authorize(USER_PTR u) const;
+ void Unauthorize(USER_PTR u) const;
static void * Run(void *);
static void * Run(void *);
- mutable string errorStr;
- AUTH_STRESS_SETTINGS stressSettings;
+ bool nonstop;
+
+ mutable std::string errorStr;
+ AUTH_STRESS_SETTINGS stressSettings;
USERS * users;
USERS * users;
-
list<user_iter>
usersList;
+
std::list<USER_PTR>
usersList;
bool isRunning;
MODULE_SETTINGS settings;
pthread_t thread;
pthread_mutex_t mutex;
bool isRunning;
MODULE_SETTINGS settings;
pthread_t thread;
pthread_mutex_t mutex;
-
list<CHG_BEFORE_NOTIFIER<USER_IPS> >
BeforeChgIPNotifierList;
-
list<CHG_AFTER_NOTIFIER<USER_IPS> >
AfterChgIPNotifierList;
+
std::list<CHG_BEFORE_NOTIFIER<USER_IPS> >
BeforeChgIPNotifierList;
+
std::list<CHG_AFTER_NOTIFIER<USER_IPS> >
AfterChgIPNotifierList;
- class ADD_USER_NONIFIER: public NOTIFIER_BASE<user_iter>
- {
+ class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
public:
public:
- ADD_USER_NONIFIER()
{};
- virtual ~ADD_USER_NONIFIER()
{};
+ ADD_USER_NONIFIER()
: auth(NULL) {}
+ virtual ~ADD_USER_NONIFIER()
{}
void SetAuthorizator(AUTH_STRESS * a) { auth = a; }
void SetAuthorizator(AUTH_STRESS * a) { auth = a; }
- void Notify(const
user_iter
& user)
+ void Notify(const
USER_PTR
& user)
{
auth->AddUser(user);
}
{
auth->AddUser(user);
}
@@
-151,14
+147,13
@@
private:
AUTH_STRESS * auth;
} onAddUserNotifier;
AUTH_STRESS * auth;
} onAddUserNotifier;
- class DEL_USER_NONIFIER: public NOTIFIER_BASE<user_iter>
- {
+ class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
public:
public:
- DEL_USER_NONIFIER()
{};
- virtual ~DEL_USER_NONIFIER()
{};
+ DEL_USER_NONIFIER()
: auth(NULL) {}
+ virtual ~DEL_USER_NONIFIER()
{}
void SetAuthorizator(AUTH_STRESS * a) { auth = a; }
void SetAuthorizator(AUTH_STRESS * a) { auth = a; }
- void Notify(const
user_iter
& user)
+ void Notify(const
USER_PTR
& user)
{
auth->DelUser(user);
}
{
auth->DelUser(user);
}
@@
-171,5
+166,3
@@
private:
//-----------------------------------------------------------------------------
#endif
//-----------------------------------------------------------------------------
#endif
-
-