#include <ctime>
#include <list>
+#include <vector>
#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/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/message.h"
+#include "stg/noncopyable.h"
//-----------------------------------------------------------------------------
class TARIFF;
class TARIFFS;
class ADMIN;
class USER_IMPL;
+#ifdef USE_ABSTRACT_SETTINGS
+class SETTINGS;
+#else
+class SETTINGS_IMPL;
+#endif
//-----------------------------------------------------------------------------
class USER_ID_GENERATOR {
friend class USER_IMPL;
CHG_PASSIVE_NOTIFIER(USER_IMPL * u) : user(u) {}
void Notify(const int & oldPassive, const int & newPassive);
+private:
+ USER_IMPL * user;
+};
+//-----------------------------------------------------------------------------
+class CHG_DISABLED_NOTIFIER : public PROPERTY_NOTIFIER_BASE<int>,
+ private NONCOPYABLE {
+public:
+ CHG_DISABLED_NOTIFIER(USER_IMPL * u) : user(u) {}
+ void Notify(const int & oldValue, const int & newValue);
+
private:
USER_IMPL * user;
};
USER_IMPL * user;
};
//-----------------------------------------------------------------------------
-class CHG_IP_NOTIFIER : public PROPERTY_NOTIFIER_BASE<uint32_t>,
- private NONCOPYABLE {
+class CHG_IPS_NOTIFIER : public PROPERTY_NOTIFIER_BASE<USER_IPS>,
+ private NONCOPYABLE {
public:
- CHG_IP_NOTIFIER(USER_IMPL * u) : user(u) {}
- void Notify(const uint32_t & oldCash, const uint32_t & newCash);
+ CHG_IPS_NOTIFIER(USER_IMPL * u) : user(u) {}
+ void Notify(const USER_IPS & oldIPs, const USER_IPS & newIPs);
private:
USER_IMPL * user;
//-----------------------------------------------------------------------------
class USER_IMPL : public USER {
friend class CHG_PASSIVE_NOTIFIER;
+friend class CHG_DISABLED_NOTIFIER;
friend class CHG_TARIFF_NOTIFIER;
friend class CHG_CASH_NOTIFIER;
-friend class CHG_IP_NOTIFIER;
+friend class CHG_IPS_NOTIFIER;
public:
+#ifdef USE_ABSTRACT_SETTINGS
USER_IMPL(const SETTINGS * settings,
const STORE * store,
const TARIFFS * tariffs,
- const ADMIN & sysAdmin,
+ const ADMIN * sysAdmin,
const USERS * u);
+#else
+ USER_IMPL(const SETTINGS_IMPL * settings,
+ const STORE * store,
+ const TARIFFS * tariffs,
+ const ADMIN * sysAdmin,
+ const USERS * u);
+#endif
USER_IMPL(const USER_IMPL & u);
virtual ~USER_IMPL();
int WriteStat();
int WriteMonthStat();
- std::string const & GetLogin() const { return login; }
+ const std::string & GetLogin() const { return login; }
void SetLogin(std::string const & l);
uint32_t GetCurrIP() const { return currIP; }
time_t GetCurrIPModificationTime() const { return currIP.ModificationTime(); }
- void AddCurrIPBeforeNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
- void DelCurrIPBeforeNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
+ void AddCurrIPBeforeNotifier(CURR_IP_NOTIFIER * notifier);
+ void DelCurrIPBeforeNotifier(const CURR_IP_NOTIFIER * notifier);
+
+ void AddCurrIPAfterNotifier(CURR_IP_NOTIFIER * notifier);
+ void DelCurrIPAfterNotifier(const CURR_IP_NOTIFIER * notifier);
- void AddCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
- void DelCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
+ void AddConnectedBeforeNotifier(CONNECTED_NOTIFIER * notifier);
+ void DelConnectedBeforeNotifier(const CONNECTED_NOTIFIER * notifier);
+
+ void AddConnectedAfterNotifier(CONNECTED_NOTIFIER * notifier);
+ void DelConnectedAfterNotifier(const CONNECTED_NOTIFIER * notifier);
int GetID() const { return id; }
bool GetConnected() const { return connected; }
time_t GetConnectedModificationTime() const { return connected.ModificationTime(); }
- int GetAuthorized() const { return authorizedBy.size(); }
+ int GetAuthorized() const { return static_cast<int>(authorizedBy.size()); }
int Authorize(uint32_t ip, uint32_t enabledDirs, const AUTH * auth);
- void Unauthorize(const AUTH * auth);
+ void Unauthorize(const AUTH * auth,
+ const std::string & reason = std::string());
bool IsAuthorizedBy(const AUTH * auth) const;
+ std::vector<std::string> GetAuthorizers() const;
int AddMessage(STG_MSG * msg);
const std::string & GetStrError() const { return errorStr; }
- USER_PROPERTIES & GetProperty() { return property; };
- const USER_PROPERTIES & GetProperty() const { return property; };
+ USER_PROPERTIES & GetProperty() { return property; }
+ const USER_PROPERTIES & GetProperty() const { return property; }
void SetDeleted() { deleted = true; }
bool GetDeleted() const { return deleted; }
void MidnightResetSessionStat();
void ProcessDayFee();
- void SetPrepaidTraff();
void ProcessDayFeeSpread();
void ProcessNewMonth();
bool IsInetable();
- std::string GetEnabledDirs();
+ std::string GetEnabledDirs();
void OnAdd();
void OnDelete();
private:
+ USER_IMPL & operator=(const USER_IMPL & rvalue);
+
const USERS * users;
USER_PROPERTIES property;
STG_LOGGER & WriteServLog;
void Disconnect(bool fakeDisconnect, const std::string & reason);
int SaveMonthStat(int month, int year);
+ void SetPrepaidTraff();
+
int SendMessage(STG_MSG & msg) const;
void ScanMessage();
USER_ID_GENERATOR userIDGenerator;
- uint32_t __currIP; // ôÅËÕÝÉÊ ÁÄÒÅÓ ÐÏÌØÚÏ×ÁÔÅÌÑ
+ uint32_t __currIP; // Current user's ip
USER_PROPERTY<uint32_t> currIP;
- /*
- ë ÔÏÍÕ ÍÏÍÅÎÔÕ ËÁË ÍÙ ÕÖÅ ÎÅ Á×ÔÏÒÉÚÏ×ÁÎÉÙ, ÎÏ ÅÝÅ ÎÅ ×ÙÐÏÌÎÅÎ Disconnect,
- currIP ÕÖÅ ÓÂÒÏÛÅÎ. ðÏÓÌÅÄÎÅÅ ÚÎÁÞÅÎÉÅ currIP ÓÏÈÒÁÎÑÅÍ × lastIPForDisconnect
- */
- uint32_t lastIPForDisconnect;
+ uint32_t lastIPForDisconnect; // User's ip after unauth but before disconnect
+ std::string lastDisconnectReason;
time_t pingTime;
- const ADMIN & sysAdmin;
+ const ADMIN * sysAdmin;
const STORE * store;
const TARIFFS * tariffs;
TRAFF_STAT traffStat;
std::pair<time_t, TRAFF_STAT> traffStatSaved;
+#ifdef USE_ABSTRACT_SETTINGS
const SETTINGS * settings;
+#else
+ const SETTINGS_IMPL * settings;
+#endif
std::set<const AUTH *> authorizedBy;
bool deleted;
- time_t lastWriteStat; // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÓÔÁÔÉÓÔÉËÉ
- time_t lastWriteDeatiledStat; // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÄÅÔÁÌØÎÏÊ ÓÔÁÔÉÓÔÉËÉ
+ time_t lastWriteStat;
+ time_t lastWriteDetailedStat;
// Properties
USER_PROPERTY<double> & cash;
DIR_TRAFF sessionDownload;
CHG_PASSIVE_NOTIFIER passiveNotifier;
+ CHG_DISABLED_NOTIFIER disabledNotifier;
CHG_TARIFF_NOTIFIER tariffNotifier;
CHG_CASH_NOTIFIER cashNotifier;
- CHG_IP_NOTIFIER ipNotifier;
+ CHG_IPS_NOTIFIER ipNotifier;
mutable pthread_mutex_t mutex;
};
//-----------------------------------------------------------------------------
+typedef USER_IMPL * USER_IMPL_PTR;
+
#endif //USER_H
git.stg.codes / stg.git / blobdiff