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

[Redirector] Add more feature

Browse Source
This commit is contained in:
Connection Refused
2021-10-18 16:32:44 +08:00
parent c8345fb7ff
commit d3fce18f8a
7 changed files with 78 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Redirector/Based.cpp
View File

@@ -10,6 +10,8 @@ bool filterDNS = true;
DWORD icmping = 0;
bool dnsOnly = false;
bool dnsProx = true;
string dnsHost = "1.1.1.1";
USHORT dnsPort = 53;

2
Redirector/Based.h
View File

@@ -36,6 +36,8 @@ typedef enum _AIO_TYPE {
AIO_ICMPING,
AIO_DNSONLY,
AIO_DNSPROX,
AIO_DNSHOST,
AIO_DNSPORT,

59
Redirector/DNSHandler.cpp
View File

@@ -2,12 +2,58 @@
#include "SocksHelper.h"
extern bool dnsProx;
extern string dnsHost;
extern USHORT dnsPort;
SOCKADDR_IN6 dnsAddr;
void HandleDNS(ENDPOINT_ID id, PSOCKADDR_IN6 target, char* packet, int length, PNF_UDP_OPTIONS option)
void HandleClientDNS(ENDPOINT_ID id, PSOCKADDR_IN6 target, char* packet, int length, PNF_UDP_OPTIONS option)
{
auto remote = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
if (remote != INVALID_SOCKET)
{
int v6only = 0;
if (setsockopt(remote, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&v6only, sizeof(v6only)) != SOCKET_ERROR)
{
SOCKADDR_IN6 addr;
IN6ADDR_SETANY(&addr);
if (bind(remote, (PSOCKADDR)&addr, sizeof(SOCKADDR_IN6)) != SOCKET_ERROR)
{
if (sendto(remote, packet, length, 0, (PSOCKADDR)&dnsAddr, (dnsAddr.sin6_family == AF_INET ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6))) == length)
{
timeval timeout{};
timeout.tv_sec = 4;
fd_set fds;
FD_ZERO(&fds);
FD_SET(remote, &fds);
int size = select(NULL, &fds, NULL, NULL, &timeout);
if (size != 0 && size != SOCKET_ERROR)
{
char buffer[1024];
size = recvfrom(remote, buffer, sizeof(buffer), 0, NULL, NULL);
if (size != 0 && size != SOCKET_ERROR)
nf_udpPostReceive(id, (PBYTE)target, buffer, size, option);
}
}
}
}
}
if (remote != INVALID_SOCKET)
closesocket(remote);
delete target;
delete[] packet;
delete[] option;
}
void HandleRemoteDNS(ENDPOINT_ID id, PSOCKADDR_IN6 target, char* packet, int length, PNF_UDP_OPTIONS option)
{
auto remote = new SocksHelper::UDP();
if (remote->Associate())
@@ -23,7 +69,7 @@ void HandleDNS(ENDPOINT_ID id, PSOCKADDR_IN6 target, char* packet, int length, P
int size = remote->Read(NULL, buffer, sizeof(buffer), &timeout);
if (size != 0 && size != SOCKET_ERROR)
nf_udpPostReceive(id, (unsigned char*)target, buffer, size, option);
nf_udpPostReceive(id, (PBYTE)target, buffer, size, option);
}
}
}
@@ -60,13 +106,9 @@ bool DNSHandler::INIT()
bool DNSHandler::IsDNS(PSOCKADDR_IN6 target)
{
if (target->sin6_family == AF_INET)
{
return ((PSOCKADDR_IN)target)->sin_port == htons(53);
}
else
{
return target->sin6_port == htons(53);
}
}
void DNSHandler::CreateHandler(ENDPOINT_ID id, PSOCKADDR_IN6 target, const char* packet, int length, PNF_UDP_OPTIONS options)
@@ -79,5 +121,8 @@ void DNSHandler::CreateHandler(ENDPOINT_ID id, PSOCKADDR_IN6 target, const char*
memcpy(buffer, packet, length);
memcpy(option, options, sizeof(NF_UDP_OPTIONS) + options->optionsLength - 1);
thread(HandleDNS, id, remote, buffer, length, option).detach();
if (!dnsProx)
thread(HandleClientDNS, id, remote, buffer, length, option).detach();
else
thread(HandleRemoteDNS, id, remote, buffer, length, option).detach();
}

8
Redirector/EventHandler.cpp
View File

@@ -8,6 +8,8 @@ extern bool filterTCP;
extern bool filterUDP;
extern bool filterDNS;
extern bool dnsOnly;
extern vector<wstring> bypassList;
extern vector<wstring> handleList;
@@ -279,18 +281,24 @@ void udpCreated(ENDPOINT_ID id, PNF_UDP_CONN_INFO info)
if (!filterUDP)
{
if (!filterDNS) nf_udpDisableFiltering(id);
wcout << "[Redirector][EventHandler][udpCreated][" << id << "][" << info->processId << "][!filterUDP] " << GetProcessName(info->processId) << endl;
return;
}
if (checkBypassName(info->processId))
{
if (dnsOnly) nf_udpDisableFiltering(id);
wcout << "[Redirector][EventHandler][udpCreated][" << id << "][" << info->processId << "][checkBypassName] " << GetProcessName(info->processId) << endl;
return;
}
if (!checkHandleName(info->processId))
{
if (dnsOnly) nf_udpDisableFiltering(id);
wcout << "[Redirector][EventHandler][udpCreated][" << id << "][" << info->processId << "][!checkHandleName] " << GetProcessName(info->processId) << endl;
return;
}

4
Redirector/README.md
View File

@@ -11,6 +11,8 @@ typedef enum _AIO_TYPE {
AIO_ICMPING,
AIO_DNSONLY,
AIO_DNSPROX,
AIO_DNSHOST,
AIO_DNSPORT,
@@ -46,6 +48,8 @@ private enum NameList : int
AIO_ICMPING,
AIO_DNSONLY,
AIO_DNSPROX,
AIO_DNSHOST,
AIO_DNSPORT,

8
Redirector/Redirector.cpp
View File

@@ -13,6 +13,8 @@ extern bool filterDNS;
extern DWORD icmping;
extern bool dnsOnly;
extern bool dnsProx;
extern string dnsHost;
extern USHORT dnsPort;
@@ -113,6 +115,12 @@ extern "C" {
case AIO_ICMPING:
icmping = atoi(ws2s(value).c_str());
break;
case AIO_DNSONLY:
dnsOnly = (wstring(value).find(L"false") == string::npos);
break;
case AIO_DNSPROX:
dnsProx = (wstring(value).find(L"false") == string::npos);
break;
case AIO_DNSHOST:
dnsHost = ws2s(value);
break;

4
Redirector/SocksHelper.cpp
View File

@@ -197,7 +197,7 @@ bool SocksHelper::TCP::Connect(PSOCKADDR_IN6 target)
/* Connect Request */
if (target->sin6_family == AF_INET)
{
char buffer[10];
char buffer[10]{};
buffer[0] = 0x05;
buffer[1] = 0x01;
buffer[2] = 0x00;
@@ -215,7 +215,7 @@ bool SocksHelper::TCP::Connect(PSOCKADDR_IN6 target)
}
else
{
char buffer[22];
char buffer[22]{};
buffer[0] = 0x05;
buffer[1] = 0x01;
buffer[2] = 0x00;