github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-21 19:30:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

add ICMP timeouts, default is 5 seconds

Browse Source
This commit is contained in:
DuckVador 2020-07-13 16:15:06 +08:00
parent fb4318c808
commit 9c7b9e7b60
No known key found for this signature in database
GPG Key ID: 9B0DED785B37110E
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/latency/unix/ICMPPing.cpp
View File

@ -7,7 +7,7 @@
#include <QObject>
#ifdef Q_OS_UNIX
#include <iostream>
#include <netinet/in.h>
#include <netinet/ip.h> //macos need that
#include <netinet/ip_icmp.h>
@ -151,6 +151,11 @@ namespace Qv2ray::components::latency::icmping
else
data.errorMessage.clear(), data.avg = data.avg / successCount;
testHost->OnLatencyTestCompleted(req.id, data);
if(timoutTimer)
{
timoutTimer->stop();
timoutTimer->close();
}
return true;
}
return false;
@ -158,21 +163,33 @@ namespace Qv2ray::components::latency::icmping
void ICMPPing::ping()
{
timoutTimer = loop->resource<uvw::TimerHandle>();
uvw::OSSocketHandle osSocketHandle{ socketId };
auto pollHandle = loop->resource<uvw::PollHandle>(osSocketHandle);
timoutTimer->once<uvw::TimerEvent>([pollHandle,this,ptr=shared_from_this()](auto&,uvw::TimerHandle&h)
{
pollHandle->clear();
pollHandle->stop();
pollHandle->close();
successCount=0;
data.failedCount=data.totalCount=req.totalCount;
notifyTestHost();
});
timoutTimer->start(uvw::TimerHandle::Time{ 5000 }, uvw::TimerHandle::Time{ 0 });
pollHandle->init();
auto pollEvent = uvw::Flags<uvw::PollHandle::Event>::from<uvw::PollHandle::Event::READABLE>();
pollHandle->on<uvw::PollEvent>([this, ptr = shared_from_this()](uvw::PollEvent &, uvw::PollHandle &h) {
timeval end;
sockaddr_in remove_addr;
socklen_t slen = sizeof(remove_addr);
socklen_t slen = sizeof(sockaddr_in);
int rlen = 0;
icmp resp;
// std::cout<<"pollevent"<<"\n";
do
{
do
{
rlen = recvfrom(socketId, &resp, sizeof(icmp), 0, (struct sockaddr *) &remove_addr, &slen);
rlen = recvfrom(socketId, &resp, sizeof(icmp), 0, (struct sockaddr *) &storage, &slen);
// std::cout<<"rlen:"<<rlen<<"\n";
} while (rlen == -1 && errno == EINTR);
gettimeofday(&end, NULL);
@ -243,6 +260,7 @@ namespace Qv2ray::components::latency::icmping
do
{
n = ::sendto(socketId, &_icmp_request, sizeof(icmp), 0, (struct sockaddr *) &storage, sizeof(struct sockaddr));
// std::cout<<"n:"<<n<<"\n";
} while (n < 0 && errno == EINTR);
}
}

1
src/components/latency/unix/ICMPPing.hpp
View File

@ -75,6 +75,7 @@ namespace Qv2ray::components::latency::icmping
char digitBuffer[20] = { 0 };
std::shared_ptr<uvw::Loop> loop;
std::shared_ptr<uvw::GetAddrInfoReq> getAddrHandle;
std::shared_ptr<uvw::TimerHandle> timoutTimer;
std::vector<timeval> startTimevals;
QString initErrorMessage;
};