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

[tor/master] Rename circuit_expire_all_dirty_circs
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 7bb51fdd89feb5ea3eb7e0a0b76c0dda0e50a82e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 18:37:03 2013 -0500 Rename circuit_expire_all_dirty_circs The new name is circuit_mark_all_dirty_circs_as_unusable. This resolves an XXX024 --- src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 3 +-- src/or/circuitlist.h | 2 +- src/or/config.c | 2 +- src/or/main.c | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 8a3a36a..5097f19 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -901,7 +901,7 @@ circuit_note_clock_jumped(int seconds_elapsed) control_event_client_status(severity, "CIRCUIT_NOT_ESTABLISHED REASON=%s", "CLOCK_JUMPED"); circuit_mark_all_unused_circs(); - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); } /** Take the 'extend' cell, pull out addr/port plus the onion diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index ae0955d..d1720b9 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1300,9 +1300,8 @@ circuit_mark_all_unused_circs(void) * This is useful for letting the user change pseudonyms, so new * streams will not be linkable to old streams. */ -/* XXX024 this is a bad name for what this function does */ void -circuit_expire_all_dirty_circs(void) +circuit_mark_all_dirty_circs_as_unusable(void) { circuit_t *circ; diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index e81c078..d67f80b 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -46,7 +46,7 @@ or_circuit_t *circuit_get_intro_point(const char *digest); origin_circuit_t *circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, int flags); void circuit_mark_all_unused_circs(void); -void circuit_expire_all_dirty_circs(void); +void circuit_mark_all_dirty_circs_as_unusable(void); void circuit_mark_for_close_(circuit_t *circ, int reason, int line, const char *file); int circuit_get_cpath_len(origin_circuit_t *circ); diff --git a/src/or/config.c b/src/or/config.c index f888426..c98c81a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1500,7 +1500,7 @@ options_act(const or_options_t *old_options) "preferred or excluded node lists. " "Abandoning previous circuits."); circuit_mark_all_unused_circs(); - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); revise_trackexithosts = 1; } diff --git a/src/or/main.c b/src/or/main.c index b5d1e2d..5add6a0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1129,7 +1129,7 @@ signewnym_impl(time_t now) return; } - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); addressmap_clear_transient(); rend_client_purge_state(); time_of_last_signewnym = now; @@ -1848,7 +1848,7 @@ do_hup(void) /* Rotate away from the old dirty circuits. This has to be done * after we've read the new options, but before we start using * circuits for directory fetches. */ - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); /* retry appropriate downloads */ router_reset_status_download_failures();

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 6e94d2fb3a11d7cba5796c1662e0c5089ad3e509 Merge: b0f7af1 597cd89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 16:36:52 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug6174 | 6 ++++++ src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 12 +++++------- src/or/circuitlist.h | 2 +- src/or/circuituse.c | 36 +++++++++++++++++++++++++++++++++--- src/or/circuituse.h | 1 + src/or/config.c | 2 +- src/or/connection_edge.c | 18 ++++++------------ src/or/main.c | 4 ++-- src/or/or.h | 4 ++++ src/or/relay.c | 5 ++--- 11 files changed, 62 insertions(+), 30 deletions(-)

1 0

