- tor-commits - lists.torproject.org

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 29 May '11

29 May '11

commit c3199495503930e33e7370d6c364b2b8b35844f4 Merge: a5232e0 ee72557 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:08:39 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug2574 | 2 ++ src/or/eventdns.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --cc src/or/eventdns.c index b7cc292,1d93ae0..4753429 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@@ -2288,10 -2318,9 +2288,10 @@@ _evdns_nameserver_add_impl(const struc if (!ns) return -1; memset(ns, 0, sizeof(struct nameserver)); - ns->timeout_event_deleted = __LINE__; + + evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns); - ns->socket = socket(PF_INET, SOCK_DGRAM, 0); + ns->socket = socket(address->sa_family, SOCK_DGRAM, 0); if (ns->socket < 0) { err = 1; goto out1; } #ifdef WIN32 {

1 0

[tor/release-0.2.2] Merge branch 'feature3049-v2' into maint-0.2.2
by arma＠torproject.org 29 May '11

29 May '11

commit b80a8bba199b9adfb9c893641ba770566fa548e1 Merge: 1ba1bde 1e69c60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 01:19:04 2011 -0400 Merge branch 'feature3049-v2' into maint-0.2.2 Conflicts: src/common/Makefile.am changes/exit-policy-default-is-not-a-prefix | 5 + changes/feature3049 | 6 + src/common/Makefile.am | 4 +- src/common/compat.h | 2 +- src/common/compat_libevent.c | 2 +- src/common/log.c | 2 +- src/common/procmon.c | 332 +++++++++++++++++++++++++++ src/common/procmon.h | 30 +++ src/common/torlog.h | 1 - src/common/util.c | 18 +- src/or/config.c | 15 ++ src/or/connection.c | 3 +- src/or/control.c | 138 +++++++++++- src/or/control.h | 4 + src/or/or.h | 10 +- 15 files changed, 554 insertions(+), 18 deletions(-) diff --cc src/common/Makefile.am index 2d009bd,8889245..6952591 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@@ -12,11 -12,11 +12,11 @@@ libor_extra_source endif libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \ - memarea.c di_ops.c util_codedigest.c $(libor_extra_source) - memarea.c util_codedigest.c procmon.c $(libor_extra_source) ++ memarea.c di_ops.c procmon.c util_codedigest.c $(libor_extra_source) libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c libor_event_a_SOURCES = compat_libevent.c - noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h -noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h procmon.h ciphers.inc compat_libevent.h tortls_states.h ++noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h procmon.h common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \

1 0

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

29 May '11

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 29 May '11

29 May '11

commit 1f18b5a5d532449f46a9c4b74d188870ea56d813 Merge: c319949 f43aceb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:13:14 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug2574 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Fix typo in changes/bug2574. Thanks, rransom
by arma＠torproject.org 29 May '11

29 May '11

commit f43aceb0f1b10d71d2e99e323668ac35327e286b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:13:04 2011 -0400 Fix typo in changes/bug2574. Thanks, rransom --- changes/bug2574 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug2574 b/changes/bug2574 index 32f4ae4..5cf2dae 100644 --- a/changes/bug2574 +++ b/changes/bug2574 @@ -1,2 +1,3 @@ o Minor features: - - Allow nameserves with IPv6 address. Fixes bug 2574. + - Allow nameservers with IPv6 address. Fixes bug 2574. +

1 0

[tor/release-0.2.2] Remove the -F option from tor-resolve.
by arma＠torproject.org 29 May '11

29 May '11

