Ticket 37. WriteTime() changed to WriteString() and formatTime() added

[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 fde7d3a0f91435811f71041f2a1f0929292126fa..5bb938feb507a5f10b540cd7aa8355c1d8e0dc6d 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
@@ -30,48 +30,47 @@
 
 #include <string>
 
 
 #include <string>
 

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

 
 

-using namespace std;
+class USERS;
+class TARIFFS;
+class ADMINS;
+class TRAFFCOUNTER;
+class SETTINGS;

 
 

-extern "C" BASE_PLUGIN * GetPlugin();
+class TRAFFCOUNTER;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-class ETHER_CAP :public BASE_PLUGIN
-{
+class ETHER_CAP : public PLUGIN {

 public:
     ETHER_CAP();
 public:
     ETHER_CAP();

-    virtual ~ETHER_CAP(){};
+    virtual ~ETHER_CAP() {}

 
 

-    void                SetUsers(USERS *){};
-    void                SetTariffs(TARIFFS *){};
-    void                SetAdmins(ADMINS *){};
-    void                SetTraffcounter(TRAFFCOUNTER * tc);
-    void                SetStore(BASE_STORE *){};
-    void                SetStgSettings(const SETTINGS *){};
+    void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }

 
     int                 Start();
     int                 Stop();
 
     int                 Start();
     int                 Stop();

-    int                 Reload() { return 0; };
-    bool                IsRunning();
+    int                 Reload(const MODULE_SETTINGS & /*ms*/) { return 0; }
+    bool                IsRunning() { return isRunning; }

 
 

-    void                SetSettings(const MODULE_SETTINGS &){};
-    int                 ParseSettings(){ return 0; };
-    const string      & GetStrError() const;
-    const string        GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    int                 ParseSettings() { return 0; }
+    const std::string & GetStrError() const { return errorStr; }
+    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 string      errorStr;
+    mutable std::string errorStr;

 
     pthread_t           thread;
     bool                nonstop;
 
     pthread_t           thread;
     bool                nonstop;


@@ -79,8 +78,9 @@ private:
     int                 capSock;
 
     TRAFFCOUNTER *      traffCnt;
     int                 capSock;
 
     TRAFFCOUNTER *      traffCnt;

+
+    PLUGIN_LOGGER       logger;

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

-#endif //ETHER_CAP_H
-
+#endif