Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / projects / stargazer / user_impl.h

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index ad5b451601a7aa05cac07aa3a01bea994e91aa6d..75f02a0e180c6d6db6611ab7f759f9aef71e34d1 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -27,27 +27,34 @@
 #ifndef USER_IMPL_H
 #define USER_IMPL_H
 
 #ifndef USER_IMPL_H
 #define USER_IMPL_H
 

-#include <ctime>
+#include "stg/user.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"
+#include "stg/os_int.h"
+#include "stg/const.h"
+

 #include <list>
 #include <list>

+#include <vector>

 #include <string>
 #include <set>
 
 #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 <ctime>

 
 //-----------------------------------------------------------------------------
 class TARIFF;
 class TARIFFS;
 class ADMIN;
 class USER_IMPL;
 
 //-----------------------------------------------------------------------------
 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;
 //-----------------------------------------------------------------------------
 class USER_ID_GENERATOR {
 friend class USER_IMPL;


@@ -62,6 +69,16 @@ public:
     CHG_PASSIVE_NOTIFIER(USER_IMPL * u) : user(u) {}
     void Notify(const int & oldPassive, const int & newPassive);
 
     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;
 };
 private:
     USER_IMPL * user;
 };


@@ -86,11 +103,11 @@ 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:
 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;
 
 private:
     USER_IMPL * user;