commit 57810c333a38c72c1e361c02e31de7712d1f221a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 16:59:41 2011 -0400 Remove the -F option from tor-resolve. It used to mean "Force": it would tell tor-resolve to ask tor to resolve an address even if it ended with .onion. But when AutomapHostsOnResolve was added, automatically refusing to resolve .onion hosts stopped making sense. So in 0.2.1.16-rc (commit 298dc95dfd8), we made tor-resolve happy to resolve anything. The -F option stayed in, though, even though it didn't do anything. Oddly, it never got documented. Found while fixing GCC 4.6 "set, unused variable" warnings. --- changes/bug3208 | 4 ++++ src/tools/tor-resolve.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug3208 b/changes/bug3208 new file mode 100644 index 0000000..731c96e --- /dev/null +++ b/changes/bug3208 @@ -0,0 +1,4 @@ + o Removed options: + - Remove undocumented option "-F" from tor-resolve: it hasn't done + anything since 0.2.1.16-rc. + diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 12349d9..8c4d3f6 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -319,7 +319,7 @@ main(int argc, char **argv) { uint32_t sockshost; uint16_t socksport = 0, port_option = 0; - int isSocks4 = 0, isVerbose = 0, isReverse = 0, force = 0; + int isSocks4 = 0, isVerbose = 0, isReverse = 0; char **arg; int n_args; struct in_addr a; @@ -349,8 +349,6 @@ main(int argc, char **argv) isSocks4 = 0; else if (!strcmp("-x", arg[0])) isReverse = 1; - else if (!strcmp("-F", arg[0])) - force = 1; else if (!strcmp("-p", arg[0])) { int p; if (n_args < 2) {

1 0

[tor/release-0.2.2] Work correctly if your nameserver is ::1
by arma＠torproject.org 29 May '11

29 May '11

commit be76850995f337337dd94be66a9f03b35d8b1412 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 17:42:38 2011 -0400 Work correctly if your nameserver is ::1 We had all the code in place to handle this right... except that we were unconditionally opening a PF_INET socket instead of looking at sa_family. Ow. Fixes bug 2574; not a bugfix on any particular version, since this never worked before. --- changes/bug2574 | 2 ++ src/or/eventdns.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/changes/bug2574 b/changes/bug2574 new file mode 100644 index 0000000..32f4ae4 --- /dev/null +++ b/changes/bug2574 @@ -0,0 +1,2 @@ + o Minor features: + - Allow nameserves with IPv6 address. Fixes bug 2574. diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 2777f90..adab22b 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -2320,7 +2320,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, memset(ns, 0, sizeof(struct nameserver)); ns->timeout_event_deleted = __LINE__; - ns->socket = socket(PF_INET, SOCK_DGRAM, 0); + ns->socket = socket(address->sa_family, SOCK_DGRAM, 0); if (ns->socket < 0) { err = 1; goto out1; } #ifdef WIN32 {

1 0

[tor/release-0.2.2] Fix GCC 4.6's new -Wunused-but-set-variable warnings.
by arma＠torproject.org 29 May '11

29 May '11

commit a5232e0c4c572cdff85701f698b8b90c9443d7e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 17:04:38 2011 -0400 Fix GCC 4.6's new -Wunused-but-set-variable warnings. Most instances were dead code; for those, I removed the assignments. Some were pieces of info we don't currently plan to use, but which we might in the future. For those, I added an explicit cast-to-void to indicate that we know that the thing's unused. Finally, one was a case where we were testing the wrong variable in a unit test. That one I fixed. This resolves bug 3208. --- changes/bug3208 | 2 ++ src/or/circuitbuild.c | 3 --- src/or/command.c | 1 + src/or/control.c | 2 -- src/or/directory.c | 2 -- src/or/dirvote.c | 3 +-- src/or/eventdns.c | 3 +++ src/test/test_crypto.c | 4 +++- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/changes/bug3208 b/changes/bug3208 index 731c96e..fd737ba 100644 --- a/changes/bug3208 +++ b/changes/bug3208 @@ -2,3 +2,5 @@ - Remove undocumented option "-F" from tor-resolve: it hasn't done anything since 0.2.1.16-rc. + o Minor bugfixes: + - Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 08bfb98..108007e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3766,7 +3766,6 @@ void entry_guards_compute_status(or_options_t *options, time_t now) { int changed = 0; - int severity = LOG_DEBUG; digestmap_t *reasons; if (! entry_guards) @@ -3793,8 +3792,6 @@ entry_guards_compute_status(or_options_t *options, time_t now) if (remove_dead_entry_guards(now)) changed = 1; - severity = changed ? LOG_DEBUG : LOG_INFO; - if (changed) { SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) { const char *reason = digestmap_get(reasons, entry->identity); diff --git a/src/or/command.c b/src/or/command.c index 00d9af3..e377f4f 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -645,6 +645,7 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) /* XXX maybe act on my_apparent_addr, if the source is sufficiently * trustworthy. */ + (void)my_apparent_addr; if (connection_or_set_state_open(conn)<0) connection_mark_for_close(TO_CONN(conn)); diff --git a/src/or/control.c b/src/or/control.c index 0dad1b9..f75ac67 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3142,7 +3142,6 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, { const char *status; char extended_buf[96]; - int providing_reason=0; if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS)) return 0; tor_assert(circ); @@ -3166,7 +3165,6 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, const char *reason_str = circuit_end_reason_to_control_string(reason_code); char *reason = NULL; size_t n=strlen(extended_buf); - providing_reason=1; if (!reason_str) { reason = tor_malloc(16); tor_snprintf(reason, 16, "UNKNOWN_%d", reason_code); diff --git a/src/or/directory.c b/src/or/directory.c index eb99e9d..ff0a5a4 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1900,7 +1900,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn) router_get_trusteddirserver_by_digest(conn->identity_digest); char *rejected_hdr = http_get_header(headers, "X-Descriptor-Not-New: "); - int rejected = 0; if (rejected_hdr) { if (!strcmp(rejected_hdr, "Yes")) { log_info(LD_GENERAL, @@ -1913,7 +1912,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn) * last descriptor, not on the published time of the last * descriptor. If those are different, that's a bad thing to * do. -NM */ - rejected = 1; } tor_free(rejected_hdr); } diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 96e3df5..c6ce9f6 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1592,7 +1592,7 @@ networkstatus_compute_consensus(smartlist_t *votes, * is the same flag as votes[j]->known_flags[b]. */ int *named_flag; /* Index of the flag "Named" for votes[j] */ int *unnamed_flag; /* Index of the flag "Unnamed" for votes[j] */ - int chosen_named_idx, chosen_unnamed_idx; + int chosen_named_idx; strmap_t *name_to_id_map = strmap_new(); char conflict[DIGEST_LEN]; @@ -1610,7 +1610,6 @@ networkstatus_compute_consensus(smartlist_t *votes, for (i = 0; i < smartlist_len(votes); ++i) unnamed_flag[i] = named_flag[i] = -1; chosen_named_idx = smartlist_string_pos(flags, "Named"); - chosen_unnamed_idx = smartlist_string_pos(flags, "Unnamed"); /* Build the flag index. */ SMARTLIST_FOREACH(votes, networkstatus_t *, v, diff --git a/src/or/eventdns.c b/src/or/eventdns.c index fc005df..b7cc292 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1028,6 +1028,9 @@ request_parse(u8 *packet, ssize_t length, struct evdns_server_port *port, struct GET16(answers); GET16(authority); GET16(additional); + (void)additional; + (void)authority; + (void)answers; if (flags & 0x8000) return -1; /* Must not be an answer. */ flags &= 0x0110; /* Only RD and CD get preserved. */ diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 781081a..bf2cc48 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -69,7 +69,7 @@ test_crypto_rng(void) uint64_t big; char *host; j = crypto_rand_int(100); - if (i < 0 || i >= 100) + if (j < 0 || j >= 100) allok = 0; big = crypto_rand_uint64(U64_LITERAL(1)<<40); if (big >= (U64_LITERAL(1)<<40)) @@ -240,11 +240,13 @@ test_crypto_sha(void) /* Test SHA-1 with a test vector from the specification. */ i = crypto_digest(data, "abc", 3); test_memeq_hex(data, "A9993E364706816ABA3E25717850C26C9CD0D89D"); + tt_int_op(i, ==, 0); /* Test SHA-256 with a test vector from the specification. */ i = crypto_digest256(data, "abc", 3, DIGEST_SHA256); test_memeq_hex(data, "BA7816BF8F01CFEA414140DE5DAE2223B00361A3" "96177A9CB410FF61F20015AD"); + tt_int_op(i, ==, 0); /* Test HMAC-SHA-1 with test cases from RFC2202. */

1 0

[tor/release-0.2.2] Unbreak the build on libevent 1.x systems
by arma＠torproject.org 29 May '11

29 May '11

commit 6cac100b13794b74db8e831bed56df2f0443ea13 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 22 22:54:02 2011 -0700 Unbreak the build on libevent 1.x systems --- src/common/procmon.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/common/procmon.c b/src/common/procmon.c index bd25bc1..8fcc1af 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -152,7 +152,11 @@ tor_validate_process_specifier(const char *process_spec, #define PERIODIC_TIMER_FLAGS (0) #endif -static const struct timeval poll_interval_tv = {15, 0}; +static struct timeval poll_interval_tv = {15, 0}; +/* Note: If you port this file to plain Libevent 2, you can make + * poll_interval_tv const. It has to be non-const here because in + * libevent 1.x, event_add expects a pointer to a non-const struct + * timeval. */ /** Create a process-termination monitor for the process specifier * given in process_spec. Return a newly allocated

1 0

[tor/release-0.2.2] Fix some comments
by arma＠torproject.org 29 May '11

29 May '11

commit 0caa37db4df76fc50af48a107a14e4f139b7fa55 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 15 08:23:29 2011 -0700 Fix some comments --- src/common/log.c | 2 +- src/common/torlog.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index d14563c..ac98f13 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -390,7 +390,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, /** Output a message to the log. It gets logged to all logfiles that * care about messages with severity in domain. The content - * is formatted printf style basedc on format and extra arguments. + * is formatted printf-style based on format and extra arguments. * */ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) diff --git a/src/common/torlog.h b/src/common/torlog.h index 000e32d..541a0d1 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -146,7 +146,6 @@ void change_callback_log_severity(int loglevelMin, int loglevelMax, void flush_pending_log_callbacks(void); void log_set_application_name(const char *name); -/* Outputs a message to stdout */ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) CHECK_PRINTF(3,4); #define log tor_log /* hack it so we don't conflict with log() as much */

1 0