mirror of
https://github.com/bol-van/zapret.git
synced 2024-11-30 05:50:53 +03:00
Compare commits
No commits in common. "74b6281770bf69c2634361c1c2a27dcc06533b21" and "8f8e082ab478153da1dfabf3e27e07c3874709a7" have entirely different histories.
74b6281770
...
8f8e082ab4
@ -171,7 +171,7 @@ static bool dp_match(
|
||||
// target ip does not match
|
||||
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 (PROFILE_HOSTLISTS_EMPTY(dp))
|
||||
@ -179,7 +179,7 @@ static bool dp_match(
|
||||
return true;
|
||||
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 (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
|
||||
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 (PROFILE_HOSTLISTS_EMPTY(dp))
|
||||
// profile without hostlist filter wins
|
||||
return true;
|
||||
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 false;
|
||||
|
Loading…
Reference in New Issue
Block a user