Merge branch 'log-unauth-reasons' into full-month-stats

[stg.git] / projects / stargazer / plugins / capture / ether_linux / ether_cap.h

diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
index 05f89c9a5ab073b986297890901ab09419a472a4..8dfb6c043e741dd7dbbb80ee2ff661becbfdce1c 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
@@ -30,8 +30,9 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "plugin.h"
-#include "module_settings.h"
+#include "stg/plugin.h"
+#include "stg/module_settings.h"
+#include "stg/logger.h"

 
 class USERS;
 class TARIFFS;
 
 class USERS;
 class TARIFFS;


@@ -39,8 +40,6 @@ class ADMINS;
 class TRAFFCOUNTER;
 class SETTINGS;
 
 class TRAFFCOUNTER;
 class SETTINGS;
 

-extern "C" PLUGIN * GetPlugin();
-

 class TRAFFCOUNTER;
 
 //-----------------------------------------------------------------------------
 class TRAFFCOUNTER;
 
 //-----------------------------------------------------------------------------


@@ -49,31 +48,27 @@ public:
     ETHER_CAP();
     virtual ~ETHER_CAP() {}
 
     ETHER_CAP();
     virtual ~ETHER_CAP() {}
 

-    void                SetUsers(USERS *) {}
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}

     void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
     void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }

-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}

 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }
     bool                IsRunning() { return isRunning; }
 
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }
     bool                IsRunning() { return isRunning; }
 

-    void                SetSettings(const MODULE_SETTINGS &) {}

     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }

-    const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const { return 10; }
-    uint16_t            GetStopPosition() const { return 10; }
+    std::string         GetVersion() const;
+    uint16_t            GetStartPosition() const { return 40; }
+    uint16_t            GetStopPosition() const { return 40; }

 
 private:
 
 private:

+    ETHER_CAP(const ETHER_CAP & rvalue);
+    ETHER_CAP & operator=(const ETHER_CAP & rvalue);
+

     static void *       Run(void *);
     int                 EthCapOpen();
     int                 EthCapClose();
     int                 EthCapRead(void * buffer, int blen, char ** iface);
     static void *       Run(void *);
     int                 EthCapOpen();
     int                 EthCapClose();
     int                 EthCapRead(void * buffer, int blen, char ** iface);

-    bool                WaitPackets(int sd) const;

 
     mutable std::string errorStr;
 
 
     mutable std::string errorStr;
 


@@ -83,6 +78,8 @@ private:
     int                 capSock;
 
     TRAFFCOUNTER *      traffCnt;
     int                 capSock;
 
     TRAFFCOUNTER *      traffCnt;

+
+    PLUGIN_LOGGER       logger;

 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------