tor-commits August 2014

tor-commits@lists.torproject.org

21 participants
1599 discussions

[bridgedb/develop] Fix test_Bucket.BucketDataTests to test `needed` attribute.
by isis＠torproject.org 21 Aug '14

21 Aug '14

commit dadd800384358356542ccc49bbdad1ae54006cfc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 05:35:01 2014 +0000 Fix test_Bucket.BucketDataTests to test `needed` attribute. --- lib/bridgedb/test/test_Bucket.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/test/test_Bucket.py b/lib/bridgedb/test/test_Bucket.py index ab89fb4..cff8cb8 100644 --- a/lib/bridgedb/test/test_Bucket.py +++ b/lib/bridgedb/test/test_Bucket.py @@ -31,19 +31,19 @@ class BucketDataTest(unittest.TestCase): def test_alloc_some_of_the_bridges(self): """Set the needed number of bridges""" - alloc = 10 + needed = 10 distname = "test-distributor" bucket = Bucket.BucketData(distname, alloc) - this(distname).should.be.equal(bucket.name) - this(alloc).should.be.equal(bucket.needed) + this(bucket.name).should.be.equal(distname) + this(bucket.needed).should.be.equal(needed) def test_alloc_all_the_bridges(self): """Set the needed number of bridges to the default""" - alloc = '*' + needed = '*' distname = "test-distributor" bucket = Bucket.BucketData(distname, alloc) - this(distname).should.be.equal(bucket.name) - this(alloc).should.be.equal(1000000) + this(bucket.name).should.be.equal(distname) + this(bucket.needed).should.be.equal(needed) class BucketManagerTest(unittest.TestCase):

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 21 Aug '14

21 Aug '14

commit 96132a6e4319695b9ca0ccf54c39d60fd2bb94dc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 21 00:15:44 2014 +0000 Update translations for torbutton-torbuttonproperties --- nb/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/torbutton.properties b/nb/torbutton.properties index d2362c6..8b6719c 100644 --- a/nb/torbutton.properties +++ b/nb/torbutton.properties @@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Nettlesertillegg som f.eks Flash kan skade per torbutton.popup.never_ask_again = Ikke spør meg igjen # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.siteprompt=Denne nettsiden (%S) prøvde å pakke ut HTML5-canvas billeddata, hvilket kan brukes til å tilkjennegi din datamaskin spesifikt i identifiseringsøyemed.\n\nSkal Tor-nettleseren tillate denne nettsiden å pakke ut HTML5-canvas billeddata? +canvas.notNow=Ikke nå canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=Tillat i fremtiden canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Aldri for denne siden (anbefalt) canvas.neverAccessKey=e

1 0

[obfs4/master] Elide the error out from most logs unless unsafeLogging is set.
by yawning＠torproject.org 20 Aug '14

20 Aug '14