[tor/maint-0.2.4] Stop frobbing timestamp_dirty as our sole means to mark circuits unusable
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 62fb209d837f3f5510075ef8bdb6e231ebdfa9bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 18:29:17 2013 -0500 Stop frobbing timestamp_dirty as our sole means to mark circuits unusable In a number of places, we decrement timestamp_dirty by MaxCircuitDirtiness in order to mark a stream as "unusable for any new connections. This pattern sucks for a few reasons: * It is nonobvious. * It is error-prone: decrementing 0 can be a bad choice indeed. * It really wants to have a function. It can also introduce bugs if the system time jumps backwards, or if MaxCircuitDirtiness is increased. So in this patch, I add an unusable_for_new_conns flag to origin_circuit_t, make it get checked everywhere it should (I looked for things that tested timestamp_dirty), and add a new function to frob it. For now, the new function does still frob timestamp_dirty (after checking for underflow and whatnot), in case I missed any cases that should be checking unusable_for_new_conns. Fixes bug 6174. We first used this pattern in 516ef41ac1fd26f338c, which I think was in 0.0.2pre26 (but it could have been 0.0.2pre27). --- changes/bug6174 | 6 ++++++ src/or/circuitlist.c | 9 ++++----- src/or/circuituse.c | 36 +++++++++++++++++++++++++++++++++--- src/or/circuituse.h | 1 + src/or/connection_edge.c | 18 ++++++------------ src/or/or.h | 4 ++++ src/or/relay.c | 5 ++--- 7 files changed, 56 insertions(+), 23 deletions(-) diff --git a/changes/bug6174 b/changes/bug6174 new file mode 100644 index 0000000..79d2930 --- /dev/null +++ b/changes/bug6174 @@ -0,0 +1,6 @@ + o Major bugfixes: + - When we mark a circuit as unusable for new circuits, have it + continue to be unusable for new circuits even if MaxCircuitDirtiness + is increased too much at the wrong time, or the system clock jumped + backwards. Fix for bug 6174; bugfix on 0.0.2pre26. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index ef32680..ae0955d 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1204,6 +1204,7 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, if ((!need_uptime || circ->build_state->need_uptime) && (!need_capacity || circ->build_state->need_capacity) && (internal == circ->build_state->is_internal) && + !circ->unusable_for_new_conns && circ->remaining_relay_early_cells && circ->build_state->desired_path_len == DEFAULT_ROUTE_LEN && !circ->build_state->onehop_tunnel && @@ -1304,15 +1305,13 @@ void circuit_expire_all_dirty_circs(void) { circuit_t *circ; - const or_options_t *options = get_options(); for (circ=global_circuitlist; circ; circ = circ->next) { if (CIRCUIT_IS_ORIGIN(circ) && !circ->marked_for_close && - circ->timestamp_dirty) - /* XXXX024 This is a screwed-up way to say "This is too dirty - * for new circuits. */ - circ->timestamp_dirty -= options->MaxCircuitDirtiness; + circ->timestamp_dirty) { + mark_circuit_unusable_for_new_conns(TO_ORIGIN_CIRCUIT(circ)); + } } } diff --git a/src/or/circuituse.c b/src/or/circuituse.c index c061203..7ee58fc 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -85,10 +85,14 @@ circuit_is_acceptable(const origin_circuit_t *origin_circ, } if (purpose == CIRCUIT_PURPOSE_C_GENERAL || - purpose == CIRCUIT_PURPOSE_C_REND_JOINED) + purpose == CIRCUIT_PURPOSE_C_REND_JOINED) { if (circ->timestamp_dirty && circ->timestamp_dirty+get_options()->MaxCircuitDirtiness <= now) return 0; + } + + if (origin_circ->unusable_for_new_conns) + return 0; /* decide if this circ is suitable for this conn */ @@ -798,9 +802,12 @@ circuit_stream_is_being_handled(entry_connection_t *conn, circ->purpose == CIRCUIT_PURPOSE_C_GENERAL && (!circ->timestamp_dirty || circ->timestamp_dirty + get_options()->MaxCircuitDirtiness > now)) { - cpath_build_state_t *build_state = TO_ORIGIN_CIRCUIT(circ)->build_state; + origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ); + cpath_build_state_t *build_state = origin_circ->build_state; if (build_state->is_internal || build_state->onehop_tunnel) continue; + if (!origin_circ->unusable_for_new_conns) + continue; exitnode = build_state_get_exit_node(build_state); if (exitnode && (!need_uptime || build_state->need_uptime)) { @@ -842,6 +849,7 @@ circuit_predict_and_launch_new(void) /* First, count how many of each type of circuit we have already. */ for (circ=global_circuitlist;circ;circ = circ->next) { cpath_build_state_t *build_state; + origin_circuit_t *origin_circ; if (!CIRCUIT_IS_ORIGIN(circ)) continue; if (circ->marked_for_close) @@ -850,7 +858,10 @@ circuit_predict_and_launch_new(void) continue; /* only count clean circs */ if (circ->purpose != CIRCUIT_PURPOSE_C_GENERAL) continue; /* only pay attention to general-purpose circs */ - build_state = TO_ORIGIN_CIRCUIT(circ)->build_state; + origin_circ = TO_ORIGIN_CIRCUIT(circ); + if (origin_circ->unusable_for_new_conns) + continue; + build_state = origin_circ->build_state; if (build_state->onehop_tunnel) continue; num++; @@ -2272,3 +2283,22 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) } } +/** Mark circ so that no more connections can be attached to it. */ +void +mark_circuit_unusable_for_new_conns(origin_circuit_t *circ) +{ + const or_options_t *options = get_options(); + tor_assert(circ); + + /* XXXX025 This is a kludge; we're only keeping it around in case there's + * something that doesn't check unusable_for_new_conns, and to avoid + * deeper refactoring of our expiration logic. */ + if (! circ->base_.timestamp_dirty) + circ->base_.timestamp_dirty = approx_time(); + if (options->MaxCircuitDirtiness >= circ->base_.timestamp_dirty) + circ->base_.timestamp_dirty = 1; /* prevent underflow */ + else + circ->base_.timestamp_dirty -= options->MaxCircuitDirtiness; + + circ->unusable_for_new_conns = 1; +} diff --git a/src/or/circuituse.h b/src/or/circuituse.h index d4d68aa..11e5a64 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -55,6 +55,7 @@ void circuit_change_purpose(circuit_t *circ, uint8_t new_purpose); int hostname_in_track_host_exits(const or_options_t *options, const char *address); +void mark_circuit_unusable_for_new_conns(origin_circuit_t *circ); #endif diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index fcbcb95..76c5f6a 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -674,12 +674,10 @@ connection_ap_expire_beginning(void) /* un-mark it as ending, since we're going to reuse it */ conn->edge_has_sent_end = 0; conn->end_reason = 0; - /* kludge to make us not try this circuit again, yet to allow - * current streams on it to survive if they can: make it - * unattractive to use for new streams */ - /* XXXX024 this is a kludgy way to do this. */ - tor_assert(circ->timestamp_dirty); - circ->timestamp_dirty -= options->MaxCircuitDirtiness; + /* make us not try this circuit again, but allow + * current streams on it to survive if they can */ + mark_circuit_unusable_for_new_conns(TO_ORIGIN_CIRCUIT(circ)); + /* give our stream another 'cutoff' seconds to try */ conn->base_.timestamp_lastread += cutoff; if (entry_conn->num_socks_retries < 250) /* avoid overflow */ @@ -1806,9 +1804,7 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn) connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); /* Mark this circuit "unusable for new streams". */ - /* XXXX024 this is a kludgy way to do this. */ - tor_assert(circ->base_.timestamp_dirty); - circ->base_.timestamp_dirty -= get_options()->MaxCircuitDirtiness; + mark_circuit_unusable_for_new_conns(circ); return -1; } @@ -1899,9 +1895,7 @@ connection_ap_handshake_send_resolve(entry_connection_t *ap_conn) connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); /* Mark this circuit "unusable for new streams". */ - /* XXXX024 this is a kludgy way to do this. */ - tor_assert(circ->base_.timestamp_dirty); - circ->base_.timestamp_dirty -= get_options()->MaxCircuitDirtiness; + mark_circuit_unusable_for_new_conns(circ); return -1; } diff --git a/src/or/or.h b/src/or/or.h index 45eb467..e5c6045 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2944,6 +2944,10 @@ typedef struct origin_circuit_t { */ ENUM_BF(path_state_t) path_state : 3; + /* If this flag is set, we should not consider attaching any more + * connections to this circuit. */ + unsigned int unusable_for_new_conns : 1; + /** * Tristate variable to guard against pathbias miscounting * due to circuit purpose transitions changing the decision diff --git a/src/or/relay.c b/src/or/relay.c index 9ff9e1e..fb15141 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -17,6 +17,7 @@ #include "channel.h" #include "circuitbuild.h" #include "circuitlist.h" +#include "circuituse.h" #include "config.h" #include "connection.h" #include "connection_edge.h" @@ -851,9 +852,7 @@ connection_ap_process_end_not_open( /* We haven't retried too many times; reattach the connection. */ circuit_log_path(LOG_INFO,LD_APP,circ); /* Mark this circuit "unusable for new streams". */ - /* XXXX024 this is a kludgy way to do this. */ - tor_assert(circ->base_.timestamp_dirty); - circ->base_.timestamp_dirty -= get_options()->MaxCircuitDirtiness; + mark_circuit_unusable_for_new_conns(circ); if (conn->chosen_exit_optional) { /* stop wanting a specific exit */

