From 41793fe3ee6f5b0ddbb8d20afad9ffcc3a923e22 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust@gts.dp.ua>
Date: Tue, 7 Dec 2010 17:23:22 +0200
Subject: [PATCH] =?utf8?q?=D0=98=D0=B7=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8?=
 =?utf8?q?=D0=BD=D0=B0=20=D0=B7=D0=B0=D1=85=D0=B2=D0=B0=D1=82=D0=B0=20?=
 =?utf8?q?=D1=82=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B0=20cap=5Fether=20?=
 =?utf8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20=D0=BD=D0=B5=D0=B8=D1=81?=
 =?utf8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D0=B5=20?=
 =?utf8?q?=D1=82=D0=B8=D0=BF=D1=8B=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?=
 =?utf8?q?=20=D0=B8=20=D1=87=D0=BB=D0=B5=D0=BD=D1=8B.=20=D0=A2=D0=B0=D0=BA?=
 =?utf8?q?-=D0=B6=D0=B5=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8?=
 =?utf8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=87=D0=BB=D0=B5=D0=BD=D0=BE?=
 =?utf8?q?=D0=B2=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20=D1=80=D0=B5?=
 =?utf8?q?=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D1=87?=
 =?utf8?q?=D0=B5=D1=80=D0=B5=D0=B7=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA?=
 =?utf8?q?=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?=
 =?utf8?q?=D1=86=D0=B8=D0=B8=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82?=
 =?utf8?q?=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../plugins/capture/ether_linux/ether_cap.cpp        |  6 ++++--
 .../plugins/capture/ether_linux/ether_cap.h          | 12 ++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
index 5c76be91..11aa475a 100644
--- 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 9643076b..fde7d3a0 100644
--- 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;
-- 
2.44.2