Nick Mathewson
17fdde3d92
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/common/tortls.c
2010-10-21 16:23:01 -04:00
Nick Mathewson
441241c136
Fix a whitespace error
2010-10-21 16:12:04 -04:00
Nick Mathewson
1587735c90
Merge branch 'bug988-nm' into maint-0.2.2
2010-10-21 16:11:02 -04:00
Nick Mathewson
03adb8caad
Add some asserts to get_{tlsclient|server}_identity_key
...
We now require that:
- Only actual servers should ever call get_server_identity_key
- If you're being a client or bridge, the client and server keys should
differ.
- If you're being a public relay, the client and server keys
should be the same.
2010-10-21 13:54:12 -04:00
Nick Mathewson
704076680a
Rename get_client_identity_key to get_tlsclient_identity_key
2010-10-21 13:54:02 -04:00
Nick Mathewson
f3eb2a10ae
Remove a ??? comment in node_get_by_nickname
...
Bug 1859 shows that the router_get_by_nickname behavior was wrong,
and the node_get_by_nickname is right.
2010-10-21 11:18:55 -04:00
Nick Mathewson
bd1a694221
Add a node_get_by_hex_id().
2010-10-21 11:18:16 -04:00
Nick Mathewson
f32140238f
Merge remote branch 'origin/maint-0.2.2' for bug 1859 patches
...
Some of this is already done in nodelist.
2010-10-21 11:17:34 -04:00
Nick Mathewson
5f3010667d
Fix a remaining bug in Robert's bug1859 fix.
...
When intro->extend_info is created for an introduction point, it
only starts out with a nickname, not necessarily an identity digest.
Thus, doing router_get_by_digest isn't necessarily safe.
2010-10-21 11:09:35 -04:00
Nick Mathewson
0e8d1c2217
Merge remote branch 'hoganrobert/bug1859' into maint-0.2.2
2010-10-21 11:01:12 -04:00
Nick Mathewson
2c3dafc342
Merge remote branch 'origin/maint-0.2.2'
2010-10-21 10:52:12 -04:00
Nick Mathewson
ea7f4be6d2
Merge remote branch 'sebastian/relay_early_rend' into maint-0.2.2
2010-10-21 10:49:44 -04:00
Nick Mathewson
d17b9bf1a5
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/networkstatus.c
2010-10-20 21:32:27 -04:00
Nick Mathewson
0ac9a3df6c
Fix a logic error in 98aee84
. Found by boboper
2010-10-20 14:40:09 -04:00
Nick Mathewson
444193ff5d
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/networkstatus.c
2010-10-20 13:53:11 -04:00
Nick Mathewson
2849a95691
Add a ! to directory_caches_dir_info() to fix a logic error
...
We want to fetch directory info more aggressively if we need it to
refuseunknownexits. Thus, we'll want it if our exit policy is _NOT_
reject *.
2010-10-20 13:49:38 -04:00
Nick Mathewson
c2323f1340
Merge branch 'bug2097' into maint-0.2.2
2010-10-20 13:45:53 -04:00
Nick Mathewson
98aee8472f
Fix a read of a freed pointer while in set_current_consensus
...
Found by rransom while working on issue #988 . Bugfix on
0.2.2.17-alpha. Fixes bug 2097.
2010-10-20 13:10:20 -04:00
Nick Mathewson
ca7d5dc299
Merge remote branch 'origin/maint-0.2.2'
2010-10-20 13:07:25 -04:00
Sebastian Hahn
4f0badf974
Remove redundant -Wpointer-sign CFLAG
...
-Wpointer-sign is implied with -Wall, which we use when building with
--enable-gcc-warnings.
2010-10-20 13:13:50 +02:00
Sebastian Hahn
12d675a8dd
Remove redundant -Wformat -Wformat-security CFLAGS
...
When configuring with --enable-gcc-warnings, we use -Wformat=2 which
automatically enables the available -Wformat switches, so adding them
again in the --enable-gcc-hardening case doesn't make sense..
2010-10-20 13:13:50 +02:00
Sebastian Hahn
cee4dc6101
Use ssp-buffer-size param when hardening
...
We used to enable ssp-buffer-size=1 only when building with
--enable-gcc-warnings. That would result in warnings (and no
protection for small arrays) when building with
--enable-gcc-hardening without enabling warnings, too. Fixes bug
2031.
Also remove an XXX: We now allow to build with -fstack-protector
by using --enable-gcc-hardening.
2010-10-20 13:13:44 +02:00
Sebastian Hahn
d3b67cba3c
Send relay_early cells in rend circs
...
There are no relay left that run version 0.2.1.3 through 0.2.1.18, so
changing this behaviour should be safe now.
2010-10-18 07:46:51 +02:00
Robert Hogan
69a496ba98
Issues with router_get_by_nickname() (3)
...
Add changes file
2010-10-17 15:12:25 +01:00
Robert Hogan
0acd5e6208
Issues with router_get_by_nickname()
...
https://trac.torproject.org/projects/tor/ticket/1859
Use router_get_by_digest() instead of router_get_by_hexdigest()
in circuit_discard_optional_exit_enclaves() and
rend_client_get_random_intro(), per Nick's comments.
Using router_get_by_digest() in rend_client_get_random_intro() will
break hidden services published by Tor versions pre 0.1.2.18 and
0.2.07-alpha as they only publish by nickname. This is acceptable
however as these versions only publish to authority tor26 and
don't work for versions in the 0.2.2.x series anyway.
2010-10-17 12:27:57 +01:00
Nick Mathewson
4dbd8ba008
clarify fmt_addr32 documentation to note that the address is in host-order
2010-10-15 18:04:07 -04:00
Nick Mathewson
441d90a8f9
Fix one-time memory leak when initializing libevent. Spotted by Sebastian
2010-10-15 17:14:04 -04:00
Nick Mathewson
a7cf788740
Merge branch 'bug1992_part1'
2010-10-15 17:08:18 -04:00
Nick Mathewson
b97da61b5a
Tweak the fmt_addr32 code
...
Clarify documentation, rename a local, and fix a memory leak.
2010-10-15 17:07:27 -04:00
Nick Mathewson
d6bd2e55a6
Remove more unused code from routerlist.c
2010-10-15 14:25:52 -04:00
Nick Mathewson
e70cfbeb40
Remove an unused field from circ_buffer_stats_t
2010-10-15 14:25:36 -04:00
Nick Mathewson
96ab83d3b6
Improve accuracy of comment about aes_crypt performance
...
The old comment was from before I tried a huge pile of crazy stuff to
make the inner loop faster. Short answer: GCC already knows how to
unroll loops pretty well. Other short answer: we should have made the
relay payload size an even multiple of 4, 8, or ideally 16.
2010-10-15 13:44:25 -04:00
Nick Mathewson
006acf8b3f
Fix a documention issue in circuitlist.c
2010-10-15 13:44:25 -04:00
Nick Mathewson
05274ba9b5
Kill comments saying to remove asserts once bug930 is solved.
...
It's okay to leave the asserts in: the code doesn't appear in profiles.
2010-10-15 13:44:25 -04:00
Roger Dingledine
aab6952887
fix another typo
2010-10-15 13:00:37 -04:00
Nick Mathewson
04231a2ebe
Fix an apostrophe in a comment
2010-10-15 12:39:23 -04:00
Nick Mathewson
36c5476e70
Fold timestamp_created into highres_created
...
There's no reason to keep a time_t and a struct timeval to represent
the same value: highres_created.tv_sec was the same as timestamp_created.
This should save a few bytes per circuit.
2010-10-15 12:38:02 -04:00
Nick Mathewson
94a99ad205
Add a portable tor_timercmp
...
We can't use the platform timercmp, because
1) some platforms don't have them
2) some that do have them only support certain relational operators
2010-10-15 12:35:05 -04:00
Nick Mathewson
9516c1efdb
Remove XXXs about improving buf_t API: bufferevents are the future
2010-10-15 11:38:33 -04:00
Nick Mathewson
59cba1767c
Make the return value of tor_addr_sockaddr always be signed
2010-10-15 11:36:16 -04:00
Nick Mathewson
247ce5876a
Remove "is this too slow?" XXXX comments for code not appearing in profiles
2010-10-15 11:21:33 -04:00
Nick Mathewson
a5289fa794
Remove the unused old fuzzy-time code
2010-10-15 11:16:42 -04:00
Nick Mathewson
adc4f678f1
Fix an xxx wrt picking libevent methods known-to-work
...
The short version is, "where we want to do it, we have nothing real to
chose from and we can't do it easily. Where it's easy to do, we have
no reason to do it yet."
2010-10-15 10:58:16 -04:00
Nick Mathewson
be13b5775a
Remove an XXX in ntmain.c: a simple function call per loop is not so expensive.
2010-10-15 10:57:42 -04:00
Sebastian Hahn
01cde8dbf3
Raise libevent version needed for bufferevents
2010-10-15 02:46:19 +02:00
Sebastian Hahn
9bed40eb10
Make check-spaces happy
2010-10-14 17:54:45 +02:00
Sebastian Hahn
4556f2e7c8
Rename router_get_by_digest()
...
We now call the function router_get_by_id_digest() to make clear that
we're talking about the identity digest here, not descriptor digest.
2010-10-14 17:49:51 +02:00
Nick Mathewson
376939c9ac
Fix a few trivial bugs from the nodelist merge
2010-10-13 21:54:09 -04:00
Nick Mathewson
3af12a5557
Fix some XXXXs in connection_add_impl related to bufferevent error checking
...
This might make bufferevents more asserty for a while, but they should
make other bugs less likely to go unnoticed.
Noted by Sebastian.
2010-10-13 20:37:04 -04:00
Nick Mathewson
3d10c89201
Fix a couple users of buf_datalen that slipped in. Found by Sebastian
2010-10-13 20:36:34 -04:00