Merge branch 'master' of madf.dyndns.org:/var/git/stg

[stg.git] / include / user_stat.h

diff --git a/include/user_stat.h b/include/user_stat.h
index eeb73df682506720ad44e99cf491d797f9f98863..42d436fdc96c472675eef9f2e5d0ce980d4db05e 100644 (file)
--- a/include/user_stat.h
+++ b/include/user_stat.h
@@ -28,6 +28,7 @@
 #define USER_STAT_H
 
 #include <ctime>
 #define USER_STAT_H
 
 #include <ctime>

+#include <map>

 
 #include "os_int.h"
 #include "resetable.h"
 
 #include "os_int.h"
 #include "resetable.h"


@@ -73,6 +74,22 @@ struct IP_DIR_PAIR
         return false;
         }
     //------------------------
         return false;
         }
     //------------------------

+    bool operator!=(const IP_DIR_PAIR & rvalue) const
+        {
+        if (ip != rvalue.ip)
+            return true;
+
+        #ifdef TRAFF_STAT_WITH_PORTS
+        if (port != rvalue.port)
+            return true;
+        #endif
+
+        if (dir != rvalue.dir)
+            return true;
+
+        return false;
+        }
+    //------------------------

     uint32_t        ip;
     int             dir;
     #ifdef TRAFF_STAT_WITH_PORTS
     uint32_t        ip;
     int             dir;
     #ifdef TRAFF_STAT_WITH_PORTS


@@ -118,6 +135,8 @@ struct USER_STAT
     time_t      lastActivityTime;
 };
 //-----------------------------------------------------------------------------
     time_t      lastActivityTime;
 };
 //-----------------------------------------------------------------------------

+typedef std::map<IP_DIR_PAIR, STAT_NODE> TRAFF_STAT;
+//-----------------------------------------------------------------------------

 struct USER_STAT_RES
 {
     USER_STAT_RES()
 struct USER_STAT_RES
 {
     USER_STAT_RES()


@@ -143,7 +162,7 @@ struct USER_STAT_RES
         down = us.down;
         return * this;
     };
         down = us.down;
         return * this;
     };

-    operator USER_STAT()
+    operator USER_STAT() const

     {
         USER_STAT us;
         us.cash             = cash;
     {
         USER_STAT us;
         us.cash             = cash;


@@ -168,6 +187,3 @@ struct USER_STAT_RES
 };
 //-----------------------------------------------------------------------------
 #endif
 };
 //-----------------------------------------------------------------------------
 #endif

-
-
-