diff options
| author | George Kadianakis <desnacked@riseup.net> | 2013-08-05 19:08:14 +0300 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-08-15 12:03:38 -0400 |
| commit | 794447d03db263a0b887db53fc6bcd2c8d24eb71 (patch) | |
| tree | 7546ee8a82af09c3734419c8718f5429ddb5a82e /src/test/test_extorport.c | |
| parent | f549e4c36d0658b6255d3b9cf7c56131d4a37a57 (diff) | |
| download | tor-794447d03db263a0b887db53fc6bcd2c8d24eb71.tar tor-794447d03db263a0b887db53fc6bcd2c8d24eb71.tar.gz | |
Fix some #5040 bugs found by Nick's tests.
- Set conn->address when we receive a USERADDR command.
- Set conn->state to a sane value when we transition from Extended
ORPort to ORPort.
Diffstat (limited to 'src/test/test_extorport.c')
| -rw-r--r-- | src/test/test_extorport.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index e76808fa9..b32ca35ff 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -505,10 +505,7 @@ test_ext_or_handshake(void *arg) tt_int_op(is_reading,==,1); tt_int_op(handshake_start_called,==,1); tt_int_op(TO_CONN(conn)->type, ==, CONN_TYPE_OR); - /* XXXXX the state is now nonsensical! It should be set to something - * neutral (zero?) before we connection_or_change_state; right now - * it's EXT_OR_CONN_STATE_FLUSHING */ - /* tt_int_op(TO_CONN(conn)->state, ==, 0); XXXX */ + tt_int_op(TO_CONN(conn)->state, ==, 0); done: UNMOCK(connection_write_to_buf_impl_); |