Sebastian Hahn
d3fee8b823
ClientDNSRejectInternalAddresses in non-default networks
...
Once again allow the flag to be set, unless the default network is used.
Thanks to nickm for a suggestion for the workaround to a test failure.
2017-11-04 18:31:02 +01:00
Sebastian Hahn
e491c05f96
Undo deprecation of ClientDNSRejectInternalAddresses
2017-11-04 18:31:00 +01:00
Sebastian Hahn
5a46074e55
Revert "Make ClientDNSRejectInternalAddresses testing-only."
...
This reverts commit 27fa4a98d2
2017-11-04 18:30:59 +01:00
Sebastian Hahn
e24df58245
fixup! Allow bootstrapping networks to have Exit flags
2017-11-04 04:18:32 +01:00
Sebastian Hahn
4d6b679318
Allow bootstrapping networks to have Exit flags
...
Relevant for non-test networks
2017-11-03 23:07:30 +01:00
Nick Mathewson
cceb43c5e3
Merge branch 'maint-0.3.2'
2017-11-02 10:34:08 -04:00
David Goulet
0386280487
nodelist: Downgrade warning to protocol warning
...
The node_get_ed25519_id() warning can actually be triggered by a relay flagged
with NoEdConsensus so instead of triggering a warning on all relays of the
network, downgrade it to protocol warning.
Fixes #24025
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-02 10:33:57 -04:00
Nick Mathewson
65d22dc2f2
Merge branch 'maint-0.3.2'
2017-11-02 10:32:18 -04:00
Nick Mathewson
cb42c62c9e
Merge branch 'dgoulet_ticket23753_032_02_squashed' into maint-0.3.2
2017-11-02 10:30:42 -04:00
David Goulet
6dc591a024
sched: Rate limit scheduler_bug_occurred()
...
Just in case we end up hitting a SCHED_BUG() multiple times, rate limit the
log warning.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-02 10:30:33 -04:00
Matt Traudt
52050bb2c6
sched: Add another SCHED_BUG() callsite
2017-11-02 10:30:33 -04:00
David Goulet
3931a6f264
sched: Use SCHED_BUG() macro in scheduler
...
When a BUG() occurs, this macro will print extra information about the state
of the scheduler and the given channel if any. This will help us greatly to
fix future bugs in the scheduler especially when they occur rarely.
Fixes #23753
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-02 10:30:33 -04:00
Nick Mathewson
a46dcc0709
Merge branch 'maint-0.3.2'
2017-11-02 10:22:35 -04:00
Nick Mathewson
6a9a118f90
Tweak a comment for a minor but important distinction
2017-11-02 10:22:32 -04:00
Nick Mathewson
3aab8307a5
Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2
2017-11-02 10:19:29 -04:00
teor
cc072b6fbf
Stop users configuring IPv6-only v3 single onion services
...
They are not yet implemented: they will upload descriptors, but won't be
able to rendezvous, because IPv6 addresses in link specifiers are ignored.
Part of #23820 .
2017-11-02 10:19:05 -04:00
teor
a4f34c1106
Improve v3 onion service logging for intro and rend points
...
Diagnostics for #23820 .
2017-11-02 10:19:05 -04:00
teor
77ed99b1a7
Remove buggy IPv6 and ed25519 handling from get_lspecs_from_extend_info()
...
The previous version of this function had the following issues:
* it didn't check if the extend_info contained an IPv6 address,
* it didn't check if the ed25519 identity key was valid.
But we can't add IPv6 support in a bugfix release.
Instead, BUG() if the address is an IPv6 address, so we always put IPv4
addresses in link specifiers. And ignore missing ed25519 identifiers,
rather than generating an all-zero link specifier.
This supports v3 hidden services on IPv4, dual-stack, and IPv6, and
v3 single onion services on IPv4 only.
Part of 23820, bugfix on 0.3.2.1-alpha.
2017-11-02 10:19:05 -04:00
Nick Mathewson
a321f8f4af
Merge branch 'buf_for_stringbuffer_squashed'
2017-11-02 10:01:30 -04:00
Nick Mathewson
8993159f3d
Refactor geoip_get_dirreq_history to use buf_t
2017-11-02 10:00:32 -04:00
Nick Mathewson
3b30015143
Refactor connection_write_to_buf_impl_(); add one that takes a buf_t
2017-11-02 10:00:32 -04:00
Nick Mathewson
5240d02a11
Refactor write_http_response_header_impl() to use buf_t
2017-11-02 10:00:32 -04:00
Roger Dingledine
7700b99fe6
easy typos while reviewing commits
2017-11-01 16:44:09 -04:00
Nick Mathewson
cd606d5ad3
Merge remote-tracking branch 'public/owning_control_fd'
2017-11-01 13:28:31 -04:00
Nick Mathewson
ef25f957e7
Merge branch 'tor_api_squashed'
2017-11-01 13:22:16 -04:00
Nick Mathewson
8c49194505
Add more usage notes on tor_api.h
2017-11-01 13:22:09 -04:00
Nick Mathewson
fa02ea102e
Add a public tor_api.h with an implementation in tor_api.c
...
The main effect of this change is to commit to an extensible
long-term API.
Closes ticket 23684.
2017-11-01 13:22:09 -04:00
Roger Dingledine
9635843342
trivial comment fixes
...
done while i was trying to debug nearby code
2017-10-31 23:09:00 -04:00
Nick Mathewson
f9aed40156
Merge branch 'maint-0.3.2'
2017-10-31 14:18:52 -04:00
Nick Mathewson
c3ea1ccf04
double newline
2017-10-31 14:18:48 -04:00
Nick Mathewson
2b6f246652
Merge branch 'maint-0.3.2'
2017-10-31 14:04:34 -04:00
Nick Mathewson
8dffc46748
Merge branch 'hsdescv3_fuzz_more' into maint-0.3.2
2017-10-31 14:04:31 -04:00
Nick Mathewson
b76a161e01
Merge branch 'fix-torrcd-sandbox-22605v2'
2017-10-31 13:58:33 -04:00
Nick Mathewson
00e781142b
Don't give "exitrelay may become 0 when no policy" warning on ReducedExitPolicy
2017-10-31 13:25:41 -04:00
Nick Mathewson
6e2f8de62d
Fix: when BridgeRelay is set, you do not get any exit policy.
2017-10-31 13:25:41 -04:00
Neel Chauhan
b70e11ef6b
Add code for letting user select Reduced Exit Policy
2017-10-31 13:25:41 -04:00
Nick Mathewson
4700ba6c3d
Merge branch 'maint-0.3.2'
2017-10-31 12:19:42 -04:00
Nick Mathewson
3d93ec3ef4
Merge branch 'bug23762_032_02_squashed' into maint-0.3.2
2017-10-31 12:14:21 -04:00
David Goulet
5dbcd48f0e
hs-v3: Attempt descriptor refetch when dirinfo changes
...
When the directory information changes, callback to the HS client subsystem so
it can check if any pending SOCKS connections are waiting for a descriptor. If
yes, attempt a refetch for those.
Fixes #23762
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-31 12:14:11 -04:00
Nick Mathewson
c9ad172dd4
Merge branch 'bug23571_033_squashed'
2017-10-31 11:59:18 -04:00
teor
e9f57e193d
Consistently use braced blocks in hibernate_go_dormant()
2017-10-31 11:58:34 -04:00
teor
e57604183c
When hibernating, close connections normally and allow them to flush
...
Bugfix on 7267 in 0.2.4.7-alpha
2017-10-31 11:58:34 -04:00
Nick Mathewson
5a21b27083
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-31 11:43:14 -04:00
Nick Mathewson
f2e23d38ab
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-31 11:43:14 -04:00
Nick Mathewson
7c59c751b0
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-31 11:43:14 -04:00
Nick Mathewson
cf98ca715c
Merge branch 'maint-0.3.2'
2017-10-31 11:43:14 -04:00
Nick Mathewson
04d4786cc4
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
2017-10-31 11:43:07 -04:00
David Goulet
ce99ebf25d
Make tor recalculate voting schedule even if not a dirauth
...
Because the HS subsystem needs the voting schedule to compute time period, we
need all tor type to do that.
Part of #23623
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-31 09:55:24 -04:00
Nick Mathewson
332d6bf901
Merge branch 'maint-0.3.2'
2017-10-30 11:07:44 -04:00
Nick Mathewson
5bee5fbac7
Merge remote-tracking branch 'public/bug23774_032' into maint-0.3.2
2017-10-30 11:07:26 -04:00
