- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Fix a docstring
by nickm＠torproject.org 09 May '11

09 May '11

commit 532c13693e97565fe50a8a788d669d3ec94ad822 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 02:16:24 2011 +0200 Fix a docstring --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 9f7739a..28780d2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3875,7 +3875,7 @@ static int bootstrap_problems = 0; * information and initial circuits. * * status is the new status, that is, what task we will be doing - * next. percent is zero if we just started this task, else it + * next. progress is zero if we just started this task, else it * represents progress on the task. */ void control_event_bootstrap(bootstrap_status_t status, int progress)

1 0

[tor/maint-0.2.2] Appease clang - and my tortured mind
by nickm＠torproject.org 09 May '11

09 May '11

commit 80e57af50fe06ac76733ee99644c5efe797b2b8c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 03:01:25 2011 +0200 Appease clang - and my tortured mind This possible div by 0 warning from clang's analyzer was quite fun to track down. Turns out the current behaviour is safe. --- src/or/circuitbuild.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 0e033a5..2189e0e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -559,7 +559,9 @@ circuit_build_times_create_histogram(circuit_build_times_t *cbt, * Return the Pareto start-of-curve parameter Xm. * * Because we are not a true Pareto curve, we compute this as the - * weighted average of the N=3 most frequent build time bins. + * weighted average of the N most frequent build time bins. N is either + * 1 if we don't have enough circuit build time data collected, or + * determined by the consensus parameter cbtnummodes (default 3). */ static build_time_t circuit_build_times_get_xm(circuit_build_times_t *cbt) @@ -572,6 +574,9 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) int n=0; int num_modes = circuit_build_times_default_num_xm_modes(); + tor_assert(nbins > 0); + tor_assert(num_modes > 0); + // Only use one mode if < 1000 buildtimes. Not enough data // for multiple. if (cbt->total_build_times < CBT_NCIRCUITS_TO_OBSERVE) @@ -579,6 +584,7 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) nth_max_bin = (build_time_t*)tor_malloc_zero(num_modes*sizeof(build_time_t)); + /* Determine the N most common build times */ for (i = 0; i < nbins; i++) { if (histogram[i] >= histogram[nth_max_bin[0]]) { nth_max_bin[0] = i; @@ -600,6 +606,10 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) histogram[nth_max_bin[n]]); } + /* The following assert is safe, because we don't get called when we + * haven't observed at least CBT_MIN_MIN_CIRCUITS_TO_OBSERVE circuits. */ + tor_assert(bin_counts > 0); + ret /= bin_counts; tor_free(histogram); tor_free(nth_max_bin);

1 0

[tor/maint-0.2.2] Add an assert to un-confuse clang's analyzer
by nickm＠torproject.org 09 May '11

09 May '11

commit 58a16a4d6f47728e029cc8380604bda262a40d30 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 02:20:29 2011 +0200 Add an assert to un-confuse clang's analyzer The analyzer assumed that bootstrap_percent could be less than 0 when we call control_event_bootstrap_problem(), which would mean we're calling log_fn() with undefined values. The assert makes it clear this can't happen. --- src/or/control.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 28780d2..926a465 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3931,6 +3931,9 @@ control_event_bootstrap_problem(const char *warn, int reason) char buf[BOOTSTRAP_MSG_LEN]; const char *recommendation = "ignore"; + /* bootstrap_percent must not be in "undefined" state here. */ + tor_assert(status >= 0); + if (bootstrap_percent == 100) return; /* already bootstrapped; nothing to be done here. */

1 0

[tor/maint-0.2.2] CONN_LOG_PROTECT()'s first argument may not be 0
by nickm＠torproject.org 09 May '11

09 May '11

commit 8ebb3ce6e27c104e35d65662c04d23795f2b5605 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 03:24:04 2011 +0200 CONN_LOG_PROTECT()'s first argument may not be 0 Make that explicit by adding an assert and removing a null-check. All of its callers currently depend on the argument being non-null anyway. Silences a few clang complaints. --- src/or/or.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 7d354c8..f693ad9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3203,7 +3203,9 @@ typedef enum buildtimeout_set_event_t { */ #define CONN_LOG_PROTECT(conn, stmt) \ STMT_BEGIN \ - int _log_conn_is_control = (conn && conn->type == CONN_TYPE_CONTROL); \ + int _log_conn_is_control; \ + tor_assert(conn); \ + _log_conn_is_control = (conn->type == CONN_TYPE_CONTROL); \ if (_log_conn_is_control) \ disable_control_logging(); \ STMT_BEGIN stmt; STMT_END; \

1 0

[tor/maint-0.2.2] Fix a potential null deref when rebuilding md cache
by nickm＠torproject.org 09 May '11

09 May '11

commit 1827e60976d54d1917dfc54bdf62b4818662ac12 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 04:23:35 2011 +0200 Fix a potential null deref when rebuilding md cache Issue discovered using clang's static analyzer --- changes/mdesc_null_deref | 5 +++++ src/or/microdesc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/mdesc_null_deref b/changes/mdesc_null_deref new file mode 100644 index 0000000..30f0280 --- /dev/null +++ b/changes/mdesc_null_deref @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid a possible null-pointer dereference when rebuilding the mdesc + cache without actually having any descriptors to cache. Bugfix on + 0.2.2.6-alpha. Issue discovered using clang's static analyzer. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 73d2285..5740c40 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -423,7 +423,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) cache->journal_len = 0; cache->bytes_dropped = 0; - new_size = (int)cache->cache_content->size; + new_size = cache->cache_content ? (int)cache->cache_content->size : 0; log_info(LD_DIR, "Done rebuilding microdesc cache. " "Saved %d bytes; %d still used.", orig_size-new_size, new_size);

1 0

[arm/master] fix: connection resolution test was nonfunctional
by atagar＠torproject.org 09 May '11

09 May '11

commit 8364fc6a47238053738cce70f3cf9debe0cfb088 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 08:28:47 2011 -0700 fix: connection resolution test was nonfunctional The second test (running targeted connection resolvers) was broken due to changes in the connection util. --- src/test.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test.py b/src/test.py index e403076..af80879 100644 --- a/src/test.py +++ b/src/test.py @@ -78,9 +78,9 @@ while True: printDivider() break - if userSelection.isdigit() and int(userSelection) in range(1, 8): + if userSelection.isdigit() and int(userSelection) in range(0, 7): try: - resolver = int(userSelection) + resolver = connections.Resolver.values()[int(userSelection)] startTime = time.time() print(connections.getResolverCommand(resolver, "tor", conn.getMyPid())) @@ -93,7 +93,7 @@ while True: print(" %s:%s -> %s:%s" % (lIp, lPort, fIp, fPort)) print("\n Runtime: %0.4f seconds" % (time.time() - startTime)) - except IOError, exc: + except (IOError, IndexError), exc: print exc else: print("'%s' isn't a valid selection\n" % userSelection)

1 0

[arm/master] Dropping unused config switcher function
by atagar＠torproject.org 09 May '11

09 May '11

