Nick Mathewson
edde1a7844
Merge branch 'bug15541_squashed'
2015-04-07 14:09:55 -04:00
rl1987
6b0c443dde
Update other entries in CMDLINE_ONLY_OPTIONS to use values from takes_argument_t.
2015-04-07 14:09:41 -04:00
rl1987
e89c200c47
Print the error message for --dump-config even if no arguments are given.
2015-04-07 14:09:41 -04:00
Yawning Angel
79544a6fc5
Fix the memory leak in warn_if_option_path_is_relative()
.
...
Fixes coverity defect CID 1293337, not in any released version of tor.
2015-04-06 17:53:01 +00:00
Nick Mathewson
d366c3354f
Merge branch 'remove_digests'
2015-04-01 13:53:03 -04:00
Nick Mathewson
cd8f13b5cb
Merge branch 'bug13736'
2015-04-01 13:46:50 -04:00
Nick Mathewson
8ba2d971b1
Remove needless call to crypto_set_tls_dh_prime()
2015-04-01 13:37:47 -04:00
Nick Mathewson
c66dd17980
Drop support for --digests
...
This is a fair amount of maintainance burden, and doesn't help much
more than the git microversion.
Closes ticket 14742.
2015-04-01 09:54:20 -04:00
Nick Mathewson
e5e2644f23
clean up list of paths that cannot be relative
2015-03-25 09:16:04 -04:00
Nick Mathewson
112c554fcf
Merge branch 'bug14018'
2015-03-24 14:36:23 -04:00
rl1987
09c54655f1
Complain if relative paths are used in configuration
...
When we validate torrc options, print warning(s) when relative
path(s) been found.
2015-03-24 14:35:52 -04:00
Nick Mathewson
fec923d72b
Check return values for tor_addr_parse(default) in config.c
...
In these cases, the address is always a constant "default", so
should always succeed. But coverity can't tell that.
Fixes CID 1291645
2015-03-24 10:46:39 -04:00
Nick Mathewson
511ca9b91c
Remove DynamicDHGroups as obsoleted by PluggableTransports or P256.
...
Closes ticket 13736.
2015-03-14 12:40:55 -04:00
Matthew Finkel
61dcd926aa
Flag when a controlsocket is configured as WorldWritable
2015-03-13 07:06:16 +00:00
Matthew Finkel
5ce5527823
Move to the next flag when we recognize Writable flags
2015-03-13 07:04:22 +00:00
Nick Mathewson
517e0f965b
Remove workarounds for Libevent < 1.3.
...
This actually lets us dump a lot of old cruft that nobody had (I
hope!) tested in ages.
Closes 15248.
2015-03-12 16:59:05 -04:00
Yawning Angel
b3281fc6d6
Initialize the extorport auth cookie before launching PTs.
...
PTs expect the auth cookie to be available immedieately after launch,
leading to a race condition when PTs opt to cache the extorport cookie
once immediately after startup.
Fixes #15240 .
2015-03-12 13:12:56 -04:00
Nick Mathewson
809517a863
Allow {World,Group}Writable on AF_UNIX {Socks,Control}Ports.
...
Closes ticket 15220
2015-03-11 13:31:33 -04:00
Nick Mathewson
03a4e97c76
Merge remote-tracking branch 'origin/maint-0.2.5'
2015-02-20 01:05:21 -05:00
Nick Mathewson
1525eeeb49
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-02-20 01:04:49 -05:00
Nick Mathewson
86105a4009
Check ENABLE_TOR2WEB_MODE before any tor2webmode code
2015-02-19 09:09:25 -05:00
Nick Mathewson
96211bcf71
Merge branch 'bug9321_rerebase'
...
Conflicts:
src/or/dirvote.h
src/test/include.am
src/test/test_entrynodes.c
2015-02-18 09:17:02 -05:00
George Kadianakis
5c34a53068
Don't exit if we can't find the GuardfractionFile when booting.
...
...just disable the feature in that case.
2015-02-18 09:09:34 -05:00
George Kadianakis
f4a63f8eab
Parse GuardFraction info from consensuses and votes.
...
Also introduce the UseGuardFraction torrc option which decides whether
clients should use guardfraction information found in the consensus.
2015-02-18 09:09:33 -05:00
George Kadianakis
5ee48d47a7
Parse Guardfraction file and apply results to routerstatuses.
...
Parse the file just before voting and apply its information to the
provided vote_routerstatus_t. This follows the same logic as when
dirauths parse bwauth files.
2015-02-18 09:09:32 -05:00
Nick Mathewson
9bf6da1861
Merge remote-tracking branch 'public/feature_13822'
2015-02-17 12:34:13 -05:00
Nick Mathewson
2fe139473d
No, coverity, this is not a memory leak. 1268065
2015-02-16 15:42:48 -05:00
Sina Rabbani
8e61d38cf1
Faravahar's New IP Address as of 2/20/2015
2015-02-16 11:51:36 -05:00
Sebastian Hahn
3bcdb26267
Call cpu_init if we change to being a relay
...
The issue is that we use the cpuworker system with relays only, so if we
start up as a client and transition to being a relay later, we'll be
sad.
This fixes bug 14901; not in any released version of Tor.
2015-02-15 11:49:19 +01:00
Nick Mathewson
caf28519d9
Merge branch 'bug12844'
...
Conflicts:
src/or/circuituse.c
src/test/include.am
src/test/test_entrynodes.c
2015-02-11 15:06:04 -05:00
Nick Mathewson
8b82f6261e
Search-and-replace to regain coding style in wake of 13822.
...
(all-caps should be reserved for global or module-global constants and
2015-02-07 08:33:36 -05:00
Nick Mathewson
4beb830953
Split ROUTER_REQUIRED_MIN_BANDWIDTH into RELAY_ and BRIDGE_ variants
...
Also raise those minima from 20 to 75 and 50 respectively.
Closes ticket 13822.
2015-02-07 08:33:23 -05:00
Nick Mathewson
03563f4723
Fix an unused-variable warning.
2015-02-02 13:35:44 -05:00
Nick Mathewson
79c7625e38
Merge branch 'feature13864_squashed'
2015-02-02 13:32:53 -05:00
rl1987
fe328d192e
Allow reading torrc from stdin.
2015-02-02 13:31:56 -05:00
Nick Mathewson
fac8d40886
Merge remote-tracking branch 'public/prop227_v2'
...
Conflicts:
src/test/test_dir.c
2015-01-30 07:36:55 -05:00
Nick Mathewson
d1e52d9a2a
Correctly handle OutboundBindAddress again.
...
ca5ba2956b
broke this; bug not in any
released Tor.
Also fix a typo.
Fixes 14541 and 14527. Reported by qbi.
2015-01-30 07:29:23 -05:00
Nick Mathewson
4c1a779539
Restrict unix: addresses to control and socks for now
2015-01-29 14:51:59 -05:00
Nick Mathewson
204374f7d9
Remove SocksSocket; it's now spelled differently thanks to 14451
...
Also, revise bug12585 changes file to mention new syntax
2015-01-29 14:46:20 -05:00
David Goulet
bf3fb55c47
Support unix: prefix in port configuration
...
It's now possible to use SocksPort or any other kind of port that can use a
Unix socket like so:
SocksPort unix:/foo/bar/unix.sock
Fixes #14451
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-01-28 17:55:38 -05:00
Nick Mathewson
034e2788f8
whitespace fixes
2015-01-23 11:18:28 -05:00
Nick Mathewson
23fc1691b6
Merge branch 'better_workqueue_v3_squashed'
2015-01-21 14:47:16 -05:00
Nick Mathewson
e7e33d4b04
Merge branch 'bug14084'
2015-01-20 14:07:37 -05:00
Nick Mathewson
da423532f7
Merge branch 'ticket14254_squashed'
2015-01-20 13:46:56 -05:00
Nick Mathewson
78c53eff85
Fix SocksSocket 0. That was easy!
2015-01-20 13:46:44 -05:00
Nick Mathewson
63765399eb
Merge remote-tracking branch 'public/ticket13037'
...
Conflicts:
src/or/config.c
2015-01-18 16:07:08 -05:00
Nick Mathewson
31838bd783
changes suggested by weasel
2015-01-16 11:46:20 -05:00
Nick Mathewson
485fdcf826
Unify parse_unix_socket_config and parse_port_config
...
This incidentally makes unix SocksSocket support all the same options
as SocksPort.
This patch breaks 'SocksSocket 0'; next will restore it.
Resolves 14254.
2015-01-16 11:35:48 -05:00
Nick Mathewson
bbad23bf37
No, client-side DNS cacheing should not be on by default.
2015-01-16 09:32:22 -05:00
Nick Mathewson
4b23b398a3
Merge branch 'bug8546_squashed'
...
Conflicts:
src/or/connection.c
src/or/or.h
src/or/relay.c
2015-01-16 09:31:50 -05:00
Nick Mathewson
f444f2b1d3
Split client-specific and server-specific parts of port_cfg_t
...
Also, apply this cocci script to transform accesses. (Plus manual
migration for accesses inside smartlist_foreach loops.)
@@
port_cfg_t *cfgx;
@@
cfgx->
+server_cfg.
\(
no_advertise
\|
no_listen
\|
all_addrs
\|
bind_ipv4_only
\|
bind_ipv6_only
\)
@@
port_cfg_t *cfgx;
@@
cfgx->
+entry_cfg.
\(
isolation_flags
\|
session_group
\|
socks_prefer_no_auth
\|
ipv4_traffic
\|
ipv6_traffic
\|
prefer_ipv6
\|
cache_ipv4_answers
\|
cache_ipv6_answers
\|
use_cached_ipv4_answers
\|
use_cached_ipv6_answers
\|
prefer_ipv6_virtaddr
\)
2015-01-16 09:22:49 -05:00
Nick Mathewson
3668a4126e
Merge remote-tracking branch 'public/bug13397'
2015-01-14 14:15:29 -05:00
Nick Mathewson
1e896214e7
Refactor cpuworker to use workqueue/threadpool code.
2015-01-14 11:23:34 -05:00
George Kadianakis
220f419da1
New minimum uptime to become an HSDir is 96 hours.
2015-01-14 12:48:09 +00:00
Nick Mathewson
d8b7dcca8d
Merge remote-tracking branch 'andrea/ticket12585_v3'
2015-01-13 12:50:55 -05:00
Andrea Shepard
cb047f4078
Fix ipv4/ipv6 traffic bits on AF_UNIX socks listeners and remove hacky workarounds for brokenness
2015-01-13 00:18:17 +00:00
Andrea Shepard
f50068b17e
Fix default list handling for parse_unix_socket_config(); avoid clearing whole pre-existing list
2015-01-12 22:12:18 +00:00
Nick Mathewson
2edfdc02a2
Merge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'
2015-01-12 14:06:14 -05:00
Tomasz Torcz
b17918726d
send PID of the main daemon to supervisor
...
If running under systemd, notify the supervisor about current PID
of Tor daemon. This makes systemd unit simpler and more robust:
it will do the right thing regardless of RunAsDaemon settings.
2015-01-11 11:14:08 -05:00
Nick Mathewson
c83d838146
Implement proposal 227-vote-on-package-fingerprints.txt
...
This implementation includes tests and a little documentation.
2015-01-10 15:09:07 -05:00
teor
f9d57473e1
Create TestingDirAuthVoteHSDir like TestingDirAuthVoteExit/Guard
...
TestingDirAuthVoteHSDir ensures that authorities vote the HSDir flag
for the listed relays regardless of uptime or ORPort connectivity.
Respects the value of VoteOnHidServDirectoriesV2.
Partial fix for bug 14067.
2015-01-10 22:34:28 +11:00
Nick Mathewson
e136606fe8
Smaller RendPostPeriod on test networks
...
This patch makes the minimum 5 seconds, and the default 2 minutes.
Closes 13401.
2015-01-10 22:34:28 +11:00
teor
f8ffb57bc4
Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty
...
Conflicts:
src/or/connection_edge.c
Merged in favour of origin.
2015-01-10 17:20:06 +11:00
teor
c200ab46b8
Merge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-empty
...
Conflicts:
src/or/router.c
Choose newer comment.
Merge changes to comment and function invocation.
2015-01-10 16:34:10 +11:00
Andrea Shepard
0729b2be53
Add support for a default list of paths and passing '0' to disable it to parse_unix_socket_config()
2015-01-09 20:49:54 +00:00
Jacob Appelbaum
8d59ddf3cb
Commit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #12585 .
...
Signed-off-by: Andrea Shepard <andrea@torproject.org>
2015-01-07 17:42:57 +00:00
Nick Mathewson
6bb31cba12
New option "--disable-system-torrc" to not read torrc from etc
...
Implements 13037.
2015-01-06 17:07:40 -05:00
Nick Mathewson
14dedff0ab
Drop assumption that get_torrc_fname() can't return NULL.
2015-01-06 17:06:55 -05:00
Nick Mathewson
9396005428
Remove a check for an ancient bad dirserver fingerprint
2015-01-06 16:28:11 -05:00
Nick Mathewson
90b9e23bec
Merge branch 'exitnode_10067_squashed'
...
Conflicts:
src/or/or.h
2015-01-06 15:15:18 -05:00
Nick Mathewson
35efce1f3f
Add an ExitRelay option to override ExitPolicy
...
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-06 14:31:20 -05:00
Nick Mathewson
a034863b45
Merge remote-tracking branch 'public/bug12509_025'
2015-01-06 14:15:08 -05:00
Nick Mathewson
cf2ac8e255
Merge remote-tracking branch 'public/feature11791'
2015-01-06 13:52:54 -05:00
Nick Mathewson
b06b783fa0
Tolerate relative paths for torrc files with RunAsDaemon
...
We had a check to block these, but the patch we merged as a1c1fc72
broke this check by making them absolute on demand every time we
opened them. That's not so great though. Instead, we should make them
absolute on startup, and not let them change after that.
Fixes bug 13397; bugfix on 0.2.3.11-alpha.
2015-01-04 19:34:38 -05:00
Nick Mathewson
8ef6cdc39f
Prevent changes to other options from removing . from AutomapHostsSuffixes
...
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-04 17:28:54 -05:00
Nick Mathewson
74cd57517c
New option "HiddenServiceAllowUnknownPorts"
...
This allows hidden services to disable the anti-scanning feature
introduced in 0.2.6.2-alpha. With this option not set, a connection
to an unlisted port closes the circuit. With this option set, only
a RELAY_DONE cell is sent.
Closes ticket #14084 .
2015-01-03 12:34:52 -05:00
Nick Mathewson
f54e54b0b4
Bump copyright dates to 2015, in case someday this matters.
2015-01-02 14:27:39 -05:00
Nick Mathewson
5b770ac7b7
Merge branch 'no-exit-bootstrap-squashed'
2014-12-30 09:06:47 -05:00
Nick Mathewson
e85f0c650c
Merge branch 'resolvemyaddr_squashed'
2014-12-29 10:00:34 -05:00
rl1987
28217b969e
Adding comprehensive test cases for resolve_my_address.
...
Also, improve comments on resolve_my_address to explain what it
actually does.
2014-12-29 09:59:47 -05:00
teor
5710b83d5d
Fix a function name in a comment in config.c
2014-12-26 00:54:09 +11:00
Nick Mathewson
f9ba0b76cd
Merge remote-tracking branch 'teor/bug13718-consensus-interval'
2014-12-23 14:25:37 -05:00
teor
1ee41b3eef
Allow consensus interval of 10 seconds when testing
...
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-24 06:13:32 +11:00
Nick Mathewson
647a90b9b3
Merge remote-tracking branch 'teor/bug14002-osx-transproxy-ipfw-pf'
2014-12-21 13:37:40 -05:00
teor
d93516c445
Fix transparent proxy checks to allow OS X to use ipfw or pf
...
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-20 22:28:58 +11:00
George Kadianakis
14e83e626b
Add two hidden-service related statistics.
...
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-12-19 10:35:25 -05:00
Nick Mathewson
b1e1b439b8
Fix some issues with the scheduler configuration options
...
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-27 22:51:13 -05:00
Nick Mathewson
a28df3fb67
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
...
Conflicts:
src/or/or.h
src/test/Makefile.nmake
2014-11-27 22:39:46 -05:00
Nick Mathewson
6218f48950
Use consistent formatting for list of directory authorities
...
Based on a patch from grpamp on tor-dev.
2014-11-24 01:34:17 -05:00
Nick Mathewson
336c856e52
Make can_complete_circuits a static variable.
2014-11-20 12:03:46 -05:00
Nick Mathewson
f15cd22bb7
Don't build introduction circuits until we know we can build circuits
...
Patch from akwizgran. Ticket 13447.
2014-11-20 11:51:36 -05:00
Nick Mathewson
126f220071
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-19 17:27:37 -05:00
Nick Mathewson
0872d8e3cf
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-19 17:26:42 -05:00
Micah Anderson
dca902ceba
Update longclaw dirauth IP to be a more stable location
2014-11-19 17:22:25 -05:00
Nick Mathewson
b3bd7a736c
Remove Support022HiddenServices
...
This has been already disabled in the directory consensus for a while;
it didn't seem to break anything.
Finally closes #7803 .
2014-11-17 11:52:10 -05:00
Nick Mathewson
734ba5cb0a
Use smaller zlib objects when under memory pressure
...
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-17 11:43:50 -05:00
Nick Mathewson
5c813f6ca1
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-12 15:32:15 -05:00
Nick Mathewson
6c146f9c83
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2014-11-12 15:30:11 -05:00
Micah Anderson
b6e7b8c88c
Remove turtles as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00
Micah Anderson
ad448c6405
Add longclaw as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00