Nick Mathewson
caa392a73a
Merge remote-tracking branch 'tor-github/pr/1685/head'
2020-02-24 07:45:20 -05:00
George Kadianakis
93cb8072be
Final touches to #32709 based on Nick's feedback.
...
- Fix a bug and add unittest.
- Add changes file.
- Add man page entry.
2020-02-24 12:15:35 +02:00
Nick Mathewson
7ba7f9c0de
Merge branch 'maint-0.4.3'
2020-02-20 10:44:43 -05:00
Nick Mathewson
7b42502869
Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
2020-02-20 10:44:36 -05:00
Nick Mathewson
66bbdadbbe
Merge branch 'extract_routerkeys_squashed'
2020-02-20 10:41:12 -05:00
Nick Mathewson
1d068625dd
Move relay_handshake.[ch] into src/feature/relay, and make it optional
2020-02-20 10:41:06 -05:00
Nick Mathewson
e425ffc637
Disable routerkeys.c with --disable-relay-mode.
2020-02-20 10:41:06 -05:00
Nick Mathewson
626eb025b6
Merge remote-tracking branch 'tor-github/pr/1745/head'
2020-02-20 09:14:40 -05:00
Nick Mathewson
09fb7987c5
Merge branch 'maint-0.4.3'
2020-02-20 08:50:18 -05:00
Nick Mathewson
f733b8acd6
Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3
2020-02-20 08:48:17 -05:00
Nick Mathewson
d559ca3d5a
Move router_reset_reachability() into correct header, add a stub
...
Without this, -O0 builds fail, which is a sign that LTO builds may
fail too.
2020-02-20 08:36:40 -05:00
Nick Mathewson
5149c100ed
run "make autostyle"
2020-02-20 08:33:40 -05:00
Nick Mathewson
b9cc4cc50a
Merge branch 'ticket4631_squashed'
2020-02-20 08:17:47 -05:00
teor
bed3b292ad
dirvote: Improve the posted vote log message
...
Cleanup after 4631.
2020-02-20 08:17:37 -05:00
Nick Mathewson
dd4fa9b468
Extract relay-only handshake code into its own file.
...
This is not the only relay-only handshake code, but it is most of
such code that is in connection_or.c.
2020-02-19 19:11:57 -05:00
Roger Dingledine
98bf7604a3
fix typo from 7920fc35
2020-02-19 14:53:36 -05:00
Nick Mathewson
a65efa7e83
Merge branch 'extract_relay_dns'
2020-02-19 13:58:53 -05:00
Nick Mathewson
65b75ef3d5
Merge branch 'extract_ext_orport'
2020-02-19 13:55:18 -05:00
Nick Mathewson
defd941fe7
Make dns_cancel_pending_resolve() STATIC.
...
It is not called by anything outside of the tests and dns.c.
2020-02-19 12:30:09 -05:00
Nick Mathewson
f739aa7962
Remove assert_all_pending_dns_resolves_ok().
...
It hasn't been used since 2009.
2020-02-19 12:27:49 -05:00
Nick Mathewson
51b470dbc8
dns.h: label functions that are only used inside feature/relay
2020-02-19 12:17:13 -05:00
Nick Mathewson
9b21a5d254
Note module-local functions in ext_orport.h
...
Since these are only used inside the feature/relay module, they
don't need stubs.
2020-02-19 12:12:00 -05:00
Nick Mathewson
df6191f620
Make connection_or_get_by_ext_or_id() testing-only
...
Apparently it is only used by the unit tests: tor doesn't want it at
all.
I've opened a new ticket (33383) to we if we should remove this
whole feature.
2020-02-19 12:11:23 -05:00
Nick Mathewson
7b6e81f8e6
Merge branch 'extract_selftest'
2020-02-19 11:58:17 -05:00
Nick Mathewson
11d0016ca1
Merge remote-tracking branch 'tor-github/pr/1756/head'
2020-02-19 11:57:27 -05:00
Nick Mathewson
dca2c00aca
Merge remote-tracking branch 'tor-github/pr/1755/head'
2020-02-19 11:39:05 -05:00
teor
15192f88c0
dirvote: Remove an incorrect log message
...
Cleanup after 4631.
2020-02-19 11:09:21 +10:00
teor
4dd594d33c
Merge remote-tracking branch 'tor-github/pr/1744'
2020-02-19 10:09:29 +10:00
teor
6e76570ede
Makefile: Tweak the test-network* chuttney networks
...
In "make test-network", add tests for single onion services v2 and v3.
In "make test-network-all", test onion services v2 and v3 in the same
network.
Part of 33334.
2020-02-19 09:29:02 +10:00
teor
57ff8d4a53
practracker: Read unicode files when using Python 2
...
Allow the "practracker" coding best practices checking script to read
unicode files, when using Python 2.
We made the script use unicode literals in 0.4.3.1-alpha, but didn't
change the codec for opening files.
Fixes bug 33374; bugfix on 0.4.3.1-alpha.
2020-02-19 08:22:01 +10:00
teor
d8cbb2965e
Run "practracker --regen-overbroad"
...
Closes ticket 33373.
2020-02-19 08:13:02 +10:00
Taylor Yu
5164709f90
changes file for ticket 33275
2020-02-18 13:34:46 -06:00
Taylor Yu
a46e585d6d
manpage: Add a missing out-of-order comment
2020-02-18 13:28:57 -06:00
David Goulet
f0561861e3
Merge branch 'tor-github/pr/1746'
2020-02-18 13:57:03 -05:00
Steven Engler
9a68eca3a7
Small changes to scheduler comments and state changes
...
Tries to make some of the comments in scheduler.c easier to follow,
and simplifies a couple of the scheduler channel state changes.
2020-02-18 13:56:58 -05:00
Nick Mathewson
e85f46b7be
Do not build selftest.c when running relay mode is disabled.
2020-02-18 13:31:33 -05:00
Nick Mathewson
a1a3a4d585
Make ext_orport.c relay-mode-only.
2020-02-18 13:23:50 -05:00
Nick Mathewson
1f958b6020
Move ext_orport identifier map into ext_orport.c
...
There's no need to move the declarations: those were already in
ext_orport.h.
This shrinks connection_or.c a little.
2020-02-18 13:10:57 -05:00
Nick Mathewson
8ce15933e5
Move some declarations into proto_ext_or.h
...
They are for functions declared in that file.
2020-02-18 13:07:33 -05:00
Nick Mathewson
eb07166eb8
Make sure callers can handle NULL ext-or auth cookie filename
2020-02-18 12:55:57 -05:00
Nick Mathewson
c43a245292
Disable dns.c when relay mode is disabled.
...
This saves about 1% for me on a binary compiled without relay mode.
Closes ticket 33366.
2020-02-18 12:46:10 -05:00
Nick Mathewson
1f06f494c8
Move DNS TTL manipulation code to src/core/or
...
This removes a dependency from the client code on feature/relay.
2020-02-18 12:08:29 -05:00
Nick Mathewson
dcbc45e6b2
Replace identifiers related to clipping DNS ttls.
...
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
MIN_DNS_TTL_AT_EXIT MIN_DNS_TTL \
MAX_DNS_TTL_AT_EXIT MAX_DNS_TTL \
dns_clip_ttl clip_dns_ttl
2020-02-18 12:00:24 -05:00
David Goulet
17724a7cde
Merge branch 'tor-github/pr/1743'
2020-02-18 09:06:13 -05:00
Nick Mathewson
d3c23b079a
lintChanges: Tolerate variants that sortChanges knows how to clean up.
2020-02-18 09:01:56 -05:00
David Goulet
f24959df1d
Merge branch 'tor-github/pr/1740'
2020-02-18 08:46:52 -05:00
George Kadianakis
975102869a
Fix issues pointed out by Nick.
...
- Loose the asserts on num_pkeys.
- Straighten some dangling &.
- Fix some unpredictable memcpys.
2020-02-18 12:37:34 +02:00
teor
f298706326
dirauth: Update disabled dirvote_add_vote()
...
Update the function that handles directory authority votes when the
dirauth module is disabled.
Part of 4631.
2020-02-18 13:23:33 +10:00
teor
e540a4147f
changes: file for 4631
2020-02-18 13:23:30 +10:00
teor
8b5b574a81
dirauth: Refactor dirvote_add_vote()
...
Refactor dirvote_add_vote() by splitting some code out into static
functions.
Cleanup after 4631.
2020-02-18 13:23:27 +10:00