Из плагина захвата трафика cap_ether убраны неиспользуемые типы данных и

члены. Так-же инициализация членов класса реализована через список
инициализации в конструкторе

diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
index 5c76be916d56fcb58c572100c79e064f3693eaa7..11aa475a48905e44d9447e1da7e4aeaf238a6f4f 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
@@ -92,9 +92,11 @@ return "Ether_cap v.1.2";
 }
 //-----------------------------------------------------------------------------
 ETHER_CAP::ETHER_CAP()
+    : nonstop(false),
+      isRunning(false),
+      capSock(-1),
+      traffCnt(NULL)
 {
-isRunning = false;
-nonstop = false;
 }
 //-----------------------------------------------------------------------------
 void ETHER_CAP::SetTraffcounter(TRAFFCOUNTER * tc)

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
 
-#include <string>
 #include <pthread.h>
 
+#include <string>
+
 #include "base_plugin.h"
 #include "base_settings.h"
 #include "../../../traffcounter.h"
@@ -37,13 +38,6 @@ using namespace std;
 
 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
 {
@@ -77,8 +71,6 @@ private:
     int                 EthCapRead(void * buffer, int blen, char ** iface);
     bool                WaitPackets(int sd) const;
 
-    ETHER_CAP_SETTINGS  capSettings;
-
     mutable string      errorStr;
 
     pthread_t           thread;