X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9faa3c51da5965b95d165ade36120a74a69521f4..4b7c404f1c3340d5e0ce0d1763176d04f9774d98:/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp?ds=inline diff --git a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp index 5c7ec364..6bbfd7e8 100644 --- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp +++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp @@ -22,26 +22,31 @@ $Revision: 1.13 $ $Date: 2010/09/10 06:43:03 $ */ -#include #include #include #include -#include #include #include #include #include -#include #include -#include -#include #include -#include "common.h" +#include +#include +#include +#include +#include + +#include +#include + +#include "stg/common.h" +#include "stg/traffcounter.h" +#include "stg/plugin_creator.h" #include "divert_cap.h" -#include "traffcounter.h" #define BUFF_LEN (16384) /* max mtu -> lo=16436 TODO why?*/ @@ -49,42 +54,21 @@ $Date: 2010/09/10 06:43:03 $ struct DIVERT_DATA { int sock; short int port; -unsigned char buffer[BUFF_LEN]; char iface[10]; }; //----------------------------------------------------------------------------- pollfd pollddiv; DIVERT_DATA cddiv; //capture data //----------------------------------------------------------------------------- -class DIVERT_CAP_CREATOR { -private: - DIVERT_CAP * divc; - -public: - DIVERT_CAP_CREATOR() - : divc(new DIVERT_CAP()) - { - } - ~DIVERT_CAP_CREATOR() - { - delete divc; - } - - DIVERT_CAP * GetCapturer() - { - return divc; - } -}; -//----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -DIVERT_CAP_CREATOR dcc; +PLUGIN_CREATOR dcc; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- PLUGIN * GetPlugin() { -return dcc.GetCapturer(); +return dcc.GetPlugin(); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -95,10 +79,15 @@ return "Divert_cap v.1.0"; } //----------------------------------------------------------------------------- DIVERT_CAP::DIVERT_CAP() - : port(0), + : settings(), + port(0), + disableForwarding(false), + errorStr(), + thread(), nonstop(false), isRunning(false), - traffCnt(NULL) + traffCnt(NULL), + logger(GetPluginLogger(GetStgLogger(), "cap_divert")) { } //----------------------------------------------------------------------------- @@ -116,14 +105,15 @@ if (DivertCapOpen() < 0) nonstop = true; -if (pthread_create(&thread, NULL, Run, this) == 0) +if (pthread_create(&thread, NULL, Run, this)) { - return 0; + errorStr = "Cannot create thread."; + logger("Cannot create thread."); + printfd(__FILE__, "Cannot create thread\n"); + return -1; } -errorStr = "Cannot create thread."; -printfd(__FILE__, "Cannot create thread\n"); -return -1; +return 0; } //----------------------------------------------------------------------------- int DIVERT_CAP::Stop() @@ -142,7 +132,8 @@ for (i = 0; i < 25; i++) if (!isRunning) break; - usleep(200000); + struct timespec ts = {0, 200000000}; + nanosleep(&ts, NULL); } //after 5 seconds waiting thread still running. now killing it @@ -151,6 +142,7 @@ if (isRunning) if (pthread_kill(thread, SIGINT)) { errorStr = "Cannot kill thread."; + logger("Cannot send signal to thread."); printfd(__FILE__, "Cannot kill thread\n"); return -1; } @@ -161,7 +153,11 @@ return 0; //----------------------------------------------------------------------------- void * DIVERT_CAP::Run(void * d) { -DIVERT_CAP * dc = (DIVERT_CAP *)d; +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + +DIVERT_CAP * dc = static_cast(d); dc->isRunning = true; char buffer[64]; @@ -173,7 +169,7 @@ while (dc->nonstop) if (buffer[12] != 0x8) continue; - memcpy(rp.pckt, &buffer[14], pcktSize); + memcpy(rp.rawPacket.pckt, &buffer[14], pcktSize); dc->traffCnt->Process(rp); } @@ -204,6 +200,7 @@ cddiv.sock = socket(PF_INET, SOCK_RAW, IPPROTO_DIVERT); if (cddiv.sock < 0) { errorStr = "Create divert socket error."; + logger("Cannot create a socket: %s", strerror(errno)); printfd(__FILE__, "Cannot create divert socket\n"); return -1; } @@ -221,6 +218,7 @@ ret = bind(cddiv.sock, (struct sockaddr *)&divAddr, sizeof(divAddr)); if (ret < 0) { errorStr = "Bind divert socket error."; + logger("Cannot bind the scoket: %s", strerror(errno)); printfd(__FILE__, "Cannot bind divert socket\n"); return -1; } @@ -258,7 +256,16 @@ if ((bytes = recvfrom (cddiv.sock, buf, BUFF_LEN, if (iface) *iface = cddiv.iface; - sendto(cddiv.sock, buf, bytes, 0, (struct sockaddr*)&divertaddr, divertaddrSize); + if (!disableForwarding) + { + if (sendto(cddiv.sock, buf, bytes, 0, (struct sockaddr*)&divertaddr, divertaddrSize) < 0) + logger("sendto error: %s", strerror(errno)); + } + } +else + { + if (bytes < 0) + logger("recvfrom error: %s", strerror(errno)); } return 0; @@ -274,17 +281,15 @@ int DIVERT_CAP::ParseSettings() { int p; PARAM_VALUE pv; -vector::const_iterator pvi; +std::vector::const_iterator pvi; pv.param = "Port"; -pvi = find(settings.moduleParams.begin(), settings.moduleParams.end(), pv); +pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv); if (pvi == settings.moduleParams.end()) { - port = 15701; - return 0; + p = 15701; } - -if (ParseIntInRange(pvi->value[0], 1, 65535, &p)) +else if (ParseIntInRange(pvi->value[0], 1, 65535, &p)) { errorStr = "Cannot parse parameter \'Port\': " + errorStr; printfd(__FILE__, "Cannot parse parameter 'Port'\n"); @@ -293,21 +298,22 @@ if (ParseIntInRange(pvi->value[0], 1, 65535, &p)) port = p; -return 0; -} -//----------------------------------------------------------------------------- -int DIVERT_CAP::ParseIntInRange(const std::string & str, int min, int max, int * val) -{ -if (str2x(str.c_str(), *val)) +bool d = false; +pv.param = "DisableForwarding"; +pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv); +if (pvi == settings.moduleParams.end()) { - errorStr = "Incorrect value \'" + str + "\'."; - return -1; + disableForwarding = false; } -if (*val < min || *val > max) +else if (ParseYesNo(pvi->value[0], &d)) { - errorStr = "Value \'" + str + "\' out of range."; + errorStr = "Cannot parse parameter \'DisableForwarding\': " + errorStr; + printfd(__FILE__, "Cannot parse parameter 'DisableForwarding'\n"); return -1; } + +disableForwarding = d; + return 0; } //-----------------------------------------------------------------------------