nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant boolean expression from firewall_is_fascist_impl()

Browse Source 
Let A = UseBridges
Let B = ClientUseIPv4

Then firewall_is_fascist_impl expands and simplifies to:
B || (!(A || ...) && A)
B || (!A && ... && A)
B || 0
B
This commit is contained in:
teor 2016-12-16 22:43:46 +11:00 committed by Nick Mathewson
parent 0417dae580
commit 2debcc869f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/policies.c
View File

@ -317,10 +317,8 @@ firewall_is_fascist_impl(void)
const or_options_t *options = get_options();
/* Assume every non-bridge relay has an IPv4 address.
* Clients which use bridges may only know the IPv6 address of their
* bridge. */
return (options->ClientUseIPv4 == 0
|| (!fascist_firewall_use_ipv6(options)
&& options->UseBridges == 1));
* bridge, but they will connect regardless of the ClientUseIPv6 setting. */
return options->ClientUseIPv4 == 0;
}
/** Return true iff the firewall options, including ClientUseIPv4 0 and