aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
AgeCommit message (Collapse)Author
2015-01-06Merge branch 'exitnode_10067_squashed'Nick Mathewson
Conflicts: src/or/or.h
2015-01-06Add an ExitRelay option to override ExitPolicyNick Mathewson
If we're not a relay, we ignore it. If it's set to 1, we obey ExitPolicy. If it's set to 0, we force ExitPolicy to 'reject *:*' And if it's set to auto, then we warn the user if they're running an exit, and tell them how they can stop running an exit if they didn't mean to do that. Fixes ticket 10067
2015-01-06Merge remote-tracking branch 'public/bug12509_025'Nick Mathewson
2015-01-06Merge remote-tracking branch 'public/feature11791'Nick Mathewson
2015-01-04Prevent changes to other options from removing . from AutomapHostsSuffixesNick Mathewson
This happened because we changed AutomapHostsSuffixes to replace "." with "", since a suffix of "" means "match everything." But our option handling code for CSV options likes to remove empty entries when it re-parses stuff. Instead, let "." remain ".", and treat it specially when we're checking for a match. Fixes bug 12509; bugfix on 0.2.0.1-alpha.
2015-01-02Bump copyright dates to 2015, in case someday this matters.Nick Mathewson
2014-12-30Merge branch 'no-exit-bootstrap-squashed'Nick Mathewson
2014-12-29Merge branch 'resolvemyaddr_squashed'Nick Mathewson
2014-12-29Adding comprehensive test cases for resolve_my_address.rl1987
Also, improve comments on resolve_my_address to explain what it actually does.
2014-12-26Fix a function name in a comment in config.cteor
2014-12-23Merge remote-tracking branch 'teor/bug13718-consensus-interval'Nick Mathewson
2014-12-24Allow consensus interval of 10 seconds when testingteor
Decrease minimum consensus interval to 10 seconds when TestingTorNetwork is set. (Or 5 seconds for the first consensus.) Fix code that assumes larger interval values. This assists in quickly bootstrapping a testing Tor network. Fixes bugs 13718 & 13823.
2014-12-21Merge remote-tracking branch 'teor/bug14002-osx-transproxy-ipfw-pf'Nick Mathewson
2014-12-20Fix transparent proxy checks to allow OS X to use ipfw or pfteor
OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent proxy option checks to allow for both ipfw and pf on OS X. Fixes bug 14002.
2014-12-19Add two hidden-service related statistics.George Kadianakis
The two statistics are: 1. number of RELAY cells observed on successfully established rendezvous circuits; and 2. number of .onion addresses observed as hidden-service directory. Both statistics are accumulated over 24 hours, obfuscated by rounding up to the next multiple of a given number and adding random noise, and written to local file stats/hidserv-stats. Notably, no statistics will be gathered on clients or services, but only on relays.
2014-11-27Fix some issues with the scheduler configuration optionsNick Mathewson
1) Set them to the values that (according to Rob) avoided performance regressions. This means that the scheduler won't get much exercise until we implement KIST or something like it. 2) Rename the options to end with a __, since I think they might be going away, and nobody should mess with them. 3) Use the correct types for the option variables. MEMUNIT needs to be a uint64_t; UINT needs to be (I know, I know!) an int. 4) Validate the values in options_validate(); do the switch in options_act(). This way, setting the option to an invalid value on a running Tor will get backed out.
2014-11-27Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'Nick Mathewson
Conflicts: src/or/or.h src/test/Makefile.nmake
2014-11-24Use consistent formatting for list of directory authoritiesNick Mathewson
Based on a patch from grpamp on tor-dev.
2014-11-20Make can_complete_circuits a static variable.Nick Mathewson
2014-11-20Don't build introduction circuits until we know we can build circuitsNick Mathewson
Patch from akwizgran. Ticket 13447.
2014-11-19Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-11-19Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-11-19Update longclaw dirauth IP to be a more stable locationMicah Anderson
2014-11-17Remove Support022HiddenServicesNick Mathewson
This has been already disabled in the directory consensus for a while; it didn't seem to break anything. Finally closes #7803.
2014-11-17Use smaller zlib objects when under memory pressureNick Mathewson
We add a compression level argument to tor_zlib_new, and use it to determine how much memory to allocate for the zlib object. We use the existing level by default, but shift to smaller levels for small requests when we have been over 3/4 of our memory usage in the past half-hour. Closes ticket 11791.
2014-11-12Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-11-12Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
Conflicts: src/or/config.c
2014-11-12Remove turtles as a directory authority (#13296)Micah Anderson
2014-11-12Add longclaw as a directory authority (#13296)Micah Anderson
2014-11-05Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'Nick Mathewson
Conflicts: src/or/config.c
2014-11-04Fix a wide line I introducedNick Mathewson
2014-11-04Merge remote-tracking branch 'andrea/ticket6456'Nick Mathewson
Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-02Apply new calloc coccinelle patchNick Mathewson
2014-10-28Add another year to our copyright dates.Nick Mathewson
Because in 95 years, we or our successors will surely care about enforcing the BSD license terms on this code. Right?
2014-10-22Merge remote-tracking branch 'public/ticket6938'Nick Mathewson
Conflicts: src/tools/tor-resolve.c
2014-10-09Merge remote-tracking branch ↵Nick Mathewson
'teor/bug-13163-AlternateAuthorities-type-handling-fixed'
2014-10-08Improve DIRINFO flags' usage commentsteor
Document usage of the NO_DIRINFO and ALL_DIRINFO flags clearly in functions which take them as arguments. Replace 0 with NO_DIRINFO in a function call for clarity. Seeks to prevent future issues like 13163.
2014-10-08Stop using default authorities with both Alternate Dir and Bridge Authorityteor
Stop using the default authorities in networks which provide both AlternateDirAuthority and AlternateBridgeAuthority. This bug occurred due to an ambiguity around the use of NO_DIRINFO. (Does it mean "any" or "none"?) Partially fixes bug 13163.
2014-10-07Make queue thresholds and flush size for global scheduler into config optionsAndrea Shepard
2014-10-01Add TestingDirAuthVoteExit option (like TestingDirAuthVoteGuard)teor
Add the TestingDirAuthVoteExit option, a list of nodes to vote Exit for, regardless of their uptime, bandwidth, or exit policy. TestingTorNetwork must be set for this option to have any effect. Works around an issue where authorities would take up to 35 minutes to give nodes the Exit flag in a test network, despite short consensus intervals. Partially implements ticket 13161.
2014-09-30Make is_local_addr() mockableAndrea Shepard
2014-09-30Uglify scheduler init logic to avoid crash on startup.Nick Mathewson
Otherwise, when we authority try to do a self-test because of init-keys, if that self-test can't be launched for whatever reason and so we close the channel immediately, we crash. Yes, this a silly way for initialization to work.
2014-09-29Clear the cached address from resolve_my_address() when our IP changesNick Mathewson
Closes 11582; patch from "ra".
2014-09-29Merge branch 'ticket961_squashed'Nick Mathewson
2014-09-29Avoid frequent strcmp() calls for AccountingRuleNick Mathewson
Generally, we don't like to parse the same thing over and over; it's best IMO to do it once at the start of the code.
2014-09-29Add an "AccountingRule" feature to permit limiting bw usage by read+writeNick Mathewson
Patch from "chobe". Closes ticket 961.
2014-09-29Merge remote-tracking branch 'yawning/bug13213'Nick Mathewson
2014-09-29Whitespace fixesNick Mathewson
2014-09-24Do not launch pluggable transport plugins when DisableNetwork is set.Yawning Angel
When DisableNetwork is set, do not launch pluggable transport plugins, and if any are running already, terminate the existing instances. Resolves ticket 13213.
2014-09-22Remove config options that have been obsolete since 0.2.3Adrien BAK