Nick Mathewson
f36b3faa75
Merge branch 'maint-0.3.4'
2018-08-24 08:32:33 -04:00
Nick Mathewson
2ae92ab973
Merge branch 'maint-0.3.4'
2018-08-23 14:26:04 -04:00
Neel Chauhan
aab6aea197
Fix typo in comment for getinfo_helper_current_time()
2018-08-20 11:49:35 -04:00
Neel Chauhan
64d9ea1413
In addrs_in_same_network_family(), choose IP subnet size based on IP type
2018-08-17 13:37:51 +10:00
Nick Mathewson
7e50d43f07
Merge branch 'maint-0.3.4'
2018-08-16 08:37:11 -04:00
Nick Mathewson
61d5bcc1a2
Merge remote-tracking branch 'tor-github/pr/268'
2018-08-11 10:04:04 -04:00
Nick Mathewson
b7ed61167f
Merge remote-tracking branch 'tor-github/pr/239'
2018-08-10 12:35:06 -04:00
Nick Mathewson
df444e482b
Provide examples of tor_api_get_provider_version() output
...
At the same time, sternly warn any person thinking about relying on
any particular format too strictly. If you do this, and your
program breaks, it is your bug, not mine.
2018-08-08 18:10:28 -04:00
Nick Mathewson
159141a8c6
Merge branch 'ticket26947'
2018-08-08 18:07:32 -04:00
rl1987
7a1007861f
Print stacktrace when crypto_pk_get_digest() fails in router_build_fresh_descriptor()
2018-08-08 18:56:27 +03:00
rl1987
9c242e950b
Consider all routerinfo errors other than "not a server" transient
2018-08-08 18:47:43 +03:00
Neel Chauhan
3a2b5a5bcb
Fix typo in control_event_hs_descriptor_content()
2018-08-08 00:12:00 -04:00
Nick Mathewson
772106c6bc
Add a new function, tor_api_get_provider_version()
...
Closes ticket 26947.
2018-07-31 09:18:54 -04:00
Roger Dingledine
fe9f585143
fix wrong word in comment
2018-07-30 22:35:33 -04:00
Nick Mathewson
3a6bd21440
Merge remote-tracking branch 'teor/bug26627_033_merged_master'
2018-07-30 09:01:55 -04:00
Nick Mathewson
13393b2d91
Merge remote-tracking branch 'rl1987/ticket21349_4'
2018-07-30 08:49:49 -04:00
Nick Mathewson
ac9d08f66a
Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'
2018-07-30 08:33:59 -04:00
rl1987
ffdfd39d4f
Early bailout from log_addr_has_changed() if running as client
2018-07-26 17:49:27 +03:00
teor
fc4d08e260
Merge branch 'bug26627_033' into bug26627_033_merged_master
2018-07-25 09:17:17 +10:00
rl1987
042d22c8d1
Split select_entry_guard_for_circuit()
2018-07-21 18:38:33 +03:00
rl1987
e6c51a056c
Make entry_guards_update_primary() shorter
2018-07-21 18:38:33 +03:00
rl1987
86549c0d9e
Split sampled_guards_update_from_consensus() into subfunctions
2018-07-21 18:38:33 +03:00
Nick Mathewson
9ae3597540
Tweak assertion in get_time_period_length() for coverity
...
This is another attempt to fix 1437668. The assertion here should
be safe, since the rules of networkstatus_get_param() keep the value
it returns in range.
2018-07-20 11:02:07 -04:00
Nick Mathewson
583df33e20
Merge branch 'maint-0.3.4'
2018-07-20 10:42:29 -04:00
Nick Mathewson
c1092e9aab
Merge remote-tracking branch 'ahf-github/bugs/26780'
2018-07-19 12:22:39 -04:00
Nick Mathewson
23811052fe
Add some missing includes and struct declarations.
2018-07-18 15:12:18 -04:00
Nick Mathewson
61e080e24a
Merge branch 'maint-0.3.4'
2018-07-18 15:09:28 -04:00
Nick Mathewson
e2b744ce38
Merge branch 'bug25552_ope_squashed'
2018-07-17 16:19:32 -04:00
Neel Chauhan
32db806dfa
Teach the OOM handler about the DNS cache
2018-07-17 09:19:27 -04:00
Neel Chauhan
d807ca1b01
Add and use dns_cache_total_allocation()
2018-07-16 17:19:53 -04:00
teor
79f249e786
dirauth: Handle V3BandwidthsFile failure modes according to the new spec
...
If an authority is not configured with a V3BandwidthsFile, this line
SHOULD NOT appear in its vote.
If an authority is configured with a V3BandwidthsFile, but parsing
fails, this line SHOULD appear in its vote, but without any headers.
Part of 3723, implements the spec in 26799.
2018-07-16 14:43:49 +00:00
juga0
9773311b20
Add keyval header, that was moved to other file
2018-07-16 14:43:49 +00:00
juga0
8164534f46
Ensure that bw_file_headers is not bigger than max
2018-07-16 14:43:49 +00:00
juga0
87fc409a70
Replace bwlist by bw_file and terminator condition
...
If bandwidth file terminator is found, set end of headers flag
and do not store the line.
If it is not, parse a relay line and check whether it is a header
line.
2018-07-16 14:43:49 +00:00
juga0
f906d9be11
Replace bwlist by bw_file
...
and add bw file terminator constant
2018-07-16 14:43:49 +00:00
juga0
d79c65772b
Rename bwlist to bw_file and banwidth to
...
bandwidth-file
2018-07-16 14:43:49 +00:00
juga0
6d8bc12583
Free bw_list_headers in networstatus_t
2018-07-16 14:43:49 +00:00
juga0
106eb08d27
Add bw_file_headers to networkstatus_t
2018-07-16 14:43:49 +00:00
juga0
f0a4a5f726
Check that the header is key_value
...
to avoid interpreting as headers extra lines that are not key_values
2018-07-16 14:43:49 +00:00
juga0
086060e138
Do not add bw file line to the vote
...
when there are not bw file headers lines.
2018-07-16 14:43:49 +00:00
juga0
e5dd46beab
Add the Bandwidth List file headers to votes
...
* add bwlist_headers argument to dirserv_read_measured_bandwidth
in order to store all the headers found when parsing the file
* add bwlist_headers to networkstatus_t in order to store the
the headers found by the previous function
* include the bandwidth headers as string in vote documents
* add test to check that dirserv_read_measured_bandwidth generates
the bwlist_headers
2018-07-16 14:43:48 +00:00
Alexander Færøy
c9de65f966
Add checks in get_net_param_from_list() for valid output domain.
...
This patch adds two assertions in get_net_param_from_list() to ensure
that the `res` value is correctly within the range of the output domain.
Hopefully fixes Coverity CID #1415721 , #1415722 , and #1415723 .
See: https://bugs.torproject.org/26780
2018-07-13 12:43:57 +02:00
Nick Mathewson
537092cdbb
Merge branch 'ticket26223'
2018-07-10 20:18:28 -04:00
Nick Mathewson
391ef5e42c
Explain why we use raw_free with getdelim result.
2018-07-10 20:16:37 -04:00
Nick Mathewson
e7f5f48d68
Rename torlog.[ch] to log.[ch]
...
Fun fact: these files used to be called log.[ch] until we ran into
conflicts with systems having a log.h file. But now that we always
include "lib/log/log.h", we should be fine.
2018-07-10 15:20:30 -04:00
Nick Mathewson
a2c44a7a7e
Isolate resolve.h usage in the modules that really need it.
...
(Almost none of Tor should actually need to touch the platform resolver.)
2018-07-10 13:36:45 -04:00
Nick Mathewson
951d59d706
Use tor_getline() in dirserv.c to remove its upper line limit.
...
Closes ticket 26223.
2018-07-10 10:36:49 -04:00
Nick Mathewson
6574d4bd27
Refactor dirserv_read_measured_bandwidths to have a single exit point
2018-07-10 10:36:49 -04:00
Nick Mathewson
19f2057d49
Fix some lingering windows compilation issues from Jenkins.
...
These were caused by the recent refactoring.
2018-07-09 12:54:40 -04:00
Nick Mathewson
e7463be39b
Merge branch 'maint-0.3.4'
2018-07-09 10:16:51 -04:00