- tor-commits - lists.torproject.org

[pyonionoo/master] Make OFFSET work without a LIMIT
by karsten＠torproject.org 22 Sep '12

22 Sep '12

commit eaefe79fe85ef6b44d33eeddc91fef5720770f9d Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Sep 22 08:45:41 2012 +0530 Make OFFSET work without a LIMIT sqlite doesn't understand OFFSET without a LIMIT clause. Use TOTAL_ROWS-offset_value to find the LIMIT. --- pyonionoo/database.py | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pyonionoo/database.py b/pyonionoo/database.py index b0aaae8..be70578 100644 --- a/pyonionoo/database.py +++ b/pyonionoo/database.py @@ -30,6 +30,12 @@ DB_UPDATE_INTERVAL = 60 # The timer object used for updating the database. FRESHEN_TIMER = None +# Total number of rows in summary db. This can also be calculated during +# run time by doing "SELECT COUNT(*) FROM summary" but this will take +# time to execute. It seems like a better idea to count the number of rows +# during insertion. +TOTAL_ROWS = 0 + # Database schemas. # Summary database: in conjunction with addresses and flags, holds the # information in the summary document. addresses and flags are lists of @@ -124,7 +130,7 @@ def update_databases(summary_file=None): database. Once this function completes, all future reads will be from the "updated" database. """ - global DB_CREATION_TIME + global DB_CREATION_TIME, TABLE_ROWS if DB_CREATION_TIME >= os.stat(summary_file).st_mtime: return @@ -141,6 +147,7 @@ def update_databases(summary_file=None): CURSOR.execute('DELETE FROM %s' % summary_tbl_name) CURSOR.execute('DELETE FROM %s' % flags_tbl_name) CURSOR.execute('DELETE FROM %s' %addresses_tbl_name) + TABLE_ROWS = 0 # Create the summary database. We could accumulate all the router tuples # and then insert them with an executemany(...) in one go, except that @@ -192,6 +199,7 @@ def update_databases(summary_file=None): # or might allow users to optimize in this way. CURSOR.execute(summary_insert_stmt, router_tuple) id_num = CURSOR.lastrowid + TABLE_ROWS += 1 address_values = (id_num, router.address) CURSOR.execute(addresses_insert_stmt, address_values) @@ -260,9 +268,11 @@ def query_summary_tbl(running_filter=None, type_filter=None, hex_fingerprint_fil limit_clause = 'LIMIT %s' % limit_value offset_clause = '' if offset_value: + if not limit_value: + # sqlite doesn't support OFFSET without a LIMIT clause, this is + # a hack to get around that. + limit_clause = 'LIMIT %s' % (TOTAL_ROWS-int(offset_value)) offset_clause = 'OFFSET %s' % offset_value - - cursor = conn.cursor() cursor.execute('SELECT %s FROM summary %s %s %s %s' % (','.join(fields), where_clause, order_clause, limit_clause, offset_clause))

1 0