commit 18905474729b648a45b5052e7a7751d6c5ea9723 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 7 22:45:27 2011 -0700 Dropping unused config switcher function Once upon a time the config panel showed both tor and arm configuration options. However, arm doesn't yet have a counterpart for SETCONF so I dropped the arm config from the interface. I'll probably re-introduce this at some point, but for now this is just dead code and the back-end needs some more work before it's useful to users. Since the showMenu function is being refactored this dead code would, as is, be broken so dropping it. --- src/cli/controller.py | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 09e3575..a195c15 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -1190,29 +1190,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): if selection != -1 and options[selection] != panels["conn"]._listingType: panels["conn"].setListingType(options[selection]) panels["conn"].redraw(True) - elif page == 2 and (key == ord('c') or key == ord('C')) and False: - # TODO: disabled for now (probably gonna be going with separate pages - # rather than popup menu) - # provides menu to pick config being displayed - #options = [confPanel.CONFIG_LABELS[confType] for confType in range(4)] - options = [] - initialSelection = panels["torrc"].configType - - # hides top label of the graph panel and pauses panels - panels["torrc"].showLabel = False - panels["torrc"].redraw(True) - setPauseState(panels, isPaused, page, True) - - selection = showMenu(stdscr, panels["popup"], "Configuration:", options, initialSelection) - - # reverts changes made for popup - panels["torrc"].showLabel = True - setPauseState(panels, isPaused, page) - - # applies new setting - if selection != -1: panels["torrc"].setConfigType(selection) - - selectiveRefresh(panels, page) elif page == 2 and (key == ord('w') or key == ord('W')): # display a popup for saving the current configuration panel.CURSES_LOCK.acquire()

1 0

[arm/master] Moving menus fromt he controller to panels
by atagar＠torproject.org 09 May '11

09 May '11

