X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5924017d951d69132f2b8522dfa04927abc417d0..f22c4c0a3cec5604287cefec55661ffdea19667a:/stglibs/pinger.lib/pinger.cpp diff --git a/stglibs/pinger.lib/pinger.cpp b/stglibs/pinger.lib/pinger.cpp index edbcd11e..216b5977 100644 --- a/stglibs/pinger.lib/pinger.cpp +++ b/stglibs/pinger.lib/pinger.cpp @@ -15,8 +15,8 @@ #include #include "pinger.h" -#include "common.h" -#include "stg_locker.h" +#include "stg/common.h" +#include "stg/locker.h" #ifdef STG_TIME extern volatile time_t stgTime; @@ -33,6 +33,7 @@ STG_PINGER::STG_PINGER(time_t d) pid(0) { pthread_mutex_init(&mutex, NULL); + memset(&pmSend, 0, sizeof(pmSend)); } //----------------------------------------------------------------------------- STG_PINGER::~STG_PINGER() @@ -76,8 +77,7 @@ int STG_PINGER::Stop() if (isRunningRecver) { //5 seconds to thread stops itself - int i; - for (i = 0; i < 25; i++) + for (size_t i = 0; i < 25; i++) { if (i % 5 == 0) SendPing(0x0100007f);//127.0.0.1 @@ -91,20 +91,18 @@ int STG_PINGER::Stop() //after 5 seconds waiting thread still running. now killing it if (isRunningRecver) { - //if (pthread_kill(recvThread, SIGINT)) - // { + if (pthread_kill(recvThread, SIGINT)) + { errorStr = "Cannot kill thread."; return -1; - // } - //printf("recvThread killed\n"); + } } } if (isRunningSender) { //5 seconds to thread stops itself - int i; - for (i = 0; i < 25; i++) + for (size_t i = 0; i < 25; i++) { if (!isRunningSender) break; @@ -115,12 +113,11 @@ int STG_PINGER::Stop() //after 5 seconds waiting thread still running. now killing it if (isRunningSender) { - //if (pthread_kill(sendThread, SIGINT)) - // { + if (pthread_kill(sendThread, SIGINT)) + { errorStr = "Cannot kill thread."; return -1; - // } - //printf("sendThread killed\n"); + } } } @@ -131,14 +128,12 @@ int STG_PINGER::Stop() void STG_PINGER::AddIP(uint32_t ip) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); - //printf("AddIP\n"); ipToAdd.push_back(ip); } //----------------------------------------------------------------------------- void STG_PINGER::DelIP(uint32_t ip) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); - //printf("DelIP\n"); ipToDel.push_back(ip); } //----------------------------------------------------------------------------- @@ -146,14 +141,12 @@ void STG_PINGER::RealAddIP() { STG_LOCKER lock(&mutex, __FILE__, __LINE__); - list::iterator iter; + std::list::iterator iter; iter = ipToAdd.begin(); while (iter != ipToAdd.end()) { - /*packets.insert(pair(rawPacket, ed));*/ - //pingIP[*iter] = 0; - pingIP.insert(pair(*iter, 0)); - iter++; + pingIP.insert(std::make_pair(*iter, 0)); + ++iter; } ipToAdd.erase(ipToAdd.begin(), ipToAdd.end()); } @@ -162,17 +155,16 @@ void STG_PINGER::RealDelIP() { STG_LOCKER lock(&mutex, __FILE__, __LINE__); - list::iterator iter; - multimap::iterator treeIter; + std::list::iterator iter; + std::multimap::iterator treeIter; iter = ipToDel.begin(); while (iter != ipToDel.end()) { treeIter = pingIP.find(*iter); - //printf("Found %X\n", *iter); if (treeIter != pingIP.end()) pingIP.erase(treeIter); - iter++; + ++iter; } ipToDel.erase(ipToDel.begin(), ipToDel.end()); } @@ -182,24 +174,19 @@ int STG_PINGER::GetPingIPNum() const return pingIP.size(); } //----------------------------------------------------------------------------- -/*void STG_PINGER::GetAllIP(vector *) const -{ - //STG_LOCKER lock(&mutex, __FILE__, __LINE__); -}*/ -//----------------------------------------------------------------------------- void STG_PINGER::PrintAllIP() { STG_LOCKER lock(&mutex, __FILE__, __LINE__); - multimap::iterator iter; + std::multimap::iterator iter; iter = pingIP.begin(); while (iter != pingIP.end()) { uint32_t ip = iter->first; time_t t = iter->second; - string s; + std::string s; x2str(t, s); printf("ip = %s, time = %9s\n", inet_ntostring(ip).c_str(), s.c_str()); - iter++; + ++iter; } } @@ -207,7 +194,7 @@ void STG_PINGER::PrintAllIP() int STG_PINGER::GetIPTime(uint32_t ip, time_t * t) const { STG_LOCKER lock(&mutex, __FILE__, __LINE__); - multimap::const_iterator treeIter; + std::multimap::const_iterator treeIter; treeIter = pingIP.find(ip); if (treeIter == pingIP.end()) @@ -217,21 +204,6 @@ int STG_PINGER::GetIPTime(uint32_t ip, time_t * t) const return 0; } //----------------------------------------------------------------------------- -void STG_PINGER::SetDelayTime(time_t d) -{ - delay = d; -} -//----------------------------------------------------------------------------- -time_t STG_PINGER::GetDelayTime() const -{ - return delay; -} -//----------------------------------------------------------------------------- -string STG_PINGER::GetStrError() const -{ - return errorStr; -} -//----------------------------------------------------------------------------- uint16_t STG_PINGER::PingCheckSum(void * data, int len) { unsigned short * buf = (unsigned short *)data; @@ -253,7 +225,6 @@ uint16_t STG_PINGER::PingCheckSum(void * data, int len) int STG_PINGER::SendPing(uint32_t ip) { struct sockaddr_in addr; - //printf("SendPing %X \n", ip); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; addr.sin_port = 0; @@ -268,7 +239,7 @@ int STG_PINGER::SendPing(uint32_t ip) if (sendto(sendSocket, &pmSend, sizeof(pmSend), 0, (sockaddr *)&addr, sizeof(addr)) <= 0 ) { - errorStr = "Send ping error: " + string(strerror(errno)); + errorStr = "Send ping error: " + std::string(strerror(errno)); return -1; } @@ -287,13 +258,11 @@ uint32_t STG_PINGER::RecvPing() socklen_t len = sizeof(addr); bytes = recvfrom(recvSocket, &buf, sizeof(buf), 0, (struct sockaddr*)&addr, &len); - //printf("recvfrom\n"); if (bytes > 0) { struct IP_HDR * ip = (struct IP_HDR *)buf; struct ICMP_HDR *icmp = (struct ICMP_HDR *)(buf + ip->ihl * 4); - //printf("icmp->un.echo.id=%d, pid=%d, tid: %d\n", icmp->un.echo.id, pid); if (icmp->un.echo.id != pid) return 0; @@ -305,7 +274,7 @@ uint32_t STG_PINGER::RecvPing() //----------------------------------------------------------------------------- void * STG_PINGER::RunSendPing(void * d) { - STG_PINGER * pinger = (STG_PINGER*)d; + STG_PINGER * pinger = static_cast(d); pinger->isRunningSender = true; time_t lastPing = 0; @@ -314,13 +283,12 @@ void * STG_PINGER::RunSendPing(void * d) pinger->RealAddIP(); pinger->RealDelIP(); - multimap::iterator iter; + std::multimap::iterator iter; iter = pinger->pingIP.begin(); while (iter != pinger->pingIP.end()) { - uint32_t ip = iter->first; - pinger->SendPing(ip); - iter++; + pinger->SendPing(iter->first); + ++iter; } time_t currTime; @@ -341,7 +309,6 @@ void * STG_PINGER::RunSendPing(void * d) #endif usleep(20000); } - //printf("new ping cycle\n"); } pinger->isRunningSender = false; @@ -351,37 +318,26 @@ void * STG_PINGER::RunSendPing(void * d) //----------------------------------------------------------------------------- void * STG_PINGER::RunRecvPing(void * d) { - STG_PINGER * pinger = (STG_PINGER*)d; + STG_PINGER * pinger = static_cast(d); pinger->isRunningRecver = true; - uint32_t ip; - multimap::iterator treeIterLower; - multimap::iterator treeIterUpper; - while (pinger->nonstop) { - ip = pinger->RecvPing(); + uint32_t ip = pinger->RecvPing(); if (ip) { - //printf("RecvPing %X\n", ip); - treeIterUpper = pinger->pingIP.upper_bound(ip); - treeIterLower = pinger->pingIP.lower_bound(ip); - int i = 0; + std::multimap::iterator treeIterUpper = pinger->pingIP.upper_bound(ip); + std::multimap::iterator treeIterLower = pinger->pingIP.lower_bound(ip); while (treeIterUpper != treeIterLower) - //treeIterUpper = pinger->pingIP.find(ip); - //if (treeIterUpper != pinger->pingIP.end()) { - //printf("+++! time=%d %X i=%d !+++\n", time(NULL), ip, i); - //printf("--- time=%d ---\n", time(NULL)); #ifdef STG_TIME treeIterLower->second = stgTime; #else treeIterLower->second = time(NULL); #endif ++treeIterLower; - i++; } }