X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/675f54bb620f9457bf45450308e0ee0659c8e46a..87b537b8e3e393c865cfa5bcb199ab6223a20134:/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 ca308593..603c5209 100644 --- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp +++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp @@ -43,9 +43,10 @@ $Date: 2010/09/10 06:43:03 $ #include #include -#include "common.h" +#include "stg/common.h" +#include "stg/traffcounter.h" +#include "sg/plugin_creator.h" #include "divert_cap.h" -#include "traffcounter.h" #define BUFF_LEN (16384) /* max mtu -> lo=16436 TODO why?*/ @@ -60,35 +61,15 @@ 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(); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -300,18 +281,3 @@ port = p; return 0; } //----------------------------------------------------------------------------- -int DIVERT_CAP::ParseIntInRange(const std::string & str, int min, int max, int * val) -{ -if (str2x(str.c_str(), *val)) - { - errorStr = "Incorrect value \'" + str + "\'."; - return -1; - } -if (*val < min || *val > max) - { - errorStr = "Value \'" + str + "\' out of range."; - return -1; - } -return 0; -} -//-----------------------------------------------------------------------------