ForkMaster/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-13 18:28:34 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

winws: prevent multiple instances with the same filter

Browse Source
This commit is contained in:
bol-van 2024-06-22 20:59:26 +03:00
parent 42422f479c
commit fb7fe79022
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/win64/winws.exe
View File

Binary file not shown.

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

Binary file not shown.

26
nfq/nfqws.c
View File

@ -901,6 +901,7 @@ int main(int argc, char **argv)
char windivert_filter[8192], wf_pf_tcp_src[256], wf_pf_tcp_dst[256], wf_pf_udp_src[256], wf_pf_udp_dst[256], wf_save_file[256]; char windivert_filter[8192], wf_pf_tcp_src[256], wf_pf_tcp_dst[256], wf_pf_udp_src[256], wf_pf_udp_dst[256], wf_save_file[256];
bool wf_ipv4=true, wf_ipv6=true; bool wf_ipv4=true, wf_ipv6=true;
unsigned int IfIdx=0, SubIfIdx=0; unsigned int IfIdx=0, SubIfIdx=0;
unsigned int hash_wf_tcp=0,hash_wf_udp=0,hash_wf_raw=0,hash_ssid_filter=0;
*windivert_filter = *wf_pf_tcp_src = *wf_pf_tcp_dst = *wf_pf_udp_src = *wf_pf_udp_dst = *wf_save_file = 0; *windivert_filter = *wf_pf_tcp_src = *wf_pf_tcp_dst = *wf_pf_udp_src = *wf_pf_udp_dst = *wf_save_file = 0;
#endif #endif
@ -1502,6 +1503,7 @@ int main(int argc, char **argv)
} }
break; break;
case 52: /* wf-tcp */ case 52: /* wf-tcp */
HASH_JEN(optarg,strlen(optarg),hash_wf_tcp);
if (!wf_make_pf(optarg,"tcp","SrcPort",wf_pf_tcp_src,sizeof(wf_pf_tcp_src)) || if (!wf_make_pf(optarg,"tcp","SrcPort",wf_pf_tcp_src,sizeof(wf_pf_tcp_src)) ||
!wf_make_pf(optarg,"tcp","DstPort",wf_pf_tcp_dst,sizeof(wf_pf_tcp_dst))) !wf_make_pf(optarg,"tcp","DstPort",wf_pf_tcp_dst,sizeof(wf_pf_tcp_dst)))
{ {
@ -1510,6 +1512,7 @@ int main(int argc, char **argv)
} }
break; break;
case 53: /* wf-udp */ case 53: /* wf-udp */
HASH_JEN(optarg,strlen(optarg),hash_wf_udp);
if (!wf_make_pf(optarg,"udp","SrcPort",wf_pf_udp_src,sizeof(wf_pf_udp_src)) || if (!wf_make_pf(optarg,"udp","SrcPort",wf_pf_udp_src,sizeof(wf_pf_udp_src)) ||
!wf_make_pf(optarg,"udp","DstPort",wf_pf_udp_dst,sizeof(wf_pf_udp_dst))) !wf_make_pf(optarg,"udp","DstPort",wf_pf_udp_dst,sizeof(wf_pf_udp_dst)))
{ {
@ -1518,6 +1521,7 @@ int main(int argc, char **argv)
} }
break; break;
case 54: /* wf-raw */ case 54: /* wf-raw */
HASH_JEN(optarg,strlen(optarg),hash_wf_raw);
if (optarg[0]=='@') if (optarg[0]=='@')
{ {
size_t sz = sizeof(windivert_filter)-1; size_t sz = sizeof(windivert_filter)-1;
@ -1535,6 +1539,7 @@ int main(int argc, char **argv)
wf_save_file[sizeof(wf_save_file) - 1] = '\0'; wf_save_file[sizeof(wf_save_file) - 1] = '\0';
break; break;
case 56: /* ssid-filter */ case 56: /* ssid-filter */
HASH_JEN(optarg,strlen(optarg),hash_ssid_filter);
{ {
char *e,*p = optarg; char *e,*p = optarg;
while (p) while (p)
@ -1596,6 +1601,20 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
} }
HANDLE hMutexArg;
{
char mutex_name[128];
snprintf(mutex_name,sizeof(mutex_name),"Global\\winws_arg_%u_%u_%u_%u_%u_%u_%u_%u",hash_wf_tcp,hash_wf_udp,hash_wf_raw,hash_ssid_filter,IfIdx,SubIfIdx,wf_ipv4,wf_ipv6);
hMutexArg = CreateMutexA(NULL,TRUE,mutex_name);
if (hMutexArg && GetLastError()==ERROR_ALREADY_EXISTS)
{
CloseHandle(hMutexArg);
printf("A copy of winws is already running with the same filter\n");
goto exiterr;
}
}
#endif #endif
// not specified - use desync_ttl value instead // not specified - use desync_ttl value instead
@ -1644,6 +1663,13 @@ int main(int argc, char **argv)
ex: ex:
rawsend_cleanup(); rawsend_cleanup();
cleanup_params(); cleanup_params();
#ifdef __CYGWIN__
if (hMutexArg)
{
ReleaseMutex(hMutexArg);
CloseHandle(hMutexArg);
}
#endif
return result; return result;
exiterr: exiterr:
result = 1; result = 1;