1 0

[tor/maint-0.2.4] Rename circuit_expire_all_dirty_circs
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 7bb51fdd89feb5ea3eb7e0a0b76c0dda0e50a82e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 18:37:03 2013 -0500 Rename circuit_expire_all_dirty_circs The new name is circuit_mark_all_dirty_circs_as_unusable. This resolves an XXX024 --- src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 3 +-- src/or/circuitlist.h | 2 +- src/or/config.c | 2 +- src/or/main.c | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 8a3a36a..5097f19 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -901,7 +901,7 @@ circuit_note_clock_jumped(int seconds_elapsed) control_event_client_status(severity, "CIRCUIT_NOT_ESTABLISHED REASON=%s", "CLOCK_JUMPED"); circuit_mark_all_unused_circs(); - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); } /** Take the 'extend' cell, pull out addr/port plus the onion diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index ae0955d..d1720b9 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1300,9 +1300,8 @@ circuit_mark_all_unused_circs(void) * This is useful for letting the user change pseudonyms, so new * streams will not be linkable to old streams. */ -/* XXX024 this is a bad name for what this function does */ void -circuit_expire_all_dirty_circs(void) +circuit_mark_all_dirty_circs_as_unusable(void) { circuit_t *circ; diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index e81c078..d67f80b 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -46,7 +46,7 @@ or_circuit_t *circuit_get_intro_point(const char *digest); origin_circuit_t *circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, int flags); void circuit_mark_all_unused_circs(void); -void circuit_expire_all_dirty_circs(void); +void circuit_mark_all_dirty_circs_as_unusable(void); void circuit_mark_for_close_(circuit_t *circ, int reason, int line, const char *file); int circuit_get_cpath_len(origin_circuit_t *circ); diff --git a/src/or/config.c b/src/or/config.c index f888426..c98c81a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1500,7 +1500,7 @@ options_act(const or_options_t *old_options) "preferred or excluded node lists. " "Abandoning previous circuits."); circuit_mark_all_unused_circs(); - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); revise_trackexithosts = 1; } diff --git a/src/or/main.c b/src/or/main.c index b5d1e2d..5add6a0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1129,7 +1129,7 @@ signewnym_impl(time_t now) return; } - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); addressmap_clear_transient(); rend_client_purge_state(); time_of_last_signewnym = now; @@ -1848,7 +1848,7 @@ do_hup(void) /* Rotate away from the old dirty circuits. This has to be done * after we've read the new options, but before we start using * circuits for directory fetches. */ - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); /* retry appropriate downloads */ router_reset_status_download_failures();

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug6174' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 597cd893c557f8e05be98b6cade1b312fc6f0f8d Merge: 01407f9 7bb51fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 16:36:25 2013 -0400 Merge remote-tracking branch 'public/bug6174' into maint-0.2.4 changes/bug6174 | 6 ++++++ src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 12 +++++------- src/or/circuitlist.h | 2 +- src/or/circuituse.c | 36 +++++++++++++++++++++++++++++++++--- src/or/circuituse.h | 1 + src/or/config.c | 2 +- src/or/connection_edge.c | 18 ++++++------------ src/or/main.c | 4 ++-- src/or/or.h | 4 ++++ src/or/relay.c | 5 ++--- 11 files changed, 62 insertions(+), 30 deletions(-)

