August 2011 - tor-commits - lists.torproject.org

r24948: {projects} Set svn:mime-type on the whiteboard photos correctly (projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig)
by Robert Ransom 08 Aug '11

08 Aug '11

Author: rransom Date: 2011-08-08 18:05:13 +0000 (Mon, 08 Aug 2011) New Revision: 24948 Modified: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2363.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2364.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2365.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2368.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2369.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2372.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2373.jpg Log: Set svn:mime-type on the whiteboard photos correctly Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2363.jpg ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/jpeg Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2364.jpg ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/jpeg Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2365.jpg ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/jpeg Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2368.jpg ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/jpeg Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2369.jpg ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/jpeg Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2372.jpg ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/jpeg Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2373.jpg ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/jpeg

1 0

r24947: {} Add another whiteboard photo (projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig)
by Robert Ransom 08 Aug '11

08 Aug '11

Author: rransom Date: 2011-08-08 17:58:01 +0000 (Mon, 08 Aug 2011) New Revision: 24947 Added: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2373.jpg Log: Add another whiteboard photo Added: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2373.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2373.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[arm/master] Deduplicating common startup message
by atagar＠torproject.org 08 Aug '11

08 Aug '11

commit 5ca794e25271a09054adb0c63b86d1398c52089c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 8 07:46:15 2011 -0700 Deduplicating common startup message Deduplication entry for the "Loading relay descriptors" notice messages. --- src/settings.cfg | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 9154ed5..0e8f9dd 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -279,6 +279,7 @@ config.summary.TestingEstimatedDescriptorPropagationTime Delay before clients at # [NOTICE] I learned some more directory information, but not enough to build a # circuit: We have only 469/2027 usable descriptors. # [NOTICE] Attempt by %s to open a stream from unknown relay. Closing. +# [NOTICE] Bootstrapped 72%: Loading relay descriptors. # [WARN] You specified a server "Amunet8" by name, but this name is not # registered # [WARN] I have no descriptor for the router named "Amunet8" in my declared @@ -314,6 +315,7 @@ msg.INFO rep_hist_downrate_old_runs(): Discounting all old stability info by a f msg.NOTICE We stalled too much while trying to write msg.NOTICE I learned some more directory information, but not enough to build a circuit msg.NOTICE Attempt by +msg.NOTICE *Loading relay descriptors. msg.WARN You specified a server msg.WARN I have no descriptor for the router named msg.WARN Controller gave us config lines that didn't validate

1 0

[arm/master] fix: config description content too long
by atagar＠torproject.org 08 Aug '11

08 Aug '11

commit e239fd7931d6014306a76648663f6f6b2a92323d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 8 08:42:58 2011 -0700 fix: config description content too long Descriptions for configuration options were one cell too long, causing it to draw on top of the border if just the right length. --- src/cli/configPanel.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index e4a48fc..2e8e1c1 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -601,11 +601,11 @@ class ConfigPanel(panel.Panel): if i != descriptionHeight - 1: # there's more lines to display - msg, remainder = uiTools.cropStr(lineContent, width - 2, 4, 4, uiTools.Ending.HYPHEN, True) + msg, remainder = uiTools.cropStr(lineContent, width - 3, 4, 4, uiTools.Ending.HYPHEN, True) descriptionContent = remainder.strip() + descriptionContent else: # this is the last line, end it with an ellipse - msg = uiTools.cropStr(lineContent, width - 2, 4, 4) + msg = uiTools.cropStr(lineContent, width - 3, 4, 4) self.addstr(3 + i, 2, msg, selectionFormat)

1 0

[arm/master] Periodically refreshing display
by atagar＠torproject.org 08 Aug '11

08 Aug '11

