X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/479b8853c2ab18c98926a9369a03888021e9b986..c59911ca3cd38cf4ab36d2cc62686f97395899f9:/projects/stargazer/traffcounter_impl.h

diff --git a/projects/stargazer/traffcounter_impl.h b/projects/stargazer/traffcounter_impl.h
index ed639f5c..7fd06309 100644
--- a/projects/stargazer/traffcounter_impl.h
+++ b/projects/stargazer/traffcounter_impl.h
@@ -25,8 +25,6 @@
 #include "stg/raw_ip_packet.h"
 #include "stg/noncopyable.h"
 #include "stg/notifer.h"
-#include "actions.h"
-#include "eventloop.h"
 #include "user_impl.h"
 
 #include <ctime>
@@ -97,7 +95,7 @@ public:
                       traffCnt(rvalue.traffCnt),
                       user(rvalue.user)
                 {}
-    void        Notify(const uint32_t & oldValue, const uint32_t & newValue);
+    void        notify(const uint32_t & oldValue, const uint32_t & newValue) override;
     void        SetUser(UserImpl * u) { user = u; }
     UserImpl * GetUser() const { return user; }
 
@@ -120,7 +118,7 @@ public:
                       traffCnt(rvalue.traffCnt),
                       user(rvalue.user)
                 {}
-    void        Notify(const uint32_t & oldValue, const uint32_t & newValue);
+    void        notify(const uint32_t & oldValue, const uint32_t & newValue) override;
     void        SetUser(UserImpl * u) { user = u; }
     UserImpl * GetUser() const { return user; }
 private:
@@ -139,7 +137,7 @@ public:
                 traffCnt(t)
             {}
     virtual ~ADD_USER_NONIFIER() {}
-    void    Notify(const UserImplPtr & user);
+    void    notify(const UserImplPtr & user) override;
 
 private:
     ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rvalue);
@@ -155,7 +153,7 @@ public:
                 traffCnt(t)
             {}
     virtual ~DEL_USER_NONIFIER() {}
-    void    Notify(const UserImplPtr & user);
+    void    notify(const UserImplPtr & user) override;
 
 private:
     DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rvalue);
@@ -236,38 +234,6 @@ class TraffCounterImpl : public TraffCounter {
         ADD_USER_NONIFIER        addUserNotifier;
         DEL_USER_NONIFIER        delUserNotifier;
 };
-//-----------------------------------------------------------------------------
-inline
-void TRF_IP_BEFORE::Notify(const uint32_t & oldValue, const uint32_t &)
-{
-// User changes his address. Remove old IP
-if (!oldValue)
-    return;
 
-EVENT_LOOP::instance().Enqueue(traffCnt, &TraffCounterImpl::DelUser, oldValue);
 }
 //-----------------------------------------------------------------------------
-inline
-void TRF_IP_AFTER::Notify(const uint32_t &, const uint32_t & newValue)
-{
-// User changes his address. Add new IP
-if (!newValue)
-    return;
-
-EVENT_LOOP::instance().Enqueue(traffCnt, &TraffCounterImpl::AddUser, user);
-}
-//-----------------------------------------------------------------------------
-inline
-void ADD_USER_NONIFIER::Notify(const UserImplPtr & user)
-{
-EVENT_LOOP::instance().Enqueue(traffCnt, &TraffCounterImpl::SetUserNotifiers, user);
-}
-//-----------------------------------------------------------------------------
-inline
-void DEL_USER_NONIFIER::Notify(const UserImplPtr & user)
-{
-EVENT_LOOP::instance().Enqueue(traffCnt, &TraffCounterImpl::UnSetUserNotifiers, user);
-EVENT_LOOP::instance().Enqueue(traffCnt, &TraffCounterImpl::DelUser, user->GetCurrIP());
-}
-//-----------------------------------------------------------------------------
-}