@@ -98,15 +115,26 @@ private:
 //-----------------------------------------------------------------------------
 class USER_IMPL : public USER {
 friend class CHG_PASSIVE_NOTIFIER;
 //-----------------------------------------------------------------------------
 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_TARIFF_NOTIFIER;
 friend class CHG_CASH_NOTIFIER;

-friend class CHG_IP_NOTIFIER;
+friend class CHG_IPS_NOTIFIER;

 public:
 public:

+#ifdef USE_ABSTRACT_SETTINGS

     USER_IMPL(const SETTINGS * settings,
               const STORE * store,
               const TARIFFS * tariffs,
     USER_IMPL(const SETTINGS * settings,
               const STORE * store,
               const TARIFFS * tariffs,

-              const ADMIN & sysAdmin,
-              const USERS * u);
+              const ADMIN * sysAdmin,
+              const USERS * u,
+              const SERVICES & svcs);
+#else
+    USER_IMPL(const SETTINGS_IMPL * settings,
+              const STORE * store,
+              const TARIFFS * tariffs,
+              const ADMIN * sysAdmin,
+              const USERS * u,
+              const SERVICES & svcs);
+#endif

     USER_IMPL(const USER_IMPL & u);
     virtual ~USER_IMPL();
 
     USER_IMPL(const USER_IMPL & u);
     virtual ~USER_IMPL();
 


@@ -116,17 +144,23 @@ public:
     int             WriteStat();
     int             WriteMonthStat();
 
     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            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            AddConnectedBeforeNotifier(CONNECTED_NOTIFIER * notifier);
+    void            DelConnectedBeforeNotifier(const CONNECTED_NOTIFIER * notifier);

 
 

-    void            AddCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
-    void            DelCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
+    void            AddConnectedAfterNotifier(CONNECTED_NOTIFIER * notifier);
+    void            DelConnectedAfterNotifier(const CONNECTED_NOTIFIER * notifier);

 
     int             GetID() const { return id; }
 
 
     int             GetID() const { return id; }
 


@@ -149,26 +183,31 @@ public:
 
     const DIR_TRAFF & GetSessionUpload() const { return sessionUpload; }
     const DIR_TRAFF & GetSessionDownload() const { return sessionDownload; }
 
     const DIR_TRAFF & GetSessionUpload() const { return sessionUpload; }
     const DIR_TRAFF & GetSessionDownload() const { return sessionDownload; }

+    time_t GetSessionUploadModificationTime() const { return sessionUploadModTime; }
+    time_t GetSessionDownloadModificationTime() const { return sessionDownloadModTime; }

 
     bool            GetConnected() const { return connected; }
     time_t          GetConnectedModificationTime() const { return connected.ModificationTime(); }
 
     bool            GetConnected() const { return connected; }
     time_t          GetConnectedModificationTime() const { return connected.ModificationTime(); }

-    int             GetAuthorized() const { return authorizedBy.size(); }
+    const std::string & GetLastDisconnectReason() const { return lastDisconnectReason; }
+    int             GetAuthorized() const { return static_cast<int>(authorizedBy.size()); }
+    time_t          GetAuthorizedModificationTime() const { return authorizedModificationTime; }

     int             Authorize(uint32_t ip, uint32_t enabledDirs, const AUTH * auth);
     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;
     bool            IsAuthorizedBy(const AUTH * auth) const;

+    std::vector<std::string> GetAuthorizers() const;

 
     int             AddMessage(STG_MSG * msg);
 
     void            UpdatePingTime(time_t t = 0);
     time_t          GetPingTime() const { return pingTime; }
 
 
     int             AddMessage(STG_MSG * msg);
 
     void            UpdatePingTime(time_t t = 0);
     time_t          GetPingTime() const { return pingTime; }
 

-    void            PrintUser() const;

     void            Run();
 
     const std::string & GetStrError() const { return errorStr; }
 
     void            Run();
 
     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            SetDeleted() { deleted = true; }
     bool            GetDeleted() const { return deleted; }


@@ -177,17 +216,24 @@ public:
 
     void            MidnightResetSessionStat();
     void            ProcessDayFee();
 
     void            MidnightResetSessionStat();
     void            ProcessDayFee();

-    void            SetPrepaidTraff();

     void            ProcessDayFeeSpread();
     void            ProcessNewMonth();
     void            ProcessDayFeeSpread();
     void            ProcessNewMonth();

+    void            ProcessDailyFee();
+    void            ProcessServices();

 
     bool            IsInetable();
 
     bool            IsInetable();

-    std::string          GetEnabledDirs();
+    std::string     GetEnabledDirs() const;

 
     void            OnAdd();
     void            OnDelete();
 
 
     void            OnAdd();
     void            OnDelete();
 

+    virtual std::string GetParamValue(const std::string & name) const;
+

 private:
 private:

+    USER_IMPL & operator=(const USER_IMPL & rvalue);
+
+    void            Init();
+

     const USERS *   users;
     USER_PROPERTIES property;
     STG_LOGGER &    WriteServLog;
     const USERS *   users;
     USER_PROPERTIES property;
     STG_LOGGER &    WriteServLog;


@@ -196,6 +242,8 @@ private:
     void            Disconnect(bool fakeDisconnect, const std::string & reason);
     int             SaveMonthStat(int month, int year);
 
     void            Disconnect(bool fakeDisconnect, const std::string & reason);
     int             SaveMonthStat(int month, int year);
 

+    void            SetPrepaidTraff();
+

     int             SendMessage(STG_MSG & msg) const;
     void            ScanMessage();
 
     int             SendMessage(STG_MSG & msg) const;
     void            ScanMessage();
 


@@ -210,36 +258,40 @@ private:
 
     USER_ID_GENERATOR userIDGenerator;
 
 
     USER_ID_GENERATOR userIDGenerator;
 

-    uint32_t        __currIP; // ôÅËÕÝÉÊ ÁÄÒÅÓ ÐÏÌØÚÏ×ÁÔÅÌÑ
+    uint32_t        __currIP; // Current user's ip

     USER_PROPERTY<uint32_t> currIP;
 
     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;
 
 
     time_t          pingTime;
 

-    const ADMIN &   sysAdmin;
+    const ADMIN *   sysAdmin;

     const STORE *   store;
 
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 
     const STORE *   store;
 
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 

+    const SERVICES & m_services;
+

     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;
 
     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;
 

+#ifdef USE_ABSTRACT_SETTINGS

     const SETTINGS * settings;
     const SETTINGS * settings;

+#else
+    const SETTINGS_IMPL * settings;
+#endif

 
     std::set<const AUTH *> authorizedBy;
 
     std::set<const AUTH *> authorizedBy;

+    time_t          authorizedModificationTime;

 
     std::list<STG_MSG> messages;
 
     bool            deleted;
 
 
     std::list<STG_MSG> messages;
 
     bool            deleted;
 

-    time_t          lastWriteStat;           // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÓÔÁÔÉÓÔÉËÉ
-    time_t          lastWriteDeatiledStat;   // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÄÅÔÁÌØÎÏÊ ÓÔÁÔÉÓÔÉËÉ
+    time_t          lastWriteStat;
+    time_t          lastWriteDetailedStat;

 
     // Properties
     USER_PROPERTY<double>         & cash;
 
     // Properties
     USER_PROPERTY<double>         & cash;


@@ -281,11 +333,14 @@ private:
 
     DIR_TRAFF                sessionUpload;
     DIR_TRAFF                sessionDownload;
 
     DIR_TRAFF                sessionUpload;
     DIR_TRAFF                sessionDownload;

+    time_t                   sessionUploadModTime;
+    time_t                   sessionDownloadModTime;

 
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
 
     CHG_PASSIVE_NOTIFIER     passiveNotifier;

+    CHG_DISABLED_NOTIFIER    disabledNotifier;

     CHG_TARIFF_NOTIFIER      tariffNotifier;
     CHG_CASH_NOTIFIER        cashNotifier;
     CHG_TARIFF_NOTIFIER      tariffNotifier;
     CHG_CASH_NOTIFIER        cashNotifier;

-    CHG_IP_NOTIFIER          ipNotifier;
+    CHG_IPS_NOTIFIER         ipNotifier;

 
     mutable pthread_mutex_t  mutex;
 
 
     mutable pthread_mutex_t  mutex;
 


@@ -293,4 +348,6 @@ private:
 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------
 

+typedef USER_IMPL * USER_IMPL_PTR;
+

 #endif //USER_H
 #endif //USER_H