commit 596cc8507340a1233defe5bf88e6e2a400cc7f9f Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Aug 20 22:44:07 2014 +0000 Elide the error out from most logs unless unsafeLogging is set. The Golang runtime will happily splatter the remote IP address and port in the error's string representation for network related errors. While useful for debugging, this is unacceptable from a privacy standpoint. --- obfs4proxy/obfs4proxy.go | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 8820127..7ba0e93 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -167,7 +167,11 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) // the configuration phase. dialer, err := proxy.FromURL(proxyURI, proxy.Direct) if err != nil { - log.Printf("[ERROR]: %s(%s) - failed to obtain proxy dialer: %s", name, addrStr, err) + if unsafeLogging { + log.Printf("[ERROR]: %s(%s) - failed to obtain proxy dialer: %s", name, addrStr, err) + } else { + log.Printf("[ERROR]: %s(%s) - failed to obtain proxy dialer", name, addrStr) + } conn.Reject() return } @@ -191,18 +195,26 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) // bytes back and forth. remote, err := f.WrapConn(remoteConn, args) if err != nil { - log.Printf("[ERROR]: %s(%s) - handshake failed: %s", name, addrStr, err) + if unsafeLogging { + log.Printf("[ERROR]: %s(%s) - handshake failed: %s", name, addrStr, err) + } else { + log.Printf("[ERROR]: %s(%s) - handshake failed", name, addrStr) + } conn.Reject() return } err = conn.Grant(remoteConn.RemoteAddr().(*net.TCPAddr)) if err != nil { - log.Printf("[ERROR]: %s(%s) - SOCKS grant failed: %s", name, addrStr, err) + if unsafeLogging { + log.Printf("[ERROR]: %s(%s) - SOCKS grant failed: %s", name, addrStr, err) + } else { + log.Printf("[ERROR]: %s(%s) - SOCKS grant failed", name, addrStr) + } return } err = copyLoop(conn, remote) - if err != nil { + if err != nil && unsafeLogging { log.Printf("[INFO]: %s(%s) - closed connection: %s", name, addrStr, err) } else { log.Printf("[INFO]: %s(%s) - closed connection", name, addrStr) @@ -282,20 +294,28 @@ func serverHandler(f base.ServerFactory, conn net.Conn, info *pt.ServerInfo) { // Instantiate the server transport method and handshake. remote, err := f.WrapConn(conn) if err != nil { - log.Printf("[ERROR]: %s(%s) - handshake failed: %s", name, addrStr, err) + if unsafeLogging { + log.Printf("[ERROR]: %s(%s) - handshake failed: %s", name, addrStr, err) + } else { + log.Printf("[ERROR]: %s(%s) - handshake failed", name, addrStr) + } return } // Connect to the orport. orConn, err := pt.DialOr(info, conn.RemoteAddr().String(), name) if err != nil { - log.Printf("[ERROR]: %s(%s) - failed to connect to ORPort: %s", name, addrStr, err) + if unsafeLogging { + log.Printf("[ERROR]: %s(%s) - failed to connect to ORPort: %s", name, addrStr, err) + } else { + log.Printf("[ERROR]: %s(%s) - failed to connect to ORPort", name, addrStr) + } return } defer orConn.Close() err = copyLoop(orConn, remote) - if err != nil { + if err != nil && unsafeLogging { log.Printf("[INFO]: %s(%s) - closed connection: %s", name, addrStr, err) } else { log.Printf("[INFO]: %s(%s) - closed connection", name, addrStr)

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 20 Aug '14

20 Aug '14

commit e632a9b6576c776beebd9ecaca35be57c4d47d2f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 20 20:15:54 2014 +0000 Update translations for tor-and-https --- sl.po | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/sl.po b/sl.po index 945b219..5b6d2b1 100644 --- a/sl.po +++ b/sl.po @@ -1,11 +1,12 @@ # # Translators: +# Sebastien <sebastien.janez(a)free.fr>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-24 16:09+0000\n" -"PO-Revision-Date: 2014-05-25 09:55+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2014-08-20 20:10+0000\n" +"Last-Translator: Sebastien <sebastien.janez(a)free.fr>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/torproject/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,107 +30,107 @@ msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Site.com" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "user / pw" -msgstr "" +msgstr "uporabnik / geslo" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "data" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "location" -msgstr "" +msgstr "kraj" #. (itstool) path: defs/text #. Keep it short: 3em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "WiFi" msgstr "" #. (itstool) path: defs/text #. Keep it short: 4em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "ISP" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Hacker" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Lawyer" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Sysadmin" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Police" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "NSA" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Tor relay" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Key" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Internet connection" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Eavesdropping" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Data sharing" msgstr ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Aug '14

20 Aug '14

commit 86e723b9a0cd8894676777720689c7f5f9986323 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 20 20:15:03 2014 +0000 Update translations for bridgedb --- sl/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sl/LC_MESSAGES/bridgedb.po b/sl/LC_MESSAGES/bridgedb.po index 118555b..760ba16 100644 --- a/sl/LC_MESSAGES/bridgedb.po +++ b/sl/LC_MESSAGES/bridgedb.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Sebastien <sebastien.janez(a)free.fr>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-07-26 09:42+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-08-20 20:10+0000\n" +"Last-Translator: Sebastien <sebastien.janez(a)free.fr>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/torproject/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -267,7 +268,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:99 msgid "Contact" -msgstr "" +msgstr "Stik" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example,

1 0

