summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-09Add a check and a cast in rephist.c to fix a warningNick Mathewson
2017-05-09Tidy or_options_t by removing obsolete options.Nick Mathewson
Nothing was setting or inspecting these fields, and they were marked as OBSOLETE() in config.c -- but somehow we still had them in the or_options_t structure. Ouch.
2017-05-09Merge branch 'dgoulet_ticket22060_031_01_squashed'Nick Mathewson
2017-05-09config: Improve changes file bug22060David Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Parse ports at the start of options_validate()David Goulet
There was a bug that got exposed with the removal of ORListenAddress. Within server_mode(), we now only check ORPort_set which is set in parse_ports(). However, options_validate() is using server_mode() at the start to check if we need to look at the uname but then the ORPort_set is unset at that point because the port parsing was done just after. This commit fixes that. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove TLSECGroup optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove WarnUnsafeSocks optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove CloseHSServiceRendCircuitsImmediatelyOnTimeout optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove CloseHSClientCircuitsImmediatelyOnTimeout optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove FastFirstHopPK optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove ExcludeSingleHopRelays optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove AllowSingleHopExits optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove AllowSingleHopCircuits optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove AllowInvalidNodes optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09Whoops! Give Daniel Martí credit for prop140 work.Nick Mathewson
2017-05-09Fix an implicit conversion warningNick Mathewson
2017-05-09Fix a warning about a shadowed globalNick Mathewson
2017-05-09Fix a warning about an extraneous semicolonNick Mathewson
2017-05-08clang-i386: use house style for public-when-testing variablesNick Mathewson
This fixes a warning from jenkins.
2017-05-08Fix some clang-i386 warnings in master.Nick Mathewson
2017-05-08whitespace fixesNick Mathewson
2017-05-08Merge branch 'netflow_padding-v6-rebased2-squashed'Nick Mathewson
2017-05-08Fix some channelpadding test issues.Mike Perry
asan was finding an alignment issue with a cast, so set the field in the trunnel struct and then encode it instead. Also, enable log capture and verification.
2017-05-08Fix issues from dgoulet's code review.Mike Perry
https://gitlab.com/dgoulet/tor/merge_requests/24
2017-05-08Cache netflow-related consensus parameters.Mike Perry
Checking all of these parameter lists for every single connection every second seems like it could be an expensive waste. Updating globally cached versions when there is a new consensus will still allow us to apply consensus parameter updates to all existing connections immediately.
2017-05-08Fix a breakage in test_options.c.Mike Perry
IMO, these tests should be calling options_init() to properly set everything to default values, but when that is done, about a dozen tests fail. Setting the one default value that broke the tests for my branch. Sorry for being lame.
2017-05-08Remove a PredictedPortsRelevantTime test.Mike Perry
The option was deprecated by bug #17592.
2017-05-08Bug 17604: Converge on only one long-lived TLS conn between relays.Mike Perry
Accomplished via the following: 1. Use NETINFO cells to determine if both peers will agree on canonical status. Prefer connections where they agree to those where they do not. 2. Alter channel_is_better() to prefer older orconns in the case of multiple canonical connections, and use the orconn with more circuits on it in case of age ties. Also perform some hourly accounting on how many of these types of connections there are and log it at info or notice level.
2017-05-08Bug 17592: Clean up connection timeout logic.Mike Perry
This unifies CircuitIdleTimeout and PredictedCircsRelevanceTime into a single option, and randomizes it. It also gives us control over the default value as well as relay-to-relay connection lifespan through the consensus. Conflicts: src/or/circuituse.c src/or/config.c src/or/main.c src/test/testing_common.c
2017-05-08Netflow record collapsing defense.Mike Perry
This defense will cause Cisco, Juniper, Fortinet, and other routers operating in the default configuration to collapse netflow records that would normally be split due to the 15 second flow idle timeout. Collapsing these records should greatly reduce the utility of default netflow data for correlation attacks, since all client-side records should become 30 minute chunks of total bytes sent/received, rather than creating multiple separate records for every webpage load/ssh command interaction/XMPP chat/whatever else happens to be inactive for more than 15 seconds. The defense adds consensus parameters to govern the range of timeout values for sending padding packets, as well as for keeping connections open. The defense only sends padding when connections are otherwise inactive, and it does not pad connections used solely for directory traffic at all. By default it also doesn't pad inter-relay connections. Statistics on the total padding in the last 24 hours are exported to the extra-info descriptors.
2017-05-08Merge branch 'maint-0.3.0'Nick Mathewson
2017-05-08Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-05-08Merge branch 'bug21943_029' into maint-0.2.9Nick Mathewson
2017-05-08Add a changes file for 21943.Nick Mathewson
2017-05-08Merge remote-tracking branch 'ahf/coverity/1405875'Nick Mathewson
2017-05-08Merge branch 'maint-0.3.0'Nick Mathewson
2017-05-08Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-05-08Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-05-08Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-05-08Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-05-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-05-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-05-08Update geoip and geoip6 to the May 2 2017 database.Karsten Loesing
2017-05-05Merge remote-tracking branch 'dgoulet/ticket21978_031_02'Nick Mathewson
2017-05-05Remove dead code in test_options_validate_impl().Alexander Færøy
Dead branch found by Coverity in CID #1405875.
2017-05-05Fix memory leak found in CID #1405876.Alexander Færøy
2017-05-04Merge branch 'prop140_complete_rebased'Nick Mathewson
2017-05-04Grammar fix in a log messageNick Mathewson
2017-05-04Fix: our directory.c code expects header constants to end with a :Nick Mathewson