diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-07 10:03:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-07 10:03:31 -0400 |
| commit | 27fa4a98d23972213122fa99499efa4baebe49e3 (patch) | |
| tree | f11c4da24093f55133d2ecc0b9aa73f66979bf60 /src/test/test_relaycell.c | |
| parent | 8421756da3fc3cc116d17fe96b50384c0d79af8b (diff) | |
| download | tor-27fa4a98d23972213122fa99499efa4baebe49e3.tar.gz tor-27fa4a98d23972213122fa99499efa4baebe49e3.zip | |
Make ClientDNSRejectInternalAddresses testing-only.
Undeprecate it;
rename it to TestingClientDNSRejectInternalAddresses;
add the old name as an alias;
reject configurations where it is set but TestingTorNetwork is not;
change the documentation accordingly.
Closes tickets 21031 and 21522.
Diffstat (limited to 'src/test/test_relaycell.c')
| -rw-r--r-- | src/test/test_relaycell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index eea1f5dc80..9c010deece 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -112,7 +112,7 @@ test_relaycell_resolved(void *arg) MOCK(connection_mark_unattached_ap_, mark_unattached_mock); MOCK(connection_ap_handshake_socks_resolved, socks_resolved_mock); - options->ClientDNSRejectInternalAddresses = 0; + options->TestingClientDNSRejectInternalAddresses = 0; SET_CELL(/* IPv4: 127.0.1.2, ttl 256 */ "\x04\x04\x7f\x00\x01\x02\x00\x00\x01\x00" @@ -151,7 +151,7 @@ test_relaycell_resolved(void *arg) /* But we may be discarding private answers. */ MOCK_RESET(); - options->ClientDNSRejectInternalAddresses = 1; + options->TestingClientDNSRejectInternalAddresses = 1; r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); tt_int_op(r, OP_EQ, 0); ASSERT_MARK_CALLED(END_STREAM_REASON_DONE| |