Fix build on Darwin.

[stg.git] / projects / stargazer / plugins / capture / divert_freebsd / divert_cap.cpp

diff --git a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
index 41817d92f7821aecf18da8c3f9443a22027dc8b0..aebca0592bb2ad970e9351b1963985eccda068ac 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
@@ -84,11 +84,8 @@ return "cap_divert v.1.0";
 }
 //-----------------------------------------------------------------------------
 DIVERT_CAP::DIVERT_CAP()
-    : settings(),
-      port(0),
+    : port(0),
       disableForwarding(false),
-      errorStr(),
-      thread(),
       nonstop(false),
       isRunning(false),
       traffCnt(NULL),
@@ -165,11 +162,11 @@ pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 DIVERT_CAP * dc = static_cast<DIVERT_CAP *>(d);
 dc->isRunning = true;
 
-char buffer[64];
+char buffer[pcktSize + 14];
 while (dc->nonstop)
     {
     RAW_PACKET rp;
-    dc->DivertCapRead(buffer, 64, NULL);
+    dc->DivertCapRead(buffer, sizeof(buffer), NULL);
 
     if (buffer[12] != 0x8)
         continue;
@@ -290,7 +287,7 @@ std::vector<PARAM_VALUE>::const_iterator pvi;
 
 pv.param = "Port";
 pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);
-if (pvi == settings.moduleParams.end())
+if (pvi == settings.moduleParams.end() || pvi->value.empty())
     {
     p = 15701;
     }
@@ -306,7 +303,7 @@ port = p;
 bool d = false;
 pv.param = "DisableForwarding";
 pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);
-if (pvi == settings.moduleParams.end())
+if (pvi == settings.moduleParams.end() || pvi->value.empty())
     {
     disableForwarding = false;
     }