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

[arm/master] Moving graph panel resizing to the graph panel
by atagar＠torproject.org 13 May '11

13 May '11

commit 62a0e17f2ff9d3d44d82ca43360fa6da8eb21d54 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 19:04:41 2011 -0700 Moving graph panel resizing to the graph panel --- src/cli/controller.py | 15 --------------- src/cli/graphing/graphPanel.py | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index dc82d65..035ef07 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -919,21 +919,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() 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, - # but for now just gonna use standard characters. - - if key in (ord('n'), ord('N')): - panels["graph"].setGraphHeight(panels["graph"].graphHeight - 1) - else: - # don't grow the graph if it's already consuming the whole display - # (plus an extra line for the graph/log gap) - maxHeight = panels["graph"].parent.getmaxyx()[0] - panels["graph"].top - currentHeight = panels["graph"].getHeight() - - if currentHeight < maxHeight + 1: - panels["graph"].setGraphHeight(panels["graph"].graphHeight + 1) else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index 0c52f6f..c419119 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -256,7 +256,22 @@ class GraphPanel(panel.Panel): def handleKey(self, key): isKeystrokeConsumed = True - if key == ord('s') or key == ord('S'): + if 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, + # but for now just gonna use standard characters. + + if key in (ord('n'), ord('N')): + self.setGraphHeight(self.graphHeight - 1) + else: + # don't grow the graph if it's already consuming the whole display + # (plus an extra line for the graph/log gap) + maxHeight = self.parent.getmaxyx()[0] - self.top + currentHeight = self.getHeight() + + if currentHeight < maxHeight + 1: + self.setGraphHeight(self.graphHeight + 1) + elif key == ord('s') or key == ord('S'): # provides a menu to pick the graphed stats availableStats = self.stats.keys() availableStats.sort()

1 0

[arm/master] Moving log panel clearing handler to the log panel
by atagar＠torproject.org 13 May '11

13 May '11

commit bafcb04a9843443290dbfe697f5467f441941806 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 19:00:21 2011 -0700 Moving log panel clearing handler to the log panel --- src/cli/controller.py | 20 -------------------- src/cli/logPanel.py | 4 ++++ src/cli/popups.py | 6 ++++-- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 20a4e7e..dc82d65 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -934,26 +934,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): if currentHeight < maxHeight + 1: panels["graph"].setGraphHeight(panels["graph"].graphHeight + 1) - elif page == 0 and (key == ord('c') or key == ord('C')): - # provides prompt to confirm that arm should clear the log - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - panels["control"].setMsg("This will clear the log. Are you sure (c again to confirm)?", curses.A_BOLD) - panels["control"].redraw(True) - - curses.cbreak() - confirmationKey = stdscr.getch() - if confirmationKey in (ord('c'), ord('C')): panels["log"].clear() - - # reverts display settings - curses.halfdelay(REFRESH_RATE * 10) - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index d34b640..745cb57 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -767,6 +767,10 @@ class LogPanel(panel.Panel, threading.Thread): self.showDuplicates = not self.showDuplicates self.redraw(True) self.valsLock.release() + elif key == ord('c') or key == ord('C'): + msg = "This will clear the log. Are you sure (c again to confirm)?" + keyPress = popups.showMsg(msg, attr = curses.A_BOLD) + if keyPress in (ord('c'), ord('C')): self.clear() 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 diff --git a/src/cli/popups.py b/src/cli/popups.py index de4bad6..b957186 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -66,7 +66,7 @@ def inputPrompt(msg, initialValue = ""): def showMsg(msg, maxWait = -1, attr = curses.A_STANDOUT): """ Displays a single line message on the control line for a set time. Pressing - any key will end the message. + any key will end the message. This returns the key pressed. Arguments: msg - message to be displayed to the user @@ -81,10 +81,12 @@ def showMsg(msg, maxWait = -1, attr = curses.A_STANDOUT): if maxWait == -1: curses.cbreak() else: curses.halfdelay(maxWait * 10) - controller.getScreen().getch() + keyPress = controller.getScreen().getch() controlPanel.revertMsg() curses.halfdelay(controller.REFRESH_RATE * 10) panel.CURSES_LOCK.release() + + return keyPress def showHelpPopup(): """

1 0

[tor/maint-0.2.2] Downgrade the "we launched 10 circuits for this stream" message. (See bug 3080)
by nickm＠torproject.org 13 May '11

