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

Compare commits

base: drygdryg:74b6281770bf69c2634361c1c2a27dcc06533b21
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:8f8e082ab478153da1dfabf3e27e07c3874709a7
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. "74b6281770bf69c2634361c1c2a27dcc06533b21" and "8f8e082ab478153da1dfabf3e27e07c3874709a7" have entirely different histories.
74b6281770 ... 8f8e082ab4

2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

4
nfq/desync.c
View File

@ -171,7 +171,7 @@ static bool dp_match(
// target ip does not match // target ip does not match
return false; return false;
// autohostlist profile matching l3/l4/l7 filter always win // autohostlist profile matching l3/l4 filter always win
if (dp->hostlist_auto) return true; if (dp->hostlist_auto) return true;
if (PROFILE_HOSTLISTS_EMPTY(dp)) if (PROFILE_HOSTLISTS_EMPTY(dp))
@ -179,7 +179,7 @@ static bool dp_match(
return true; return true;
else else
{ {
// if hostlists are present profile matches only if hostname is known and satisfy profile hostlists // without known hostname first profile matching l3/l4 filter and without hostlist filter wins
if (hostname) if (hostname)
{ {
if (bCheckDone) *bCheckDone = true; if (bCheckDone) *bCheckDone = true;

4
tpws/tamper.c
View File

@ -44,14 +44,14 @@ static bool dp_match(struct desync_profile *dp, const struct sockaddr *dest, con
// target ip does not match // target ip does not match
return false; return false;
// autohostlist profile matching l3/l4/l7 filter always win // autohostlist profile matching l3/l4 filter always win
if (dp->hostlist_auto) return true; if (dp->hostlist_auto) return true;
if (PROFILE_HOSTLISTS_EMPTY(dp)) if (PROFILE_HOSTLISTS_EMPTY(dp))
// profile without hostlist filter wins // profile without hostlist filter wins
return true; return true;
else if (hostname) else if (hostname)
// if hostlists are present profile matches only if hostname is known and satisfy profile hostlists // without known hostname first profile matching l3/l4 filter and without hostlist filter wins
return HostlistCheck(dp, hostname, NULL, true); return HostlistCheck(dp, hostname, NULL, true);
return false; return false;