Nick Mathewson
5e5e019b31
Merge remote-tracking branch 'dgoulet/bug27550_035_01'
2018-09-26 08:36:09 -04:00
Nick Mathewson
3a643078c1
Changes file for splitting router.c
2018-09-25 18:54:17 -04:00
Nick Mathewson
5fe05de4fe
Remove extra includes from router.c
2018-09-25 18:33:13 -04:00
Nick Mathewson
4f0bc0c8f5
Revise things that had included router.h before
...
Make them only include the headers that they needed, and sort their
headers while we're at it.
2018-09-25 17:57:58 -04:00
Nick Mathewson
3ff58e47d2
Move the "is the network disabled?" functions out of router.c
...
Since this is completely core functionality, I'm putting it in
core/mainloop, even though it depends on feature/hibernate. We'll
have to sort that out in the future.
2018-09-25 17:22:14 -04:00
Nick Mathewson
b8df2318e9
Move routerinfo_t functions out of router.c
...
(It turns out that some of the functions in router.h didn't even
exist any more, so I just got to delete their declarations completely.)
2018-09-25 16:48:00 -04:00
Nick Mathewson
efa978124f
Extract nickname-checking functions from router.c
2018-09-25 16:22:11 -04:00
Nick Mathewson
5c86f3c297
Move the various _describe() functions out of router.c
...
Note that I haven't separated the headers yet (there's still an
2018-09-25 16:13:47 -04:00
Nick Mathewson
fcd0f76134
Extract all the "am I a server" functions from router.c
2018-09-25 16:00:50 -04:00
Nick Mathewson
70539e3d5e
Move all authdir_mode_*() functions into authmode.h
2018-09-25 15:39:24 -04:00
Nick Mathewson
9385b7ec5f
Rename dirauth/mode.h to dirauth/authmode.h
...
This is preparation for having a routermode.h as well
2018-09-25 15:18:21 -04:00
Nick Mathewson
8a350e088b
Move self-test functionality into its own file.
2018-09-25 15:14:57 -04:00
Nick Mathewson
934859cf80
Move key-loading and crosscert-checking out of feature/relay
...
This is also used by onion services, so it needs to go in another
module.
2018-09-25 15:14:57 -04:00
cypherpunks
fcbbcf92cb
add --enable-nss build to Travis CI
2018-09-25 18:43:23 +00:00
rl1987
c82163dff4
Fix reference to socks-extensions.txt in tor-resolve manpage
2018-09-25 12:39:27 +03:00
cypherpunks
5e74db95c2
rust: run rustfmt
2018-09-24 18:00:56 +00:00
Nick Mathewson
6b90972dc6
Merge branch 'pr_339_squashed'
2018-09-24 11:25:39 -04:00
rl1987
d49133d9ca
Mention that we require Python 2.7 or newer
2018-09-24 11:25:33 -04:00
Nick Mathewson
9767cf8cc0
Merge branch 'bug26913_033'
2018-09-24 11:17:09 -04:00
Nick Mathewson
6c739c3fb2
Fix arm compilation with openssl <1.1
...
Bug 27781; bugfix on 0.3.5.1-alpha.
2018-09-24 11:11:29 -04:00
Nick Mathewson
112e5fa7ec
Merge branch 'maint-0.3.4'
2018-09-24 11:10:56 -04:00
Nick Mathewson
f57d8722e0
Fix the 0.3.4 part of bug 27781 (arm compilation)
...
Because with arm on OpenSSL <1.1 we don't define USE_EVP_AES_CTR, we
need to include crypto_util.h here.
2018-09-24 11:08:27 -04:00
Nick Mathewson
78295904f7
Merge branch 'ticket26744'
2018-09-24 10:56:50 -04:00
cypherpunks
b91bc1babc
rust/protover: remove redundant ExceedsMax checks
...
This is already checked elsewhere.
2018-09-24 14:30:43 +00:00
Nick Mathewson
ae0cb94b69
Initialize mainloop events earlier, since other stuff may run them.
...
Fixes a stem test failure; bugfix on c7ce6b9821
. Bug
not in any released Tor.
2018-09-22 17:40:04 -04:00
Nick Mathewson
7d9bea6a77
But, actually move systemd_watchdog_timer free into mainloop.c
2018-09-21 16:49:20 -04:00
Nick Mathewson
7eea45c5c4
Move systemd_watchdog_timer free into mainloop.c
2018-09-21 16:46:17 -04:00
Nick Mathewson
08d934b3fe
Missing include in ntmain.c
2018-09-21 16:32:14 -04:00
Nick Mathewson
169f238c23
Merge remote-tracking branch 'onionk/protover-rust1'
2018-09-21 16:28:32 -04:00
cypherpunks
5c0dd1aa90
move protover_rust.c to core/or/
...
Missed in 667a6e8fe9
.
2018-09-21 20:14:53 +00:00
Nick Mathewson
63e08f56b8
Merge remote-tracking branch 'tor-github/pr/365'
2018-09-21 16:13:59 -04:00
Nick Mathewson
7ed7fe230b
Add an include to get --disable-module-dirauth happy again
2018-09-21 15:03:42 -04:00
Nick Mathewson
b7bd162af7
Merge remote-tracking branch 'dgoulet/ticket27774_035_03'
2018-09-21 13:02:12 -04:00
Nick Mathewson
194acfb51d
Split directory.c code into several modules
...
Parts of this C file naturally belong in dircache, dirclient, and
dircommon: so, move them there.
2018-09-21 12:57:22 -04:00
David Goulet
dbc32400d5
man: Fix format typo for HiddenServiceExportCircuitID
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-21 09:54:22 -04:00
Nick Mathewson
0e4c42a912
Merge remote-tracking branch 'ahf-github/asn/bugs4700_2'
2018-09-21 09:40:16 -04:00
David Goulet
36be6f0d2d
fixup! hs-v3: Silence some logging for client authorization
2018-09-21 09:39:21 -04:00
Nick Mathewson
a1b0283040
Changes file for #26747
2018-09-21 09:38:51 -04:00
Nick Mathewson
9399c579e5
Merge branch 'split_mainloop_onion'
2018-09-21 09:37:23 -04:00
Nick Mathewson
9b0a17a74f
Merge branch 'maint-0.3.4'
2018-09-21 09:36:31 -04:00
Nick Mathewson
e818a71905
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-21 09:35:54 -04:00
Nick Mathewson
2cadd93cea
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-21 09:35:51 -04:00
Nick Mathewson
5b04392c15
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-21 09:35:23 -04:00
Nick Mathewson
96d1f2e6d0
Merge remote-tracking branch 'dgoulet/ticket27797_035_01'
2018-09-21 09:33:03 -04:00
Nick Mathewson
c7ce6b9821
Split main.c into main.c and mainloop.c
...
The main.c code is responsible for initialization and shutdown;
the mainloop.c code is responsible for running the main loop of Tor.
Splitting the "generic event loop" part of mainloop.c from the
event-loop-specific part is not done as part of this patch.
2018-09-21 09:14:06 -04:00
Nick Mathewson
98ef3e82e4
Move the non-crypto parts of onion.c out of src/core/crypto
...
The parts for handling cell formats should be in src/core/or.
The parts for handling onionskin queues should be in src/core/or.
Only the crypto wrapper belongs in src/core/crypto.
2018-09-21 09:14:05 -04:00
Nick Mathewson
55122bfe04
Bump to 0.3.5.2-alpha-dev
2018-09-21 09:11:33 -04:00
Alexander Færøy
03ef4ec466
Document the haproxy option of HiddenServiceExportCircuitID.
...
See: https://bugs.torproject.org/4700
2018-09-21 15:06:45 +02:00
David Goulet
49e4bda50b
fixup! hs-v3: Silence some logging for client authorization
2018-09-21 08:52:47 -04:00
David Goulet
79265a6fb6
hs-v3: Don't BUG() if the RP node_t is invalid client side
...
When sending the INTRODUCE1 cell, we acquire the needed data for the cell but
if the RP node_t has invalid data, we'll fail the send and completely kill the
SOCKS connection.
Instead, close the rendezvous circuit and return a transient error meaning
that Tor can recover by selecting a new rendezvous point. We'll also do the
same when we are unable to encode the INTRODUCE1 cell for which at that point,
we'll simply take another shot at a new rendezvous point.
Fixes #27774
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-21 08:44:12 -04:00