Ticket 37. The RESETABLE<TARIFF::CHANGE_POLICY> changePolicy declared in

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

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 90ae01b96669043dfd2a1facf3afa9e0f88668d7..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 USERS * u);
+              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 USERS * u,
+              const SERVICES & svcs);
 #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; }
+    time_t GetSessionUploadModificationTime() const { return sessionUploadModTime; }
+    time_t GetSessionDownloadModificationTime() const { return sessionDownloadModTime; }
 
     bool            GetConnected() const { return connected; }
     time_t          GetConnectedModificationTime() const { return connected.ModificationTime(); }
@@ -198,7 +202,6 @@ public:
     void            UpdatePingTime(time_t t = 0);
     time_t          GetPingTime() const { return pingTime; }
 
-    void            PrintUser() const;
     void            Run();
 
     const std::string & GetStrError() const { return errorStr; }
@@ -218,7 +221,7 @@ public:
     void            ProcessDailyFee();
 
     bool            IsInetable();
-    std::string     GetEnabledDirs();
+    std::string     GetEnabledDirs() const;
 
     void            OnAdd();
     void            OnDelete();
@@ -228,6 +231,8 @@ public:
 private:
     USER_IMPL & operator=(const USER_IMPL & rvalue);
 
+    void            Init();
+
     const USERS *   users;
     USER_PROPERTIES property;
     STG_LOGGER &    WriteServLog;
@@ -247,7 +252,6 @@ private:
     int             id;
     bool            __connected;
     USER_PROPERTY<bool> connected;
-    std::string     lastDisconnectReason;
 
     bool            enabledDirs[DIR_NUM];
 
@@ -267,6 +271,8 @@ private:
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 
+    const SERVICES & m_services;
+
     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;
 
@@ -326,6 +332,8 @@ private:
 
     DIR_TRAFF                sessionUpload;
     DIR_TRAFF                sessionDownload;
+    time_t                   sessionUploadModTime;
+    time_t                   sessionDownloadModTime;
 
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
     CHG_DISABLED_NOTIFIER    disabledNotifier;