commit a2c89f6f8261a892cc02aee5325fc0ffff7671d9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 09:56:27 2011 -0700 Moving menus fromt he controller to panels Moving all of the option menus from a huge if/else block in the controller to the panels they're being used for. This included a couple minor changes to the panel api to better accommodate them. --- src/cli/configPanel.py | 15 ++- src/cli/connections/connPanel.py | 39 ++++++- src/cli/controller.py | 242 ++------------------------------------ src/cli/graphing/graphPanel.py | 36 ++++++- src/cli/logPanel.py | 59 +++++++++- src/cli/popups.py | 97 +++++++++++++++- src/cli/torrcPanel.py | 6 +- src/util/panel.py | 27 ++++ 8 files changed, 272 insertions(+), 249 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 6aaafc2..31a78ab 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -247,6 +247,7 @@ class ConfigPanel(panel.Panel): def handleKey(self, key): self.valsLock.acquire() + isKeystrokeConsumed = True if uiTools.isScrollKey(key): pageHeight = self.getPreferredSize()[0] - 1 detailPanelHeight = self._config["features.config.selectionDetails.height"] @@ -270,8 +271,10 @@ class ConfigPanel(panel.Panel): # converts labels back to enums resultEnums = [getFieldFromLabel(label) for label in results] self.setSortOrder(resultEnums) + else: isKeystrokeConsumed = False self.valsLock.release() + return isKeystrokeConsumed def getHelp(self): options = [] @@ -288,10 +291,6 @@ class ConfigPanel(panel.Panel): def draw(self, width, height): self.valsLock.acquire() - # draws the top label - configType = "Tor" if self.configType == State.TOR else "Arm" - hiddenMsg = "press 'a' to hide most options" if self.showAll else "press 'a' to show all options" - # panel with details for the current selection detailPanelHeight = self._config["features.config.selectionDetails.height"] isScrollbarVisible = False @@ -311,8 +310,12 @@ class ConfigPanel(panel.Panel): self._drawSelectionPanel(cursorSelection, width, detailPanelHeight, isScrollbarVisible) - titleLabel = "%s Configuration (%s):" % (configType, hiddenMsg) - self.addstr(0, 0, titleLabel, curses.A_STANDOUT) + # draws the top label + if self.isTitleVisible(): + configType = "Tor" if self.configType == State.TOR else "Arm" + hiddenMsg = "press 'a' to hide most options" if self.showAll else "press 'a' to show all options" + titleLabel = "%s Configuration (%s):" % (configType, hiddenMsg) + self.addstr(0, 0, titleLabel, curses.A_STANDOUT) # draws left-hand scroll bar if content's longer than the height scrollOffset = 1 diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 8ad41d5..4d89d5c 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -131,6 +131,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): listingType - Listing instance for the primary information to be shown """ + if self._listingType == listingType: return + self.valsLock.acquire() self._listingType = listingType @@ -143,6 +145,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): def handleKey(self, key): self.valsLock.acquire() + isKeystrokeConsumed = True if uiTools.isScrollKey(key): pageHeight = self.getPreferredSize()[0] - 1 if self._showDetails: pageHeight -= (DETAILS_HEIGHT + 1) @@ -159,8 +162,39 @@ class ConnectionPanel(panel.Panel, threading.Thread): optionColors = dict([(attr, entries.SORT_COLORS[attr]) for attr in options]) results = cli.popups.showSortDialog(titleLabel, options, oldSelection, optionColors) if results: self.setSortOrder(results) + elif key == ord('u') or key == ord('U'): + # provides a menu to pick the connection resolver + title = "Resolver Util:" + options = ["auto"] + connections.Resolver.values() + connResolver = connections.getResolver("tor") + + currentOverwrite = connResolver.overwriteResolver + if currentOverwrite == None: oldSelection = 0 + else: oldSelection = options.index(currentOverwrite) + + selection = cli.popups.showMenu(title, options, oldSelection) + + # applies new setting + if selection != -1: + selectedOption = options[selection] if selection != 0 else None + connResolver.overwriteResolver = selectedOption + elif key == ord('l') or key == ord('L'): + # provides a menu to pick the primary information we list connections by + title = "List By:" + options = entries.ListingType.values() + + # dropping the HOSTNAME listing type until we support displaying that content + options.remove(cli.connections.entries.ListingType.HOSTNAME) + + oldSelection = options.index(self._listingType) + selection = cli.popups.showMenu(title, options, oldSelection) + + # applies new setting + if selection != -1: self.setListingType(options[selection]) + else: isKeystrokeConsumed = False self.valsLock.release() + return isKeystrokeConsumed def run(self): """ @@ -233,8 +267,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): drawEntries[i].render(self, 1 + i, 2) # title label with connection counts - title = "Connection Details:" if self._showDetails else self._title - self.addstr(0, 0, title, curses.A_STANDOUT) + if self.isTitleVisible(): + title = "Connection Details:" if self._showDetails else self._title + self.addstr(0, 0, title, curses.A_STANDOUT) scrollOffset = 1 if isScrollbarVisible: diff --git a/src/cli/controller.py b/src/cli/controller.py index a195c15..6f4b70d 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -42,6 +42,7 @@ def refresh(): # new panel params and accessors (this is part of the new controller apis) PANELS = {} STDSCR = None +IS_PAUSED = False def getScreen(): return STDSCR @@ -83,7 +84,6 @@ def getPanels(page = None): CONFIRM_QUIT = True REFRESH_RATE = 5 # seconds between redrawing screen -MAX_REGEX_FILTERS = 5 # maximum number of previous regex filters that'll be remembered # enums for message in control label CTL_HELP, CTL_PAUSED = range(2) @@ -129,6 +129,9 @@ class ControlPanel(panel.Panel): self.msgText = msgText self.msgAttr = msgAttr + def revertMsg(self): + self.setMsg(CTL_PAUSED if IS_PAUSED else CTL_HELP) + def draw(self, width, height): msgText = self.msgText msgAttr = self.msgAttr @@ -275,57 +278,6 @@ def setPauseState(panels, monitorIsPaused, currentPage, overwrite=False): for key in allPanels: panels[key].setPaused(overwrite or monitorIsPaused or (key not in PAGES[currentPage] and key not in PAGE_S)) -def showMenu(stdscr, popup, title, options, initialSelection): - """ - Provides menu with options laid out in a single column. User can cancel - selection with the escape key, in which case this proives -1. Otherwise this - returns the index of the selection. If initialSelection is -1 then the first - option is used and the carrot indicating past selection is ommitted. - """ - - selection = initialSelection if initialSelection != -1 else 0 - - if popup.win: - if not panel.CURSES_LOCK.acquire(False): return -1 - try: - # TODO: should pause interface (to avoid event accumilation) - curses.cbreak() # wait indefinitely for key presses (no timeout) - - # uses smaller dimentions more fitting for small content - popup.height = len(options) + 2 - - newWidth = max([len(label) for label in options]) + 9 - popup.recreate(stdscr, newWidth) - - key = 0 - while not uiTools.isSelectionKey(key): - popup.clear() - popup.win.box() - popup.addstr(0, 0, title, curses.A_STANDOUT) - - for i in range(len(options)): - label = options[i] - format = curses.A_STANDOUT if i == selection else curses.A_NORMAL - tab = "> " if i == initialSelection else " " - popup.addstr(i + 1, 2, tab) - popup.addstr(i + 1, 4, " %s " % label, format) - - popup.refresh() - key = stdscr.getch() - if key == curses.KEY_UP: selection = max(0, selection - 1) - elif key == curses.KEY_DOWN: selection = min(len(options) - 1, selection + 1) - elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel - - # reverts popup dimensions and conn panel label - popup.height = 9 - popup.recreate(stdscr, 80) - - curses.halfdelay(REFRESH_RATE * 10) # reset normal pausing behavior - finally: - panel.CURSES_LOCK.release() - - return selection - def setEventListening(selectedEvents, isBlindMode): # creates a local copy, note that a suspected python bug causes *very* # puzzling results otherwise when trying to discard entries (silently @@ -381,7 +333,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): otherwise unrecognized events) """ - global PANELS, STDSCR, REFRESH_FLAG, PAGE + global PANELS, STDSCR, REFRESH_FLAG, PAGE, IS_PAUSED STDSCR = stdscr # loads config for various interface components @@ -592,7 +544,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): isPaused = False # if true updates are frozen overrideKey = None # immediately runs with this input rather than waiting for the user if set page = 0 - regexFilters = [] # previously used log regex filters panels["popup"].redraw(True) # hack to make sure popup has a window instance (not entirely sure why...) PAGE = page @@ -846,6 +797,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.acquire() try: isPaused = not isPaused + IS_PAUSED = isPaused setPauseState(panels, isPaused, page) panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) finally: @@ -883,69 +835,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() elif key == ord('h') or key == ord('H'): overrideKey = popups.showHelpPopup() - elif page == 0 and (key == ord('s') or key == ord('S')): - # provides menu to pick stats to be graphed - #options = ["None"] + [label for label in panels["graph"].stats.keys()] - options = ["None"] - - # appends stats labels with first letters of each word capitalized - initialSelection, i = -1, 1 - if not panels["graph"].currentDisplay: initialSelection = 0 - graphLabels = panels["graph"].stats.keys() - graphLabels.sort() - for label in graphLabels: - if label == panels["graph"].currentDisplay: initialSelection = i - words = label.split() - options.append(" ".join(word[0].upper() + word[1:] for word in words)) - i += 1 - - # hides top label of the graph panel and pauses panels - if panels["graph"].currentDisplay: - panels["graph"].showLabel = False - panels["graph"].redraw(True) - setPauseState(panels, isPaused, page, True) - - selection = showMenu(stdscr, panels["popup"], "Graphed Stats:", options, initialSelection) - - # reverts changes made for popup - panels["graph"].showLabel = True - setPauseState(panels, isPaused, page) - - # applies new setting - if selection != -1 and selection != initialSelection: - if selection == 0: panels["graph"].setStats(None) - else: panels["graph"].setStats(options[selection].lower()) - - selectiveRefresh(panels, page) - - # TODO: this shouldn't be necessary with the above refresh, but doesn't seem responsive otherwise... - panels["graph"].redraw(True) - elif page == 0 and (key == ord('i') or key == ord('I')): - # provides menu to pick graph panel update interval - options = [label for (label, intervalTime) in graphing.graphPanel.UPDATE_INTERVALS] - - initialSelection = panels["graph"].updateInterval - - #initialSelection = -1 - #for i in range(len(options)): - # if options[i] == panels["graph"].updateInterval: initialSelection = i - - # hides top label of the graph panel and pauses panels - if panels["graph"].currentDisplay: - panels["graph"].showLabel = False - panels["graph"].redraw(True) - setPauseState(panels, isPaused, page, True) - - selection = showMenu(stdscr, panels["popup"], "Update Interval:", options, initialSelection) - - # reverts changes made for popup - panels["graph"].showLabel = True - setPauseState(panels, isPaused, page) - - # applies new setting - if selection != -1: panels["graph"].updateInterval = selection - - selectiveRefresh(panels, page) elif page == 0 and (key == ord('b') or key == ord('B')): # uses the next boundary type for graph panels["graph"].bounds = graphing.graphPanel.Bounds.next(panels["graph"].bounds) @@ -1031,64 +920,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() panels["graph"].redraw(True) - elif page == 0 and (key == ord('f') or key == ord('F')): - # provides menu to pick previous regular expression filters or to add a new one - # for syntax see: http://docs.python.org/library/re.html#regular-expression-syntax - options = ["None"] + regexFilters + ["New..."] - initialSelection = 0 if not panels["log"].regexFilter else 1 - - # hides top label of the graph panel and pauses panels - if panels["graph"].currentDisplay: - panels["graph"].showLabel = False - panels["graph"].redraw(True) - setPauseState(panels, isPaused, page, True) - - selection = showMenu(stdscr, panels["popup"], "Log Filter:", options, initialSelection) - - # applies new setting - if selection == 0: - panels["log"].setFilter(None) - elif selection == len(options) - 1: - # selected 'New...' option - prompt user to input regular expression - panel.CURSES_LOCK.acquire() - try: - # provides prompt - panels["control"].setMsg("Regular expression: ") - panels["control"].redraw(True) - - # gets user input (this blocks monitor updates) - regexInput = panels["control"].getstr(0, 20) - - if regexInput: - try: - panels["log"].setFilter(re.compile(regexInput)) - if regexInput in regexFilters: regexFilters.remove(regexInput) - regexFilters = [regexInput] + regexFilters - except re.error, exc: - panels["control"].setMsg("Unable to compile expression: %s" % str(exc), curses.A_STANDOUT) - panels["control"].redraw(True) - time.sleep(2) - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - finally: - panel.CURSES_LOCK.release() - elif selection != -1: - try: - panels["log"].setFilter(re.compile(regexFilters[selection - 1])) - - # move selection to top - regexFilters = [regexFilters[selection - 1]] + regexFilters - del regexFilters[selection] - except re.error, exc: - # shouldn't happen since we've already checked validity - log.log(log.WARN, "Invalid regular expression ('%s': %s) - removing from listing" % (regexFilters[selection - 1], str(exc))) - del regexFilters[selection - 1] - - if len(regexFilters) > MAX_REGEX_FILTERS: del regexFilters[MAX_REGEX_FILTERS:] - - # reverts changes made for popup - panels["graph"].showLabel = True - setPauseState(panels, isPaused, page) - panels["graph"].redraw(True) elif page == 0 and key in (ord('n'), ord('N'), ord('m'), ord('M')): # Unfortunately modifier keys don't work with the up/down arrows (sending # multiple keycodes. The only exception to this is shift + left/right, @@ -1124,30 +955,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): setPauseState(panels, isPaused, page) finally: panel.CURSES_LOCK.release() - elif page == 1 and (key == ord('u') or key == ord('U')): - # provides menu to pick identification resolving utility - options = ["auto"] + connections.Resolver.values() - - currentOverwrite = connections.getResolver("tor").overwriteResolver # enums correspond to indices - if currentOverwrite == None: initialSelection = 0 - else: initialSelection = options.index(currentOverwrite) - - # hides top label of conn panel and pauses panels - panelTitle = panels["conn"]._title - panels["conn"]._title = "" - panels["conn"].redraw(True) - setPauseState(panels, isPaused, page, True) - - selection = showMenu(stdscr, panels["popup"], "Resolver Util:", options, initialSelection) - selectedOption = options[selection] if selection != 0 else None - - # reverts changes made for popup - panels["conn"]._title = panelTitle - setPauseState(panels, isPaused, page) - - # applies new setting - if selection != -1 and selectedOption != connections.getResolver("tor").overwriteResolver: - connections.getResolver("tor").overwriteResolver = selectedOption elif page == 1 and key in (ord('d'), ord('D')): # presents popup for raw consensus data panel.CURSES_LOCK.acquire() @@ -1165,31 +972,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): curses.halfdelay(REFRESH_RATE * 10) # reset normal pausing behavior finally: panel.CURSES_LOCK.release() - elif page == 1 and (key == ord('l') or key == ord('L')): - # provides a menu to pick the primary information we list connections by - options = cli.connections.entries.ListingType.values() - - # dropping the HOSTNAME listing type until we support displaying that content - options.remove(cli.connections.entries.ListingType.HOSTNAME) - - initialSelection = options.index(panels["conn"]._listingType) - - # hides top label of connection panel and pauses the display - panelTitle = panels["conn"]._title - panels["conn"]._title = "" - panels["conn"].redraw(True) - setPauseState(panels, isPaused, page, True) - - selection = showMenu(stdscr, panels["popup"], "List By:", options, initialSelection) - - # reverts changes made for popup - panels["conn"]._title = panelTitle - setPauseState(panels, isPaused, page) - - # applies new setting - if selection != -1 and options[selection] != panels["conn"]._listingType: - panels["conn"].setListingType(options[selection]) - panels["conn"].redraw(True) elif page == 2 and (key == ord('w') or key == ord('W')): # display a popup for saving the current configuration panel.CURSES_LOCK.acquire() @@ -1400,14 +1182,10 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): time.sleep(1) panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - elif page == 0: - panels["log"].handleKey(key) - elif page == 1: - panels["conn"].handleKey(key) - elif page == 2: - panels["config"].handleKey(key) - elif page == 3: - panels["torrc"].handleKey(key) + else: + for pagePanel in getPanels(page + 1): + isKeystrokeConsumed = pagePanel.handleKey(key) + if isKeystrokeConsumed: break if REFRESH_FLAG: REFRESH_FLAG = False diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index d8808b3..0c52f6f 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -20,6 +20,8 @@ import copy import curses from TorCtl import TorCtl +import cli.popups + from util import enum, panel, uiTools # time intervals at which graphs can be updated @@ -229,7 +231,6 @@ class GraphPanel(panel.Panel): self.graphHeight = CONFIG["features.graph.height"] self.currentDisplay = None # label of the stats currently being displayed self.stats = {} # available stats (mappings of label -> instance) - self.showLabel = True # shows top label if true, hides otherwise self.setPauseAttr("stats") def getHeight(self): @@ -253,6 +254,37 @@ class GraphPanel(panel.Panel): self.graphHeight = max(MIN_GRAPH_HEIGHT, newGraphHeight) + def handleKey(self, key): + isKeystrokeConsumed = True + if key == ord('s') or key == ord('S'): + # provides a menu to pick the graphed stats + availableStats = self.stats.keys() + availableStats.sort() + + # uses sorted, camel cased labels for the options + options = ["None"] + for label in availableStats: + words = label.split() + options.append(" ".join(word[0].upper() + word[1:] for word in words)) + + if self.currentDisplay: + initialSelection = availableStats.index(self.currentDisplay) + 1 + else: initialSelection = 0 + + selection = cli.popups.showMenu("Graphed Stats:", options, initialSelection) + + # applies new setting + if selection == 0: self.setStats(None) + elif selection != -1: self.setStats(options[selection].lower()) + elif key == ord('i') or key == ord('I'): + # provides menu to pick graph panel update interval + options = [label for (label, _) in UPDATE_INTERVALS] + selection = cli.popups.showMenu("Update Interval:", options, self.updateInterval) + if selection != -1: self.updateInterval = selection + else: isKeystrokeConsumed = False + + return isKeystrokeConsumed + def getHelp(self): if self.currentDisplay: graphedStats = self.currentDisplay else: graphedStats = "none" @@ -275,7 +307,7 @@ class GraphPanel(panel.Panel): primaryColor = uiTools.getColor(param.getColor(True)) secondaryColor = uiTools.getColor(param.getColor(False)) - if self.showLabel: self.addstr(0, 0, param.getTitle(width), curses.A_STANDOUT) + if self.isTitleVisible(): self.addstr(0, 0, param.getTitle(width), curses.A_STANDOUT) # top labels left, right = param.getHeaderLabel(width / 2, True), param.getHeaderLabel(width / 2, False) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index b12715e..d34b640 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -4,13 +4,15 @@ for. This provides prepopulation from the log file and supports filtering by regular expressions. """ -import time +import re import os +import time import curses import threading from TorCtl import TorCtl +import popups from version import VERSION from util import conf, log, panel, sysTools, torTools, uiTools @@ -75,6 +77,9 @@ CACHED_DUPLICATES_RESULT = None # duration we'll wait for the deduplication function before giving up (in ms) DEDUPLICATION_TIMEOUT = 100 +# maximum number of regex filters we'll remember +MAX_REGEX_FILTERS = 5 + def daysSince(timestamp=None): """ Provides the number of days since the epoch converted to local time (rounded @@ -551,6 +556,7 @@ class LogPanel(panel.Panel, threading.Thread): self.msgLog = [] # log entries, sorted by the timestamp self.loggedEvents = loggedEvents # events we're listening to self.regexFilter = None # filter for presented log events (no filtering if None) + self.filterOptions = [] # filters the user has input self.lastContentHeight = 0 # height of the rendered content when last drawn self.logFile = None # file log messages are saved to (skipped if None) self.scroll = 0 @@ -746,6 +752,7 @@ class LogPanel(panel.Panel, threading.Thread): raise exc def handleKey(self, key): + isKeystrokeConsumed = True if uiTools.isScrollKey(key): pageHeight = self.getPreferredSize()[0] - 1 newScroll = uiTools.getScrollPosition(key, self.scroll, pageHeight, self.lastContentHeight) @@ -760,6 +767,53 @@ class LogPanel(panel.Panel, threading.Thread): self.showDuplicates = not self.showDuplicates self.redraw(True) self.valsLock.release() + elif key == ord('f') or key == ord('F'): + # Provides menu to pick regular expression filters or adding new ones: + # for syntax see: http://docs.python.org/library/re.html#regular-expression-syntax + options = ["None"] + self.filterOptions + ["New..."] + oldSelection = 0 if not self.regexFilter else 1 + + # does all activity under a curses lock to prevent redraws when adding + # new filters + panel.CURSES_LOCK.acquire() + try: + selection = popups.showMenu("Log Filter:", options, oldSelection) + + # applies new setting + if selection == 0: + self.setFilter(None) + elif selection == len(options) - 1: + # selected 'New...' option - prompt user to input regular expression + regexInput = popups.inputPrompt("Regular expression: ") + + if regexInput: + try: + self.setFilter(re.compile(regexInput)) + if regexInput in self.filterOptions: self.filterOptions.remove(regexInput) + self.filterOptions.insert(0, regexInput) + except re.error, exc: + popups.showMsg("Unable to compile expression: %s" % exc, 2) + elif selection != -1: + selectedOption = self.filterOptions[selection - 1] + + try: + self.setFilter(re.compile(selectedOption)) + + # move selection to top + self.filterOptions.remove(selectedOption) + self.filterOptions.insert(0, selectedOption) + except re.error, exc: + # shouldn't happen since we've already checked validity + msg = "Invalid regular expression ('%s': %s) - removing from listing" % (selectedOption, exc) + log.log(log.WARN, msg) + self.filterOptions.remove(selectedOption) + finally: + panel.CURSES_LOCK.release() + + if len(self.filterOptions) > MAX_REGEX_FILTERS: del self.filterOptions[MAX_REGEX_FILTERS:] + else: isKeystrokeConsumed = False + + return isKeystrokeConsumed def getHelp(self): options = [] @@ -784,7 +838,8 @@ class LogPanel(panel.Panel, threading.Thread): self._lastLoggedEvents, self._lastUpdate = list(currentLog), time.time() # draws the top label - self.addstr(0, 0, self._getTitle(width), curses.A_STANDOUT) + if self.isTitleVisible(): + self.addstr(0, 0, self._getTitle(width), curses.A_STANDOUT) # restricts scroll location to valid bounds self.scroll = max(0, min(self.scroll, self.lastContentHeight - height + 1)) diff --git a/src/cli/popups.py b/src/cli/popups.py index d5cf76c..81b4589 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -44,6 +44,46 @@ def finalize(): controller.refresh() panel.CURSES_LOCK.release() +def inputPrompt(msg): + """ + Prompts the user to enter a string on the control line (which usually + displays the page number and basic controls). + + Arguments: + msg - message to prompt the user for input with + """ + + panel.CURSES_LOCK.acquire() + controlPanel = controller.getPanel("control") + controlPanel.setMsg(msg) + controlPanel.redraw(True) + userInput = controlPanel.getstr(0, len(msg)) + controlPanel.revertMsg() + panel.CURSES_LOCK.release() + return userInput + +def showMsg(msg, maxWait, attr = curses.A_STANDOUT): + """ + Displays a single line message on the control line for a set time. Pressing + any key will end the message. + + Arguments: + msg - message to be displayed to the user + maxWait - time to show the message + attr - attributes with which to draw the message + """ + + panel.CURSES_LOCK.acquire() + controlPanel = controller.getPanel("control") + controlPanel.setMsg(msg, attr) + controlPanel.redraw(True) + + curses.halfdelay(maxWait * 10) + controller.getScreen().getch() + controlPanel.revertMsg() + curses.halfdelay(controller.REFRESH_RATE * 10) + panel.CURSES_LOCK.release() + def showHelpPopup(): """ Presents a popup with instructions for the current page's hotkeys. This @@ -108,7 +148,7 @@ def showHelpPopup(): return exitKey else: return None -def showSortDialog(titleLabel, options, oldSelection, optionColors): +def showSortDialog(title, options, oldSelection, optionColors): """ Displays a sorting dialog of the form: @@ -122,7 +162,7 @@ def showSortDialog(titleLabel, options, oldSelection, optionColors): then this returns None. Otherwise, the new ordering is provided. Arguments: - titleLabel - title displayed for the popup window + title - title displayed for the popup window options - ordered listing of option labels oldSelection - current ordering optionColors - mappings of options to their color @@ -142,7 +182,7 @@ def showSortDialog(titleLabel, options, oldSelection, optionColors): while len(newSelections) < len(oldSelection): popup.win.erase() popup.win.box() - popup.addstr(0, 0, titleLabel, curses.A_STANDOUT) + popup.addstr(0, 0, title, curses.A_STANDOUT) _drawSortSelection(popup, 1, 2, "Current Order: ", oldSelection, optionColors) _drawSortSelection(popup, 2, 2, "New Order: ", newSelections, optionColors) @@ -214,3 +254,54 @@ def _drawSortSelection(popup, y, x, prefix, options, optionColors): popup.addstr(y, x, ", ", curses.A_BOLD) x += 2 +def showMenu(title, options, oldSelection): + """ + Provides menu with options laid out in a single column. User can cancel + selection with the escape key, in which case this proives -1. Otherwise this + returns the index of the selection. + + Arguments: + title - title displayed for the popup window + options - ordered listing of options to display + oldSelection - index of the initially selected option (uses the first + selection without a carrot if -1) + """ + + maxWidth = max([len(label) for label in options]) + 9 + popup, width, height = init(len(options) + 2, maxWidth) + if not popup: return + key, selection = 0, oldSelection if oldSelection != -1 else 0 + + try: + # hides the title of the first panel on the page + topPanel = controller.getPanels(controller.getPage())[0] + topPanel.setTitleVisible(False) + topPanel.redraw(True) + + curses.cbreak() # wait indefinitely for key presses (no timeout) + + while not uiTools.isSelectionKey(key): + popup.win.erase() + popup.win.box() + popup.addstr(0, 0, title, curses.A_STANDOUT) + + for i in range(len(options)): + label = options[i] + format = curses.A_STANDOUT if i == selection else curses.A_NORMAL + tab = "> " if i == oldSelection else " " + popup.addstr(i + 1, 2, tab) + popup.addstr(i + 1, 4, " %s " % label, format) + + popup.win.refresh() + + key = controller.getScreen().getch() + if key == curses.KEY_UP: selection = max(0, selection - 1) + elif key == curses.KEY_DOWN: selection = min(len(options) - 1, selection + 1) + elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel + + topPanel.setTitleVisible(True) + curses.halfdelay(controller.REFRESH_RATE * 10) # reset normal pausing behavior + finally: finalize() + + return selection + diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index 6d7156d..5ca839f 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -31,7 +31,6 @@ class TorrcPanel(panel.Panel): self.valsLock = threading.RLock() self.configType = configType self.scroll = 0 - self.showLabel = True # shows top label (hides otherwise) self.showLineNum = True # shows left aligned line numbers self.stripComments = False # drops comments and extra whitespace @@ -42,6 +41,7 @@ class TorrcPanel(panel.Panel): def handleKey(self, key): self.valsLock.acquire() + isKeystrokeConsumed = True if uiTools.isScrollKey(key): pageHeight = self.getPreferredSize()[0] - 1 newScroll = uiTools.getScrollPosition(key, self.scroll, pageHeight, self._lastContentHeight) @@ -57,8 +57,10 @@ class TorrcPanel(panel.Panel): self.stripComments = not self.stripComments self._lastContentHeightArgs = None self.redraw(True) + else: isKeystrokeConsumed = False self.valsLock.release() + return isKeystrokeConsumed def getHelp(self): options = [] @@ -120,7 +122,7 @@ class TorrcPanel(panel.Panel): displayLine = -self.scroll + 1 # line we're drawing on # draws the top label - if self.showLabel: + if self.isTitleVisible(): sourceLabel = "Tor" if self.configType == Config.TORRC else "Arm" locationLabel = " (%s)" % confLocation if confLocation else "" self.addstr(0, 0, "%s Configuration File%s:" % (sourceLabel, locationLabel), curses.A_STANDOUT) diff --git a/src/util/panel.py b/src/util/panel.py index 7387833..06c8649 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -61,6 +61,7 @@ class Panel(): self.panelName = name self.parent = parent self.visible = False + self.titleVisible = True # Attributes for pausing. The pauseAttr contains variables our getAttr # method is tracking, and the pause buffer has copies of the values from @@ -93,6 +94,21 @@ class Panel(): return self.panelName + def isTitleVisible(self): + """ + True if the title is configured to be visible, False otherwise. + """ + + return self.titleVisible + + def setTitleVisible(self, isVisible): + """ + Configures the panel's title to be visible or not when it's next redrawn. + This is not guarenteed to be respected (not all panels have a title). + """ + + self.titleVisible = isVisible + def getParent(self): """ Provides the parent used to create subwindows. @@ -290,6 +306,17 @@ class Panel(): if setWidth != -1: newWidth = min(newWidth, setWidth) return (newHeight, newWidth) + def handleKey(self, key): + """ + Handler for user input. This returns true if the key press was consumed, + false otherwise. + + Arguments: + key - keycode for the key pressed + """ + + return False + def getHelp(self): """ Provides help information for the controls this page provides. This is a

