drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-26 20:20:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: drygdryg:e8241a4fa3f64ea22990005c73662aa3050ea72c
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64
..
compare: drygdryg:f5f210b30c5646f9156ac759dcb0bd15da3588e9
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64

No commits in common. "e8241a4fa3f64ea22990005c73662aa3050ea72c" and "f5f210b30c5646f9156ac759dcb0bd15da3588e9" have entirely different histories.
e8241a4fa3 ... f5f210b30c

6 changed files with 8 additions and 12 deletions
Show Stats Expand all files Collapse all files

BIN
binaries/win64/winws.exe
View File

Binary file not shown.

BIN
binaries/win64/zapret-winws/cygwin1.dll
View File

Binary file not shown.

1
binaries/win64/zapret-winws/preset_russia.cmd
View File

@ -1,3 +1,2 @@
start "zapret: http,https" "%~dp0winws.exe" --wf-tcp=80,443 --dpi-desync=fake,disorder2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig start "zapret: http,https" "%~dp0winws.exe" --wf-tcp=80,443 --dpi-desync=fake,disorder2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig
timeout /t 1
start "zapret: quic" "%~dp0winws.exe" --wf-udp=443 --dpi-desync=fake --dpi-desync-repeats=11 start "zapret: quic" "%~dp0winws.exe" --wf-udp=443 --dpi-desync=fake --dpi-desync-repeats=11

1
binaries/win64/zapret-winws/preset_russia_autohostlist.cmd
View File

@ -1,3 +1,2 @@
start "zapret: http,https,autohostlist" "%~dp0winws.exe" --wf-tcp=80,443 --dpi-desync=fake,disorder2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --hostlist-auto="%~dp0autohostlist.txt" start "zapret: http,https,autohostlist" "%~dp0winws.exe" --wf-tcp=80,443 --dpi-desync=fake,disorder2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --hostlist-auto="%~dp0autohostlist.txt"
timeout /t 1
start "zapret: quic,autohostlist" "%~dp0winws.exe" --wf-udp=443 --dpi-desync=fake --dpi-desync-repeats=10 --hostlist-auto="%~dp0autohostlist.txt" start "zapret: quic,autohostlist" "%~dp0winws.exe" --wf-udp=443 --dpi-desync=fake --dpi-desync-repeats=10 --hostlist-auto="%~dp0autohostlist.txt"

BIN
binaries/win64/zapret-winws/winws.exe
View File

Binary file not shown.

18
nfq/darkmagic.c
View File

@ -957,9 +957,7 @@ void tcp_rewrite_winsize(struct tcphdr *tcp, uint16_t winsize, uint8_t scale_fac
#ifdef __CYGWIN__ #ifdef __CYGWIN__
static HANDLE w_filter = NULL; static HANDLE w_filter = NULL, w_event = NULL;
static OVERLAPPED ovl = { .hEvent = NULL };
;
static HANDLE windivert_init_filter(const char *filter, UINT64 flags) static HANDLE windivert_init_filter(const char *filter, UINT64 flags)
{ {
@ -985,14 +983,13 @@ void rawsend_cleanup(void)
{ {
if (w_filter) if (w_filter)
{ {
CancelIoEx(w_filter,&ovl);
WinDivertClose(w_filter); WinDivertClose(w_filter);
w_filter=NULL; w_filter=NULL;
} }
if (ovl.hEvent) if (w_event)
{ {
CloseHandle(ovl.hEvent); CloseHandle(w_event);
ovl.hEvent=NULL; w_event=NULL;
} }
} }
bool windivert_init(const char *filter) bool windivert_init(const char *filter)
@ -1001,8 +998,8 @@ bool windivert_init(const char *filter)
w_filter = windivert_init_filter(filter, 0); w_filter = windivert_init_filter(filter, 0);
if (w_filter) if (w_filter)
{ {
ovl.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL); w_event = CreateEventW(NULL,FALSE,FALSE,NULL);
if (!ovl.hEvent) if (!w_event)
{ {
rawsend_cleanup(); rawsend_cleanup();
return false; return false;
@ -1016,6 +1013,7 @@ static bool windivert_recv_filter(HANDLE hFilter, uint8_t *packet, size_t *len,
{ {
UINT recv_len; UINT recv_len;
DWORD err; DWORD err;
OVERLAPPED ovl = { .hEvent = w_event };
DWORD rd; DWORD rd;
char c; char c;
@ -1036,7 +1034,7 @@ static bool windivert_recv_filter(HANDLE hFilter, uint8_t *packet, size_t *len,
{ {
case ERROR_IO_PENDING: case ERROR_IO_PENDING:
// make signals working // make signals working
while (WaitForSingleObject(ovl.hEvent,50)==WAIT_TIMEOUT) while (WaitForSingleObject(w_event,50)==WAIT_TIMEOUT)
{ {
if (bQuit) if (bQuit)
{ {