Added common functions for tests.

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

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 5e8f49dbad303a53d95607d4776c1bbe73f83c70..29cc63c4f57b12522e8df7189ba2d623366f02f4 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -27,14 +27,7 @@
 #ifndef USER_IMPL_H
 #define USER_IMPL_H
 
 #ifndef USER_IMPL_H
 #define USER_IMPL_H
 

-#include <ctime>
-#include <list>
-#include <string>
-#include <set>
-

 #include "stg/user.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_stat.h"
 #include "stg/user_conf.h"
 #include "stg/user_ips.h"


@@ -42,6 +35,15 @@
 #include "stg/auth.h"
 #include "stg/message.h"
 #include "stg/noncopyable.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 <vector>
+#include <string>
+#include <set>
+
+#include <ctime>

 
 //-----------------------------------------------------------------------------
 class TARIFF;
 
 //-----------------------------------------------------------------------------
 class TARIFF;


@@ -179,13 +181,19 @@ 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(); }

+    const std::string & GetLastDisconnectReason() const { return lastDisconnectReason; }

     int             GetAuthorized() const { return static_cast<int>(authorizedBy.size()); }
     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);
 
 
     int             AddMessage(STG_MSG * msg);
 


@@ -209,13 +217,16 @@ 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();
 

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

 private:
     USER_IMPL & operator=(const USER_IMPL & rvalue);
 
 private:
     USER_IMPL & operator=(const USER_IMPL & rvalue);
 


@@ -247,6 +258,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;
 


@@ -266,6 +278,7 @@ private:
 #endif
 
     std::set<const AUTH *> authorizedBy;
 #endif
 
     std::set<const AUTH *> authorizedBy;

+    time_t          authorizedModificationTime;

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


@@ -314,6 +327,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;