mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
i think fascistfirewall still has its uses. it's a synonym
for a certain reachableaddresses line, but it's easier to remember and people already understand it. i think we should think about undeprecating it. svn:r5559
This commit is contained in:
parent
c21666ca59
commit
a4e1014f4d
@ -1914,14 +1914,14 @@ options_validate(or_options_t *old_options, or_options_t *options)
|
|||||||
});
|
});
|
||||||
new_line->value = smartlist_join_strings(instead,",",0,NULL);
|
new_line->value = smartlist_join_strings(instead,",",0,NULL);
|
||||||
/* These have been deprecated since 0.1.1.5-alpha-cvs */
|
/* These have been deprecated since 0.1.1.5-alpha-cvs */
|
||||||
log(LOG_WARN, LD_CONFIG, "FascistFirewall and FirewallPorts are deprecated. Instead, use \"ReachableAddresses %s\"", new_line->value);
|
log(LOG_NOTICE, LD_CONFIG, "Converting FascistFirewall and FirewallPorts config options to new format: \"ReachableAddresses %s\"", new_line->value);
|
||||||
new_line->next = options->ReachableAddresses;
|
new_line->next = options->ReachableAddresses;
|
||||||
options->ReachableAddresses = new_line;
|
options->ReachableAddresses = new_line;
|
||||||
SMARTLIST_FOREACH(instead, char *, cp, tor_free(cp));
|
SMARTLIST_FOREACH(instead, char *, cp, tor_free(cp));
|
||||||
smartlist_free(instead);
|
smartlist_free(instead);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options->FascistFirewall || options->ReachableAddresses) {
|
if (options->ReachableAddresses) {
|
||||||
/* We need to end with a reject *:*, not an implicit accept *:* */
|
/* We need to end with a reject *:*, not an implicit accept *:* */
|
||||||
config_line_t **linep = &options->ReachableAddresses;
|
config_line_t **linep = &options->ReachableAddresses;
|
||||||
while (*linep) {
|
while (*linep) {
|
||||||
|
Loading…
Reference in New Issue
Block a user