X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/f91192c77eec33a27dea7fcd0d451823ef478529..638e02a86c3c80557ef75c38f9e6f3f56628ede1:/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp index 69761722..cc64bc18 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,16 +71,14 @@ 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() - : errorStr(), - thread(), - nonstop(false), + : nonstop(false), isRunning(false), capSock(-1), traffCnt(NULL), @@ -97,7 +100,7 @@ if (EthCapOpen() < 0) nonstop = true; -if (pthread_create(&thread, NULL, Run, this) == 0) +if (pthread_create(&thread, NULL, Run, this)) { errorStr = "Cannot create thread."; logger("Cannot create thread."); @@ -127,7 +130,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 +141,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 +172,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 +215,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 +224,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;