Merge branch 'master' into naffanya-dev

[stg.git] / projects / stargazer / plugins / capture / cap_debug / debug_cap.h

diff --git a/projects/stargazer/plugins/capture/cap_debug/debug_cap.h b/projects/stargazer/plugins/capture/cap_debug/debug_cap.h
index 207aa40e78d59ebe50dc68e97487f9cc0619090a..6bea457fbe79d4d4a41944aba10b5e933bda02ff 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_debug/debug_cap.h
+++ b/projects/stargazer/plugins/capture/cap_debug/debug_cap.h
@@ -32,12 +32,9 @@ $Author: faust $
 
 #include <string>
 
 
 #include <string>
 

-#include "os_int.h"
-#include "plugin.h"
-#include "module_settings.h"
-
-using namespace std;
-extern "C" PLUGIN * GetPlugin();
+#include "stg/os_int.h"
+#include "stg/plugin.h"
+#include "stg/module_settings.h"

 
 //-----------------------------------------------------------------------------
 struct iphdr_eth {
 
 //-----------------------------------------------------------------------------
 struct iphdr_eth {


@@ -58,8 +55,8 @@ struct iphdr_eth {
 //-----------------------------------------------------------------------------
 class CAP_SETTINGS {
 public:
 //-----------------------------------------------------------------------------
 class CAP_SETTINGS {
 public:

-    const string &  GetStrError() const { static string s; return s; }
-    int             ParseSettings(const MODULE_SETTINGS & s) { return 0; }
+    const std::string & GetStrError() const { static std::string s; return s; }
+    int                 ParseSettings(const MODULE_SETTINGS & s) { return 0; }

 };
 //-----------------------------------------------------------------------------
 class DEBUG_CAP :public PLUGIN
 };
 //-----------------------------------------------------------------------------
 class DEBUG_CAP :public PLUGIN


@@ -68,28 +65,22 @@ public:
     DEBUG_CAP();
     virtual ~DEBUG_CAP() {}
 
     DEBUG_CAP();
     virtual ~DEBUG_CAP() {}
 

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

     void                SetTraffcounter(TRAFFCOUNTER * tc);
     void                SetTraffcounter(TRAFFCOUNTER * tc);

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

 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }
     int                 ParseSettings() { return 0; }
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }
     int                 ParseSettings() { return 0; }

-    void                SetSettings(const MODULE_SETTINGS & s) {}

     bool                IsRunning();
     bool                IsRunning();

-    const string &      GetStrError() const;
-    const string        GetVersion() const;
+    const std::string & GetStrError() const;
+    std::string         GetVersion() const;

     uint16_t            GetStartPosition() const;
     uint16_t            GetStopPosition() const;
 private:
     static void *       Run1(void *);
     static void *       Run2(void *);
     static void *       Run3(void *);
     uint16_t            GetStartPosition() const;
     uint16_t            GetStopPosition() const;
 private:
     static void *       Run1(void *);
     static void *       Run2(void *);
     static void *       Run3(void *);

-    mutable string      errorStr;
+    mutable std::string errorStr;

     CAP_SETTINGS        capSettings;
     pthread_t           thread;
     bool                nonstop;
     CAP_SETTINGS        capSettings;
     pthread_t           thread;
     bool                nonstop;