[tor/master] Rewriting entry_is_time_to_retry() using table approach.
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit 197d8550094d0509bed9e682b4a7b723dd948141 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Aug 19 22:12:19 2014 +0300 Rewriting entry_is_time_to_retry() using table approach. --- changes/bug12205 | 4 ++++ src/or/entrynodes.c | 37 +++++++++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/changes/bug12205 b/changes/bug12205 new file mode 100644 index 0000000..f71ba41 --- /dev/null +++ b/changes/bug12205 @@ -0,0 +1,4 @@ + o Minor refactoring: + - Refactoring and unit-testing entry_is_time_to_retry() in + entrynodes.c. Resolves ticket 12205. + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 365b927..b9a0bf4 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -159,18 +159,35 @@ entry_guard_set_status(entry_guard_t *e, const node_t *node, static int entry_is_time_to_retry(const entry_guard_t *e, time_t now) { - long diff; + struct guard_retry_period_s { + time_t period_duration; + time_t interval_during_period; + }; + + struct guard_retry_period_s periods[] = { + { 6*60*60, 60*60 }, + { 3*24*60*60, 4*60*60 }, + { 7*24*60*60, 18*60*60 }, + { TIME_MAX, 36*60*60 } + }; + + time_t ith_deadline_for_retry; + time_t unreachable_for; + int i; + if (e->last_attempted < e->unreachable_since) return 1; - diff = now - e->unreachable_since; - if (diff < 6*60*60) - return now > (e->last_attempted + 60*60); - else if (diff < 3*24*60*60) - return now > (e->last_attempted + 4*60*60); - else if (diff < 7*24*60*60) - return now > (e->last_attempted + 18*60*60); - else - return now > (e->last_attempted + 36*60*60); + + unreachable_for = now - e->unreachable_since; + + for (i = 0; ; i++) { + if (unreachable_for <= periods[i].period_duration) { + ith_deadline_for_retry = e->last_attempted + + periods[i].interval_during_period; + + return (now > ith_deadline_for_retry); + } + } } /** Return the node corresponding to e, if e is

1 0

[tor/master] Write comments for members of periods array.
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit c731a1c68f47812f0bc536a8fab548c3c734ce28 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Aug 19 22:23:11 2014 +0300 Write comments for members of periods array. --- src/or/entrynodes.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index b9a0bf4..ee4f447 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -165,10 +165,12 @@ entry_is_time_to_retry(const entry_guard_t *e, time_t now) }; struct guard_retry_period_s periods[] = { - { 6*60*60, 60*60 }, - { 3*24*60*60, 4*60*60 }, - { 7*24*60*60, 18*60*60 }, - { TIME_MAX, 36*60*60 } + { 6*60*60, 60*60 }, /* For first 6 hrs., retry hourly; */ + { 3*24*60*60, 4*60*60 }, /* Then retry every 4 hrs. until the + 3-day mark; */ + { 7*24*60*60, 18*60*60 }, /* After 3 days, retry every 18 hours until + 1 week mark. */ + { TIME_MAX, 36*60*60 } /* After 1 week, retry every 36 hours. */ }; time_t ith_deadline_for_retry;

1 0

[tor/master] Small cleanups to test_entry_is_time_to_retry
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit a5fe84b5a6a2adb78ea917ad46a77b1793518cc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 20 15:31:25 2014 -0400 Small cleanups to test_entry_is_time_to_retry --- src/test/test_entrynodes.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 5fee033..bf014f1 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -541,16 +541,14 @@ test_entry_guards_set_from_config(void *arg) static void test_entry_is_time_to_retry(void *arg) { - (void)arg; - entry_guard_t *test_guard; time_t now; int retval; + (void)arg; now = time(NULL); - test_guard = tor_malloc(sizeof(entry_guard_t)); - memset(test_guard,0,sizeof(entry_guard_t)); + test_guard = tor_malloc_zero(sizeof(entry_guard_t)); test_guard->last_attempted = now - 10; test_guard->unreachable_since = now - 1; @@ -610,9 +608,8 @@ test_entry_is_time_to_retry(void *arg) retval = entry_is_time_to_retry(test_guard,now); tt_int_op(retval,==,1); - done: + done: tor_free(test_guard); - return; } /** XXX Do some tests that entry_is_live() */

1 0

