Nick Mathewson
3aec655694
Merge remote branch 'arma/bug1982_2'
...
Resolved a minor conflict in:
src/or/circuitbuild.c
2010-10-13 16:07:37 -04:00
Nick Mathewson
8c837db38f
Merge branch 'nodes'
2010-10-13 16:04:25 -04:00
Nick Mathewson
cbda016bc5
Send END cells on bufferevent tunneled directory conns
...
Our old code correctly called bufferevent_flush() on linked
connections to make sure that the other side got an EOF event... but
it didn't call bufferevent_flush() when the connection wasn't
hold_open_until_flushed. Directory connections don't use
hold_open_until_flushed, so the linked exit connection never got an
EOF, so they never sent a RELAY_END cell to the client, and the
client never concluded that data had arrived.
The solution is to make the bufferevent_flush() code apply to _all_
closing linked conns whose partner is not already marked for close.
2010-10-13 15:05:06 -04:00
Nick Mathewson
1c6649418d
Revert accidentally-committed changes to routerlist.c
...
This reverts part of commit a0c1c2ac01
.
2010-10-13 13:16:12 -04:00
Nick Mathewson
a0c1c2ac01
Use connection_mark_and_flush consistently.
2010-10-13 13:08:46 -04:00
Nick Mathewson
5710d99f00
Remember to re-install inbuf/outbuf callbacks on ssl bufferevents
...
If we don't, we will (among other bad things) never update
lastread/lastwritten, and so flood the network with keepalives.
2010-10-12 15:48:17 -04:00
Nick Mathewson
fbacbf9fd9
Set OpenSSL 0.9.8l renegotiation flag early enough for bufferevents
...
This seems to fix another case of bug2001.
2010-10-12 14:52:33 -04:00
Nick Mathewson
a9172c87be
Actually call connection_tls_finish_handshake() with bufferevents
...
First start of a fix for bug2001, but my test network still isn't
working: the client and the server send each other VERSIONS cells,
but never notice that they got them.
2010-10-12 14:52:33 -04:00
Nick Mathewson
c1c74c51d4
Merge remote branch 'origin/maint-0.2.2'
2010-10-12 14:50:57 -04:00
Steven Murdoch
06eafb3fcc
Fix running unit tests from outside of the build directory (fixes bug #2051 )
...
Currently the unit tests test_util_spawn_background_* assume that they
are run from the Tor build directory. This is not the case when running
make distcheck, so the test will fail. This problem is fixed by autoconf
setting BUILDDIR to be the root of the Tor build directory, and this
preprocessor variable being used to specify the absolute path to
test-child. Also, in test-child, do not print out argv[0] because this will
no longer be predictable. Found by Sebastian Hahn.
2010-10-11 23:29:52 +01:00
Nick Mathewson
8ecb5abbe1
Add header for tor_tls_log_one_error
2010-10-11 13:26:57 -04:00
Nick Mathewson
4cfa6fbaca
Log OpenSSL errors coming from bufferevent_openssl
2010-10-11 13:25:41 -04:00
Sebastian Hahn
f3d000f496
Fix MIPSpro and time_t signedness detection
...
3d6e283087
silenced the autogen.sh warnings as it was supposed to, but
introduced two bugs. Fix them.
2010-10-11 19:24:25 +02:00
Sebastian Hahn
50d77ad4b6
Fix the new warnings during autogen.sh
...
Follow-up fix to 3d6e283087
for configure.in additions in master that
weren't in maint-0.2.2
2010-10-11 17:08:42 +02:00
Nick Mathewson
544a8afe5a
Merge remote branch 'sjmurdoch/bug1903'
2010-10-11 11:01:15 -04:00
Steven Murdoch
f7338d3baa
Skip running fgets_eagain test until we fix it
2010-10-11 15:56:14 +01:00
Nick Mathewson
8f76f31761
Make tor_sscanf handle %x
2010-10-11 10:50:47 -04:00
Nick Mathewson
45ce1f678f
Merge remote branch 'origin/maint-0.2.2'
2010-10-11 10:16:09 -04:00
Sebastian Hahn
3d6e283087
Fix warnings with new versions of autoconf
...
It looks like autoconf 2.68 introduced a bunch of new warnings when it
didn't like the syntax you used or forgot to use
AC_LANG_(SOURCE|PROGRAM).
2010-10-11 12:36:02 +02:00
Steven Murdoch
8a12ce2cf9
Add a unit test for tor_spawn_background
...
- Test sucessfully starting a process
- Test failing to find the executable
2010-10-10 19:08:44 +01:00
Steven Murdoch
68e576e9f9
Update documentation for tor_spawn_background
...
- Include description of stdout_read, stderr_read, and argv
2010-10-10 19:08:44 +01:00
Steven Murdoch
8ee559bd63
Add a unit test for fgets (currently fails)
...
- For a non-blocking pipe, check that on EAGAIN fgets returns NULL
rather than a partial line
2010-10-10 19:08:44 +01:00
Steven Murdoch
23e9f362a2
Fix issues in nickm's review of log_from_pipe for bug #1903
...
- Replace sscanf with tor_sscanf
- Replace use of strstr with equivalent call to strcmpstart
2010-10-10 19:08:44 +01:00
Steven Murdoch
4d694c7890
Fix nickm's comments on logging for bug #1903
...
- Use log_warn rather than log_err for bad but survivable events
2010-10-10 19:08:44 +01:00
Steven Murdoch
708ba8899f
Note icky constructs mentioned in bug #1903
...
- To be dealt with as part of bug #2029
2010-10-10 19:07:40 +01:00
Nick Mathewson
9fe3cd0be3
Fix a crash bug when serving microdescs on a bufferevent.
2010-10-07 21:02:12 -04:00
Nick Mathewson
d0f1f9ce9e
Remove a spurious .z from microdesc fetch URLs so they no logner end with .z.z
2010-10-07 20:41:15 -04:00
Nick Mathewson
c9dece14ae
Add some missing documentation for things added in nodes branch
2010-10-07 17:10:06 -04:00
Nick Mathewson
5bab9fe79e
Actually add test_microdesc.c file.
2010-10-07 16:27:01 -04:00
Nick Mathewson
1dffefc907
Add more documentation to microdesc.c, plus another assert.
2010-10-07 16:25:27 -04:00
Nick Mathewson
ab5b11fbb8
Add a more verbose log message to try to catch bug #2022 .
2010-10-07 16:04:24 -04:00
Nick Mathewson
3061a036c8
Unit tests for microdescriptor cache
...
May help with tracking down bug #2022
2010-10-07 15:28:54 -04:00
Sebastian Hahn
34546e2573
Fix a compile warning on OSX 10.6
2010-10-07 06:31:08 +02:00
Nick Mathewson
99062c4003
Spotted another missing check
2010-10-05 00:39:01 -04:00
Nick Mathewson
4080d9b0fa
Fix a couple more node_t-related nullpointer bugs
2010-10-04 23:51:30 -04:00
Nick Mathewson
9edd85aa4c
Switch an && to an ||, stop a *NULL.
2010-10-04 23:33:50 -04:00
Nick Mathewson
4c71be65d8
Merge remote branch 'origin/maint-0.2.2'
2010-10-04 13:56:17 -04:00
Robert Ransom
1b8c8059c7
Correct a bogus comment.
...
Whether or not OpenSSL reference-counts SSL_CTX objects is irrelevant;
what matters is that Tor reference-counts its wrapper objects for
SSL_CTXs.
2010-10-04 13:53:54 -04:00
Robert Ransom
c70d9d77ab
Correct a couple of log messages in tortls.c
2010-10-04 13:53:48 -04:00
Robert Ransom
068185eca2
Fix several comments in tortls.c
2010-10-04 13:47:57 -04:00
Nick Mathewson
64535a401b
Merge remote branch 'origin/maint-0.2.2'
2010-10-04 12:58:35 -04:00
Nick Mathewson
1fa50c778c
Clarify PublishServerDescriptor even more
2010-10-04 12:58:20 -04:00
Nick Mathewson
5eb3630f1a
Merge remote branch 'rransom/manpage-fixes' into maint-0.2.2
2010-10-04 12:56:05 -04:00
Nick Mathewson
3e5ada6a29
Merge remote branch 'origin/maint-0.2.2'
2010-10-04 12:32:52 -04:00
Nick Mathewson
69b4138c00
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-10-04 12:32:35 -04:00
Steven Murdoch
5a77c64834
Fix issues in nickm's review of format_helper_exit_status for bug #1903
...
- Responsibility of clearing hex_errno is no longer with caller
- More conservative bounds checking
- Length requirement of hex_errno documented
- Output format documented
2010-10-04 14:31:27 +01:00
Karsten Loesing
bad609ae6b
Update to the October 1 2010 Maxmind GeoLite Country database.
2010-10-04 11:45:53 +02:00
Nick Mathewson
b9f2ccbdcc
More debugging code for node_t branch
2010-10-01 19:52:05 -04:00
Nick Mathewson
1bb9734e3a
Implement policies for nodes (and for microdescriptors too)
2010-10-01 18:14:28 -04:00
Nick Mathewson
42acef68ad
Fix a bug in smartlist_choose_node_by_bandwidth
2010-10-01 18:14:28 -04:00