Merge branch 'master' of gitorious.org:stg/stg

[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..ed7ba29924e33f7eba522c6d38763019913d67ac 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,8 @@
 
 #include <string>
 
 
 #include <string>
 

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

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


@@ -42,8 +41,10 @@ class SETTINGS;
 
 extern "C" PLUGIN * GetPlugin();
 
 
 extern "C" PLUGIN * GetPlugin();
 

+class TRAFFCOUNTER;
+

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

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

 public:
     ETHER_CAP();
     virtual ~ETHER_CAP() {}
 public:
     ETHER_CAP();
     virtual ~ETHER_CAP() {}


@@ -51,21 +52,21 @@ public:
     void                SetUsers(USERS *) {}
     void                SetTariffs(TARIFFS *) {}
     void                SetAdmins(ADMINS *) {}
     void                SetUsers(USERS *) {}
     void                SetTariffs(TARIFFS *) {}
     void                SetAdmins(ADMINS *) {}

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

     void                SetStore(STORE *) {}
     void                SetStgSettings(const SETTINGS *) {}
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }
     void                SetStore(STORE *) {}
     void                SetStgSettings(const SETTINGS *) {}
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }

-    bool                IsRunning();
+    bool                IsRunning() { return isRunning; }

 
     void                SetSettings(const MODULE_SETTINGS &) {}
     int                 ParseSettings() { return 0; }
 
     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;
     const std::string   GetVersion() const;

-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    uint16_t            GetStartPosition() const { return 10; }
+    uint16_t            GetStopPosition() const { return 10; }

 
 private:
     static void *       Run(void *);
 
 private:
     static void *       Run(void *);