commit 3f93c66d2536ae85a0880b98425fedb507ad8503 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 8 08:30:48 2011 -0700 Periodically refreshing display On some platforms the terminal gets into a screwed up state, displaying scrambled content (I haven't reproduced this on my system, but seen it on an Ubuntu netbook). Redrawing the display, reguardless of if the content has changed every five seconds so this glitches will correct themselves. Arm had previously done this but I took it out when the display code had stabilized (to cut down on load). However, this doesn't have a noticeable cpu cost so might as well put it back. This also simplifies some of the redrawing logic, centralizing it in the controller. --- armrc.sample | 5 ++ src/cli/controller.py | 75 +++++++++++++++++++----------------- src/cli/graphing/bandwidthStats.py | 2 +- src/cli/graphing/graphPanel.py | 2 +- src/cli/headerPanel.py | 2 +- src/cli/menu/item.py | 2 +- src/cli/menu/menu.py | 2 +- src/cli/wizard.py | 6 +- 8 files changed, 53 insertions(+), 43 deletions(-) diff --git a/armrc.sample b/armrc.sample index 1edd024..d547b6c 100644 --- a/armrc.sample +++ b/armrc.sample @@ -57,6 +57,11 @@ features.showFdUsage false # Seconds to wait on user input before refreshing content features.redrawRate 5 +# Rate (seconds) to periodically redraw the screen, disabled if zero. This +# shouldn't be necessary, but can correct issues if the terminal gets into a +# funky state. +features.refreshRate 5 + # Confirms promt to confirm when quiting if true features.confirmQuit true diff --git a/src/cli/controller.py b/src/cli/controller.py index 1554949..d2c9d73 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -37,6 +37,7 @@ CONFIG = {"startup.events": "N3", "features.panels.show.config": True, "features.panels.show.torrc": True, "features.redrawRate": 5, + "features.refreshRate": 5, "features.confirmQuit": True, "features.graph.type": 1, "features.graph.bw.prepopulate": True, @@ -171,6 +172,7 @@ class Controller: self._forceRedraw = False self._isDone = False self._torManager = TorManager(self) + self._lastDrawn = 0 self.setMsg() # initializes our control message def getScreen(self): @@ -310,39 +312,49 @@ class Controller: return allPanels - def requestRedraw(self, immediate = False): + def redraw(self, force = True): """ - Requests that all content is redrawn when the interface is next rendered. + Redraws the displayed panel content. Arguments: - immediate - redraws now if true, otherwise waits for when next normally - drawn + force - redraws reguardless of if it's needed if true, otherwise ignores + the request when there arne't changes to be displayed """ - if immediate: - displayPanels = self.getDisplayPanels() - - occupiedContent = 0 - for panelImpl in displayPanels: - panelImpl.setTop(occupiedContent) - occupiedContent += panelImpl.getHeight() - - for panelImpl in displayPanels: - panelImpl.redraw(True) - else: - self._forceRedraw = True + force |= self._forceRedraw + self._forceRedraw = False + + currentTime = time.time() + if CONFIG["features.refreshRate"] != 0: + if self._lastDrawn + CONFIG["features.refreshRate"] <= currentTime: + force = True + + displayPanels = self.getDisplayPanels() + + occupiedContent = 0 + for panelImpl in displayPanels: + panelImpl.setTop(occupiedContent) + occupiedContent += panelImpl.getHeight() + + for panelImpl in displayPanels: + panelImpl.redraw(force) + + if force: self._lastDrawn = currentTime - def isRedrawRequested(self, clearFlag = False): + def requestRedraw(self): + """ + Requests that all content is redrawn when the interface is next rendered. """ - True if a full redraw has been requested, false otherwise. - Arguments: - clearFlag - request clears the flag if true + self._forceRedraw = True + + def getLastRedrawTime(self): + """ + Provides the time when the content was last redrawn, zero if the content + has never been drawn. """ - returnValue = self._forceRedraw - if clearFlag: self._forceRedraw = False - return returnValue + return self._lastDrawn def setMsg(self, msg = None, attr = None, redraw = False): """ @@ -612,7 +624,9 @@ def startTorMonitor(startTime): # initializes interface configs config = conf.getConfig("arm") - config.update(CONFIG) + config.update(CONFIG, { + "features.redrawRate": 1, + "features.refreshRate": 0}) cli.graphing.graphPanel.loadConfig(config) cli.connections.connEntry.loadConfig(config) @@ -710,17 +724,8 @@ def drawTorMonitor(stdscr, startTime): for panelImpl in control.getAllPanels(): panelImpl.setVisible(panelImpl in displayPanels) - # panel placement - occupiedContent = 0 - for panelImpl in displayPanels: - panelImpl.setTop(occupiedContent) - occupiedContent += panelImpl.getHeight() - - # redraws visible content - forceRedraw = control.isRedrawRequested(True) - for panelImpl in displayPanels: - panelImpl.redraw(forceRedraw) - + # redraws the interface if it's needed + control.redraw(False) stdscr.refresh() # wait for user keyboard input until timeout, unless an override was set diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index 654443c..9782d9f 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -100,7 +100,7 @@ class BandwidthStats(graphPanel.GraphStats): self.isAccounting = isAccountingEnabled # redraws the whole screen since our height changed - cli.controller.getController().requestRedraw(True) + cli.controller.getController().redraw() # redraws to reflect changes (this especially noticeable when we have # accounting and shut down since it then gives notice of the shutdown) diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index b080871..76221ff 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -324,7 +324,7 @@ class GraphPanel(panel.Panel): self.setGraphHeight(self.graphHeight - 1) elif uiTools.isSelectionKey(key): break - control.requestRedraw(True) + control.redraw() finally: control.setMsg() panel.CURSES_LOCK.release() diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index e64a6de..4e78f6c 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -427,7 +427,7 @@ class HeaderPanel(panel.Panel, threading.Thread): # We're toggling between being a relay and client, causing the height # of this panel to change. Redraw all content so we don't get # overlapping content. - cli.controller.getController().requestRedraw(True) + cli.controller.getController().redraw() else: # just need to redraw ourselves self.redraw(True) diff --git a/src/cli/menu/item.py b/src/cli/menu/item.py index f46cdbb..1ed3f1f 100644 --- a/src/cli/menu/item.py +++ b/src/cli/menu/item.py @@ -58,7 +58,7 @@ class MenuItem(): if self._callback: control = cli.controller.getController() control.setMsg() - control.requestRedraw(True) + control.redraw() self._callback() return True diff --git a/src/cli/menu/menu.py b/src/cli/menu/menu.py index 8302551..a93a1e0 100644 --- a/src/cli/menu/menu.py +++ b/src/cli/menu/menu.py @@ -114,7 +114,7 @@ def showMenu(): cursor.handleKey(key) # redraws the rest of the interface if we're rendering on it again - if not cursor.isDone(): control.requestRedraw(True) + if not cursor.isDone(): control.redraw() finally: control.setMsg() cli.popups.finalize() diff --git a/src/cli/wizard.py b/src/cli/wizard.py index f0c14a8..82b2825 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -342,7 +342,7 @@ def showWizard(): generatedTorrc = getTorrc(relayType, config, disabledOpt) torrcLocation = manager.getTorrcPath() - controller.requestRedraw(True) + controller.redraw() confirmationSelection = showConfirmationDialog(generatedTorrc, torrcLocation) if confirmationSelection == NEXT: @@ -463,7 +463,7 @@ def showWizard(): elif confirmationSelection == CANCEL: break # redraws screen to clear away the dialog we just showed - cli.controller.getController().requestRedraw(True) + cli.controller.getController().redraw() def promptRelayType(initialSelection): """ @@ -621,7 +621,7 @@ def promptConfigOptions(relayType, config, disabledOpt): try: options[selection].setValue(newValue.strip()) except ValueError, exc: cli.popups.showMsg(str(exc), 3) - cli.controller.getController().requestRedraw(True) + cli.controller.getController().redraw() elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel finally: cli.popups.finalize()

1 0

[arm/master] Forcing redraw when user presses ctrl+L
by atagar＠torproject.org 08 Aug '11

08 Aug '11

commit 38c2f3662ac8858fabc54a5826c1af601590c9b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 8 08:50:15 2011 -0700 Forcing redraw when user presses ctrl+L Triggering a manual redraw when the user presses ctrl+L, which is expected of terminal applications. This addresses: https://trac.torproject.org/projects/tor/ticket/2830 --- src/cli/controller.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index d2c9d73..8b87b1d 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -765,6 +765,9 @@ def drawTorMonitor(stdscr, startTime): overrideKey = cli.popups.showHelpPopup() elif key == ord('w') or key == ord('W'): cli.wizard.showWizard() + elif key == ord('l') - 96: + # force redraw when ctrl+l is pressed + control.redraw() else: for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key)

1 0

[tor/master] Make --quiet and --hush apply to default logs, not only initial logs
by nickm＠torproject.org 08 Aug '11

08 Aug '11

commit e5e7b6d71835841f037841ea60cb4f39b554b892 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 4 14:23:51 2011 -0400 Make --quiet and --hush apply to default logs, not only initial logs Fixes bug 3550; bugfix on 0.2.0.10-alpha (where --quiet was introduced). --- changes/bug3550 | 5 +++++ src/or/config.c | 11 +++++++++-- src/or/main.c | 7 +++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/bug3550 b/changes/bug3550 new file mode 100644 index 0000000..658179f --- /dev/null +++ b/changes/bug3550 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - The "--quiet" and "--hush" options now apply not only to Tor's + behavior before user-configured logs are added, but also to + Tor's behavior in the absense of configured logs. Fixes bug + 3550; bugfix on 0.2.0.10-alpha. diff --git a/src/or/config.c b/src/or/config.c index 088617b..ddce958 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -40,6 +40,9 @@ #include "procmon.h" +/* From main.c */ +extern int quiet_level; + /** Enumeration of types which option values can take */ typedef enum config_type_t { CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */ @@ -3095,8 +3098,12 @@ options_validate(or_options_t *old_options, or_options_t *options, "misconfigured or something else goes wrong."); /* Special case on first boot if no Log options are given. */ - if (!options->Logs && !options->RunAsDaemon && !from_setconf) - config_line_append(&options->Logs, "Log", "notice stdout"); + if (!options->Logs && !options->RunAsDaemon && !from_setconf) { + if (quiet_level == 0) + config_line_append(&options->Logs, "Log", "notice stdout"); + else if (quiet_level == 1) + config_line_append(&options->Logs, "Log", "warn stdout"); + } if (options_init_logs(options, 1)<0) /* Validate the log(s) */ REJECT("Failed to validate Log options. See logs for details."); diff --git a/src/or/main.c b/src/or/main.c index 54e6451..260de16 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -154,6 +154,12 @@ int can_complete_circuit=0; * they are obsolete? */ #define TLS_HANDSHAKE_TIMEOUT (60) +/** Decides our behavior when no logs are configured/before any + * logs have been configured. For 0, we log notice to stdout as normal. + * For 1, we log warnings only. For 2, we log nothing. + */ +int quiet_level = 0; + /********* END VARIABLES ************/ /**************************************************************************** @@ -2148,6 +2154,7 @@ tor_init(int argc, char *argv[]) default: add_temp_log(LOG_NOTICE); } + quiet_level = quiet; log(LOG_NOTICE, LD_GENERAL, "Tor v%s. This is experimental software. " "Do not rely on it for strong anonymity. (Running on %s)",get_version(),

1 0

[tor/master] Merge remote-tracking branch 'public/bug3550'
by nickm＠torproject.org 08 Aug '11

08 Aug '11

commit a72b1815e83fcd7d24731b9a41f956267e8780fc Merge: cb24a06 e5e7b6d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 8 10:05:41 2011 -0400 Merge remote-tracking branch 'public/bug3550' changes/bug3550 | 5 +++++ src/or/config.c | 11 +++++++++-- src/or/main.c | 7 +++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix log message typo
by nickm＠torproject.org 08 Aug '11

08 Aug '11

commit 52421e91014ee8c1d105bb07b336c95a64dc557f Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Aug 6 00:25:07 2011 -0700 Fix log message typo --- src/or/connection_edge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index ae2dfd2..971cee2 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3528,7 +3528,7 @@ connection_edge_update_circuit_isolation(const edge_connection_t *conn, return mixed; if ((mixed & conn->isolation_flags) != 0) { - log_warn(LD_BUG, "Updating a circuit with seemingly incomaptible " + log_warn(LD_BUG, "Updating a circuit with seemingly incompatible " "isolation flags."); } circ->isolation_flags_mixed |= mixed;

1 0

[tor/master] Fix handling of ISO_STREAM
by nickm＠torproject.org 08 Aug '11

08 Aug '11

commit cab3641638540834a0867f26eb5b432fd793fd5e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Aug 6 13:42:32 2011 -0700 Fix handling of ISO_STREAM Now we track *which* stream with ISO_STREAM set is associated to a particular circuit, so that we won't think that stream is incompatible with its circuit and launch another one a second later, and we use that same field to mark circuits which have had an ISO_STREAM stream attached to them, so that we won't ever put a second stream on that circuit. Fixes bug 3695. --- src/or/connection_edge.c | 9 ++++++--- src/or/or.h | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 971cee2..37a695c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3432,9 +3432,9 @@ connection_edge_compatible_with_circuit(const edge_connection_t *conn, tor_strdup(conn->socks_request->address); } - /* If isolation_values_set, then the circuit is not compatible with - * any new ISO_STREAM stream. */ - if (iso & ISO_STREAM) + if ((iso & ISO_STREAM) && + (circ->associated_isolated_stream_global_id != + TO_CONN(conn)->global_identifier)) return 0; if ((iso & ISO_DESTPORT) && conn->socks_request->port != circ->dest_port) @@ -3487,6 +3487,8 @@ connection_edge_update_circuit_isolation(const edge_connection_t *conn, if (!circ->isolation_values_set) { if (dry_run) return -1; + circ->associated_isolated_stream_global_id = + TO_CONN(conn)->global_identifier; circ->dest_port = conn->socks_request->port; circ->dest_address = tor_strdup(conn->original_dest_address); circ->client_proto_type = conn->socks_request->listener_type; @@ -3562,6 +3564,7 @@ circuit_clear_isolation(origin_circuit_t *circ) circ->isolation_values_set = 0; circ->isolation_flags_mixed = 0; + circ->associated_isolated_stream_global_id = 0; circ->client_proto_type = 0; circ->client_proto_socksver = 0; circ->dest_port = 0; diff --git a/src/or/or.h b/src/or/or.h index eb271b5..9c5d354 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2530,6 +2530,9 @@ typedef struct origin_circuit_t { socks_username_len and socks_password_len for their lengths. */ char *socks_username; char *socks_password; + /** Global identifier for the first stream attached here; used by + * ISO_STREAM. */ + uint64_t associated_isolated_stream_global_id; /**@}*/ } origin_circuit_t;

1 0