X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1a73e47fb21475ad48496e5eeedcd36a61344450..8356c34ac9097616997e5d9905f54aa3ba79dd22:/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp?ds=inline diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp index 6ed2e068..fd83c485 100644 --- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp +++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp @@ -56,7 +56,12 @@ $Date: 2009/12/13 13:45:13 $ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- +namespace +{ PLUGIN_CREATOR ecc; +} + +extern "C" PLUGIN * GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -66,10 +71,10 @@ return ecc.GetPlugin(); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -const std::string ETHER_CAP::GetVersion() const +//----------------------------------------------------------------------------- +std::string ETHER_CAP::GetVersion() const { -return "Ether_cap v.1.2"; +return "cap_ether v.1.2"; } //----------------------------------------------------------------------------- ETHER_CAP::ETHER_CAP() @@ -127,7 +132,7 @@ if (isRunning) if (pthread_kill(thread, SIGUSR1)) { errorStr = "Cannot kill thread."; - logger("Cannot send signal to thread."); + logger("Cannot send signal to thread."); return -1; } for (int i = 0; i < 25 && isRunning; ++i) @@ -138,7 +143,7 @@ if (isRunning) if (isRunning) { errorStr = "ETHER_CAP not stopped."; - logger("Cannot stop thread."); + logger("Cannot stop thread."); printfd(__FILE__, "Cannot stop thread\n"); return -1; } @@ -169,13 +174,11 @@ char padding[4]; char padding1[8]; }; -ETH_IP * ethIP; - char ethip[sizeof(ETH_IP)]; memset(ðip, 0, sizeof(ETH_IP)); -ethIP = (ETH_IP *)ðip; +ETH_IP * ethIP = static_cast(static_cast(ðip)); ethIP->rp.dataLen = -1; char * iface = NULL; @@ -214,7 +217,7 @@ return 0; int ETHER_CAP::EthCapRead(void * buffer, int blen, char **) { struct sockaddr_ll addr; -int addrLen, res; +int addrLen; if (!WaitPackets(capSock)) { @@ -223,9 +226,7 @@ if (!WaitPackets(capSock)) addrLen = sizeof(addr); -res = recvfrom(capSock, ((char*)buffer) + 2, blen, 0, (struct sockaddr *)&addr, (socklen_t*)&addrLen); - -if (res < 0) +if (recvfrom(capSock, ((char*)buffer) + 2, blen, 0, (struct sockaddr *)&addr, (socklen_t*)&addrLen) < 0) { logger("recvfrom error: %s", strerror(errno)); return ENODATA;