March 2016 - tor-commits - lists.torproject.org

[nyx/master] Help namedtuple
by atagar＠torproject.org 29 Mar '16

29 Mar '16

commit f8efef547f18d98bb236c773e2254fc10cb6b490 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 29 09:28:25 2016 -0700 Help namedtuple Having our get_help() methods provide namedtuples rather than tuples. Not a big whoop, but we might combine the handle_key() and get_help() methods soon. --- nyx/panel/__init__.py | 22 +++++++++++++++++----- nyx/panel/config.py | 20 ++++++++++---------- nyx/panel/connection.py | 22 +++++++++++----------- nyx/panel/graph.py | 12 ++++++------ nyx/panel/log.py | 18 +++++++++--------- nyx/panel/torrc.py | 18 +++++++++--------- nyx/popups.py | 12 +++++------- 7 files changed, 67 insertions(+), 57 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 70c577d..b725e20 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -2,6 +2,7 @@ Panels consisting the nyx interface. """ +import collections import time import curses import curses.ascii @@ -33,8 +34,20 @@ CONFIG = conf.config_dict('nyx', { 'features.maxLineWrap': 8, }, conf_handler) -# prevents curses redraws if set -HALT_ACTIVITY = False +HALT_ACTIVITY = False # prevents curses redraws if set + + +class Help(collections.namedtuple('Help', ['key', 'description', 'current'])): + """ + Help information about keybindings the panel handles. + + :var str key: key the user can press + :var str description: description of what it does + :var str current: optional current value + """ + + def __new__(self, key, description, current = None): + return super(Help, self).__new__(self, key, description, current) class BasicValidator(object): @@ -273,11 +286,10 @@ class Panel(object): def get_help(self): """ Provides help information for the controls this page provides. This is a - list of tuples of the form... - (control, description, status) + tuple of :class:`~nyx.panel.Help` instances. """ - return [] + return () def draw(self, width, height): """ diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 4b2881d..f0eac85 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -274,16 +274,16 @@ class ConfigPanel(nyx.panel.Panel): return True def get_help(self): - return [ - ('up arrow', 'scroll up a line', None), - ('down arrow', 'scroll down a line', None), - ('page up', 'scroll up a page', None), - ('page down', 'scroll down a page', None), - ('enter', 'edit configuration option', None), - ('w', 'write torrc', None), - ('a', 'toggle filtering', None), - ('s', 'sort ordering', None), - ] + return ( + nyx.panel.Help('up arrow', 'scroll up a line'), + nyx.panel.Help('down arrow', 'scroll down a line'), + nyx.panel.Help('page up', 'scroll up a page'), + nyx.panel.Help('page down', 'scroll down a page'), + nyx.panel.Help('enter', 'edit configuration option'), + nyx.panel.Help('w', 'write torrc'), + nyx.panel.Help('a', 'toggle filtering'), + nyx.panel.Help('s', 'sort ordering'), + ) def draw(self, width, height): contents = self._get_config_options() diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 22cda50..127cd12 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -420,23 +420,23 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): user_traffic_allowed = tor_controller().is_user_traffic_allowed() options = [ - ('up arrow', 'scroll up a line', None), - ('down arrow', 'scroll down a line', None), - ('page up', 'scroll up a page', None), - ('page down', 'scroll down a page', None), - ('enter', 'show connection details', None), - ('d', 'raw consensus descriptor', None), - ('s', 'sort ordering', None), - ('r', 'connection resolver', 'auto' if resolver is None else resolver), + nyx.panel.Help('up arrow', 'scroll up a line'), + nyx.panel.Help('down arrow', 'scroll down a line'), + nyx.panel.Help('page up', 'scroll up a page'), + nyx.panel.Help('page down', 'scroll down a page'), + nyx.panel.Help('enter', 'show connection details'), + nyx.panel.Help('d', 'raw consensus descriptor'), + nyx.panel.Help('s', 'sort ordering'), + nyx.panel.Help('r', 'connection resolver', 'auto' if resolver is None else resolver), ] if user_traffic_allowed.inbound: - options.append(('c', 'client locale usage summary', None)) + options.append(nyx.panel.Help('c', 'client locale usage summary')) if user_traffic_allowed.outbound: - options.append(('e', 'exit port usage summary', None)) + options.append(nyx.panel.Help('e', 'exit port usage summary')) - return options + return tuple(options) def draw(self, width, height): controller = tor_controller() diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 510fa14..b09c8b8 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -538,12 +538,12 @@ class GraphPanel(nyx.panel.Panel): return True def get_help(self): - return [ - ('r', 'resize graph', None), - ('s', 'graphed stats', self.displayed_stat if self.displayed_stat else 'none'), - ('b', 'graph bounds', self.bounds_type.replace('_', ' ')), - ('i', 'graph update interval', self.update_interval), - ] + return ( + nyx.panel.Help('r', 'resize graph'), + nyx.panel.Help('s', 'graphed stats', self.displayed_stat if self.displayed_stat else 'none'), + nyx.panel.Help('b', 'graph bounds', self.bounds_type.replace('_', ' ')), + nyx.panel.Help('i', 'graph update interval', self.update_interval), + ) def set_paused(self, is_pause): if is_pause: diff --git a/nyx/panel/log.py b/nyx/panel/log.py index c16eaec..8a0a9c7 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -261,15 +261,15 @@ class LogPanel(nyx.panel.Panel, threading.Thread): return True def get_help(self): - return [ - ('up arrow', 'scroll log up a line', None), - ('down arrow', 'scroll log down a line', None), - ('a', 'save snapshot of the log', None), - ('e', 'change logged events', None), - ('f', 'log regex filter', 'enabled' if self._filter.selection() else 'disabled'), - ('u', 'duplicate log entries', 'visible' if self._show_duplicates else 'hidden'), - ('c', 'clear event log', None), - ] + return ( + nyx.panel.Help('up arrow', 'scroll log up a line'), + nyx.panel.Help('down arrow', 'scroll log down a line'), + nyx.panel.Help('a', 'save snapshot of the log'), + nyx.panel.Help('e', 'change logged events'), + nyx.panel.Help('f', 'log regex filter', 'enabled' if self._filter.selection() else 'disabled'), + nyx.panel.Help('u', 'duplicate log entries', 'visible' if self._show_duplicates else 'hidden'), + nyx.panel.Help('c', 'clear event log'), + ) def set_paused(self, is_pause): if is_pause: diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 39318f5..560afb3 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -97,15 +97,15 @@ class TorrcPanel(panel.Panel): return True def get_help(self): - return [ - ('up arrow', 'scroll up a line', None), - ('down arrow', 'scroll down a line', None), - ('page up', 'scroll up a page', None), - ('page down', 'scroll down a page', None), - ('s', 'comment stripping', 'off' if self._show_comments else 'on'), - ('l', 'line numbering', 'on' if self._show_line_numbers else 'off'), - ('x', 'reset tor (issue sighup)', None), - ] + return ( + nyx.panel.Help('up arrow', 'scroll up a line'), + nyx.panel.Help('down arrow', 'scroll down a line'), + nyx.panel.Help('page up', 'scroll up a page'), + nyx.panel.Help('page down', 'scroll down a page'), + nyx.panel.Help('s', 'comment stripping', 'off' if self._show_comments else 'on'), + nyx.panel.Help('l', 'line numbering', 'on' if self._show_line_numbers else 'off'), + nyx.panel.Help('x', 'reset tor (issue sighup)'), + ) def draw(self, width, height): scroll = self._scroller.location(self._last_content_height, height) diff --git a/nyx/popups.py b/nyx/popups.py index d6a14f1..0952a8d 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -93,7 +93,7 @@ def show_help_popup(): subwindow.box() subwindow.addstr(0, 0, 'Page %i Commands:' % (control.get_page() + 1), HIGHLIGHT) - for i in range(len(help_options)): + for i, option in enumerate(help_options): if i / 2 >= subwindow.height - 2: break @@ -102,17 +102,15 @@ def show_help_popup(): # # u: duplicate log entries (hidden) - key, description, selection = help_options[i] - x = 2 if i % 2 == 0 else 41 y = (i / 2) + 1 - x = subwindow.addstr(x, y, key, BOLD) - x = subwindow.addstr(x, y, ': ' + description) + x = subwindow.addstr(x, y, option.key, BOLD) + x = subwindow.addstr(x, y, ': ' + option.description) - if selection: + if option.current: x = subwindow.addstr(x, y, ' (') - x = subwindow.addstr(x, y, selection, BOLD) + x = subwindow.addstr(x, y, option.current, BOLD) x = subwindow.addstr(x, y, ')') # tells user to press a key if the lower left is unoccupied

