GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-28 18:59:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Redirector] Add DNS timeout

Browse Source
This commit is contained in:
Connection Refused
2021-10-14 19:03:42 +08:00
parent 06f215cedf
commit 1bc80b71b4
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Redirector/DNSHandler.cpp
View File

@@ -23,7 +23,10 @@ void ProcessPacket(ENDPOINT_ID id, SOCKADDR_IN6 target, char* packet, int length
{
if (udpConn.Send(&dnsAddr, packet, length) == length)
{
int size = udpConn.Read(NULL, buffer, sizeof(buffer));
timeval timeout;
timeout.tv_sec = 4;
int size = udpConn.Read(NULL, buffer, sizeof(buffer), &timeout);
if (size != 0 && size != SOCKET_ERROR)
{
nf_udpPostReceive(id, (unsigned char*)&target, buffer, size, option);

13
Redirector/SocksHelper.cpp
View File

@@ -398,11 +398,22 @@ int SocksHelper::UDP::Send(PSOCKADDR_IN6 target, const char* buffer, int length)
return length;
}
int SocksHelper::UDP::Read(PSOCKADDR_IN6 target, char* buffer, int length)
int SocksHelper::UDP::Read(PSOCKADDR_IN6 target, char* buffer, int length, PTIMEVAL timeout = NULL)
{
if (!this->udpSocket)
return SOCKET_ERROR;
if (timeout != NULL)
{
fd_set fds;
FD_ZERO(&fds);
FD_SET(this->udpSocket, &fds);
int code = select(this->udpSocket, &fds, NULL, NULL, timeout);
if (code == 0 || code == SOCKET_ERROR)
return code;
}
int bufferLength = recvfrom(this->udpSocket, buffer, length, 0, NULL, NULL);
if (bufferLength == 0 || bufferLength == SOCKET_ERROR)
return bufferLength;

2
Redirector/SocksHelper.h
View File

@@ -34,7 +34,7 @@ namespace SocksHelper
bool CreateUDP();
int Send(PSOCKADDR_IN6 target, const char* buffer, int length);
int Read(PSOCKADDR_IN6 target, char* buffer, int length);
int Read(PSOCKADDR_IN6 target, char* buffer, int length, PTIMEVAL timeout = NULL);
SOCKET tcpSocket = INVALID_SOCKET;
SOCKET udpSocket = INVALID_SOCKET;