X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/7d8cd97c12ce291be0da9e16e4c1d136020a246d..7320b695badad72772466e1cc49bb28c20b25ccc:/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp index 41817d92..aebca059 100644 --- 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(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::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; }