[tor/master] add faravahar as our ninth v3 dir auth
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit c88a4c51b4cd2d6d584231a44a6e4ea4ac7396a0 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 09:10:37 2012 -0400 add faravahar as our ninth v3 dir auth --- changes/ticket5749 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/ticket5749 b/changes/ticket5749 new file mode 100644 index 0000000..0237241 --- /dev/null +++ b/changes/ticket5749 @@ -0,0 +1,3 @@ + o New directory authorities: + - Add Faravahar (run by Sina Rabbani) as the ninth v3 directory + authority. Closes ticket 5749. diff --git a/src/or/config.c b/src/or/config.c index b9170f4..90a5dfb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -969,6 +969,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "Faravahar orport=443 no-v2 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", NULL }; for (i=0; dirservers[i]; i++) {

1 0

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit dc014c97472e3adf2306938841c13de0040a2ff0 Merge: a2f57b9 c88a4c5 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 09:31:09 2012 -0400 Merge branch 'maint-0.2.3' changes/ticket5749 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.3] add faravahar as our ninth v3 dir auth
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit c88a4c51b4cd2d6d584231a44a6e4ea4ac7396a0 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 09:10:37 2012 -0400 add faravahar as our ninth v3 dir auth --- changes/ticket5749 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/ticket5749 b/changes/ticket5749 new file mode 100644 index 0000000..0237241 --- /dev/null +++ b/changes/ticket5749 @@ -0,0 +1,3 @@ + o New directory authorities: + - Add Faravahar (run by Sina Rabbani) as the ninth v3 directory + authority. Closes ticket 5749. diff --git a/src/or/config.c b/src/or/config.c index b9170f4..90a5dfb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -969,6 +969,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "Faravahar orport=443 no-v2 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", NULL }; for (i=0; dirservers[i]; i++) {

1 0

[tor/master] bump to 0.2.4.3-alpha-dev
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit a2f57b97998b325c059d2fac06ca37d4b4dc52a3 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 08:09:17 2012 -0400 bump to 0.2.4.3-alpha-dev --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ea14ad2..4db1a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.3-alpha]) +AC_INIT([tor],[0.2.4.3-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index fca9817..cba8c43 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.3-alpha" +!define VERSION "0.2.4.3-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d49b036..78512c5 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.3-alpha" +#define VERSION "0.2.4.3-alpha-dev"

1 0

[tor/master] 4aff97cfc didn't update the 'last modified' timestamp
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit 622f90904c7511b5451392f0e4f94c1a9dd5a8fb Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 06:11:05 2012 -0400 4aff97cfc didn't update the 'last modified' timestamp --- src/config/torrc.sample.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index f30fc32..c667efc 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -1,5 +1,5 @@ ## Configuration file for a typical Tor user -## Last updated 22 April 2012 for Tor 0.2.3.14-alpha. +## Last updated 12 September 2012 for Tor 0.2.4.3-alpha. ## (may or may not work for much older or much newer versions of Tor.) ## ## Lines that begin with "## " try to explain what's going on. Lines

1 0

[tor/master] bump to 0.2.4.3-alpha
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit 3355976bb472c9a5916b20c83ecdf03a9fde20f6 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 06:11:28 2012 -0400 bump to 0.2.4.3-alpha --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7f33828..ea14ad2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.2-alpha-dev]) +AC_INIT([tor],[0.2.4.3-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 96e27b4..fca9817 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.2-alpha-dev" +!define VERSION "0.2.4.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index beebc6d..d49b036 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.2-alpha-dev" +#define VERSION "0.2.4.3-alpha"

1 0

[tor/master] fold in changes files
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit e13270446609e745aa163a2d6a4bdb16fa29c578 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 06:06:36 2012 -0400 fold in changes files --- ChangeLog | 40 +++++++++++++++++++++++++++++++++++++++- changes/6044 | 5 ----- changes/6884 | 4 ---- changes/bug4020 | 5 ----- changes/bug5809 | 3 --- changes/bug6024 | 2 -- changes/bug6843 | 5 ----- changes/bug6853 | 3 --- changes/bug6861 | 3 --- changes/bug6866 | 9 --------- changes/bug6880 | 3 --- 11 files changed, 39 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ba1286..2413f17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -Changes in version 0.2.4.3-alpha - 2012-09-?? +Changes in version 0.2.4.3-alpha - 2012-09-22 + Tor 0.2.4.3-alpha fixes another opportunity for a remotely triggerable + assertion, resumes letting relays test reachability of their DirPort, + and cleans up a bunch of smaller bugs. + o Security fixes: - Fix an assertion failure in tor_timegm() that could be triggered by a badly formatted directory object. Bug found by fuzzing with @@ -20,11 +24,40 @@ Changes in version 0.2.4.3-alpha - 2012-09-?? part of the loop after it had made its choice slightly slower than it ran through the part of the loop before it had made its choice. Addresses ticket 6538. + - Disable the use of Guard nodes when in Tor2WebMode. Guard usage + by tor2web clients allows hidden services to identity tor2web + clients through their repeated selection of the same rendezvous + and introduction point circuit endpoints (their guards). Resolves + ticket 6888. + + o Minor features: + - Enable Tor to read configuration, state, and key information from + a FIFO. Previously Tor would only read from files with a positive + stat.st_size. Code from meejah; fixes bug 6044. o Minor bugfixes: - Correct file sizes when reading binary files on Cygwin, to avoid a bug where Tor would fail to read its state file. Fixes bug 6844; bugfix on 0.1.2.7-alpha. + - Correctly handle votes with more than 31 flags. Fixes bug 6853; + bugfix on 0.2.0.3-alpha. + - When complaining about a client port on a public address, log + which address we're complaining about. Fixes bug 4020; bugfix on + 0.2.3.3-alpha. Patch by Tom Fitzhenry. + - Convert an assert in the pathbias code to a log message. The assert + appears to only be triggerable by Tor2Web mode. Fixes bug 6866; + bugfix on 0.2.3.17-beta. + - Our new buildsystem was overzealous about rebuilding manpages: it + would rebuild them all whenever any one of them changed. Now our + dependency checking should be correct. Fixes bug 6843; bugfix on + 0.2.4.1-alpha. + - Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 + is set. Fixes bug 6880. Bugfix on 0.2.4.1-alpha. + - Correct log printout about which address family is preferred + when connecting to a bridge with both an IPv4 and IPv6 OR port. + Fixes bug 6884; bugfix on 0.2.4.1-alpha. + + o Minor bugfixes (code cleanliness): - Fix round_to_power_of_2() so it doesn't invoke undefined behavior with large values. This situation was untriggered, but nevertheless incorrect. Fixes bug 6831; bugfix on 0.2.0.1-alpha. @@ -36,6 +69,8 @@ Changes in version 0.2.4.3-alpha - 2012-09-?? Previously, Tor would have confused (as-yet-unused) protocol version numbers greater than 32 with lower ones on many platforms. Fixes bug 6827; bugfix on 0.2.0.10-alpha. Found by George Kadianakis. + - Fix handling of rendezvous client authorization types over 8. + Fixes bug 6861; bugfix on 0.2.1.5-alpha. - Fix building with older versions of GCC (2.95, for one) that don't like preprocessor directives inside macro arguments. Found by grarpamp. Fixes bug 6842; bugfix on 0.2.4.2-alpha. @@ -49,8 +84,11 @@ Changes in version 0.2.4.3-alpha - 2012-09-?? - Move the core of our "choose a weighted element at random" logic into its own function, and give it unit tests. Now the logic is testable, and a little less fragile too. + - Removed the testing_since field of node_t, which hasn't been used + for anything since 0.2.0.9-alpha. o Documentation fixes: + - Clarify that hidden services are TCP only. Fixes bug 6024. - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on 0.2.3.14-alpha. diff --git a/changes/6044 b/changes/6044 deleted file mode 100644 index 6f932a3..0000000 --- a/changes/6044 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Enable Tor to read configuration, state, and key information from - a FIFO. Previously Tor would only read from files with a positive - stat.st_size. Code from meejah; fixes bug 6044. - diff --git a/changes/6884 b/changes/6884 deleted file mode 100644 index 66801db..0000000 --- a/changes/6884 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (client): - - Correct log printout about which address family is preferred - when connecting to a bridge with both an IPv4 and IPv6 OR port. - Fixes bug 6884; bugfix on 0.2.4.1-alpha. diff --git a/changes/bug4020 b/changes/bug4020 deleted file mode 100644 index 3ca86e2..0000000 --- a/changes/bug4020 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - When complaining about a client port on a public address, log - which address we're complaining about. Fixes bug 4020; bugfix on - 0.2.3.3-alpha. Patch by Tom Fitzhenry. - diff --git a/changes/bug5809 b/changes/bug5809 deleted file mode 100644 index ac3f6b1..0000000 --- a/changes/bug5809 +++ /dev/null @@ -1,3 +0,0 @@ - o Removed code: - - Removed the testing_since field of node_t, which hasn't been used - for anything since 0.2.0.9-alpha. diff --git a/changes/bug6024 b/changes/bug6024 deleted file mode 100644 index 743e6ef..0000000 --- a/changes/bug6024 +++ /dev/null @@ -1,2 +0,0 @@ - o Documentation fixes: - - Clarify that hidden services are TCP only. Fixes bug 6024. diff --git a/changes/bug6843 b/changes/bug6843 deleted file mode 100644 index 1acfdbd..0000000 --- a/changes/bug6843 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Our new buildsystem was overzealous about rebuilding manpages: it - would rebuild them all whenever any one of them changed. Now our - dependency checking should be correct. Fixes bug 6843; bugfix on - 0.2.4.1-alpha. diff --git a/changes/bug6853 b/changes/bug6853 deleted file mode 100644 index 382adfb..0000000 --- a/changes/bug6853 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (directory authority): - - Correctly handle votes with more than 31 flags. Fixes bug 6853; - bugfix on 0.2.0.3-alpha. diff --git a/changes/bug6861 b/changes/bug6861 deleted file mode 100644 index 1040bd7..0000000 --- a/changes/bug6861 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Fix handling of rendezvous client authorization types over 8. - Fixes bug 6841; bugfix on 0.2.1.5-alpha. diff --git a/changes/bug6866 b/changes/bug6866 deleted file mode 100644 index efaab98..0000000 --- a/changes/bug6866 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - Convert an assert in the pathbias code to a log message. Assert - appears to only be triggerable by Tor2Web mode. Fixes bug 6866; - bugfix on 0.2.3.17-beta. - - Disable the use of Guard nodes when in Tor2WebMode. Guard usage - by Tor2Web clients allows hidden services to identity tor2web - clients through their repeated selection of the same rendezvous - and introduction point circuit endpoints (their guards). Fixes - bug 6888. diff --git a/changes/bug6880 b/changes/bug6880 deleted file mode 100644 index c08a2d4..0000000 --- a/changes/bug6880 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Don't do reachability testing over IPv6 unless - AuthDirPublishIPv6 is set. Fix for bug 6880.

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 22 Sep '12

22 Sep '12

commit d9b8667e2309f47426ae1c38c4ac6647903e4891 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 22 07:45:19 2012 +0000 Update translations for vidalia_help --- zh_CN/services.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_CN/services.po b/zh_CN/services.po index 13db26c..b467eab 100644 --- a/zh_CN/services.po +++ b/zh_CN/services.po @@ -1,20 +1,21 @@ # # Translators: # Christopher Meng <cickumqt(a)gmail.com>, 2012. +# Curtis Stone <cstone(a)fastmail.cn>, 2012. # <p1ckw1ck(a)teachers.org>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-08-14 07:37+0000\n" -"Last-Translator: p1ckw1ck <p1ckw1ck(a)teachers.org>\n" +"PO-Revision-Date: 2012-09-22 07:26+0000\n" +"Last-Translator: Curtis Stone <cstone(a)fastmail.cn>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #. type: Content of: <html><body><h1> #: en/services.html:16 @@ -174,7 +175,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/services.html:104 msgid "What are the five buttons used for?" -msgstr "" +msgstr "这五个按钮是什么作用？" #. type: Content of: <html><body><p><ul><li> #: en/services.html:107

1 0

[tor/master] Remove the testing_since* fields
by nickm＠torproject.org 22 Sep '12

22 Sep '12

commit 9d4c53534de1c496069860f313633e1c31a8a461 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 21 22:05:09 2012 -0400 Remove the testing_since* fields They weren't actually used since 7a35dad00 Bug 5809 --- changes/bug5809 | 3 +++ src/or/dirserv.c | 6 +----- src/or/nodelist.c | 1 - src/or/or.h | 3 --- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/changes/bug5809 b/changes/bug5809 new file mode 100644 index 0000000..ac3f6b1 --- /dev/null +++ b/changes/bug5809 @@ -0,0 +1,3 @@ + o Removed code: + - Removed the testing_since field of node_t, which hasn't been used + for anything since 0.2.0.9-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 468515e..0d98324 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3400,6 +3400,7 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) { node_t *node = NULL; tor_addr_t router_addr; + (void) now; tor_assert(router); node = node_get_mutable_by_id(router->cache_info.identity_digest); @@ -3408,9 +3409,6 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) /* IPv4. */ log_debug(LD_OR,"Testing reachability of %s at %s:%u.", router->nickname, router->address, router->or_port); - /* Remember when we started trying to determine reachability */ - if (!node->testing_since) - node->testing_since = now; tor_addr_from_ipv4h(&router_addr, router->addr); connection_or_connect(&router_addr, router->or_port, router->cache_info.identity_digest); @@ -3423,8 +3421,6 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) router->nickname, tor_addr_to_str(addrstr, &router->ipv6_addr, sizeof(addrstr), 1), router->ipv6_orport); - if (!node->testing_since6) - node->testing_since6 = now; connection_or_connect(&router->ipv6_addr, router->ipv6_orport, router->cache_info.identity_digest); } diff --git a/src/or/nodelist.c b/src/or/nodelist.c index c357bc0..642816c 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -127,7 +127,6 @@ static void node_addrs_changed(node_t *node) { node->last_reachable = node->last_reachable6 = 0; - node->testing_since = node->testing_since6 = 0; node->country = -1; } diff --git a/src/or/or.h b/src/or/or.h index f7914b8..2e2c9f8 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2036,9 +2036,6 @@ typedef struct node_t { time_t last_reachable; /* IPv4. */ time_t last_reachable6; /* IPv6. */ - /** When did we start testing reachability for this OR? */ - time_t testing_since; /* IPv4. */ - time_t testing_since6; /* IPv6. */ } node_t; /** How many times will we try to download a router's descriptor before giving

1 0