1 0

[stem/master] Digest validation fails for 'non-ascii_descriptor'
by atagar＠torproject.org 18 Mar '13

18 Mar '13

commit bf5bac34abf95f1e12f0ce4030c305c364939c1f Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 18 13:34:41 2013 -0700 Digest validation fails for 'non-ascii_descriptor' The 'non-ascii_descriptor' test descriptor fails digest validation due to being slightly modified. Finding that descriptor was a PITA so simply mocking out the digest validation rather than trying to dig up the original. --- test/integ/descriptor/reader.py | 5 +++++ test/integ/descriptor/server_descriptor.py | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 3ed47ae..59e9c8c 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -12,6 +12,7 @@ import time import unittest import stem.descriptor.reader +import test.mocking import test.runner from stem.util import system @@ -85,6 +86,8 @@ class SkipListener: class TestDescriptorReader(unittest.TestCase): def tearDown(self): + test.mocking.revert_mocking() + # cleans up 'processed file' listings that we made test_listing_path = _get_processed_files_path() @@ -377,6 +380,8 @@ class TestDescriptorReader(unittest.TestCase): plaintext non-descriptor files. """ + test.mocking.mock_method(stem.descriptor.server_descriptor.RelayDescriptor, '_validate_content', test.mocking.no_op()) + skip_listener = SkipListener() reader = stem.descriptor.reader.DescriptorReader(DESCRIPTOR_TEST_DATA) reader.register_skip_listener(skip_listener.listener) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index fb2e2b3..ec7c464 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -13,12 +13,16 @@ import stem.descriptor import stem.descriptor.server_descriptor import stem.exit_policy import stem.version +import test.mocking import test.runner from test.integ.descriptor import get_resource class TestServerDescriptor(unittest.TestCase): + def tearDown(self): + test.mocking.revert_mocking() + def test_metrics_descriptor(self): """ Parses and checks our results against a server descriptor from metrics. @@ -190,6 +194,8 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Parses a descriptor with non-ascii content. """ + test.mocking.mock_method(stem.descriptor.server_descriptor.RelayDescriptor, '_validate_content', test.mocking.no_op()) + descriptor_file = open(get_resource("non-ascii_descriptor"), 'rb') expected_contact = b"2048R/F171EC1F Johan Bl\xc3\xa5b\xc3\xa4ck \xe3\x81\x93\xe3\x82\x93\xe3\x81\xab\xe3\x81\xa1\xe3\x81\xaf".decode("utf-8", "replace")

