Виправлено роботу з перекодуванням рядків

[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 9643076bcb54f2723ef00c01568bd549762a6727..fde7d3a0f91435811f71041f2a1f0929292126fa 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
@@ -26,9 +26,10 @@
 #ifndef ETHER_CAP_H
 #define ETHER_CAP_H
 
 #ifndef ETHER_CAP_H
 #define ETHER_CAP_H
 

-#include <string>

 #include <pthread.h>
 
 #include <pthread.h>
 

+#include <string>
+

 #include "base_plugin.h"
 #include "base_settings.h"
 #include "../../../traffcounter.h"
 #include "base_plugin.h"
 #include "base_settings.h"
 #include "../../../traffcounter.h"


@@ -37,13 +38,6 @@ using namespace std;
 
 extern "C" BASE_PLUGIN * GetPlugin();
 
 
 extern "C" BASE_PLUGIN * GetPlugin();
 

-//-----------------------------------------------------------------------------
-class ETHER_CAP_SETTINGS
-{
-public:
-    const string& GetStrError() const { static string s; return s; }
-    int ParseSettings(const MODULE_SETTINGS &) { return 0; }
-};

 //-----------------------------------------------------------------------------
 class ETHER_CAP :public BASE_PLUGIN
 {
 //-----------------------------------------------------------------------------
 class ETHER_CAP :public BASE_PLUGIN
 {


@@ -77,8 +71,6 @@ private:
     int                 EthCapRead(void * buffer, int blen, char ** iface);
     bool                WaitPackets(int sd) const;
 
     int                 EthCapRead(void * buffer, int blen, char ** iface);
     bool                WaitPackets(int sd) const;
 

-    ETHER_CAP_SETTINGS  capSettings;
-

     mutable string      errorStr;
 
     pthread_t           thread;
     mutable string      errorStr;
 
     pthread_t           thread;