- tor-commits - lists.torproject.org

[tor/master] Revert "Update man page for new UseBridges tristate behaviour."
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit cabb16caa9afb95ce0bfbda0d7784f71e4c153a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 16:45:23 2011 -0400 Revert "Update man page for new UseBridges tristate behaviour." This reverts commit 40cfad1b5ae90b06eb74861a4fdc1310f8611111. --- doc/tor.1.txt | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8aa32e8..1815a8d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -708,14 +708,10 @@ The following options are useful only for clients (that is, if from the configured bridge authorities when feasible. It will fall back to a direct request if the authority responds with a 404. (Default: 0) -**UseBridges** **0**|**1**|**auto**:: - Make Tor fetch descriptors for each bridge listed in the "Bridge" +**UseBridges** **0**|**1**:: + When set, Tor will fetch descriptors for each bridge listed in the "Bridge" config lines, and use these relays as both entry guards and directory - guards. If the option is 1, bridges must be used and if no bridges are - configured Tor will not make any connections until a bridge is configured; - if it's "auto", Tor will use bridges if any are configured, otherwise it - will connect directly to the Tor network; if it's 0, bridges are not used - at all. (Defaults to auto) + guards. (Default: 0) **UseEntryGuards** **0**|**1**:: If this option is set to 1, we pick a few long-term entry servers, and try

1 0

[tor/master] Tweak bug2355_revert at suggestion from Roger
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 8e5dfe42a0230722bff07ba6ededcc0d2dbd53e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 19 20:58:46 2011 -0400 Tweak bug2355_revert at suggestion from Roger --- changes/bug2355_revert | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug2355_revert b/changes/bug2355_revert index 0d2822a..2ded40a 100644 --- a/changes/bug2355_revert +++ b/changes/bug2355_revert @@ -1,6 +1,7 @@ o Minor bugfixes: - Revert the UseBridges option to its behavior before 0.2.2.28-beta. When we changed the default behavior to "use bridges if any are - listed in the torrc", we broke a number of Vidalia users. + listed in the torrc", we broke a number of users who had bridges + in their torrc files but who didn't actually want to use them. Partial resolution for bug 3354.

1 0

[tor/master] Add changes file for bug2355 revert
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 1811bef666680222fe9421bbe282b49b00df6683 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 16:54:31 2011 -0400 Add changes file for bug2355 revert --- changes/bug2355_revert | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug2355_revert b/changes/bug2355_revert new file mode 100644 index 0000000..0d2822a --- /dev/null +++ b/changes/bug2355_revert @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Revert the UseBridges option to its behavior before 0.2.2.28-beta. + When we changed the default behavior to "use bridges if any are + listed in the torrc", we broke a number of Vidalia users. + Partial resolution for bug 3354. +

1 0

[tor/master] Revert "Add an "auto" option to UseBridges"
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 3b41551b61a604b555891ecc7cb6f8bbde65d128 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 16:45:53 2011 -0400 Revert "Add an "auto" option to UseBridges" This reverts commit 507c1257a4d9c629fefc2adbad8db73607749734. --- src/or/config.c | 19 ++++--------------- src/or/or.h | 12 +----------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 8ab23a3..e0ecab2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -376,7 +376,7 @@ static config_var_t _option_vars[] = { V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - VAR("UseBridges", STRING, UseBridges_, "auto"), + V(UseBridges, BOOL, "0"), V(UseEntryGuards, BOOL, "1"), V(User, STRING, NULL), 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 " "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 && server_mode(options)) 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) 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) - REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); + REJECT("If you set UseBridges, you must set TunnelDirConns."); if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0) diff --git a/src/or/or.h b/src/or/or.h index 456dce2..97fecd1 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2480,17 +2480,7 @@ typedef struct { * when doing so. */ char *BridgePassword; - /** Whether we should start all circuits with a bridge. "1" means strictly - * 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; - + int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make

1 0

[tor/maint-0.2.2] Revert "Add an "auto" option to UseBridges"
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 3b41551b61a604b555891ecc7cb6f8bbde65d128 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 16:45:53 2011 -0400 Revert "Add an "auto" option to UseBridges" This reverts commit 507c1257a4d9c629fefc2adbad8db73607749734. --- src/or/config.c | 19 ++++--------------- src/or/or.h | 12 +----------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 8ab23a3..e0ecab2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -376,7 +376,7 @@ static config_var_t _option_vars[] = { V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - VAR("UseBridges", STRING, UseBridges_, "auto"), + V(UseBridges, BOOL, "0"), V(UseEntryGuards, BOOL, "1"), V(User, STRING, NULL), 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 " "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 && server_mode(options)) 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) 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) - REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); + REJECT("If you set UseBridges, you must set TunnelDirConns."); if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0) diff --git a/src/or/or.h b/src/or/or.h index 456dce2..97fecd1 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2480,17 +2480,7 @@ typedef struct { * when doing so. */ char *BridgePassword; - /** Whether we should start all circuits with a bridge. "1" means strictly - * 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; - + int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make

1 0

[tor/maint-0.2.2] Revert "Update man page for new UseBridges tristate behaviour."
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit cabb16caa9afb95ce0bfbda0d7784f71e4c153a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 16:45:23 2011 -0400 Revert "Update man page for new UseBridges tristate behaviour." This reverts commit 40cfad1b5ae90b06eb74861a4fdc1310f8611111. --- doc/tor.1.txt | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8aa32e8..1815a8d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -708,14 +708,10 @@ The following options are useful only for clients (that is, if from the configured bridge authorities when feasible. It will fall back to a direct request if the authority responds with a 404. (Default: 0) -**UseBridges** **0**|**1**|**auto**:: - Make Tor fetch descriptors for each bridge listed in the "Bridge" +**UseBridges** **0**|**1**:: + When set, Tor will fetch descriptors for each bridge listed in the "Bridge" config lines, and use these relays as both entry guards and directory - guards. If the option is 1, bridges must be used and if no bridges are - configured Tor will not make any connections until a bridge is configured; - if it's "auto", Tor will use bridges if any are configured, otherwise it - will connect directly to the Tor network; if it's 0, bridges are not used - at all. (Defaults to auto) + guards. (Default: 0) **UseEntryGuards** **0**|**1**:: If this option is set to 1, we pick a few long-term entry servers, and try

1 0

[tor/maint-0.2.2] Add changes file for bug2355 revert
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 1811bef666680222fe9421bbe282b49b00df6683 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 16:54:31 2011 -0400 Add changes file for bug2355 revert --- changes/bug2355_revert | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug2355_revert b/changes/bug2355_revert new file mode 100644 index 0000000..0d2822a --- /dev/null +++ b/changes/bug2355_revert @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Revert the UseBridges option to its behavior before 0.2.2.28-beta. + When we changed the default behavior to "use bridges if any are + listed in the torrc", we broke a number of Vidalia users. + Partial resolution for bug 3354. +

1 0

[tor/maint-0.2.2] Tweak bug2355_revert at suggestion from Roger
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 8e5dfe42a0230722bff07ba6ededcc0d2dbd53e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 19 20:58:46 2011 -0400 Tweak bug2355_revert at suggestion from Roger --- changes/bug2355_revert | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug2355_revert b/changes/bug2355_revert index 0d2822a..2ded40a 100644 --- a/changes/bug2355_revert +++ b/changes/bug2355_revert @@ -1,6 +1,7 @@ o Minor bugfixes: - Revert the UseBridges option to its behavior before 0.2.2.28-beta. When we changed the default behavior to "use bridges if any are - listed in the torrc", we broke a number of Vidalia users. + listed in the torrc", we broke a number of users who had bridges + in their torrc files but who didn't actually want to use them. Partial resolution for bug 3354.

1 0

[arm/master] fix: no initial connection resolution if detached
by atagar＠torproject.org 20 Jun '11

20 Jun '11

commit 2df6e67526d94a05f4b1d43d172461d37770de73 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 14:24:44 2011 -0700 fix: no initial connection resolution if detached If arm starts up detached then pauses connection resolution until we have a tor instance to get connection results for. Otherwise we fail attempts, hit fallback logic, and quite possibly disable all connection resolution when we do really have an instance. --- src/cli/controller.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 1fb52c9..51fbe2b 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -482,7 +482,10 @@ def startTorMonitor(startTime): # use the tor pid to help narrow connection results torCmdName = sysTools.getProcessName(torPid, "tor") connections.getResolver(torCmdName, torPid, "tor") - else: connections.getResolver("tor") + else: + # constructs singleton resolver and, if tor isn't connected, initizes + # it to be paused + connections.getResolver("tor").setPaused(not conn.isAlive()) # hack to display a better (arm specific) notice if all resolvers fail connections.RESOLVER_FINAL_FAILURE_MSG += " (connection related portions of the monitor won't function)"

1 0

[arm/master] fix: skipping init actions that will fail
by atagar＠torproject.org 20 Jun '11

20 Jun '11

commit 388abe5d8b31b9c735569dbe0728b54e6111ee30 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 15:11:54 2011 -0700 fix: skipping init actions that will fail When we start and are detached from tor many actions (bandwidth prepopulation and loading the torrc, for instance) will always fail. Skipping these actions if there's no tor instance to avoid pointless work and log messages. --- src/cli/configPanel.py | 4 +--- src/cli/controller.py | 11 ++--------- src/cli/torrcPanel.py | 14 ++++++++++++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 33cec34..d76a528 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -201,9 +201,7 @@ class ConfigPanel(panel.Panel): # initializes config contents if we're connected conn = torTools.getConn() conn.addStatusListener(self.resetListener) - - if conn.isAlive(): - self.resetListener(conn, torTools.State.INIT) + if conn.isAlive(): self.resetListener(conn, torTools.State.INIT) def resetListener(self, conn, eventType): # fetches configuration options if a new instance, otherewise keeps our diff --git a/src/cli/controller.py b/src/cli/controller.py index 51fbe2b..e20e023 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -110,7 +110,7 @@ def initController(stdscr, startTime): except ValueError: pass # invalid stats, maybe connections when in blind mode # prepopulates bandwidth values from state file - if CONFIG["features.graph.bw.prepopulate"]: + if CONFIG["features.graph.bw.prepopulate"] and torTools.getConn().isAlive(): isSuccessful = bwStats.prepopulateFromState() if isSuccessful: graphPanel.updateInterval = 4 @@ -461,7 +461,7 @@ def startTorMonitor(startTime): conn = torTools.getConn() torPid = conn.getMyPid() - if not torPid: + if not torPid and conn.isAlive(): msg = "Unable to determine Tor's pid. Some information, like its resource usage will be unavailable." log.log(CONFIG["log.unknownTorPid"], msg) @@ -490,13 +490,6 @@ def startTorMonitor(startTime): # hack to display a better (arm specific) notice if all resolvers fail connections.RESOLVER_FINAL_FAILURE_MSG += " (connection related portions of the monitor won't function)" - # loads the torrc and provides warnings in case of validation errors - try: - loadedTorrc = torConfig.getTorrc() - loadedTorrc.load(True) - loadedTorrc.logValidationIssues() - except IOError: pass - # provides a notice about any event types tor supports but arm doesn't missingEventTypes = cli.logPanel.getMissingEventTypes() diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index 2dc244f..c1bb3f9 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -42,7 +42,9 @@ class TorrcPanel(panel.Panel): self._lastContentHeightArgs = None # listens for tor reload (sighup) events - torTools.getConn().addStatusListener(self.resetListener) + conn = torTools.getConn() + conn.addStatusListener(self.resetListener) + if conn.isAlive(): self.resetListener(conn, torTools.State.INIT) def resetListener(self, conn, eventType): """ @@ -53,7 +55,15 @@ class TorrcPanel(panel.Panel): eventType - type of event detected """ - if eventType in (torTools.State.INIT, torTools.State.RESET): + if eventType == torTools.State.INIT: + # loads the torrc and provides warnings in case of validation errors + try: + loadedTorrc = torConfig.getTorrc() + loadedTorrc.load(True) + loadedTorrc.logValidationIssues() + self.redraw(True) + except: pass + elif eventType == torTools.State.RESET: try: torConfig.getTorrc().load(True) self.redraw(True)

1 0