Ticket. The MaybeSet() function call for the 'change-policy' parameter added in

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

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 90ae01b96669043dfd2a1facf3afa9e0f88668d7..75f02a0e180c6d6db6611ab7f759f9aef71e34d1 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(); }


@@ -198,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; }


@@ -216,9 +219,10 @@ public:
     void            ProcessDayFeeSpread();
     void            ProcessNewMonth();
     void            ProcessDailyFee();
     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();


@@ -228,6 +232,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;


@@ -247,7 +253,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];
 


@@ -267,6 +272,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;
 


@@ -326,6 +333,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;