1 0

[torspec/master] Update proposal target versions
by nickm＠torproject.org 09 May '11

09 May '11

commit 8ef0f94f7c2d370e41e98f938e53837f01e5d64d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 10:46:59 2011 -0400 Update proposal target versions This includes marking "for 0.2.3" everything arma and I suggested should be "tageted" for 0.2.3, and unmarking everything that was not done but targetted for 0.2.2 or earlier. --- proposals/000-index.txt | 53 ++++++++++---------- proposals/110-avoid-infinite-circuits.txt | 2 +- proposals/117-ipv6-exits.txt | 2 +- proposals/118-multiple-orports.txt | 6 ++- proposals/140-consensus-diffs.txt | 1 - proposals/143-distributed-storage-improvements.txt | 1 - proposals/145-newguard-flag.txt | 3 +- proposals/146-long-term-stability.txt | 3 +- proposals/147-prevoting-opinions.txt | 2 +- proposals/156-tracking-blocked-ports.txt | 2 +- proposals/157-specific-cert-download.txt | 2 +- proposals/158-microdescriptors.txt | 1 + proposals/162-consensus-flavors.txt | 2 +- proposals/164-reporting-server-status.txt | 1 - proposals/168-reduce-circwindow.txt | 2 +- proposals/171-separate-streams.txt | 3 +- proposals/172-circ-getinfo-option.txt | 1 + proposals/173-getinfo-option-expansion.txt | 1 + proposals/174-optimistic-data-server.txt | 1 + proposals/177-flag-abstention.txt | 1 + proposals/178-param-voting.txt | 3 +- .../179-TLS-cert-and-parameter-normalization.txt | 1 + proposals/180-pluggable-transport.txt | 1 + 23 files changed, 51 insertions(+), 44 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 4de2634..dca67dc 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -38,7 +38,7 @@ Proposals by number: 115 Two Hop Paths [DEAD] 116 Two hop paths from entry guards [DEAD] 117 IPv6 exits [ACCEPTED] -118 Advertising multiple ORPorts at once [ACCEPTED] +118 Advertising multiple ORPorts at once [NEEDS-REVISION] 119 New PROTOCOLINFO command for controllers [CLOSED] 120 Shutdown descriptors when Tor servers stop [DEAD] 121 Hidden Service Authentication [FINISHED] @@ -65,8 +65,8 @@ Proposals by number: 142 Combine Introduction and Rendezvous Points [DEAD] 143 Improvements of Distributed Storage for Tor Hidden Service Descriptors [OPEN] 144 Increase the diversity of circuits by detecting nodes belonging the same provider [DRAFT] -145 Separate "suitable as a guard" from "suitable as a new guard" [OPEN] -146 Add new flag to reflect long-term stability [OPEN] +145 Separate "suitable as a guard" from "suitable as a new guard" [NEEDS-RESEARCH] +146 Add new flag to reflect long-term stability [NEEDS-RESEARCH] 147 Eliminate the need for v2 directories in generating v3 directories [ACCEPTED] 148 Stream end reasons from the client side should be uniform [CLOSED] 149 Using data from NETINFO cells [SUPERSEDED] @@ -91,7 +91,7 @@ Proposals by number: 168 Reduce default circuit window [OPEN] 169 Eliminate TLS renegotiation for the Tor connection handshake [SUPERSEDED] 170 Configuration options regarding circuit building [SUPERSEDED] -171 Separate streams across circuits by connection metadata [OPEN] +171 Separate streams across circuits by connection metadata [ACCEPTED] 172 GETINFO controller option for circuit information [ACCEPTED] 173 GETINFO Option Expansion [ACCEPTED] 174 Optimistic Data for Tor: Server Side [CLOSED] @@ -112,32 +112,33 @@ Proposals by status: 141 Download server descriptors on demand 144 Increase the diversity of circuits by detecting nodes belonging the same provider 175 Automatically promoting Tor clients to nodes - 179 TLS certificate and parameter normalization + 179 TLS certificate and parameter normalization [for 0.2.3.x] NEEDS-REVISION: + 118 Advertising multiple ORPorts at once 131 Help users to verify they are using Tor + NEEDS-RESEARCH: + 145 Separate "suitable as a guard" from "suitable as a new guard" + 146 Add new flag to reflect long-term stability OPEN: - 143 Improvements of Distributed Storage for Tor Hidden Service Descriptors [for 0.2.1.x] - 145 Separate "suitable as a guard" from "suitable as a new guard" [for 0.2.1.x] - 146 Add new flag to reflect long-term stability [for 0.2.1.x] - 156 Tracking blocked ports on the client side [for 0.2.?] + 143 Improvements of Distributed Storage for Tor Hidden Service Descriptors + 156 Tracking blocked ports on the client side 159 Exit Scanning - 164 Reporting the status of server votes [for 0.2.2] + 164 Reporting the status of server votes 165 Easy migration for voting authority sets - 168 Reduce default circuit window [for 0.2.2] - 171 Separate streams across circuits by connection metadata + 168 Reduce default circuit window 176 Proposed version-3 link handshake for Tor [for 0.2.3] - 177 Abstaining from votes on individual flags - 178 Require majority of authorities to vote for consensus parameters - 180 Pluggable transports for circumvention + 177 Abstaining from votes on individual flags [for 0.2.3.x] + 178 Require majority of authorities to vote for consensus parameters [for 0.2.3.x] + 180 Pluggable transports for circumvention [for 0.2.3.x] ACCEPTED: - 110 Avoiding infinite length circuits [for 0.2.1.x] [in 0.2.1.3-alpha] - 117 IPv6 exits [for 0.2.1.x] - 118 Advertising multiple ORPorts at once [for 0.2.1.x] - 140 Provide diffs between consensuses [for 0.2.2.x] - 147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.1.x] - 157 Make certificate downloads specific [for 0.2.1.x] - 172 GETINFO controller option for circuit information - 173 GETINFO Option Expansion + 110 Avoiding infinite length circuits [for 0.2.3.x] [in 0.2.1.3-alpha] + 117 IPv6 exits [for 0.2.3.x] + 140 Provide diffs between consensuses + 147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.3.x] + 157 Make certificate downloads specific [for 0.2.3.x] + 171 Separate streams across circuits by connection metadata [for 0.2.3.x] + 172 GETINFO controller option for circuit information [for 0.2.3.x] + 173 GETINFO Option Expansion [for 0.2.3.x] META: 000 Index of Tor Proposals 001 The Tor Proposal Process @@ -147,10 +148,10 @@ Proposals by status: 121 Hidden Service Authentication [in 0.2.1.x] 151 Improving Tor Path Selection 155 Four Improvements of Hidden Service Performance [in 0.2.1.x] - 158 Clients download consensus + microdescriptors + 158 Clients download consensus + microdescriptors [in 0.2.3.1-alpha] 160 Authorities vote for bandwidth offsets in consensus [for 0.2.2.x] 161 Computing Bandwidth Adjustments [for 0.2.2.x] - 162 Publish the consensus in multiple flavors [for 0.2.2] + 162 Publish the consensus in multiple flavors [in 0.2.3.1-alpha] CLOSED: 101 Voting on the Tor Directory System [in 0.2.0.x] 102 Dropping "opt" from the directory format [in 0.2.0.x] @@ -180,7 +181,7 @@ Proposals by status: 152 Optionally allow exit from single-hop circuits [in 0.2.1.6-alpha] 166 Including Network Statistics in Extra-Info Documents [for 0.2.2] 167 Vote on network parameters in consensus [in 0.2.2] - 174 Optimistic Data for Tor: Server Side + 174 Optimistic Data for Tor: Server Side [in 0.2.3.1-alpha] SUPERSEDED: 112 Bring Back Pathlen Coin Weight 113 Simplifying directory authority administration diff --git a/proposals/110-avoid-infinite-circuits.txt b/proposals/110-avoid-infinite-circuits.txt index fffc41c..5da3261 100644 --- a/proposals/110-avoid-infinite-circuits.txt +++ b/proposals/110-avoid-infinite-circuits.txt @@ -3,7 +3,7 @@ Title: Avoiding infinite length circuits Author: Roger Dingledine Created: 13-Mar-2007 Status: Accepted -Target: 0.2.1.x +Target: 0.2.3.x Implemented-In: 0.2.1.3-alpha History: diff --git a/proposals/117-ipv6-exits.txt b/proposals/117-ipv6-exits.txt index fe458ce..648c520 100644 --- a/proposals/117-ipv6-exits.txt +++ b/proposals/117-ipv6-exits.txt @@ -3,7 +3,7 @@ Title: IPv6 exits Author: coderman Created: 10-Jul-2007 Status: Accepted -Target: 0.2.1.x +Target: 0.2.3.x Overview diff --git a/proposals/118-multiple-orports.txt b/proposals/118-multiple-orports.txt index 2381ec7..64a6000 100644 --- a/proposals/118-multiple-orports.txt +++ b/proposals/118-multiple-orports.txt @@ -2,8 +2,10 @@ Filename: 118-multiple-orports.txt Title: Advertising multiple ORPorts at once Author: Nick Mathewson Created: 09-Jul-2007 -Status: Accepted -Target: 0.2.1.x +Status: Needs-Revision + +[Needs Revision: This proposal needs revision to come up to 2011 standards +and take microdescriptors into account.] Overview: diff --git a/proposals/140-consensus-diffs.txt b/proposals/140-consensus-diffs.txt index 8bc4070..f3fcb2b 100644 --- a/proposals/140-consensus-diffs.txt +++ b/proposals/140-consensus-diffs.txt @@ -3,7 +3,6 @@ Title: Provide diffs between consensuses Author: Peter Palfrader Created: 13-Jun-2008 Status: Accepted -Target: 0.2.2.x 0. History diff --git a/proposals/143-distributed-storage-improvements.txt b/proposals/143-distributed-storage-improvements.txt index 0f7468f..fcd0773 100644 --- a/proposals/143-distributed-storage-improvements.txt +++ b/proposals/143-distributed-storage-improvements.txt @@ -3,7 +3,6 @@ Title: Improvements of Distributed Storage for Tor Hidden Service Descriptors Author: Karsten Loesing Created: 28-Jun-2008 Status: Open -Target: 0.2.1.x Change history: diff --git a/proposals/145-newguard-flag.txt b/proposals/145-newguard-flag.txt index 9e61e30..d2eea6d 100644 --- a/proposals/145-newguard-flag.txt +++ b/proposals/145-newguard-flag.txt @@ -2,8 +2,7 @@ Filename: 145-newguard-flag.txt Title: Separate "suitable as a guard" from "suitable as a new guard" Author: Nick Mathewson Created: 1-Jul-2008 -Status: Open -Target: 0.2.1.x +Status: Needs-Research [This could be obsoleted by proposal 141, which could replace NewGuard with a Guard weight.] diff --git a/proposals/146-long-term-stability.txt b/proposals/146-long-term-stability.txt index 9af0017..0fe1464 100644 --- a/proposals/146-long-term-stability.txt +++ b/proposals/146-long-term-stability.txt @@ -2,8 +2,7 @@ Filename: 146-long-term-stability.txt Title: Add new flag to reflect long-term stability Author: Nick Mathewson Created: 19-Jun-2008 -Status: Open -Target: 0.2.1.x +Status: Needs-Research Overview diff --git a/proposals/147-prevoting-opinions.txt b/proposals/147-prevoting-opinions.txt index 3d9659c..44c48f3 100644 --- a/proposals/147-prevoting-opinions.txt +++ b/proposals/147-prevoting-opinions.txt @@ -3,7 +3,7 @@ Title: Eliminate the need for v2 directories in generating v3 directories Author: Nick Mathewson Created: 2-Jul-2008 Status: Accepted -Target: 0.2.1.x +Target: 0.2.3.x Overview diff --git a/proposals/156-tracking-blocked-ports.txt b/proposals/156-tracking-blocked-ports.txt index 419de7e..399d9e8 100644 --- a/proposals/156-tracking-blocked-ports.txt +++ b/proposals/156-tracking-blocked-ports.txt @@ -3,7 +3,7 @@ Title: Tracking blocked ports on the client side Author: Robert Hogan Created: 14-Oct-2008 Status: Open -Target: 0.2.? + Motivation: Tor clients that are behind extremely restrictive firewalls can end up diff --git a/proposals/157-specific-cert-download.txt b/proposals/157-specific-cert-download.txt index 204b209..739c580 100644 --- a/proposals/157-specific-cert-download.txt +++ b/proposals/157-specific-cert-download.txt @@ -3,7 +3,7 @@ Title: Make certificate downloads specific Author: Nick Mathewson Created: 2-Dec-2008 Status: Accepted -Target: 0.2.1.x +Target: 0.2.3.x History: diff --git a/proposals/158-microdescriptors.txt b/proposals/158-microdescriptors.txt index bbfafba..39a0ed7 100644 --- a/proposals/158-microdescriptors.txt +++ b/proposals/158-microdescriptors.txt @@ -3,6 +3,7 @@ Title: Clients download consensus + microdescriptors Author: Roger Dingledine Created: 17-Jan-2009 Status: Finished +Implemented-In: 0.2.3.1-alpha 0. History diff --git a/proposals/162-consensus-flavors.txt b/proposals/162-consensus-flavors.txt index b027b42..f97143b 100644 --- a/proposals/162-consensus-flavors.txt +++ b/proposals/162-consensus-flavors.txt @@ -2,7 +2,7 @@ Filename: 162-consensus-flavors.txt Title: Publish the consensus in multiple flavors Author: Nick Mathewson Created: 14-May-2009 -Target: 0.2.2 +Implemented-In: 0.2.3.1-alpha Status: Finished Overview: diff --git a/proposals/164-reporting-server-status.txt b/proposals/164-reporting-server-status.txt index 705f5f1..c20460f 100644 --- a/proposals/164-reporting-server-status.txt +++ b/proposals/164-reporting-server-status.txt @@ -2,7 +2,6 @@ Filename: 164-reporting-server-status.txt Title: Reporting the status of server votes Author: Nick Mathewson Created: 22-May-2009 -Target: 0.2.2 Status: Open diff --git a/proposals/168-reduce-circwindow.txt b/proposals/168-reduce-circwindow.txt index a746286..aed1d61 100644 --- a/proposals/168-reduce-circwindow.txt +++ b/proposals/168-reduce-circwindow.txt @@ -3,7 +3,7 @@ Title: Reduce default circuit window Author: Roger Dingledine Created: 12-Aug-2009 Status: Open -Target: 0.2.2 + 0. History diff --git a/proposals/171-separate-streams.txt b/proposals/171-separate-streams.txt index 9842265..3b8b826 100644 --- a/proposals/171-separate-streams.txt +++ b/proposals/171-separate-streams.txt @@ -3,7 +3,8 @@ Title: Separate streams across circuits by connection metadata Author: Robert Hogan, Jacob Appelbaum, Damon McCoy, Nick Mathewson Created: 21-Oct-2008 Modified: 7-Dec-2010 -Status: Open +Status: Accepted +Target: 0.2.3.x Summary: diff --git a/proposals/172-circ-getinfo-option.txt b/proposals/172-circ-getinfo-option.txt index b7fd79c..f716194 100644 --- a/proposals/172-circ-getinfo-option.txt +++ b/proposals/172-circ-getinfo-option.txt @@ -3,6 +3,7 @@ Title: GETINFO controller option for circuit information Author: Damian Johnson Created: 03-June-2010 Status: Accepted +Target: 0.2.3.x Overview: diff --git a/proposals/173-getinfo-option-expansion.txt b/proposals/173-getinfo-option-expansion.txt index 54356c9..b9ba4bd 100644 --- a/proposals/173-getinfo-option-expansion.txt +++ b/proposals/173-getinfo-option-expansion.txt @@ -3,6 +3,7 @@ Title: GETINFO Option Expansion Author: Damian Johnson Created: 02-June-2010 Status: Accepted +Target: 0.2.3.x Overview: diff --git a/proposals/174-optimistic-data-server.txt b/proposals/174-optimistic-data-server.txt index 95c1386..193565b 100644 --- a/proposals/174-optimistic-data-server.txt +++ b/proposals/174-optimistic-data-server.txt @@ -3,6 +3,7 @@ Title: Optimistic Data for Tor: Server Side Author: Ian Goldberg Created: 2-Aug-2010 Status: Closed +Implemented-In: 0.2.3.1-alpha Overview: diff --git a/proposals/177-flag-abstention.txt b/proposals/177-flag-abstention.txt index 46d68e6..8c83504 100644 --- a/proposals/177-flag-abstention.txt +++ b/proposals/177-flag-abstention.txt @@ -3,6 +3,7 @@ Title: Abstaining from votes on individual flags Author: Nick Mathewson Created: 14 Feb 2011 Status: Open +Target: 0.2.3.x Overview: diff --git a/proposals/178-param-voting.txt b/proposals/178-param-voting.txt index b5664b5..2c4abf6 100644 --- a/proposals/178-param-voting.txt +++ b/proposals/178-param-voting.txt @@ -1,8 +1,9 @@ Filename: 178-param-voting.txt Title: Require majority of authorities to vote for consensus parameters -Author: Sebastian Hahn +Author: Sebastian Hahn Created: 16-Feb-2011 Status: Open +Target: 0.2.3.x Overview: diff --git a/proposals/179-TLS-cert-and-parameter-normalization.txt b/proposals/179-TLS-cert-and-parameter-normalization.txt index acad79a..7ad3ed8 100644 --- a/proposals/179-TLS-cert-and-parameter-normalization.txt +++ b/proposals/179-TLS-cert-and-parameter-normalization.txt @@ -3,6 +3,7 @@ Title: TLS certificate and parameter normalization Author: Jacob Appelbaum, Gladys Shufflebottom Created: 16-Feb-2011 Status: Draft +Target: 0.2.3.x Draft spec for TLS certificate and handshake normalization diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index f51a9ff..16ad761 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -3,6 +3,7 @@ Title: Pluggable transports for circumvention Author: Jacob Appelbaum, Nick Mathewson Created: 15-Oct-2010 Status: Open +Target: 0.2.3.x Overview

1 0

[torspec/master] Add a .gitignore for torspec
by nickm＠torproject.org 09 May '11

09 May '11

commit f40b6dcc9959caf139c998a9862c9f0ef546dbbf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 10:46:35 2011 -0400 Add a .gitignore for torspec --- .gitignore | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..be2ff82 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +# Editor droppings +\#*\# +.#* +*~ +*.swp +# C stuff +*.o +# Diff droppings +*.orig +*.rej +

1 0