Merge branch 'maint-0.3.2' into release-0.3.2
This commit is contained in:
commit
4bfc355799
|
@ -0,0 +1,8 @@
|
||||||
|
o Major bugfixes (relays):
|
||||||
|
- Fix a set of false positives where relays would consider connections
|
||||||
|
to other relays as being client-only connections (and thus e.g.
|
||||||
|
deserving different link padding schemes) if those relays fell out
|
||||||
|
of the consensus briefly. Now we look only at the initial handshake
|
||||||
|
and whether the connection authenticated as a relay. Fixes bug
|
||||||
|
24898; bugfix on 0.3.1.1-alpha.
|
||||||
|
|
|
@ -328,12 +328,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
|
||||||
|
|
||||||
if (connection_or_digest_is_known_relay(chan->identity_digest)) {
|
if (connection_or_digest_is_known_relay(chan->identity_digest)) {
|
||||||
rep_hist_note_circuit_handshake_requested(create_cell->handshake_type);
|
rep_hist_note_circuit_handshake_requested(create_cell->handshake_type);
|
||||||
// Needed for chutney: Sometimes relays aren't in the consensus yet, and
|
|
||||||
// get marked as clients. This resets their channels once they appear.
|
|
||||||
// Probably useful for normal operation wrt relay flapping, too.
|
|
||||||
channel_clear_client(chan);
|
|
||||||
} else {
|
|
||||||
channel_mark_client(chan);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) {
|
if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) {
|
||||||
|
|
|
@ -1954,6 +1954,12 @@ connection_or_set_state_open(or_connection_t *conn)
|
||||||
connection_or_change_state(conn, OR_CONN_STATE_OPEN);
|
connection_or_change_state(conn, OR_CONN_STATE_OPEN);
|
||||||
control_event_or_conn_status(conn, OR_CONN_EVENT_CONNECTED, 0);
|
control_event_or_conn_status(conn, OR_CONN_EVENT_CONNECTED, 0);
|
||||||
|
|
||||||
|
/* Link protocol 3 appeared in Tor 0.2.3.6-alpha, so any connection
|
||||||
|
* that uses an earlier link protocol should not be treated as a relay. */
|
||||||
|
if (conn->link_proto < 3) {
|
||||||
|
channel_mark_client(TLS_CHAN_TO_BASE(conn->chan));
|
||||||
|
}
|
||||||
|
|
||||||
or_handshake_state_free(conn->handshake_state);
|
or_handshake_state_free(conn->handshake_state);
|
||||||
conn->handshake_state = NULL;
|
conn->handshake_state = NULL;
|
||||||
connection_start_reading(TO_CONN(conn));
|
connection_start_reading(TO_CONN(conn));
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
[root]
|
[[package]]
|
||||||
|
name = "libc"
|
||||||
|
version = "0.2.22"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
name = "tor_util"
|
name = "tor_util"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
"libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "libc"
|
|
||||||
version = "0.2.22"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
|
|
||||||
[metadata]
|
[metadata]
|
||||||
"checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502"
|
"checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502"
|
||||||
|
|
Loading…
Reference in New Issue