Nick Mathewson
c4031ee847
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-21 08:55:45 -04:00
Nick Mathewson
d1dbaf2473
Relays should send timestamp in NETINFO.
...
This avoids skew warnings as authorities test reachability.
Fix 9798; fix not on any released Tor.
2013-09-21 08:54:42 -04:00
Roger Dingledine
99703c9b31
Merge branch 'maint-0.2.4'
2013-09-21 02:21:15 -04:00
Roger Dingledine
4f036acd27
back out most of 1d0ba9a
...
this was causing directory authorities to send a time of 0 on all
connections they generated themselves, which means everybody reachability
test caused a time skew warning in the log for that relay.
(i didn't just revert, because the changes file has been modified by
other later commits.)
2013-09-21 02:11:51 -04:00
Nick Mathewson
6178aaea06
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-20 11:01:10 -04:00
Nick Mathewson
07bb171856
Merge branch 'no_client_timestamps_024_v2' into maint-0.2.4
2013-09-20 11:00:43 -04:00
Nick Mathewson
39bb59d363
Avoid error by not saying which intro cell type I mean
2013-09-20 11:00:27 -04:00
Nick Mathewson
fd2954d06d
Round down hidden service descriptor publication times to nearest hour
...
Implements part of proposal 222. We can do this safely, since
REND_CACHE_MAX_SKEW is 24 hours.
2013-09-20 11:00:27 -04:00
Nick Mathewson
accadd8752
Remove the timestamp from AUTHENTICATE cells; replace with random bytes
...
This isn't actually much of an issue, since only relays send
AUTHENTICATE cells, but while we're removing timestamps, we might as
well do this too.
Part of proposal 222. I didn't take the approach in the proposal of
using a time-based HMAC, since that was a bad-prng-mitigation hack
from SSL3, and in real life, if you don't have a good RNG, you're
hopeless as a Tor server.
2013-09-20 11:00:27 -04:00
Nick Mathewson
f8b44eedf7
Get ready to stop sending timestamps in INTRODUCE cells
...
For now, round down to the nearest 10 minutes. Later, eliminate entirely by
setting a consensus parameter.
(This rounding is safe because, in 0.2.2, where the timestamp mattered,
REND_REPLAY_TIME_INTERVAL was a nice generous 60 minutes.)
2013-09-20 11:00:27 -04:00
Nick Mathewson
1d0ba9a61f
Stop sending the current time in client NETINFO handshakes.
...
Implements part of proposal 222.
2013-09-20 11:00:27 -04:00
Nick Mathewson
ee01e41937
Fix compilation with libevent 1
...
a9910d89
added trickery to make us work with interned strings and
seccomp; it requires libevent 2.
Fix for 9785; bug not in any released tor.
2013-09-19 20:25:05 -04:00
Nick Mathewson
0c807cf3e4
Document that disabledebuggerattachment prevents cores
2013-09-19 12:14:07 -04:00
Nick Mathewson
67bb1a44bd
Merge remote-tracking branch 'public/bug9716_024'
2013-09-19 10:50:34 -04:00
Nick Mathewson
2f2fa7683d
Fix benchmarks to run without crashing.
...
I broke this when I added separate test-mode support by having
the benchmarks get built with TEST_CFLAGS.
2013-09-18 21:43:38 -04:00
Nick Mathewson
1825674bd3
Fix a memory leak on getaddrinfo in sandbox. Found by coverity
2013-09-16 22:38:02 -04:00
Nick Mathewson
4ea9fbcdb1
Clean up malloc issues in sandbox.c
...
tor_malloc returns void *; in C, it is not necessary to cast a
void* to another pointer type before assigning it.
tor_malloc fails with an error rather than returning NULL; it's not
necessary to check its output. (In one case, doing so annoyed Coverity.)
2013-09-16 22:34:42 -04:00
Nick Mathewson
15b9a1ff10
Correctly re-process non-option cmdline args on sighup
...
Whenever we had an non-option commandline arguments *and*
option-bearing commandline arguments on the commandline, we would save
only the latter across invocations of options_init_from_torrc, but
take their existence as license not to re-parse the former. Yuck!
Incidentally, this fix lets us throw away the backup_arg[gv] logic.
Fix for bug 9746; bugfix on d98dfb3746
,
not in any released Tor. Found by Damian. Thanks, Damian!
2013-09-16 13:07:45 -04:00
Nick Mathewson
57859980a8
Merge remote-tracking branch 'karsten/geoip-manual-update-sep2013'
2013-09-16 12:48:49 -04:00
Nick Mathewson
3892e03cfc
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-16 12:48:45 -04:00
Nick Mathewson
ace95c525c
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-09-16 12:47:05 -04:00
Nick Mathewson
b46353b793
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-09-16 12:46:50 -04:00
Nick Mathewson
147a0f31bd
Fix a windows compilation warning from 4647 branch
2013-09-13 13:10:17 -04:00
Nick Mathewson
ccbf1cfacd
Whoops; make or_state_validate conform to validate_fn_t.
...
Bugfix on 1293835440
, which implemented
6752: Not in any released tor.
2013-09-13 12:56:14 -04:00
Nick Mathewson
25a3ae922f
Merge remote-tracking branch 'Ryman/bug6384'
...
Conflicts:
src/or/config.c
src/or/main.c
2013-09-13 12:55:53 -04:00
Nick Mathewson
f4db0f429a
Fix a windows compilation warning from sandboxing branch
2013-09-13 12:43:18 -04:00
Nick Mathewson
e35c972851
Merge branch 'bug4647_squashed'
2013-09-13 12:36:55 -04:00
Nick Mathewson
bf5e1e19f7
Finish tests for command-line arguments
2013-09-13 12:36:40 -04:00
Nick Mathewson
aac4f30d23
Add a --dump-config option to help testing option parsing.
2013-09-13 12:36:40 -04:00
Nick Mathewson
7972af7073
Whoops; make options_validate conform to validate_fn_t.
...
This just goes to show: never cast a function pointer. Found while
testing new command line parse logic.
Bugfix on 1293835440
, which implemented
6752: Not in any released tor.
2013-09-13 12:36:40 -04:00
Nick Mathewson
a6cad4db70
Add '--digests' to "that which implies --hush."
...
And have these various commandline options imply "hush", not "quiet",
since we like to see warnings.
2013-09-13 12:36:40 -04:00
Nick Mathewson
675eb1fea7
Integration test for parsing arguments on the commandline
...
(incomplete)
2013-09-13 12:36:40 -04:00
Nick Mathewson
75d795b1d7
Disallow --hash-password with no commandline arguments.
...
Fixes bug 9573.
Bugfix on 59453ac6e
in 0.0.9pre5, which fixed a crash in a silly way.
2013-09-13 12:36:40 -04:00
Nick Mathewson
b523167f2f
Make config_parse_commandline table-driven for its list of cmdline args
2013-09-13 12:36:40 -04:00
Nick Mathewson
a1096fe180
Use commandline parser for other options
...
These were previously allowed only in the initial position:
--help, -h , --version, --digests, --list-torrc-options
2013-09-13 12:36:39 -04:00
Nick Mathewson
34ec954f8e
Expose commandline parser so that we can use it for --quiet,etc.
...
Fix for bug 9578.
2013-09-13 12:36:39 -04:00
Cristian Toader
d98dfb3746
Patch for 4647 (rewrite command line parser)
2013-09-13 12:36:26 -04:00
Nick Mathewson
e0b2cd061b
Merge remote-tracking branch 'ctoader/gsoc-cap-stage2'
...
Conflicts:
src/common/sandbox.c
2013-09-13 12:31:41 -04:00
Cristian Toader
7cf1b9cc33
fixed compilation bug on i386 due to previous fix
2013-09-12 15:38:14 +03:00
Cristian Toader
d2836c8780
bug fix: syscalls send and recv not supported for x86_64 with libseccomp 1.0.1
2013-09-12 15:30:28 +03:00
Cristian Toader
0a3d1685ae
remove debugging code
2013-09-12 14:12:56 +03:00
Cristian Toader
4702cdc99d
added extra buffer and limit to mprotect not to exceed the length of that buffer
2013-09-12 13:43:06 +03:00
Nick Mathewson
6a11b6f97d
Fix osx compilation again, hopefully better this time.
2013-09-11 13:53:33 -04:00
Nick Mathewson
a2754d418d
Try using INT_MAX, not SOMAXCONN, to set listen() backlog.
...
Fall back to SOMAXCONN if INT_MAX doesn't work.
We'd like to do this because the actual maximum is overrideable by the
kernel, and the value in the header file might not be right at all.
All implementations I can find out about claim that this is supported.
Fix for 9716; bugfix on every Tor.
2013-09-11 13:30:45 -04:00
Karsten Loesing
13d192c1d8
Update to the September 2013 GeoIP database.
2013-09-10 15:00:06 +02:00
Karsten Loesing
e7361aa40a
Remove 17 now unused manual A1 substitutions.
2013-09-10 14:56:39 +02:00
Cristian Toader
79f94e236b
added filter protection for string parameter memory
2013-09-10 14:35:11 +03:00
Cristian Toader
8e003b1c69
fixed socket syscall bug
2013-09-10 00:42:36 +03:00
Cristian Toader
3802cae959
fixed compilation error on i386 linux by moving sandbox_cfg_t definition
2013-09-10 00:04:43 +03:00
Nick Mathewson
d91c776f61
Fix check-spaces
2013-09-09 16:00:40 -04:00