[tor/master] Unit testing entry_is_time_to_retry().
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit 8b539cc27684534a6a71cef92f9a6782040f6ca9 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Aug 20 22:07:08 2014 +0300 Unit testing entry_is_time_to_retry(). --- src/or/entrynodes.c | 2 +- src/or/entrynodes.h | 3 ++ src/test/test_entrynodes.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index ee4f447..edf766b 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -156,7 +156,7 @@ entry_guard_set_status(entry_guard_t *e, const node_t *node, /** Return true iff enough time has passed since we last tried to connect * to the unreachable guard e that we're willing to try again. */ -static int +STATIC int entry_is_time_to_retry(const entry_guard_t *e, time_t now) { struct guard_retry_period_s { diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 5d91756..52b31a2 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -104,6 +104,9 @@ typedef enum { STATIC const node_t *entry_is_live(const entry_guard_t *e, entry_is_live_flags_t flags, const char **msg); + +STATIC int entry_is_time_to_retry(const entry_guard_t *e, time_t now); + #endif void remove_all_entry_guards(void); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index ede93fb..5fee033 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -538,6 +538,83 @@ test_entry_guards_set_from_config(void *arg) routerset_free(options->EntryNodes); } +static void +test_entry_is_time_to_retry(void *arg) +{ + (void)arg; + + entry_guard_t *test_guard; + time_t now; + int retval; + + now = time(NULL); + + test_guard = tor_malloc(sizeof(entry_guard_t)); + memset(test_guard,0,sizeof(entry_guard_t)); + + test_guard->last_attempted = now - 10; + test_guard->unreachable_since = now - 1; + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,1); + + test_guard->unreachable_since = now - (6*60*60 - 1); + test_guard->last_attempted = now - (60*60 + 1); + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,1); + + test_guard->last_attempted = now - (60*60 - 1); + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,0); + + test_guard->unreachable_since = now - (6*60*60 + 1); + test_guard->last_attempted = now - (4*60*60 + 1); + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,1); + + test_guard->unreachable_since = now - (3*24*60*60 - 1); + test_guard->last_attempted = now - (4*60*60 + 1); + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,1); + + test_guard->unreachable_since = now - (3*24*60*60 + 1); + test_guard->last_attempted = now - (18*60*60 + 1); + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,1); + + test_guard->unreachable_since = now - (7*24*60*60 - 1); + test_guard->last_attempted = now - (18*60*60 + 1); + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,1); + + test_guard->last_attempted = now - (18*60*60 - 1); + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,0); + + test_guard->unreachable_since = now - (7*24*60*60 + 1); + test_guard->last_attempted = now - (36*60*60 + 1); + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,1); + + test_guard->unreachable_since = now - (7*24*60*60 + 1); + test_guard->last_attempted = now - (36*60*60 + 1); + + retval = entry_is_time_to_retry(test_guard,now); + tt_int_op(retval,==,1); + + done: + tor_free(test_guard); + return; +} + /** XXX Do some tests that entry_is_live() */ static void test_entry_is_live(void *arg) @@ -608,6 +685,8 @@ static const struct testcase_setup_t fake_network = { }; struct testcase_t entrynodes_tests[] = { + { "entry_is_time_to_retry", test_entry_is_time_to_retry, + TT_FORK, NULL, NULL }, { "choose_random_entry_no_guards", test_choose_random_entry_no_guards, TT_FORK, &fake_network, NULL }, { "choose_random_entry_one_possibleguard",

1 0

[tor/master] Whitespace fixes
by nickm＠torproject.org 20 Aug '14

20 Aug '14

commit 2994f00199096860c4cbdfcb6b7d82918d637b27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 20 15:32:35 2014 -0400 Whitespace fixes --- src/test/test_entrynodes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index bf014f1..00efa81 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -561,18 +561,18 @@ test_entry_is_time_to_retry(void *arg) retval = entry_is_time_to_retry(test_guard,now); tt_int_op(retval,==,1); - + test_guard->last_attempted = now - (60*60 - 1); retval = entry_is_time_to_retry(test_guard,now); tt_int_op(retval,==,0); - + test_guard->unreachable_since = now - (6*60*60 + 1); test_guard->last_attempted = now - (4*60*60 + 1); retval = entry_is_time_to_retry(test_guard,now); tt_int_op(retval,==,1); - + test_guard->unreachable_since = now - (3*24*60*60 - 1); test_guard->last_attempted = now - (4*60*60 + 1); @@ -682,7 +682,7 @@ static const struct testcase_setup_t fake_network = { }; struct testcase_t entrynodes_tests[] = { - { "entry_is_time_to_retry", test_entry_is_time_to_retry, + { "entry_is_time_to_retry", test_entry_is_time_to_retry, TT_FORK, NULL, NULL }, { "choose_random_entry_no_guards", test_choose_random_entry_no_guards, TT_FORK, &fake_network, NULL },

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2014