Robert Ransom
ca6efcf507
Make handle_control_setevents table-driven
2011-06-25 17:45:33 -07:00
Robert Ransom
c780bc4d0b
Merge branch 'bug3465-022' into bug3465-023
...
* bug3465-022:
Add BUILDTIMEOUT_SET to the result of GETINFO events/names
Correct a comment
Fix minor comment issues
2011-06-25 15:04:07 -07:00
Robert Ransom
93d52f6739
Add BUILDTIMEOUT_SET to the result of GETINFO events/names
2011-06-25 15:02:11 -07:00
Robert Ransom
53f87a89f0
Correct a comment
2011-06-24 15:18:22 -07:00
Nick Mathewson
0b536469ee
Merge remote-tracking branch 'rransom-tor/bug3456'
2011-06-24 16:48:38 -04:00
Robert Ransom
76d0d62bd9
Correct terminology in comment
2011-06-24 11:28:52 -07:00
Robert Ransom
58f801fadf
Store cpath_build_state_t flags in one-bit bitfields, not ints
2011-06-24 11:28:15 -07:00
Robert Ransom
cb1b20dbad
Fix minor comment issues
2011-06-23 15:46:15 -07:00
Nick Mathewson
9919b01275
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-22 18:15:27 -04:00
Robert Ransom
2b5ebc7097
Improve documentation of smartlist_split_string
2011-06-22 14:09:43 -07:00
Robert Ransom
d7254bea11
Fix minor comment issues
2011-06-22 14:09:43 -07:00
Robert Ransom
8a55da57ed
Fix comment typo
2011-06-22 13:42:28 -07:00
Nick Mathewson
64a5a4177f
Merge branch 'bug3367'
2011-06-21 11:32:52 -04:00
Nick Mathewson
4186b1362b
Merge remote-tracking branch 'public/bug3264'
2011-06-21 10:28:25 -04:00
Nick Mathewson
e617a34d58
Add, use a bufferevent-safe connection_flush()
...
A couple of places in control.c were using connection_handle_write()
to flush important stuff (the response to a SIGNAL command, an
ERR-level status event) before Tor went down. But
connection_handle_write() isn't meaningful for bufferevents, so we'd
crash.
This patch adds a new connection_flush() that works for all connection
backends, and makes control.c use that instead.
Fix for bug 3367; bugfix on 0.2.3.1-alpha.
2011-06-21 10:22:54 -04:00
Jacob Appelbaum
8b0d9452ca
Fix tor-fw-helper-natpmp.c API usage
...
libnatpmp-20110618 changed the API that tor-fw-helper used and for a time
tor-fw-helper could not build against the newest libnatpmp. This patch brings
support for libnatpmp to tor-fw-helper.
2011-06-20 20:01:46 -04:00
Nick Mathewson
410e440a8d
Log SSL state changes at LOG_DEBUG, LD_HANDSHAKE.
...
This can be slightly useful for debugging blocking events.
Addresses ticket 3116; based on loud_ssl_states branch.
2011-06-20 17:45:12 -04:00
Nick Mathewson
8653f31d8d
Fix overwide line in config.c
2011-06-20 15:29:22 -04:00
Nick Mathewson
997499369e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-20 15:28:16 -04:00
Nick Mathewson
1040ccafb2
Fix overwide lines in util.c
2011-06-20 15:28:06 -04:00
intrigeri
8b265543eb
Add port 6523 (Gobby) to LongLivedPorts.
2011-06-20 12:08:46 -04:00
Nick Mathewson
a046966baf
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/or.h
2011-06-19 21:00:15 -04:00
Nick Mathewson
3b41551b61
Revert "Add an "auto" option to UseBridges"
...
This reverts commit 507c1257a4
.
2011-06-17 16:45:53 -04:00
Nick Mathewson
42d6f34590
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-17 15:25:18 -04:00
Nick Mathewson
85d4c290d7
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-06-17 15:24:23 -04:00
Robert Ransom
010b8dd4f6
Abandon rendezvous circuits on SIGNAL NEWNYM
2011-06-17 15:22:23 -04:00
Nick Mathewson
31b9b1a5bb
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-17 15:04:29 -04:00
Nick Mathewson
209229f100
Merge branch 'bug3407' into maint-0.2.2
2011-06-17 14:59:39 -04:00
Robert Ransom
227896e447
Make send_control_event_impl's behaviour sane
2011-06-17 13:57:25 -04:00
Robert Ransom
70785f87bb
Fix comment typo
2011-06-17 13:57:25 -04:00
Robert Ransom
68cd0a9abe
Make connection_printf_to_buf's behaviour sane
2011-06-17 13:57:25 -04:00
Roger Dingledine
64bfbcb918
log when we finish ssl handshake and move to renegotiation
...
debug-level since it will be quite common. logged at both client
and server side. this step should help us track what's going on
with people filtering tor connections by our ssl habits.
2011-06-17 03:31:59 -04:00
Nick Mathewson
a857f61e27
Merge remote-tracking branch 'rransom-tor/bug3332-v2'
2011-06-15 11:33:40 -04:00
Robert Ransom
44eafa9697
Assert that HS operations are not performed using single-hop circuits
...
(with fixes by Nick Mathewson to unbreak the build)
2011-06-14 21:32:49 -07:00
Nick Mathewson
875a551409
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-14 13:46:46 -04:00
Nick Mathewson
a25c0a5bf8
Merge remote-tracking branch 'public/bug3369' into maint-0.2.2
2011-06-14 13:46:10 -04:00
Nick Mathewson
19febed9e5
Merge remote-tracking branch 'rransom-tor/bug3349'
2011-06-14 13:39:26 -04:00
Nick Mathewson
47c8433a0c
Make the get_options() return const
...
This lets us make a lot of other stuff const, allows the compiler to
generate (slightly) better code, and will make me get slightly fewer
patches from folks who stick mutable stuff into or_options_t.
const: because not every input is an output!
2011-06-14 13:17:06 -04:00
Nick Mathewson
22efe20309
Fix another check_private_dir instance in master
2011-06-14 12:28:16 -04:00
Nick Mathewson
8839b86085
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-14 12:25:33 -04:00
Jérémy Bobbio
54d7d31cba
Make ControlSocketsGroupWritable work with User.
...
Original message from bug3393:
check_private_dir() to ensure that ControlSocketsGroupWritable is
safe to use. Unfortunately, check_private_dir() only checks against
the currently running user… which can be root until privileges are
dropped to the user and group configured by the User config option.
The attached patch fixes the issue by adding a new effective_user
argument to check_private_dir() and updating the callers. It might
not be the best way to fix the issue, but it did in my tests.
(Code by lunar; changelog by nickm)
2011-06-14 12:18:32 -04:00
intrigeri
910472c514
client-side DNS proxy server: reply NOTIMPL to unsupported queries
...
Fix for bug 3369.
2011-06-13 13:37:45 -04:00
Nick Mathewson
676608f9a6
Upgrade to the latest version of tinytest
2011-06-09 17:30:09 -04:00
Nick Mathewson
b2e7c356db
Prefer tt_assert in unit tests, not tor_assert
2011-06-08 20:33:53 -04:00
Sebastian Hahn
8283767365
Fix a memleak in nodelist_assert_ok()
2011-06-08 21:38:42 +02:00
Sebastian Hahn
f303274490
Fix a rare memleak during stats writing
...
If rep_hist_buffer_stats_write() was called unitinitalized, we'd leak
memory.
2011-06-08 21:35:26 +02:00
Sebastian Hahn
680646e0de
Don't use signed 1-bit bitfields
...
This was harmless, we never compared it to anything but itself or 0.
But Coverity complained, and it had a point.
2011-06-08 21:30:41 +02:00
Sebastian Hahn
9e56ac27da
Comment out some obviously dead code.
...
Coverity warned about it, it's harmless to comment out.
2011-06-08 21:30:41 +02:00
Sebastian Hahn
e6fff7235e
Remove a few dead assignments during router parsing
2011-06-08 21:30:40 +02:00
Sebastian Hahn
3033f8459b
Remove a dead variable in the heartbeat code
2011-06-08 21:11:42 +02:00