summaryrefslogtreecommitdiff
path: root/src/or/config.c
AgeCommit message (Collapse)Author
2018-04-13Merge branch 'token_bucket_refactor_squashed'Nick Mathewson
2018-04-13Ensure that global buckets are updated on configuration changeNick Mathewson
2018-04-12Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-12Attempt to fix 32-bit builds, which broke with 31508a0abccfee1cdNick Mathewson
When size_t is 32 bits, doing "size_t ram; if (ram > 8GB) { ... }" produces a compile-time warning. Bug caused by #24782 fix; not in any released Tor.
2018-04-12Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-12Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM.Alexander Færøy
This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-12Use STATIC for compute_real_max_mem_in_queuesAlexander Færøy
This patch makes compute_real_max_mem_in_queues use the STATIC macro, which allows us to test the function. See: https://bugs.torproject.org/24782
2018-04-11Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-11Merge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3Nick Mathewson
2018-04-11Rename HSLayer{2,3}Nodes to start without an underscore.Nick Mathewson
The old single-underscore names remain as a deprecated synonym. Fixes bug 25581; bugfix on 0.3.3.1-alpha.
2018-04-10Merge remote-tracking branch 'isis-github/bug25409'Nick Mathewson
2018-04-10config: Obsolete PortForwarding and PortForwardingHelper options.Isis Lovecruft
* FIXES part of #25409: https://bugs.torproject.org/25409
2018-04-10Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-10Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-10Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-04-10Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-10Remove TestingEnableTbEmptyEventNick Mathewson
This option was used for shadow testing previously, but is no longer used for anything. It interferes with refactoring our token buckets.
2018-04-09Add a comment explaining why we do a certain redundant checkNick Mathewson
Closes ticket 25291.
2018-04-09Lift the list of default directory servers into their own file.Alexander Færøy
This patch lifts the list of default directory authorities from config.c into their own auth_dirs.inc file, which is then included in config.c using the C preprocessor. Patch by beastr0. See: https://bugs.torproject.org/24854
2018-04-05Switch to use should_record_bridge_info()Neel Chauhan
Both in geoip_note_client_seen() and options_need_geoip_info(), switch from accessing the options directly to using the should_record_bridge_info() helper function. Fixes #25290 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-04Remove PortForwarding optionsNeel Chauhan
Signed-off-by: Isis Lovecruft <isis@torproject.org>
2018-03-19Use tor_asprintf for in have_enough_mem_for_dircache()Neel Chauhan
(Fixes bug 20887)
2018-03-19Merge branch 'ticket25268_034_01'Nick Mathewson
2018-03-03Merge branch 'ticket23814' into maint-0.3.3Nick Mathewson
2018-02-16Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-16Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-15man: Update the CircuitPriorityHalflife entryDavid Goulet
The behavior has changed slightly in the previous commits. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-15cmux: Rename cell_ewma_set_scale_factor()David Goulet
It is rename to something more meaningful that explains what it does exactly which is sets the EWMA options (currently only one exists). The new name is cmux_ewma_set_options(). Also, remove a public function from circuitmux_ewma.h that is only used in the C file. Make it static inline as well. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-15cmux: Make EWMA policy mandatoryDavid Goulet
To achieve this, a default value for the CircuitPriorityHalflife option was needed. We still look in the options and then the consensus but in case no value can be found, the default CircuitPriorityHalflifeMsec=30000 is used. It it the value we've been using since 0.2.4.4-alpha. This means that EWMA, our only policy, can not be disabled anymore fallbacking to the round robin algorithm. Unneeded code to control that is removed in this commit. Part of #25268 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-07Remove anything related to the old SocksSockets optionDavid Goulet
At this commit, the SocksSocketsGroupWritable option is renamed to UnixSocksGroupWritable. A deprecated warning is triggered if the old option is used and tor will use it properly. Fixes #24343 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-07Fix spelling mistakes corresponding to ticket #23650Deepesh Pathak
2018-01-31Obsolete the now-unused MaxTries options.Nick Mathewson
2018-01-31Merge branch 'bug23954_squashed'Nick Mathewson
2018-01-31Use thread-safe types to store the LOG_PROTOCOL_WARN severityNick Mathewson
Fixes a race condition; resolves 23954.
2018-01-30Merge branch 'ticket24902_029_05' into ticket24902_033_02David Goulet
2018-01-30dos: Make circuit rate limit per second, not tenths anymoreDavid Goulet
Because this touches too many commits at once, it is made into one single commit. Remove the use of "tenths" for the circuit rate to simplify things. We can only refill the buckets at best once every second because of the use of approx_time() and our token system is set to be 1 token = 1 circuit so make the rate a flat integer of circuit per second. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-01-30dos: Initial code of Denial of Service mitigationDavid Goulet
This commit introduces the src/or/dos.{c|h} files that contains the code for the Denial of Service mitigation subsystem. It currently contains basic functions to initialize and free the subsystem. They are used at this commit. The torrc options and consensus parameters are defined at this commit and getters are implemented. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-01-19Merge remote-tracking branch 'mikeperry/bug23101-mergeready-squashed'Nick Mathewson
2018-01-19Implement layer 2 and layer 3 guard pinning via torrc.Mike Perry
Block circuit canibalization when HSRendezvousMiddleNodes is active. Also make it apply to all HS circuits, not just rends.
2018-01-19Merge branch 'disable_signal_handlers'Nick Mathewson
2018-01-11Merge branch 'restart_nocrash'Nick Mathewson
2018-01-11Merge branch 'simplify_transition_allowed'Nick Mathewson
2018-01-06whitespace and typo fixesRoger Dingledine
2018-01-05Merge branch 'maint-0.3.2'Nick Mathewson
2018-01-05Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2018-01-05Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-01-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2018-01-05Merge branch 'teor_ticket24681_028' into maint-0.2.9Nick Mathewson
2018-01-05fix a wide lineNick Mathewson
2017-12-23Make the default DirAuthorityFallbackRate 0.1teor
This makes clients on the public tor network prefer to bootstrap off fallback directory mirrors. This is a follow-up to 24679, which removed weights from the default fallbacks. Implements ticket 24681.