Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 26ff58fc2b8d902f093739e4cc867f1670a43794..77887514b272b2603d5a3422b028562479736a73 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -125,13 +125,15 @@ public:
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,

-              const USERS * u);
+              const USERS * u,
+              const SERVICES & svcs);

 #else
     USER_IMPL(const SETTINGS_IMPL * settings,
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,
 #else
     USER_IMPL(const SETTINGS_IMPL * settings,
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,

-              const USERS * u);
+              const USERS * u,
+              const SERVICES & svcs);

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


@@ -181,6 +183,8 @@ 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(); }


@@ -188,7 +192,8 @@ public:
     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             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);

-    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;
 
     bool            IsAuthorizedBy(const AUTH * auth) const;
     std::vector<std::string> GetAuthorizers() const;
 


@@ -197,7 +202,6 @@ public:
     void            UpdatePingTime(time_t t = 0);
     time_t          GetPingTime() const { return pingTime; }
 
     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; }


@@ -214,9 +218,10 @@ public:
     void            ProcessDayFee();
     void            ProcessDayFeeSpread();
     void            ProcessNewMonth();
     void            ProcessDayFee();
     void            ProcessDayFeeSpread();
     void            ProcessNewMonth();

+    void            ProcessDailyFee();

 
     bool            IsInetable();
 
     bool            IsInetable();

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

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


@@ -226,6 +231,8 @@ public:
 private:
     USER_IMPL & operator=(const USER_IMPL & rvalue);
 
 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;


@@ -245,7 +252,6 @@ private:
     int             id;
     bool            __connected;
     USER_PROPERTY<bool> connected;
     int             id;
     bool            __connected;
     USER_PROPERTY<bool> connected;

-    std::string     lastDisconnectReason;

 
     bool            enabledDirs[DIR_NUM];
 
 
     bool            enabledDirs[DIR_NUM];
 


@@ -255,6 +261,7 @@ private:
     USER_PROPERTY<uint32_t> currIP;
 
     uint32_t        lastIPForDisconnect; // User's ip after unauth but before disconnect
     USER_PROPERTY<uint32_t> currIP;
 
     uint32_t        lastIPForDisconnect; // User's ip after unauth but before disconnect

+    std::string     lastDisconnectReason;

 
     time_t          pingTime;
 
 
     time_t          pingTime;
 


@@ -264,6 +271,8 @@ private:
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 
     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;
 


@@ -323,6 +332,8 @@ private:
 
     DIR_TRAFF                sessionUpload;
     DIR_TRAFF                sessionDownload;
 
     DIR_TRAFF                sessionUpload;
     DIR_TRAFF                sessionDownload;

+    time_t                   sessionUploadModTime;
+    time_t                   sessionDownloadModTime;

 
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
     CHG_DISABLED_NOTIFIER    disabledNotifier;
 
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
     CHG_DISABLED_NOTIFIER    disabledNotifier;