X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ede91934442fd804d7b818971a44e3ad795cb01f..2d8751468836d2c5d92dee3328f22ceefbc0c47b:/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp?ds=inline diff --git a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp index 0f6cb98c..5835d077 100644 --- a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp +++ b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp @@ -39,70 +39,44 @@ $Author: faust $ #include #include #include - -#include #include -#include -#include -#include -#include #include -#include "ether_cap.h" -#include "common.h" -#include "raw_ip_packet.h" +#include +#include +#include +#include +#include -//#define CAP_DEBUG 1 -//----------------------------------------------------------------------------- +#include "stg/common.h" +#include "stg/raw_ip_packet.h" +#include "stg/traffcounter.h" +#include "stg/plugin_creator.h" -//----------------------------------------------------------------------------- -class BPF_CAP_CREATOR { -private: - BPF_CAP * bpfc; +#include "ether_cap.h" -public: - BPF_CAP_CREATOR() - : bpfc(new BPF_CAP()) - { - }; - ~BPF_CAP_CREATOR() - { - delete bpfc; - }; +//#define CAP_DEBUG 1 - BPF_CAP * GetCapturer() - { - return bpfc; - }; -}; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -BPF_CAP_CREATOR bcc; +PLUGIN_CREATOR bcc; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- PLUGIN * GetPlugin() { -return bcc.GetCapturer(); +return bcc.GetPlugin(); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- int BPF_CAP_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) { -//char sep[]= ", \t\n\r"; -//char *s; std::string ifaces; -//char * str; -//char *p; iface.erase(iface.begin(), iface.end()); -//PARAM_VALUE pv; -//pv.param = "WorkDir"; -//vector::const_iterator pvi; - if (s.moduleParams.empty()) { errorStr = "Parameter \'iface\' not found."; @@ -124,32 +98,6 @@ for (unsigned i = 0; i < s.moduleParams.size(); i++) } } -/*if (cf.ReadString("Iface", &ifaces, "NoIface") < 0) - { - errorStr = "Cannot read parameter \'Iface\' from " + cf.GetFileName(); - return -1; - } - -str = new char[ifaces.size() + 1]; -strcpy(str, ifaces.c_str()); -p = str; - -while((s = strtok(p, sep))) - { - printfd(__FILE__, "iface[] = %s\n", s); - p = NULL; - iface.push_back(s); - //strncpy(iface[i++], s, DEV_NAME_LEN); - //devNum++; - } - -delete[] str; -if (!ifaces.size()) - { - errorStr = "Error read parameter \'Iface\' from " + cf.GetFileName(); - return -1; - }*/ - return 0; } //----------------------------------------------------------------------------- @@ -170,18 +118,19 @@ return "bpf_cap v.1.0"; } //----------------------------------------------------------------------------- BPF_CAP::BPF_CAP() - : nonstop(false), + : capSettings(), + errorStr(), + bpfData(), + polld(), + thread(), + nonstop(false), isRunning(false), capSock(-1), + settings(), traffCnt(NULL) { } //----------------------------------------------------------------------------- -void BPF_CAP::SetSettings(const MODULE_SETTINGS & s) -{ -settings = s; -} -//----------------------------------------------------------------------------- int BPF_CAP::ParseSettings() { int ret = capSettings.ParseSettings(settings); @@ -193,16 +142,6 @@ if (ret) return 0; } //----------------------------------------------------------------------------- -void BPF_CAP::SetTraffcounter(TRAFFCOUNTER * tc) -{ -traffCnt = tc; -} -//----------------------------------------------------------------------------- -const std::string & BPF_CAP::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- int BPF_CAP::Start() { if (isRunning) @@ -242,7 +181,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 @@ -260,14 +200,13 @@ if (isRunning) return 0; } //----------------------------------------------------------------------------- -bool BPF_CAP::IsRunning() -{ -return isRunning; -} -//----------------------------------------------------------------------------- void * BPF_CAP::Run(void * d) { -BPF_CAP * dc = (BPF_CAP *)d; +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + +BPF_CAP * dc = static_cast(d); dc->isRunning = true; uint8_t hdr[96]; //68 + 14 + 4(size) + 9(SYS_IFACE) + 1(align to 4) = 96 @@ -280,12 +219,11 @@ char * iface; while (dc->nonstop) { - dc->BPFCapRead((char*)&hdr, 68 + 14, &iface); + if (dc->BPFCapRead((char*)&hdr, 68 + 14, &iface)) + continue; if (!(hdr[12] == 0x8 && hdr[13] == 0x0)) - { continue; - } dc->traffCnt->Process(*rpp); } @@ -294,19 +232,8 @@ dc->isRunning = false; return NULL; } //----------------------------------------------------------------------------- -uint16_t BPF_CAP::GetStartPosition() const -{ -return 0; -} -//----------------------------------------------------------------------------- -uint16_t BPF_CAP::GetStopPosition() const -{ -return 0; -} -//----------------------------------------------------------------------------- int BPF_CAP::BPFCapOpen() { -//for (int i = 0; i < settings->devNum; i++) int i = 0; BPF_DATA bd; pollfd pd; @@ -315,9 +242,9 @@ while ((bd.iface = capSettings.GetIface(i)) != "") { bpfData.push_back(bd); if (BPFCapOpen(&bpfData[i]) < 0) - { - return -1; - } + { + return -1; + } pd.events = POLLIN; pd.fd = bpfData[i].fd; @@ -328,7 +255,6 @@ while ((bd.iface = capSettings.GetIface(i)) != "") return 0; } //----------------------------------------------------------------------------- -//int BPF_CAP::BPFCapOpen(string ifaceToOpen) int BPF_CAP::BPFCapOpen(BPF_DATA * bd) { char devbpf[20]; @@ -337,15 +263,13 @@ int l = BUFF_LEN; int im = 1; struct ifreq ifr; -do { +do + { sprintf(devbpf, "/dev/bpf%d", i); i++; bd->fd = open(devbpf, O_RDONLY); - //cd[n].fd = open(devbpf, O_RDONLY); } while(bd->fd < 0 && errno == EBUSY); - //while(cd[n].fd < 0 && errno == EBUSY); -//if (cd[n].fd < 0) if (bd->fd < 0) { errorStr = "Can't capture packets. Open bpf device for " + bd->iface + " error."; @@ -353,10 +277,8 @@ if (bd->fd < 0) return -1; } -//strncpy(ifr.ifr_name, settings->iface[n], sizeof(ifr.ifr_name)); strncpy(ifr.ifr_name, bd->iface.c_str(), sizeof(ifr.ifr_name)); -//if (ioctl(cd[n].fd, BIOCSBLEN, (caddr_t)&l) < 0) if (ioctl(bd->fd, BIOCSBLEN, (caddr_t)&l) < 0) { errorStr = bd->iface + " BIOCSBLEN " + std::string(strerror(errno)); @@ -364,7 +286,6 @@ if (ioctl(bd->fd, BIOCSBLEN, (caddr_t)&l) < 0) return -1; } -//if (ioctl(cd[n].fd, BIOCSETIF, (caddr_t)&ifr) < 0 ) if (ioctl(bd->fd, BIOCSETIF, (caddr_t)&ifr) < 0) { errorStr = bd->iface + " BIOCSETIF " + std::string(strerror(errno)); @@ -372,7 +293,6 @@ if (ioctl(bd->fd, BIOCSETIF, (caddr_t)&ifr) < 0) return -1; } -//if (ioctl(cd[n].fd, BIOCIMMEDIATE, &im) < 0 ) if (ioctl(bd->fd, BIOCIMMEDIATE, &im) < 0) { errorStr = bd->iface + " BIOCIMMEDIATE " + std::string(strerror(errno)); @@ -381,13 +301,12 @@ if (ioctl(bd->fd, BIOCIMMEDIATE, &im) < 0) } return bd->fd; -//return 0; } //----------------------------------------------------------------------------- int BPF_CAP::BPFCapClose() { for (unsigned int i = 0; i < bpfData.size(); i++) - close(bpfData[i].fd); + close(bpfData[i].fd); return 0; } //----------------------------------------------------------------------------- @@ -399,12 +318,16 @@ for (unsigned int i = 0; i < polld.size(); i++) { if (polld[i].revents & POLLIN) { - BPFCapRead(buffer, blen, capIface, &bpfData[i]); + if (BPFCapRead(buffer, blen, capIface, &bpfData[i])) + { + polld[i].revents = 0; + continue; + } polld[i].revents = 0; return 0; } } -return 0; +return -1; } //----------------------------------------------------------------------------- int BPF_CAP::BPFCapRead(char * buffer, int blen, char **, BPF_DATA * bd) @@ -414,8 +337,9 @@ if (bd->canRead) bd->r = read(bd->fd, bd->buffer, BUFF_LEN); if (bd->r < 0) { - //printfd(__FILE__, " error read\n"); - usleep(20000); + struct timespec ts = {0, 20000000}; + nanosleep(&ts, NULL); + return -1; } bd->p = bd->buffer; @@ -426,8 +350,6 @@ if (bd->canRead) if(bd->r > bd->sum) { memcpy(buffer, (char*)(bd->p) + bd->bh->bh_hdrlen, blen); - //strncpy(iface, settings->iface[n], 9); - //*iface = settings->iface[n]; bd->sum += BPF_WORDALIGN(bd->bh->bh_hdrlen + bd->bh->bh_caplen); bd->p = bd->p + BPF_WORDALIGN(bd->bh->bh_hdrlen + bd->bh->bh_caplen); @@ -443,4 +365,3 @@ if(bd->r <= bd->sum) return 0; } //----------------------------------------------------------------------------- -