- tor-commits - lists.torproject.org

[tor/release-0.2.2] Fix typo in man page
by arma＠torproject.org 04 Mar '11

04 Mar '11

commit 88e0de9ebbb75a64d7870ccd8cf431bb0f23c937 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Mar 3 10:41:39 2011 -0800 Fix typo in man page --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8b8fd20..f1734d2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -34,7 +34,7 @@ OPTIONS Display a short help message and exit. **-f** __FILE__:: - FILE contains further "option value" paris. (Default: @CONFDIR@/torrc) + FILE contains further "option value" pairs. (Default: @CONFDIR@/torrc) **--hash-password**:: Generates a hashed password for control port access.

1 0

[tor/release-0.2.2] Avoid spurious bwhist parsing failures
by arma＠torproject.org 04 Mar '11

04 Mar '11

commit 6b7408178bf9cb3864cec14408d78e8374f26b68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 1 17:08:02 2011 -0500 Avoid spurious bwhist parsing failures This should fix a bug that special ran into, where if your state file didn't record period maxima, it would never decide that it had successfully parsed itself unless you got lucky with your uninitialized-variable values. This patch also tries to improve error messags in the case where a maximum value legitimately doesn't parse. --- src/or/rephist.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 3f4a704..61ae2c3 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1602,18 +1602,24 @@ rep_hist_load_bwhist_state_section(bw_array_t *b, b->cur_obs_time = start; b->next_period = start + NUM_SECS_BW_SUM_INTERVAL; SMARTLIST_FOREACH_BEGIN(s_values, const char *, cp) { + const char *maxstr = NULL; v = tor_parse_uint64(cp, 10, 0, UINT64_MAX, &ok, NULL); if (have_maxima) { - const char *maxstr = smartlist_get(s_maxima, cp_sl_idx); + maxstr = smartlist_get(s_maxima, cp_sl_idx); mv = tor_parse_uint64(maxstr, 10, 0, UINT64_MAX, &ok_m, NULL); mv *= NUM_SECS_ROLLING_MEASURE; } else { /* No maxima known; guess average rate to be conservative. */ mv = v / s_interval; } - if (!ok || !ok_m) { + if (!ok) { retval = -1; - log_notice(LD_HIST, "Could not parse '%s' into a number.'", cp); + log_notice(LD_HIST, "Could not parse value '%s' into a number.'",cp); + } + if (maxstr && !ok_m) { + retval = -1; + log_notice(LD_HIST, "Could not parse maximum '%s' into a number.'", + maxstr); } if (start < now) {

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 04 Mar '11

04 Mar '11

commit b3820e0d03b1b54575c1b5d946180581e281798d Merge: 17f873a 1d6af67 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Mar 4 00:43:20 2011 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 doc/tor.1.txt | 2 +- src/or/rephist.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-)

1 0

[tor/master] Fix typo in man page
by nickm＠torproject.org 04 Mar '11

04 Mar '11

commit 88e0de9ebbb75a64d7870ccd8cf431bb0f23c937 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Mar 3 10:41:39 2011 -0800 Fix typo in man page --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8b8fd20..f1734d2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -34,7 +34,7 @@ OPTIONS Display a short help message and exit. **-f** __FILE__:: - FILE contains further "option value" paris. (Default: @CONFDIR@/torrc) + FILE contains further "option value" pairs. (Default: @CONFDIR@/torrc) **--hash-password**:: Generates a hashed password for control port access.

1 0

[tor/master] Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2
by nickm＠torproject.org 04 Mar '11

04 Mar '11

commit 1d6af67ab8d96c30e022f1f7602276f10c8444dc Merge: 6b74081 88e0de9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 3 13:50:17 2011 -0500 Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2 doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote branch 'origin/maint-0.2.2'
by nickm＠torproject.org 04 Mar '11

04 Mar '11

commit c6d8e75dc3aafe7b9a658221ac3bcd4a5936ff9b Merge: f608872 1d6af67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 4 00:25:14 2011 -0500 Merge remote branch 'origin/maint-0.2.2' doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --combined doc/tor.1.txt index 8897141,f1734d2..eaebf44 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -34,7 -34,7 +34,7 @@@ OPTION Display a short help message and exit. **-f** __FILE__:: - FILE contains further "option value" paris. (Default: @CONFDIR@/torrc) + FILE contains further "option value" pairs. (Default: @CONFDIR@/torrc) **--hash-password**:: Generates a hashed password for control port access. @@@ -371,13 -371,6 +371,13 @@@ Other options can be specified either o on Windows; instead you should use the --service command-line option. (Default: 0) +**LogTimeGranularity** __NUM__:: + Set the resolution of timestamps in Tor's logs to NUM milliseconds. + NUM must be positive and either a divisor or a multiple of 1 second. + Note that this option only controls the granularity written by Tor to + a file or console log. Tor does not (for example) "batch up" log + messages to affect times logged by a controller, times attached to + syslog messages, or the mtime fields on log files. (Default: 1 second) **SafeLogging** **0**|**1**|**relay**:: Tor can scrub potentially sensitive strings from log messages (e.g. @@@ -432,11 -425,6 +432,11 @@@ networkstatus. This is an advanced option; you generally shouldn't have to mess with it. (Default: not set.) +**DisableIOCP** **0**|**1**:: + If Tor was built to use the Libevent's "bufferevents" networking code + and you're running on Windows, setting this option to 1 will tell Libevent + not to use the Windows IOCP networking API. (Default: 1) + CLIENT OPTIONS -------------- @@@ -511,7 -499,7 +511,7 @@@ The following options are useful only f list. **EntryNodes** __node__,__node__,__...__:: - A list of identity fingerprints, nicknames and address + A list of identity fingerprints, nicknames, country codes and address patterns of nodes to use for the first hop in normal circuits. These are treated only as preferences unless StrictNodes (see below) is also set. @@@ -608,8 -596,7 +608,8 @@@ constitute a "family" of similar or co-administered servers, so never use any two of them in the same circuit. Defining a NodeFamily is only needed when a server doesn't list the family itself (with MyFamily). This option - can be used multiple times. + can be used multiple times. In addition to nodes, you can also list + IP address and ranges and country codes in {curly braces}. **EnforceDistinctSubnets** **0**|**1**:: If 1, Tor will not put two servers whose IP addresses are "too close" on @@@ -912,9 -899,7 +912,9 @@@ is non-zero) characters inclusive, and must contain only the characters [a-zA-Z0-9]. **NumCPUs** __num__:: - How many processes to use at once for decrypting onionskins. (Default: 1) + How many processes to use at once for decrypting onionskins and other + parallelizable operations. If this is set to 0, Tor will try to detect + how many CPUs you have, defaulting to 1 if it can't tell. (Default: 0) **ORPort** __PORT__:: Advertise this port to listen for connections from Tor clients and servers. @@@ -925,18 -910,6 +925,18 @@@ specified in ORPort. (Default: 0.0.0.0) This directive can be specified multiple times to bind to multiple addresses/ports. +**PortForwarding** **0**|**1**:: + Attempt to automatically forward the DirPort and ORPort on a NAT router + connecting this Tor server to the Internet. If set, Tor will try both + NAT-PMP (common on Apple routers) and UPnP (common on routers from other + manufacturers). (Default: 0) + +**PortForwardingHelper** __filename__|__pathname__:: + If PortForwarding is set, use this executable to configure the forwarding. + If set to a filename, the system path will be searched for the executable. + If set to a path, only the specified path will be executed. + (Default: tor-fw-helper) + **PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**,**...**:: This option specifies which descriptors Tor will publish when acting as a relay. You can @@@ -956,11 -929,6 +956,11 @@@ seconds, we exit. If we get a second SIGINT, we exit immedi- ately. (Default: 30 seconds) +**HeartbeatPeriod** __N__ **minutes**|**hours**|**days**|**weeks**:: + Log a heartbeat message every **HeartbeatPeriod** seconds. This is + a log level __info__ message, designed to let you know your Tor + server is still alive and doing useful things. Settings this + to 0 will disable the heartbeat. (Default: 6 hours) **AccountingMax** __N__ **bytes**|**KB**|**MB**|**GB**|**TB**:: Never send more than the specified number of bytes in a given accounting @@@ -1069,10 -1037,6 +1069,10 @@@ When this option is enabled, Tor writes statistics on the number of relayed bytes and opened stream per exit port to disk every 24 hours. (Default: 0) +**ConnDirectionStatistics** **0**|**1**:: + When this option is enabled, Tor writes statistics on the bidirectional use + of connections to disk every 24 hours. (Default: 0) + **ExtraInfoStatistics** **0**|**1**:: When this option is enabled, Tor includes previously gathered statistics in its extra-info documents that it uploads to the directory authorities.

1 0

[tor/master] Remove now-unused helper functions
by nickm＠torproject.org 04 Mar '11

04 Mar '11

commit 13ee80346927c155b2cecc7859e14865c05bb5f8 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Mar 3 14:59:21 2011 -0800 Remove now-unused helper functions These functions were needed only by code removed in the preceding commit. Reported by mobmix. --- src/common/tortls.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 20a0e77..61cc4ba 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -151,24 +151,6 @@ static SSL_CIPHER *CLIENT_CIPHER_DUMMIES = NULL; static STACK_OF(SSL_CIPHER) *CLIENT_CIPHER_STACK = NULL; #endif -/** Helper: compare tor_tls_t objects by its SSL. */ -static INLINE int -tor_tls_entries_eq(const tor_tls_t *a, const tor_tls_t *b) -{ - return a->ssl == b->ssl; -} - -/** Helper: return a hash value for a tor_tls_t by its SSL. */ -static INLINE unsigned int -tor_tls_entry_hash(const tor_tls_t *a) -{ -#if SIZEOF_INT == SIZEOF_VOID_P - return ((unsigned int)(uintptr_t)a->ssl); -#else - return (unsigned int) ((((uint64_t)a->ssl)>>2) & UINT_MAX); -#endif -} - /** Helper: given a SSL* pointer, return the tor_tls_t object using that * pointer. */ static INLINE tor_tls_t *

1 0

[tor/master] Emend changes/tls-hash
by nickm＠torproject.org 04 Mar '11

04 Mar '11

commit 4d21fe28701809bf00a65f66c0191e6697504e21 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Mar 3 17:54:53 2011 -0800 Emend changes/tls-hash --- changes/tls-hash | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/changes/tls-hash b/changes/tls-hash index a34083a..884ff91 100644 --- a/changes/tls-hash +++ b/changes/tls-hash @@ -1,3 +1,5 @@ o Code simplifications and refactoring: - - Use SSL_get_app_data to map SSL objects to tortls_t objects: there's + - Use SSL_get_ex_data to map SSL objects to tor_tls_t objects: there's no need for a hash table. + +

1 0

[tor/master] Check the result of SSL_set_ex_data
by nickm＠torproject.org 04 Mar '11

04 Mar '11

commit 74fc993b98a98f57d257d2150b0a915b47356490 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Mar 3 16:17:39 2011 -0800 Check the result of SSL_set_ex_data Reported by piebeer. --- src/common/tortls.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 905ecbb..01d3e2a 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1065,7 +1065,14 @@ tor_tls_new(int sock, int isServer) tor_free(result); return NULL; } - SSL_set_ex_data(result->ssl, tor_tls_object_ex_data_index, result); + { + int set_worked = + SSL_set_ex_data(result->ssl, tor_tls_object_ex_data_index, result); + if (!set_worked) { + log_warn(LD_BUG, + "Couldn't set the tls for an SSL*; connection will fail"); + } + } SSL_set_bio(result->ssl, bio, bio); tor_tls_context_incref(context); result->context = context;

1 0

[tor/master] Use SSL_*_ex_data instead of SSL_*_app_data
by nickm＠torproject.org 04 Mar '11

04 Mar '11

commit fe1137be6f0fc01d7dfda568134590ecb5627eb4 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Mar 3 15:34:53 2011 -0800 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. --- src/common/tortls.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 61cc4ba..905ecbb 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -151,12 +151,27 @@ static SSL_CIPHER *CLIENT_CIPHER_DUMMIES = NULL; static STACK_OF(SSL_CIPHER) *CLIENT_CIPHER_STACK = NULL; #endif +/** The ex_data index in which we store a pointer to an SSL object's + * corresponding tor_tls_t object. */ +static int tor_tls_object_ex_data_index = -1; + +/** Helper: Allocate tor_tls_object_ex_data_index. */ +static void +tor_tls_allocate_tor_tls_object_ex_data_index() +{ + if (tor_tls_object_ex_data_index == -1) { + tor_tls_object_ex_data_index = + SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL); + tor_assert(tor_tls_object_ex_data_index != -1); + } +} + /** Helper: given a SSL* pointer, return the tor_tls_t object using that * pointer. */ static INLINE tor_tls_t * tor_tls_get_by_ssl(const SSL *ssl) { - return SSL_get_app_data(ssl); + return SSL_get_ex_data(ssl, tor_tls_object_ex_data_index); } static void tor_tls_context_decref(tor_tls_context_t *ctx); @@ -415,6 +430,8 @@ tor_tls_init(void) SSLeay_version(SSLEAY_VERSION), version); } + tor_tls_allocate_tor_tls_object_ex_data_index(); + tls_library_is_initialized = 1; } } @@ -1048,7 +1065,7 @@ tor_tls_new(int sock, int isServer) tor_free(result); return NULL; } - SSL_set_app_data(result->ssl, result); + SSL_set_ex_data(result->ssl, tor_tls_object_ex_data_index, result); SSL_set_bio(result->ssl, bio, bio); tor_tls_context_incref(context); result->context = context;

1 0