Nick Mathewson
26456d3354
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-27 22:14:54 -04:00
Nick Mathewson
0130e7c9d2
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/common/torint.h
2011-04-27 22:14:28 -04:00
Nick Mathewson
43ffd023e9
Make SIZE_T_CEILING unsigned; add a signed SSIZE_T_CEILING
...
None of the comparisons were _broken_ previously, but avoiding
signed/unsigned comparisons makes everybody happier.
Fixes bug2475.
2011-04-26 13:03:58 -04:00
Nick Mathewson
4a7f979b54
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-19 12:41:01 -04:00
Nick Mathewson
5cc322e547
Standardize our printf code on %d, not %i.
2011-04-19 12:40:29 -04:00
Nick Mathewson
99c2bfe76b
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/rephist.c
2011-04-08 13:37:57 -04:00
Nick Mathewson
1be1221385
Free pending_cb_messages on exit
2011-04-07 15:25:33 -04:00
Nick Mathewson
67d88a7d60
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/common/address.c
src/common/compat_libevent.c
src/common/memarea.c
src/common/util.h
src/or/buffers.c
src/or/circuitbuild.c
src/or/circuituse.c
src/or/connection.c
src/or/directory.c
src/or/networkstatus.c
src/or/or.h
src/or/routerlist.c
2011-04-07 12:17:20 -04:00
Nick Mathewson
ba0cd8094f
Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
...
Conflicts:
src/or/or.h
2011-04-07 12:03:04 -04:00
Nick Mathewson
ee871e7a0e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/common/compat.h
src/or/circuitlist.c
src/or/circuituse.c
src/or/or.h
src/or/rephist.c
2011-03-30 14:55:50 -04:00
Nick Mathewson
5eaba5ac21
Implement replacements for timer(add,cmp,sub) on platforms lacking them.
2011-03-30 14:41:41 -04:00
Sebastian Hahn
9facf8918f
Improve a few comments
2011-03-28 19:28:04 +02:00
Nick Mathewson
05887f10ff
Triage the XXX022 and XXX021 comments remaining in the code
...
Remove some, postpone others, leave some alone. Now the only
remaining XXX022s are ones that seem important to fix or investigate.
2011-03-25 18:32:27 -04:00
Nick Mathewson
c4bd067359
Comment out ancient asserts for bug 930; resolve an xxx021
2011-03-25 16:28:38 -04:00
Nick Mathewson
41380fa3b3
Fixup tor_addr_to_sockaddr return convention
2011-03-25 16:28:38 -04:00
Nick Mathewson
88bb40d8f8
Clean up a comment-conversation about bad libevent version/method combos
2011-03-25 16:28:38 -04:00
Nick Mathewson
444e46d96d
Remove the "fuzzy time" code
...
It was the start of a neat idea, but it only got used in 3 places,
none of which really needed it.
2011-03-25 16:28:37 -04:00
Nick Mathewson
1db6eb6cb7
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-03-16 18:10:24 -04:00
Nick Mathewson
721954b3a2
Resolve the one DOCDOC in the 0.2.2 code atm
2011-03-16 18:07:55 -04:00
Nick Mathewson
b1b6552251
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/common/crypto.c
2011-03-16 17:16:54 -04:00
Nick Mathewson
3310dd2358
Clean up whitespace
2011-03-16 17:11:30 -04:00
Nick Mathewson
57b954293e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Trivial Conflicts in
src/common/crypto.c
src/or/main.h
src/or/or.h
2011-03-16 17:09:32 -04:00
Nick Mathewson
6617822b84
Doxygen documentation for about 100 things that didn't have any
...
About 860 doxygen-less things remain in 0.2.2
2011-03-16 17:05:37 -04:00
Nick Mathewson
7f6af7a602
Fix up all doxygen warnings other than "foo is not documented"
2011-03-16 14:47:27 -04:00
Nick Mathewson
26009a3ed0
Merge remote branch 'origin/maint-0.2.2'
2011-03-07 17:12:08 -05:00
Sebastian Hahn
f83debb51d
Fix setting target port in get_interface_address6
...
We want to use the discard port correctly, so a htons() was missing.
Also we need to set it correctly depending on address family.
Review provided by danieldg
2011-03-05 16:58:20 +01:00
Sebastian Hahn
865ea5d263
Fix connect() failures in get_interface_address6()
...
The third argument for connect should be dependent on the address
family. Issue spotted by piebeer who also wrote the patch.
2011-03-05 16:57:05 +01:00
Nick Mathewson
f608872b0c
C style fix: a no-args function is void fn(void), not void fn().
2011-03-03 23:42:14 -05:00
Nick Mathewson
8ae179deec
Add a magic field to tor_tls_t to catch exdata corruption bugs, if any appear.
2011-03-03 23:41:34 -05:00
Robert Ransom
74fc993b98
Check the result of SSL_set_ex_data
...
Reported by piebeer.
2011-03-03 16:17:39 -08:00
Robert Ransom
fe1137be6f
Use SSL_*_ex_data instead of SSL_*_app_data
...
SSL_*_app_data uses ex_data index 0, which will be the first one allocated
by SSL_get_ex_new_index. Thus, if we ever started using the ex_data feature
for some other purpose, or a library linked to Tor ever started using
OpenSSL's ex_data feature, Tor would break in spectacular and mysterious
ways. Using the SSL_*_ex_data functions directly now may save us from
that particular form of breakage in the future.
But I would not be surprised if using OpenSSL's ex_data functions at all
(directly or not) comes back to bite us on our backends quite hard. The
specified behaviour of dup_func in the man page is stupid, and
crypto/ex_data.c is a horrific mess.
2011-03-03 15:34:53 -08:00
Robert Ransom
13ee803469
Remove now-unused helper functions
...
These functions were needed only by code removed in the preceding commit.
Reported by mobmix.
2011-03-03 14:59:21 -08:00
Gladys Shufflebottom
49de5431d5
remove tls related hash table code
2011-03-01 18:11:25 -05:00
Nick Mathewson
46b07462ae
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 13:02:42 -05:00
Nick Mathewson
9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
2011-02-22 13:01:02 -05:00
Nick Mathewson
ce149c1022
That shalt also not have a label without a statement.
2011-02-22 12:52:52 -05:00
Nick Mathewson
933ffd536d
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 12:47:47 -05:00
Sebastian Hahn
098b6ba72d
Initial heartbeat subsystem commit.
...
Sets:
* Documentation
* Logging domain
* Configuration option
* Scheduled event
* Makefile
It also creates status.c and the log_heartbeat() function.
All code was written by Sebastian Hahn. Commit message was
written by me (George Kadianakis).
2011-02-22 12:40:36 -05:00
Sebastian Hahn
5dbaf9dbd5
Windows has EACCES, not EACCESS
...
Once again spotted by mobmix
Also add a changes file for the fix
2011-02-11 17:02:26 +01:00
Nick Mathewson
50c259d763
Make the DH parameter we use for TLS match the one from Apache's mod_ssl
...
Our regular DH parameters that we use for circuit and rendezvous
crypto are unchanged. This is yet another small step on the path of
protocol fingerprinting resistance.
(Backport from 0.2.2's 5ed73e3807
)
2011-02-10 15:55:06 -05:00
Nick Mathewson
f25fc6e650
Merge remote branch 'origin/maint-0.2.2'
2011-02-08 14:02:43 -05:00
Sebastian Hahn
9c7e2cf010
Locking failures on windows are indicated by EACCES
...
Patch our implementation of tor_lockfile_lock() to handle this case
correctly. Also add a note that blocking behaviour differs from windows
to *nix. Fixes bug 2504, issue pointed out by mobmix.
2011-02-08 18:35:07 +01:00
Robert Ransom
0ab8b7c0f2
Thou shalt not overflow even stupidly small buffers
2011-02-04 05:50:44 -08:00
Nick Mathewson
912b76a1bf
Merge remote branch 'origin/maint-0.2.2'
2011-02-03 13:56:37 -05:00
Nick Mathewson
e80bdfb4a0
Correctly detect BIO_new failures
...
This bug was noticed by cypherpunks; fixes bug 2378.
Bugfix on svn commit r110.
2011-01-25 18:26:49 -05:00
Nick Mathewson
bfde636aad
Always treat failure to allocate an RSA key as an unrecoverable allocation error
2011-01-25 18:19:09 -05:00
Nick Mathewson
76582442a8
Handle failing cases of DH allocation
2011-01-25 18:09:38 -05:00
Nick Mathewson
c939c953ae
Remove an unused function in crypto.c
2011-01-25 18:07:02 -05:00
Nick Mathewson
89ee779f92
Add a torrc option to report log domains
2011-01-25 15:53:15 -05:00
Nick Mathewson
e261a1a3e6
Simplify syntax for negated log domains
...
Previously if you wanted to say "All messages except network
messages", you needed to say "[*,~net]" and if you said "[~net]" by
mistake, you would get no messages at all. Now, if you say "[~net]",
you get everything except networking messages.
2011-01-25 15:03:36 -05:00