Replace fake disconnects with real and fix some errors

[stg.git] / include / stg / user.h

diff --git a/include/stg/user.h b/include/stg/user.h
index adf140de0cac0cef36bf26a17f6d18bbeeedbd0c..f0f77bc00b28c466f10ef0ee55581cbf06c90c17 100644 (file)
--- a/include/stg/user.h
+++ b/include/stg/user.h
@@ -26,7 +26,7 @@
 
 #include "os_int.h"
 #include "notifer.h"
 
 #include "os_int.h"
 #include "notifer.h"

-#include "stg_message.h"
+#include "message.h"

 #include "tariff.h"
 #include "user_traff.h"
 
 #include "tariff.h"
 #include "user_traff.h"
 


@@ -62,14 +62,6 @@ public:
     virtual const TARIFF *      GetTariff() const = 0;
     virtual void                ResetNextTariff() = 0;
 
     virtual const TARIFF *      GetTariff() const = 0;
     virtual void                ResetNextTariff() = 0;
 

-    #ifdef TRAFF_STAT_WITH_PORTS
-    virtual void                AddTraffStatU(int dir, uint32_t ip, uint16_t port, uint32_t len) = 0;
-    virtual void                AddTraffStatD(int dir, uint32_t ip, uint16_t port, uint32_t len) = 0;
-    #else
-    virtual void                AddTraffStatU(int dir, uint32_t ip, uint32_t len) = 0;
-    virtual void                AddTraffStatD(int dir, uint32_t ip, uint32_t len) = 0;
-    #endif
-

     virtual const DIR_TRAFF &   GetSessionUpload() const = 0;
     virtual const DIR_TRAFF &   GetSessionDownload() const = 0;
 
     virtual const DIR_TRAFF &   GetSessionUpload() const = 0;
     virtual const DIR_TRAFF &   GetSessionDownload() const = 0;