13 May '11

commit e0d5a6e1849673589c5b7f04d89e25194167344d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 19:41:08 2011 -0400 Downgrade the "we launched 10 circuits for this stream" message. (See bug 3080) --- src/or/circuituse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 9feb4e1..e68fb4f 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1416,7 +1416,7 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn, * a bad sign: we should tell the user. */ if (conn->num_circuits_launched < NUM_CIRCUITS_LAUNCHED_THRESHOLD && ++conn->num_circuits_launched == NUM_CIRCUITS_LAUNCHED_THRESHOLD) - log_warn(LD_BUG, "The application request to %s:%d has launched " + log_info(LD_CIRC, "The application request to %s:%d has launched " "%d circuits without finding one it likes.", escaped_safe_str_client(conn->socks_request->address), conn->socks_request->port,

1 0

[tor/master] Reapply the automated memcmp conversion to 0.2.3 to catch newly added memcmps
by nickm＠torproject.org 13 May '11

13 May '11

commit 7267647bd75762deba5c4070e93df64d0823142e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 16:41:14 2011 -0400 Reapply the automated memcmp conversion to 0.2.3 to catch newly added memcmps --- src/or/microdesc.c | 2 +- src/or/nodelist.c | 12 ++++++------ src/or/router.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index f7f42a4..86a53d2 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -465,7 +465,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) tor_assert(md->saved_location == SAVED_IN_CACHE); md->body = (char*)cache->cache_content->data + md->off; if (PREDICT_UNLIKELY( - md->bodylen < 9 || memcmp(md->body, "onion-key", 9) != 0)) { + md->bodylen < 9 || tor_memcmp(md->body, "onion-key", 9) != 0)) { /* XXXX023 once bug 2022 is solved, we can kill this block and turn it * into just the tor_assert(!memcmp) */ off_t avail = cache->cache_content->size - md->off; diff --git a/src/or/nodelist.c b/src/or/nodelist.c index a736dc3..ed7fe9c 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -47,7 +47,7 @@ node_id_hash(const node_t *node) static INLINE unsigned int node_id_eq(const node_t *node1, const node_t *node2) { - return 0 == memcmp(node1->identity, node2->identity, DIGEST_LEN); + return tor_memeq(node1->identity, node2->identity, DIGEST_LEN); } HT_PROTOTYPE(nodelist_map, node_t, ht_ent, node_id_hash, node_id_eq); @@ -183,7 +183,7 @@ nodelist_set_consensus(networkstatus_t *ns) node->rs = rs; if (ns->flavor == FLAV_MICRODESC) { if (node->md == NULL || - 0!=memcmp(node->md->digest,rs->descriptor_digest,DIGEST256_LEN)) { + tor_memneq(node->md->digest,rs->descriptor_digest,DIGEST256_LEN)) { node->md = microdesc_cache_lookup_by_digest256(NULL, rs->descriptor_digest); } @@ -352,7 +352,7 @@ nodelist_assert_ok(void) SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) { const node_t *node = node_get_by_id(ri->cache_info.identity_digest); tor_assert(node && node->ri == ri); - tor_assert(0 == memcmp(ri->cache_info.identity_digest, + tor_assert(tor_memeq(ri->cache_info.identity_digest, node->identity, DIGEST_LEN)); tor_assert(! digestmap_get(dm, node->identity)); digestmap_set(dm, node->identity, (void*)node); @@ -364,7 +364,7 @@ nodelist_assert_ok(void) SMARTLIST_FOREACH_BEGIN(ns->routerstatus_list, routerstatus_t *, rs) { const node_t *node = node_get_by_id(rs->identity_digest); tor_assert(node && node->rs == rs); - tor_assert(0 == memcmp(rs->identity_digest, node->identity, DIGEST_LEN)); + tor_assert(tor_memeq(rs->identity_digest, node->identity, DIGEST_LEN)); digestmap_set(dm, node->identity, (void*)node); if (ns->flavor == FLAV_MICRODESC) { /* If it's a microdesc consensus, every entry that has a @@ -422,7 +422,7 @@ node_get_by_hex_id(const char *hex_id) if (nn_char == '=') { const char *named_id = networkstatus_get_router_digest_by_nickname(nn_buf); - if (!named_id || memcmp(named_id, digest_buf, DIGEST_LEN)) + if (!named_id || tor_memcmp(named_id, digest_buf, DIGEST_LEN)) return NULL; } } @@ -540,7 +540,7 @@ node_is_named(const node_t *node) named_id = networkstatus_get_router_digest_by_nickname(nickname); if (!named_id) return 0; - return !memcmp(named_id, node->identity, DIGEST_LEN); + return tor_memeq(named_id, node->identity, DIGEST_LEN); } /** Return true iff <b>node</b> appears to be a directory authority or diff --git a/src/or/router.c b/src/or/router.c index 42b07cb..49c2a92 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2210,7 +2210,7 @@ router_get_verbose_nickname(char *buf, const routerinfo_t *router) { const char *good_digest = networkstatus_get_router_digest_by_nickname( router->nickname); - int is_named = good_digest && !memcmp(good_digest, + int is_named = good_digest && tor_memeq(good_digest, router->cache_info.identity_digest, DIGEST_LEN); buf[0] = '$';

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 13 May '11

13 May '11

commit 730dce46af87884d3b5d6443ac4013f51483ca8c Merge: af85017 98870f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 19:27:25 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2'

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 13 May '11

13 May '11

commit 98870f2eada31ee7efca62ab7adf98cb843e2937 Merge: 59a6df8 1f67827 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 19:25:21 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

1 0

[tor/master] Merge remote-tracking branch 'public/bug3122_memcmp_023'
by nickm＠torproject.org 13 May '11

13 May '11

1 0

[tor/master] Merge remote-tracking branch 'public/bug3122_memcmp_squashed' into maint-0.2.1
by nickm＠torproject.org 13 May '11

13 May '11

1 0

[tor/master] Hand-tune the new tor_memcmp instances in 0.2.3
by nickm＠torproject.org 13 May '11

13 May '11

commit 9e16a418f92670ae713138701fa931567fb4983d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 16:46:38 2011 -0400 Hand-tune the new tor_memcmp instances in 0.2.3 --- src/or/microdesc.c | 2 +- src/or/nodelist.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 86a53d2..ecab799 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -465,7 +465,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) tor_assert(md->saved_location == SAVED_IN_CACHE); md->body = (char*)cache->cache_content->data + md->off; if (PREDICT_UNLIKELY( - md->bodylen < 9 || tor_memcmp(md->body, "onion-key", 9) != 0)) { + md->bodylen < 9 || fast_memneq(md->body, "onion-key", 9) != 0)) { /* XXXX023 once bug 2022 is solved, we can kill this block and turn it * into just the tor_assert(!memcmp) */ off_t avail = cache->cache_content->size - md->off; diff --git a/src/or/nodelist.c b/src/or/nodelist.c index ed7fe9c..0856b31 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -352,7 +352,7 @@ nodelist_assert_ok(void) SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) { const node_t *node = node_get_by_id(ri->cache_info.identity_digest); tor_assert(node && node->ri == ri); - tor_assert(tor_memeq(ri->cache_info.identity_digest, + tor_assert(fast_memeq(ri->cache_info.identity_digest, node->identity, DIGEST_LEN)); tor_assert(! digestmap_get(dm, node->identity)); digestmap_set(dm, node->identity, (void*)node); @@ -364,7 +364,7 @@ nodelist_assert_ok(void) SMARTLIST_FOREACH_BEGIN(ns->routerstatus_list, routerstatus_t *, rs) { const node_t *node = node_get_by_id(rs->identity_digest); tor_assert(node && node->rs == rs); - tor_assert(tor_memeq(rs->identity_digest, node->identity, DIGEST_LEN)); + tor_assert(fast_memeq(rs->identity_digest, node->identity, DIGEST_LEN)); digestmap_set(dm, node->identity, (void*)node); if (ns->flavor == FLAV_MICRODESC) { /* If it's a microdesc consensus, every entry that has a @@ -422,7 +422,7 @@ node_get_by_hex_id(const char *hex_id) if (nn_char == '=') { const char *named_id = networkstatus_get_router_digest_by_nickname(nn_buf); - if (!named_id || tor_memcmp(named_id, digest_buf, DIGEST_LEN)) + if (!named_id || tor_memneq(named_id, digest_buf, DIGEST_LEN)) return NULL; } }

1 0

[tor/master] Merge remote-tracking branch 'public/bug3122_memcmp_022' into maint-0.2.2
by nickm＠torproject.org 13 May '11

13 May '11

1 0