nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add an "auto" option to UseBridges"

Browse Source 
This reverts commit 507c1257a4.
This commit is contained in:
Nick Mathewson 2011-06-17 16:45:53 -04:00
parent cabb16caa9
commit 3b41551b61
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/or/config.c
View File

@ -376,7 +376,7 @@ static config_var_t _option_vars[] = {
V(TransPort, PORT, "0"), V(TransPort, PORT, "0"),
V(TunnelDirConns, BOOL, "1"), V(TunnelDirConns, BOOL, "1"),
V(UpdateBridgesFromAuthority, BOOL, "0"), V(UpdateBridgesFromAuthority, BOOL, "0"),
VAR("UseBridges", STRING, UseBridges_, "auto"), V(UseBridges, BOOL, "0"),
V(UseEntryGuards, BOOL, "1"), V(UseEntryGuards, BOOL, "1"),
V(User, STRING, NULL), V(User, STRING, NULL),
VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"),
@ -3234,19 +3234,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
"of the Internet, so they must not set Reachable*Addresses " "of the Internet, so they must not set Reachable*Addresses "
"or FascistFirewall."); "or FascistFirewall.");
/* XXX023 use autobool instead. */
if (!strcmp(options->UseBridges_, "auto")) {
options->UseBridges = (options->Bridges &&
!server_mode(options) &&
!options->EntryNodes);
} else if (!strcmp(options->UseBridges_, "0")) {
options->UseBridges = 0;
} else if (!strcmp(options->UseBridges_, "1")) {
options->UseBridges = 1;
} else {
REJECT("UseBridges must be 0, 1, or auto");
}
if (options->UseBridges && if (options->UseBridges &&
server_mode(options)) server_mode(options))
REJECT("Servers must be able to freely connect to the rest " REJECT("Servers must be able to freely connect to the rest "
@ -3581,8 +3568,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
if (validate_dir_authorities(options, old_options) < 0) if (validate_dir_authorities(options, old_options) < 0)
REJECT("Directory authority line did not parse. See logs for details."); REJECT("Directory authority line did not parse. See logs for details.");
if (options->UseBridges && !options->Bridges)
REJECT("If you set UseBridges, you must specify at least one bridge.");
if (options->UseBridges && !options->TunnelDirConns) if (options->UseBridges && !options->TunnelDirConns)
REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); REJECT("If you set UseBridges, you must set TunnelDirConns.");
if (options->Bridges) { if (options->Bridges) {
for (cl = options->Bridges; cl; cl = cl->next) { for (cl = options->Bridges; cl; cl = cl->next) {
if (parse_bridge_line(cl->value, 1)<0) if (parse_bridge_line(cl->value, 1)<0)

12
src/or/or.h
View File

@ -2480,17 +2480,7 @@ typedef struct {
* when doing so. */ * when doing so. */
char *BridgePassword; char *BridgePassword;
/** Whether we should start all circuits with a bridge. "1" means strictly int UseBridges; /**< Boolean: should we start all circuits with a bridge? */
* yes, "0" means strictly no, and "auto" means that we do iff any bridges
* are configured, we are not running a server and have not specified a list
* of entry nodes. */
char *UseBridges_;
/** Effective value of UseBridges. Will be set equally for UseBridges set to
* 1 or 0, but for 'auto' it will be set to 1 iff any bridges are
* configured, we are not running a server and have not specified a list of
* entry nodes. */
int UseBridges;
config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */
int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make