Roger Dingledine
fdf9fc5a7f
bump to 0.2.5.1-alpha
2013-10-01 20:57:30 -04:00
Roger Dingledine
a980d844cd
what is logging "above" notice?
2013-10-01 08:55:57 -04:00
Roger Dingledine
0d8632e585
fix another confusing whitespace instance
2013-09-30 01:47:24 -04:00
Roger Dingledine
2cf41cc70d
fix confusing whitespace
2013-09-30 01:41:48 -04:00
Jim Pannacciulli
8bc5b9f3d0
test-network.sh: tools dir in PATH, parameterization
2013-09-29 14:19:00 -04:00
Roger Dingledine
1b6ea92a57
fix whitespace in log message
2013-09-29 06:15:00 -04:00
Roger Dingledine
c902b4981b
fix two cases where we were printing unsigned int as %d
2013-09-29 06:13:59 -04:00
Nick Mathewson
090bff2dca
Merge remote-tracking branch 'public/bug6055_v2_024'
2013-09-25 14:35:18 -04:00
Nick Mathewson
ad763a336c
Re-enable TLS 1.[12] when building with OpenSSL >= 1.0.1e
...
To fix #6033 , we disabled TLS 1.1 and 1.2. Eventually, OpenSSL fixed
the bug behind #6033 .
I've considered alternate implementations that do more testing to see
if there's secretly an OpenSSL 1.0.1c or something that secretly has a
backport of the OpenSSL 1.0.1e fix, and decided against it on the
grounds of complexity.
2013-09-25 14:34:24 -04:00
Nick Mathewson
759de9f756
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-24 10:47:26 -04:00
Andrea Shepard
938ee9b24d
Always call circuit_n_chan_done(chan, 0) from channel_closed()
2013-09-24 10:42:12 -04:00
George Kadianakis
43b9b51389
Warn when the Extended ORPort should be on but it's not.
2013-09-24 12:30:25 +01:00
Nick Mathewson
31f6806aa7
Use tt_ptr_op, not test_eq, for pointer comparisons in tests
...
Makes mingw64 a bit happier.
2013-09-23 01:57:34 -04:00
Nick Mathewson
5b1c257d9a
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-23 01:48:30 -04:00
Nick Mathewson
116e6af7a7
Fix a compilation warning with older gcc
2013-09-23 01:47:52 -04:00
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
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
7dbf66713f
When freeing a cert_list_t, avoid memory leak.
...
We were freeing these on exit, but when we added the dl_status_map
field to them in fddb814f
, we forgot to arrange for it to be freed.
I've moved the cert_list_free() code into its own function, and added
an appropriate dsmap_free() call.
Fixes bug 9644; bugfix on 0.2.4.13-alpha.
2013-09-19 12:22:49 -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
dece40fd77
Fix an assert when disabling ORPort with accounting disabled.
...
The problem was that the server_identity_key_is_set() function could
return true under conditions where we don't really have an identity
key -- specifically, where we used to have one, but we stopped being a
server.
This is a fix for 6979; bugfix on 0.2.2.18-alpha where we added that
assertion to get_server_identity_key().
2013-09-18 10:26:32 -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
Nick Mathewson
49f9c4924e
Fix compilation on OSX
2013-09-09 15:59:41 -04:00
Nick Mathewson
e9ec0cb550
Do not try to add non-existent syscalls.
2013-09-09 15:37:45 -04:00
Nick Mathewson
4e00625bbe
Build correctly with older libevents
2013-09-09 15:29:19 -04:00
Nick Mathewson
a6ada1a50c
Fix a warning related to SCMP_CMP definition in header.
...
SCMP_CMP(a,b,c) leaves the fourth field of the structure undefined,
giving a missing-initializer error. All of our uses are
three-argument, so I'm overriding the default.
2013-09-09 15:16:30 -04:00
Nick Mathewson
cc35d8be84
Fix most of the --enable-gcc-warnings warnings in the sandbox code
2013-09-09 15:14:50 -04:00
Nick Mathewson
42e6ab0e14
Remove a usage of free()
2013-09-09 14:58:15 -04:00
Nick Mathewson
00fd0cc5f9
Basic compilation fixes.
2013-09-09 14:55:47 -04:00
Nick Mathewson
a0a855d586
Fix unit tests with --disable-curve25519
2013-09-08 17:14:07 -04:00
Cristian Toader
340cca524f
added missing documentation for sandbox functions
2013-09-06 21:41:45 +03:00
Cristian Toader
6a22b29641
passing hints as a const pointer to sandbox_getaddrinfo(), also one tor_free macro fails to compile..
2013-09-06 12:39:56 +03:00
Cristian Toader
839ff0063d
replaced strdup with tor_strdup
2013-09-06 12:30:01 +03:00
Cristian Toader
2a6c34750d
replaced malloc/free with tor_malloc/tor_free
2013-09-06 12:29:15 +03:00
Cristian Toader
42f5737c81
switched string lengths from int to size_t in prot_strings()
2013-09-06 12:26:50 +03:00
Nick Mathewson
c7113e702b
Merge remote-tracking branch 'public/bug9645'
2013-09-05 09:59:07 -04:00
Roger Dingledine
86907ea4db
Merge branch 'maint-0.2.4'
2013-09-05 02:34:58 -04:00
Roger Dingledine
2c877d2da4
collect and log statistics about onionskins received/processed
...
we skip onionskins that came from non-relays, so we're less likely to
run into privacy troubles.
starts to implement ticket 9658.
2013-09-05 01:44:52 -04:00
Roger Dingledine
f51add6dbc
Revert e443beff
and solve it a different way
...
Now we explicitly check for overflow.
This approach seemed smarter than a cascade of "change int to unsigned
int and hope nothing breaks right before the release".
Nick, feel free to fix in a better way, maybe in master.
2013-09-05 01:41:07 -04:00
Roger Dingledine
e443beffeb
don't let recently_chosen_ntors overflow
...
with commit c6f1668d
we let it grow arbitrarily large.
it can still overflow, but the damage is very small now.
2013-09-05 01:27:46 -04:00
Roger Dingledine
6156887adf
Merge branch 'maint-0.2.4'
...
Conflicts:
src/test/test.c
2013-09-04 23:44:39 -04:00
Roger Dingledine
c6f1668db3
nickm wants us to prioritize tap in a currently-rare edge case
2013-09-04 23:21:46 -04:00
Roger Dingledine
a4400952ee
Be more general in calculating expected onion queue processing time
...
Now we consider the TAP cells we'll process while draining the NTor
queue, and vice versa.
2013-09-04 23:21:45 -04:00
Roger Dingledine
a66791230f
let the NumNTorsPerTAP consensus param override our queue choice
2013-09-04 23:21:45 -04:00
Roger Dingledine
7acc7c3dc6
do a lopsided round-robin between the onion queues
...
that way tap won't starve entirely, but we'll still handle ntor requests
quicker.
2013-09-04 23:21:45 -04:00
Roger Dingledine
16b5c609a4
check bounds on handshake_type more thoroughly
2013-09-04 23:21:45 -04:00
Roger Dingledine
9d2030e580
add info-level logs to help track onion queue sizes
2013-09-04 23:21:45 -04:00
Roger Dingledine
bb32bfa2f2
refactor and give it unit tests
2013-09-04 23:21:45 -04:00
Roger Dingledine
87a18514ef
Separate cpuworker queues by handshake type
...
Now we prioritize ntor create cells over tap create cells.
Starts to address ticket 9574.
2013-09-04 23:21:45 -04:00
Kevin Butler
0f070e7858
Added test for new write_chunks_to_file behaviour in #1376 .
2013-09-04 23:25:41 +01:00
Nick Mathewson
d5e9573ed2
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Conflicts:
src/or/circuituse.c
2013-09-04 16:11:20 -04:00
Nick Mathewson
a60d21a85d
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/circuitbuild.c
2013-09-04 16:08:02 -04:00
Nick Mathewson
4f3dbb3c0a
use !cbt_disabled in place of LearnCBT to avoid needless circs
...
This would make us do testing circuits "even when cbt is disabled by
consensus, or when we're a directory authority, or when we've failed
to write cbt history to our state file lately." (Roger's words.)
This is a fix for 9671 and an improvement in our fix for 5049.
The original misbehavior was in 0.2.2.14-alpha; the incomplete
fix was in 0.2.3.17-beta.
2013-09-04 15:54:05 -04:00
Kevin Butler
b539b37205
Fixed leak and added minor documentation for #6384 .
2013-09-04 02:56:06 +01:00
Nick Mathewson
9b2a0f5c75
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-03 15:41:50 -04:00
Nick Mathewson
a8e76de4d9
Merge branch 'bug9400_024_squashed' into maint-0.2.4
2013-09-03 15:38:54 -04:00
Nick Mathewson
d819663b66
Avoid a double-close on one failing case of the socketpair replacement code
...
Fix for bug 9400, spotted by coverity. Bug introduced in revision 2cb4f7a4
(subversion revision r389).
2013-09-03 15:38:25 -04:00
Nick Mathewson
264aa271a7
Fix bug 9645: don't forget an md just because we can't save it.
2013-09-03 14:25:01 -04:00