Fixed invalid check of pthread_create return value.

[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 0988820082f6aa398d735a26a7438351ce684aef..c8de55226811a92f9ae71e3b3b52268bd47b6e4c 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
@@ -30,9 +30,9 @@
 
 #include <string>
 
-#include "plugin.h"
-#include "module_settings.h"
-#include "../../../traffcounter.h"
+#include "stg/plugin.h"
+#include "stg/module_settings.h"
+#include "stg/logger.h"
 
 class USERS;
 class TARIFFS;
@@ -42,37 +42,35 @@ class SETTINGS;
 
 extern "C" PLUGIN * GetPlugin();
 
+class TRAFFCOUNTER;
+
 //-----------------------------------------------------------------------------
-class ETHER_CAP :public PLUGIN {
+class ETHER_CAP : public PLUGIN {
 public:
     ETHER_CAP();
     virtual ~ETHER_CAP() {}
 
-    void                SetUsers(USERS *) {}
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER * tc);
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}
+    void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }
-    bool                IsRunning();
+    bool                IsRunning() { return isRunning; }
 
-    void                SetSettings(const MODULE_SETTINGS &) {}
     int                 ParseSettings() { return 0; }
-    const std::string & GetStrError() const;
+    const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    uint16_t            GetStartPosition() const { return 40; }
+    uint16_t            GetStopPosition() const { return 40; }
 
 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);
-    bool                WaitPackets(int sd) const;
 
     mutable std::string errorStr;
 
@@ -82,6 +80,8 @@ private:
     int                 capSock;
 
     TRAFFCOUNTER *      traffCnt;
+
+    PLUGIN_LOGGER       logger;
 };
 //-----------------------------------------------------------------------------