1 0

[tor/master] Increase link_proto field to 2 bytes
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit fca578d9b56d7d80fc43f21b77153d7e5cad92d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 12:34:14 2013 -0400 Increase link_proto field to 2 bytes This should have been 2 bytes all along, since version numbers can be 16 bits long. This isn't a live bug, since the call to is_or_protocol_version_known in channel_tls_process_versions_cell will reject any version number not in the range 1..4. Still, let's fix this before we accidentally start supporting version 256. Reported pseudonymously. Fixes bug 8062; bugfix on 0.2.0.10-alpha -- specifically, on commit 6fcda529, where during development I increased the width of a version to 16 bits without changing the type of link_proto. --- changes/bug8062 | 5 +++++ src/or/or.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug8062 b/changes/bug8062 new file mode 100644 index 0000000..805e51e --- /dev/null +++ b/changes/bug8062 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Increase the width of the field used to remember a connection's + link protocol version to two bytes. Harmless for now, since the + only currently recognized versions are one byte long. Reported + pseudynmously. Fixes bug 8062, bugfix on 0.2.0.10-alpha. diff --git a/src/or/or.h b/src/or/or.h index c7d2598..2fe36ba 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1417,8 +1417,8 @@ typedef struct or_connection_t { unsigned int is_outgoing:1; unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */ unsigned int wide_circ_ids:1; - uint8_t link_proto; /**< What protocol version are we using? 0 for - * "none negotiated yet." */ + uint16_t link_proto; /**< What protocol version are we using? 0 for + * "none negotiated yet." */ or_handshake_state_t *handshake_state; /**< If we are setting this connection * up, state information to do so. */

1 0

[tor/master] Merge remote-tracking branch 'public/bug8062' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 01407f9718a7b1eb4e43b46c2799a390551aad29 Merge: dbdc994 fca578d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 16:33:47 2013 -0400 Merge remote-tracking branch 'public/bug8062' into maint-0.2.4 changes/bug8062 | 5 +++++ src/or/or.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit b0f7af16156ef7d0c401485c6e7a533857f7b316 Merge: 899c280 01407f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 16:34:29 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8062 | 5 +++++ src/or/or.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] Increase link_proto field to 2 bytes
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit fca578d9b56d7d80fc43f21b77153d7e5cad92d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 12:34:14 2013 -0400 Increase link_proto field to 2 bytes This should have been 2 bytes all along, since version numbers can be 16 bits long. This isn't a live bug, since the call to is_or_protocol_version_known in channel_tls_process_versions_cell will reject any version number not in the range 1..4. Still, let's fix this before we accidentally start supporting version 256. Reported pseudonymously. Fixes bug 8062; bugfix on 0.2.0.10-alpha -- specifically, on commit 6fcda529, where during development I increased the width of a version to 16 bits without changing the type of link_proto. --- changes/bug8062 | 5 +++++ src/or/or.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug8062 b/changes/bug8062 new file mode 100644 index 0000000..805e51e --- /dev/null +++ b/changes/bug8062 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Increase the width of the field used to remember a connection's + link protocol version to two bytes. Harmless for now, since the + only currently recognized versions are one byte long. Reported + pseudynmously. Fixes bug 8062, bugfix on 0.2.0.10-alpha. diff --git a/src/or/or.h b/src/or/or.h index c7d2598..2fe36ba 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1417,8 +1417,8 @@ typedef struct or_connection_t { unsigned int is_outgoing:1; unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */ unsigned int wide_circ_ids:1; - uint8_t link_proto; /**< What protocol version are we using? 0 for - * "none negotiated yet." */ + uint16_t link_proto; /**< What protocol version are we using? 0 for + * "none negotiated yet." */ or_handshake_state_t *handshake_state; /**< If we are setting this connection * up, state information to do so. */

1 0