1 0

[stem/master] Clean up /tmp/descriptor_dump
by atagar＠torproject.org 29 Mar '16

29 Mar '16

commit 5f9f6986638b4a4ff193bfa03d7f34a2117ed231 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 29 08:45:40 2016 -0700 Clean up /tmp/descriptor_dump Leftover test file that isn't getting cleaned up. Caught by toralf. --- test/unit/tutorial_examples.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 3b9d1a0..a21937f 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -3,6 +3,7 @@ Tests for the examples given in stem's tutorial. """ import itertools +import os import unittest try: @@ -344,3 +345,6 @@ class TestTutorialExamples(unittest.TestCase): exec_documentation_example('persisting_a_consensus_with_parse_file.py') self.assertEqual(PERSISTING_A_CONSENSUS_OUTPUT, stdout_mock.getvalue()) + + if os.path.exists('/tmp/descriptor_dump'): + os.remove('/tmp/descriptor_dump')

1 0

[tor-browser-bundle/master] Bug 18127: fix base-vm file name when using KVM
by gk＠torproject.org 29 Mar '16

29 Mar '16

commit 162a3984a3e1c069c366676cc7fdd0d4bc8a0586 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 29 17:27:41 2016 +0200 Bug 18127: fix base-vm file name when using KVM The base-vm file name is different if we are using LXC or KVM. --- gitian/make-vms.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 554cc27..089865b 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,7 +25,8 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch ]; + if [ "z$USE_LXC" = "z1" -a ! -f ./base-$dist-$arch ] \ + || [ "z$USE_LXC" != "z1" -a ! -f ./base-$dist-$arch.qcow2 ]; then if [ "z$USE_LXC" = "z1" ]; then

1 0

[tor/maint-0.2.7] Make sure channel_t queues its own copy of incoming cells
by andrea＠torproject.org 29 Mar '16

29 Mar '16

commit bd87d37a861c541afbeb660b4d8dd62df14d5b45 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 15 07:40:19 2016 +0000 Make sure channel_t queues its own copy of incoming cells --- src/or/channel.c | 38 ++++++++++++++++++++++++++++++++++---- src/or/channeltls.c | 11 +++++++++++ src/or/connection_or.c | 35 +++++++++++++++++++++++++++++++++++ src/or/connection_or.h | 1 + 4 files changed, 81 insertions(+), 4 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 21522a5..62a21be 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2652,6 +2652,11 @@ channel_process_cells(channel_t *chan) /* * Process cells until we're done or find one we have no current handler * for. + * + * We must free the cells here after calling the handler, since custody + * of the buffer was given to the channel layer when they were queued; + * see comments on memory management in channel_queue_cell() and in + * channel_queue_var_cell() below. */ while (NULL != (q = TOR_SIMPLEQ_FIRST(&chan->incoming_queue))) { tor_assert(q); @@ -2669,6 +2674,7 @@ channel_process_cells(channel_t *chan) q->u.fixed.cell, chan, U64_PRINTF_ARG(chan->global_identifier)); chan->cell_handler(chan, q->u.fixed.cell); + tor_free(q->u.fixed.cell); tor_free(q); } else if (q->type == CELL_QUEUE_VAR && chan->var_cell_handler) { @@ -2681,6 +2687,7 @@ channel_process_cells(channel_t *chan) q->u.var.var_cell, chan, U64_PRINTF_ARG(chan->global_identifier)); chan->var_cell_handler(chan, q->u.var.var_cell); + tor_free(q->u.var.var_cell); tor_free(q); } else { /* Can't handle this one */ @@ -2701,6 +2708,7 @@ channel_queue_cell(channel_t *chan, cell_t *cell) { int need_to_queue = 0; cell_queue_entry_t *q; + cell_t *cell_copy = NULL; tor_assert(chan); tor_assert(cell); @@ -2728,8 +2736,19 @@ channel_queue_cell(channel_t *chan, cell_t *cell) U64_PRINTF_ARG(chan->global_identifier)); chan->cell_handler(chan, cell); } else { - /* Otherwise queue it and then process the queue if possible. */ - q = cell_queue_entry_new_fixed(cell); + /* + * Otherwise queue it and then process the queue if possible. + * + * We queue a copy, not the original pointer - it might have been on the + * stack in connection_or_process_cells_from_inbuf() (or another caller + * if we ever have a subclass other than channel_tls_t), or be freed + * there after we return. This is the uncommon case; the non-copying + * fast path occurs in the if (!need_to_queue) case above when the + * upper layer has installed cell handlers. + */ + cell_copy = tor_malloc_zero(sizeof(cell_t)); + memcpy(cell_copy, cell, sizeof(cell_t)); + q = cell_queue_entry_new_fixed(cell_copy); log_debug(LD_CHANNEL, "Queueing incoming cell_t %p for channel %p " "(global ID " U64_FORMAT ")", @@ -2755,6 +2774,7 @@ channel_queue_var_cell(channel_t *chan, var_cell_t *var_cell) { int need_to_queue = 0; cell_queue_entry_t *q; + var_cell_t *cell_copy = NULL; tor_assert(chan); tor_assert(var_cell); @@ -2783,8 +2803,18 @@ channel_queue_var_cell(channel_t *chan, var_cell_t *var_cell) U64_PRINTF_ARG(chan->global_identifier)); chan->var_cell_handler(chan, var_cell); } else { - /* Otherwise queue it and then process the queue if possible. */ - q = cell_queue_entry_new_var(var_cell); + /* + * Otherwise queue it and then process the queue if possible. + * + * We queue a copy, not the original pointer - it might have been on the + * stack in connection_or_process_cells_from_inbuf() (or another caller + * if we ever have a subclass other than channel_tls_t), or be freed + * there after we return. This is the uncommon case; the non-copying + * fast path occurs in the if (!need_to_queue) case above when the + * upper layer has installed cell handlers. + */ + cell_copy = var_cell_copy(var_cell); + q = cell_queue_entry_new_var(cell_copy); log_debug(LD_CHANNEL, "Queueing incoming var_cell_t %p for channel %p " "(global ID " U64_FORMAT ")", diff --git a/src/or/channeltls.c b/src/or/channeltls.c index c90f569..2a84514 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1009,6 +1009,11 @@ channel_tls_time_process_cell(cell_t *cell, channel_tls_t *chan, int *time, * for cell types specific to the handshake for this transport protocol and * handles them, and queues all other cells to the channel_t layer, which * eventually will hand them off to command.c. + * + * The channel layer itself decides whether the cell should be queued or + * can be handed off immediately to the upper-layer code. It is responsible + * for copying in the case that it queues; we merely pass pointers through + * which we get from connection_or_process_cells_from_inbuf(). */ void @@ -1106,6 +1111,12 @@ channel_tls_handle_cell(cell_t *cell, or_connection_t *conn) * related and live below the channel_t layer, so no variable-length * cells ever get delivered in the current implementation, but I've left * the mechanism in place for future use. + * + * If we were handing them off to the upper layer, the channel_t queueing + * code would be responsible for memory management, and we'd just be passing + * pointers through from connection_or_process_cells_from_inbuf(). That + * caller always frees them after this function returns, so this function + * should never free var_cell. */ void diff --git a/src/or/connection_or.c b/src/or/connection_or.c index a967c93..9944494 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -488,6 +488,28 @@ var_cell_new(uint16_t payload_len) return cell; } +/** + * Copy a var_cell_t + */ + +var_cell_t * +var_cell_copy(const var_cell_t *src) +{ + var_cell_t *copy = NULL; + size_t size = 0; + + if (src != NULL) { + size = STRUCT_OFFSET(var_cell_t, payload) + src->payload_len; + copy = tor_malloc_zero(size); + copy->payload_len = src->payload_len; + copy->command = src->command; + copy->circ_id = src->circ_id; + memcpy(copy->payload, src->payload, copy->payload_len); + } + + return copy; +} + /** Release all space held by <b>cell</b>. */ void var_cell_free(var_cell_t *cell) @@ -2060,6 +2082,19 @@ connection_or_process_cells_from_inbuf(or_connection_t *conn) { var_cell_t *var_cell; + /* + * Note on memory management for incoming cells: below the channel layer, + * we shouldn't need to consider its internal queueing/copying logic. It + * is safe to pass cells to it on the stack or on the heap, but in the + * latter case we must be sure we free them later. + * + * The incoming cell queue code in channel.c will (in the common case) + * decide it can pass them to the upper layer immediately, in which case + * those functions may run directly on the cell pointers we pass here, or + * it may decide to queue them, in which case it will allocate its own + * buffer and copy the cell. + */ + while (1) { log_debug(LD_OR, TOR_SOCKET_T_FORMAT": starting, inbuf_datalen %d " diff --git a/src/or/connection_or.h b/src/or/connection_or.h index 3877fd5..0bd8567 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -97,6 +97,7 @@ void cell_pack(packed_cell_t *dest, const cell_t *src, int wide_circ_ids); int var_cell_pack_header(const var_cell_t *cell, char *hdr_out, int wide_circ_ids); var_cell_t *var_cell_new(uint16_t payload_len); +var_cell_t *var_cell_copy(const var_cell_t *src); void var_cell_free(var_cell_t *cell); /** DOCDOC */

1 0

[tor/maint-0.2.7] changes file for bug18570
by andrea＠torproject.org 29 Mar '16

29 Mar '16

commit 72ebf4160412f64fb6ae0cd97dd89d01d89c075a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 21 10:19:07 2016 -0400 changes file for bug18570 --- changes/bug18570 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug18570 b/changes/bug18570 new file mode 100644 index 0000000..04f72f4 --- /dev/null +++ b/changes/bug18570 @@ -0,0 +1,7 @@ + o Minor bugfixes (correctness): + - Fix a bad memory handling bug that would occur if we had queued + a cell on a channel's incoming queue. Fortunately, we can't actually + queue a cell like that as our code is constructed today, but it's best + to avoid this kind of error, even if there isn't any code that triggers + it today. Fixes bug 18570; bugfix on 0.2.4.4-alpha. +

1 0

[tor/maint-0.2.7] Merge branch 'bug18570_027' into maint-0.2.7
by andrea＠torproject.org 29 Mar '16

29 Mar '16

commit 0b45cab1477d93e3065ca2d35e87483688f16bf6 Merge: 1218d73 72ebf41 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 29 15:01:36 2016 +0000 Merge branch 'bug18570_027' into maint-0.2.7 changes/bug18570 | 7 +++ src/or/channel.c | 38 +++++++++++++-- src/or/channeltls.c | 11 +++++ src/or/connection_or.c | 35 ++++++++++++++ src/or/connection_or.h | 1 + src/test/test_channel.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 204 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.2.7] Add new channel/queue_incoming unit tests; modify channel unit tests for new clarified handling of alloc/free responsibility for queued incoming cells
by andrea＠torproject.org 29 Mar '16

29 Mar '16

commit 1cdc7fddb2ed10d72f4e65e15d1af4d803a1acdb Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 15 03:28:04 2016 +0000 Add new channel/queue_incoming unit tests; modify channel unit tests for new clarified handling of alloc/free responsibility for queued incoming cells --- src/test/test_channel.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 116 insertions(+), 5 deletions(-) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index e11ac3f..b705ee5 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -25,7 +25,9 @@ extern uint64_t estimated_total_queue_size; static int test_chan_accept_cells = 0; static int test_chan_fixed_cells_recved = 0; +static cell_t * test_chan_last_seen_fixed_cell_ptr = NULL; static int test_chan_var_cells_recved = 0; +static var_cell_t * test_chan_last_seen_var_cell_ptr = NULL; static int test_cells_written = 0; static int test_destroy_not_pending_calls = 0; static int test_doesnt_want_writes_count = 0; @@ -70,6 +72,7 @@ static void test_channel_flushmux(void *arg); static void test_channel_incoming(void *arg); static void test_channel_lifecycle(void *arg); static void test_channel_multi(void *arg); +static void test_channel_queue_incoming(void *arg); static void test_channel_queue_size(void *arg); static void test_channel_write(void *arg); @@ -179,7 +182,7 @@ chan_test_cell_handler(channel_t *ch, tt_assert(ch); tt_assert(cell); - tor_free(cell); + test_chan_last_seen_fixed_cell_ptr = cell; ++test_chan_fixed_cells_recved; done: @@ -214,7 +217,7 @@ chan_test_var_cell_handler(channel_t *ch, tt_assert(ch); tt_assert(var_cell); - tor_free(var_cell); + test_chan_last_seen_var_cell_ptr = var_cell; ++test_chan_var_cells_recved; done: @@ -608,7 +611,7 @@ test_channel_dumpstats(void *arg) make_fake_cell(cell); old_count = test_chan_fixed_cells_recved; channel_queue_cell(ch, cell); - cell = NULL; + tor_free(cell); tt_int_op(test_chan_fixed_cells_recved, ==, old_count + 1); tt_assert(ch->n_bytes_recved > 0); tt_assert(ch->n_cells_recved > 0); @@ -819,7 +822,7 @@ test_channel_incoming(void *arg) make_fake_cell(cell); old_count = test_chan_fixed_cells_recved; channel_queue_cell(ch, cell); - cell = NULL; + tor_free(cell); tt_int_op(test_chan_fixed_cells_recved, ==, old_count + 1); /* Receive a variable-size cell */ @@ -827,7 +830,7 @@ test_channel_incoming(void *arg) make_fake_var_cell(var_cell); old_count = test_chan_var_cells_recved; channel_queue_var_cell(ch, var_cell); - var_cell = NULL; + tor_free(cell); tt_int_op(test_chan_var_cells_recved, ==, old_count + 1); /* Close it */ @@ -1423,6 +1426,113 @@ test_channel_queue_impossible(void *arg) } static void +test_channel_queue_incoming(void *arg) +{ + channel_t *ch = NULL; + cell_t *cell = NULL; + var_cell_t *var_cell = NULL; + int old_fixed_count, old_var_count; + + (void)arg; + + /* Mock these for duration of the test */ + MOCK(scheduler_channel_doesnt_want_writes, + scheduler_channel_doesnt_want_writes_mock); + MOCK(scheduler_release_channel, + scheduler_release_channel_mock); + + /* Accept cells to lower layer */ + test_chan_accept_cells = 1; + /* Use default overhead factor */ + test_overhead_estimate = 1.0f; + + ch = new_fake_channel(); + tt_assert(ch); + /* Start it off in OPENING */ + ch->state = CHANNEL_STATE_OPENING; + /* We'll need a cmux */ + ch->cmux = circuitmux_alloc(); + + /* Test cell handler getters */ + tt_ptr_op(channel_get_cell_handler(ch), ==, NULL); + tt_ptr_op(channel_get_var_cell_handler(ch), ==, NULL); + + /* Try to register it */ + channel_register(ch); + tt_assert(ch->registered); + + /* Open it */ + channel_change_state(ch, CHANNEL_STATE_OPEN); + tt_int_op(ch->state, ==, CHANNEL_STATE_OPEN); + + /* Assert that the incoming queue is empty */ + tt_assert(TOR_SIMPLEQ_EMPTY(&(ch->incoming_queue))); + + /* Queue an incoming fixed-length cell */ + cell = tor_malloc_zero(sizeof(cell_t)); + make_fake_cell(cell); + channel_queue_cell(ch, cell); + + /* Assert that the incoming queue has one entry */ + tt_int_op(chan_cell_queue_len(&(ch->incoming_queue)), ==, 1); + + /* Queue an incoming var cell */ + var_cell = tor_malloc_zero(sizeof(var_cell_t) + CELL_PAYLOAD_SIZE); + make_fake_var_cell(var_cell); + channel_queue_var_cell(ch, var_cell); + + /* Assert that the incoming queue has two entries */ + tt_int_op(chan_cell_queue_len(&(ch->incoming_queue)), ==, 2); + + /* + * Install cell handlers; this will drain the queue, so save the old + * cell counters first + */ + old_fixed_count = test_chan_fixed_cells_recved; + old_var_count = test_chan_var_cells_recved; + channel_set_cell_handlers(ch, + chan_test_cell_handler, + chan_test_var_cell_handler); + tt_ptr_op(channel_get_cell_handler(ch), ==, chan_test_cell_handler); + tt_ptr_op(channel_get_var_cell_handler(ch), ==, chan_test_var_cell_handler); + + /* Assert cells were received */ + tt_int_op(test_chan_fixed_cells_recved, ==, old_fixed_count + 1); + tt_int_op(test_chan_var_cells_recved, ==, old_var_count + 1); + + /* + * Assert that the pointers are different from the cells we allocated; + * when queueing cells with no incoming cell handlers installed, the + * channel layer should copy them to a new buffer, and free them after + * delivery. These pointers will have already been freed by the time + * we get here, so don't dereference them. + */ + tt_ptr_op(test_chan_last_seen_fixed_cell_ptr, !=, cell); + tt_ptr_op(test_chan_last_seen_var_cell_ptr, !=, var_cell); + + /* Assert queue is now empty */ + tt_assert(TOR_SIMPLEQ_EMPTY(&(ch->incoming_queue))); + + /* Close it; this contains an assertion that the incoming queue is empty */ + channel_mark_for_close(ch); + tt_int_op(ch->state, ==, CHANNEL_STATE_CLOSING); + chan_test_finish_close(ch); + tt_int_op(ch->state, ==, CHANNEL_STATE_CLOSED); + channel_run_cleanup(); + ch = NULL; + + done: + free_fake_channel(ch); + tor_free(cell); + tor_free(var_cell); + + UNMOCK(scheduler_channel_doesnt_want_writes); + UNMOCK(scheduler_release_channel); + + return; +} + +static void test_channel_queue_size(void *arg) { channel_t *ch = NULL; @@ -1666,6 +1776,7 @@ struct testcase_t channel_tests[] = { { "lifecycle_2", test_channel_lifecycle_2, TT_FORK, NULL, NULL }, { "multi", test_channel_multi, TT_FORK, NULL, NULL }, { "queue_impossible", test_channel_queue_impossible, TT_FORK, NULL, NULL }, + { "queue_incoming", test_channel_queue_incoming, TT_FORK, NULL, NULL }, { "queue_size", test_channel_queue_size, TT_FORK, NULL, NULL }, { "write", test_channel_write, TT_FORK, NULL, NULL }, END_OF_TESTCASES

1 0

[tor/master] majority of four is, alas, three
by arma＠torproject.org 29 Mar '16

29 Mar '16

commit 93c311daa8e7fd7021efbf3e58c1b66a3e791666 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Mar 29 10:57:01 2016 -0400 majority of four is, alas, three --- doc/HACKING/ReleasingTor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 85f3ba8..5cfd238 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -6,7 +6,7 @@ Here are the steps Roger takes when putting out a new Tor release: === 0. Preliminaries -1. Get at least two of weasel/arma/Sebastian/Sina to put the new +1. Get at least three of weasel/arma/Sebastian/Sina to put the new version number in their approved versions list.

1 0

[tor/master] fix typo in comment
by arma＠torproject.org 29 Mar '16

29 Mar '16

commit 1103d8249253889a270bc0891d1cad9647da65dd Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Mar 29 10:56:26 2016 -0400 fix typo in comment --- src/or/onion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/onion.c b/src/or/onion.c index d6ef367..4bed7ae 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -527,7 +527,7 @@ onion_skin_server_handshake(int type, * <b>rend_authenticator_out</b> to the "KH" field that can be used to * establish introduction points at this hop, and return 0. On failure, * return -1, and set *msg_out to an error message if this is worth - * complaining to the usre about. */ + * complaining to the user about. */ int onion_skin_client_handshake(int type, const onion_handshake_state_t *handshake_state,

1 0

[tor/maint-0.2.7] If we start/stop reading on a dnsserv connection, don't assert.
by andrea＠torproject.org 29 Mar '16

29 Mar '16

commit e79da62645925f3286deb21740bbe91de9dafacc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 534a6ac..3fb80e1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -578,6 +578,12 @@ connection_stop_reading,(connection_t *conn)) return; }); + /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event); if (conn->linked) { @@ -603,6 +609,12 @@ connection_start_reading,(connection_t *conn)) return; }); + /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event); if (conn->linked) {

1 0