mirror of
https://github.com/bol-van/zapret.git
synced 2024-11-29 21:40:52 +03:00
Compare commits
3 Commits
8f8e082ab4
...
74b6281770
Author | SHA1 | Date | |
---|---|---|---|
|
74b6281770 | ||
|
a581e13498 | ||
|
174772e87f |
@ -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 filter always win
|
// autohostlist profile matching l3/l4/l7 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
|
||||||
{
|
{
|
||||||
// without known hostname first profile matching l3/l4 filter and without hostlist filter wins
|
// if hostlists are present profile matches only if hostname is known and satisfy profile hostlists
|
||||||
if (hostname)
|
if (hostname)
|
||||||
{
|
{
|
||||||
if (bCheckDone) *bCheckDone = true;
|
if (bCheckDone) *bCheckDone = true;
|
||||||
|
@ -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 filter always win
|
// autohostlist profile matching l3/l4/l7 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)
|
||||||
// without known hostname first profile matching l3/l4 filter and without hostlist filter wins
|
// if hostlists are present profile matches only if hostname is known and satisfy profile hostlists
|
||||||
return HostlistCheck(dp, hostname, NULL, true);
|
return HostlistCheck(dp, hostname, NULL, true);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user