* Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
*/
-/*
- $Revision: 1.21 $
- $Date: 2010/09/10 06:38:26 $
- $Author: faust $
-*/
-
-#ifndef AO_H
-#define AO_H
-
-#include <pthread.h>
-
-#include <string>
-#include <list>
+#pragma once
#include "stg/auth.h"
+#include "stg/module_settings.h"
#include "stg/store.h"
#include "stg/notifer.h"
#include "stg/user_ips.h"
#include "stg/user.h"
#include "stg/logger.h"
-extern "C" PLUGIN * GetPlugin();
+#include <string>
+#include <vector>
+#include <list>
+
+#include <pthread.h>
+
+namespace STG
+{
+struct Users;
+}
class AUTH_AO;
-class USERS;
-//-----------------------------------------------------------------------------
+
+using UserPtr = STG::User*;
+using ConstUserPtr = const STG::User*;
+
template <typename T>
-class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
+class CHG_BEFORE_NOTIFIER : public STG::PropertyNotifierBase<T> {
public:
- CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u)
- : PROPERTY_NOTIFIER_BASE<T>(), user(u), auth(a) {}
+ CHG_BEFORE_NOTIFIER(AUTH_AO & a, UserPtr u)
+ : user(u), auth(a) {}
CHG_BEFORE_NOTIFIER(const CHG_BEFORE_NOTIFIER<T> & rvalue)
- : PROPERTY_NOTIFIER_BASE<T>(),
- user(rvalue.user), auth(rvalue.auth) {}
+ : user(rvalue.user), auth(rvalue.auth) {}
void Notify(const T & oldValue, const T & newValue);
- USER_PTR GetUser() const { return user; }
+ UserPtr GetUser() const { return user; }
private:
CHG_BEFORE_NOTIFIER<T> & operator=(const CHG_BEFORE_NOTIFIER<T> & rvalue);
- USER_PTR user;
+ UserPtr user;
const AUTH_AO & auth;
};
//-----------------------------------------------------------------------------
template <typename T>
-class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
+class CHG_AFTER_NOTIFIER : public STG::PropertyNotifierBase<T> {
public:
- CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u)
- : PROPERTY_NOTIFIER_BASE<T>(), user(u), auth(a) {}
+ CHG_AFTER_NOTIFIER(AUTH_AO & a, UserPtr u)
+ : user(u), auth(a) {}
CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER<T> & rvalue)
- : PROPERTY_NOTIFIER_BASE<T>(),
- user(rvalue.user), auth(rvalue.auth) {}
+ : user(rvalue.user), auth(rvalue.auth) {}
void Notify(const T & oldValue, const T & newValue);
- USER_PTR GetUser() const { return user; }
+ UserPtr GetUser() const { return user; }
private:
CHG_AFTER_NOTIFIER<T> & operator=(const CHG_AFTER_NOTIFIER<T> & rvalue);
- USER_PTR user;
+ UserPtr user;
const AUTH_AO & auth;
};
//-----------------------------------------------------------------------------
-class AUTH_AO : public AUTH {
+class AUTH_AO : public STG::Auth {
public:
AUTH_AO();
- virtual ~AUTH_AO(){};
- void SetUsers(USERS * u) { users = u; }
+ void SetUsers(STG::Users * u) override { users = u; }
- int Start();
- int Stop();
- int Reload() { return 0; }
- bool IsRunning() { return isRunning; }
- void SetSettings(const MODULE_SETTINGS &) {}
- int ParseSettings() { return 0; }
- const std::string & GetStrError() const { return errorStr; }
- const std::string GetVersion() const;
- uint16_t GetStartPosition() const { return 30; }
- uint16_t GetStopPosition() const { return 30; }
+ int Start() override;
+ int Stop() override;
+ int Reload(const STG::ModuleSettings & /*ms*/) override { return 0; }
+ bool IsRunning() override { return isRunning; }
+ void SetSettings(const STG::ModuleSettings &) override {}
+ int ParseSettings() override { return 0; }
+ const std::string & GetStrError() const override { return errorStr; }
+ std::string GetVersion() const override;
+ uint16_t GetStartPosition() const override { return 30; }
+ uint16_t GetStopPosition() const override { return 30; }
- void AddUser(USER_PTR u);
- void DelUser(USER_PTR u);
-
- int SendMessage(const STG_MSG & msg, uint32_t ip) const;
+ int SendMessage(const STG::Message & msg, uint32_t ip) const override;
private:
AUTH_AO(const AUTH_AO & rvalue);
AUTH_AO & operator=(const AUTH_AO & rvalue);
+ void AddUser(UserPtr u);
+ void DelUser(UserPtr u);
+
void GetUsers();
- void SetUserNotifiers(USER_PTR u);
- void UnSetUserNotifiers(USER_PTR u);
- void UpdateUserAuthorization(CONST_USER_PTR u) const;
+ void SetUserNotifiers(UserPtr u);
+ void UnSetUserNotifiers(UserPtr u);
+ void UpdateUserAuthorization(ConstUserPtr u) const;
mutable std::string errorStr;
- USERS * users;
- std::list<USER_PTR> usersList;
+ STG::Users * users;
+ std::vector<UserPtr> userList;
bool isRunning;
- MODULE_SETTINGS settings;
+ STG::ModuleSettings settings;
- list<CHG_BEFORE_NOTIFIER<int> > BeforeChgAONotifierList;
- list<CHG_AFTER_NOTIFIER<int> > AfterChgAONotifierList;
+ std::list<CHG_BEFORE_NOTIFIER<int> > BeforeChgAONotifierList;
+ std::list<CHG_AFTER_NOTIFIER<int> > AfterChgAONotifierList;
- list<CHG_BEFORE_NOTIFIER<USER_IPS> > BeforeChgIPNotifierList;
- list<CHG_AFTER_NOTIFIER<USER_IPS> > AfterChgIPNotifierList;
+ std::list<CHG_BEFORE_NOTIFIER<STG::UserIPs> > BeforeChgIPNotifierList;
+ std::list<CHG_AFTER_NOTIFIER<STG::UserIPs> > AfterChgIPNotifierList;
- class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
+ class ADD_USER_NONIFIER: public STG::NotifierBase<UserPtr> {
public:
- ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
+ explicit ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
virtual ~ADD_USER_NONIFIER() {}
- void Notify(const USER_PTR & user) { auth.AddUser(user); }
+ void Notify(const UserPtr & user) { auth.AddUser(user); }
private:
ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rvalue);
AUTH_AO & auth;
} onAddUserNotifier;
- class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
+ class DEL_USER_NONIFIER: public STG::NotifierBase<UserPtr> {
public:
- DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
+ explicit DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
virtual ~DEL_USER_NONIFIER() {}
- void Notify(const USER_PTR & user) { auth.DelUser(user); }
+ void Notify(const UserPtr & user) { auth.DelUser(user); }
private:
DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rvalue);
AUTH_AO & auth;
} onDelUserNotifier;
- PLUGIN_LOGGER logger;
+
+ STG::PluginLogger logger;
friend class CHG_BEFORE_NOTIFIER<int>;
friend class CHG_AFTER_NOTIFIER<int>;
- friend class CHG_BEFORE_NOTIFIER<USER_IPS>;
- friend class CHG_AFTER_NOTIFIER<USER_IPS>;
+ friend class CHG_BEFORE_NOTIFIER<STG::UserIPs>;
+ friend class CHG_AFTER_NOTIFIER<STG::UserIPs>;
};
-//-----------------------------------------------------------------------------
-
-#endif
git.stg.codes / stg.git / blobdiff