July 2016 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'feature19116_squashed'
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit 9de9f2d48ba0c4953df1f19992a45b33ea841e17 Merge: d70fac1 bf2f7c2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 26 19:21:04 2016 -0400 Merge branch 'feature19116_squashed' src/test/test-network.sh | 152 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 124 insertions(+), 28 deletions(-)

1 0

[tor/master] Rewrite test-network.sh so out-of-tree and $PATH binaries work
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit 6afd5506e92930eea10a2e911fa5717c8271cd67 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sun Jul 17 22:04:37 2016 +1000 Rewrite test-network.sh so out-of-tree and $PATH binaries work --- src/test/test-network.sh | 90 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 25 deletions(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 05080e0..b88577d 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,7 +1,9 @@ #! /bin/sh ECHO_N="/bin/echo -n" -use_coverage_binary=false + +# Output is prefixed with the name of the script +myname=$(basename $0) until [ -z "$1" ] do @@ -44,44 +46,82 @@ do shift ;; --coverage) - use_coverage_binary=true + export USE_COVERAGE_BINARY=true ;; *) - echo "Sorry, I don't know what to do with '$1'." + echo "$myname: Sorry, I don't know what to do with '$1'." exit 2 ;; esac shift done -TOR_DIR="${TOR_DIR:-$PWD}" -NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} -CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR -myname=$(basename $0) - -[ -n "$CHUTNEY_PATH" ] || { - echo "$myname: \$CHUTNEY_PATH not set, trying $TOR_DIR/../chutney" - CHUTNEY_PATH="$TOR_DIR/../chutney" -} +# optional: $TOR_DIR is the tor build directory +# it's used to find the location of tor binaries +# if it's not set: +# - set it ro $BUILDDIR, or +# - if $PWD looks like a tor build directory, set it to $PWD, or +# - unset $TOR_DIR, and let chutney fall back to finding tor binaries in $PATH +if [ ! -d "$TOR_DIR" ]; then + if [ -d "$BUILDDIR/src/or" -a -d "$BUILDDIR/src/tools" ]; then + # Choose the build directory + # But only if it looks like one + echo "$myname: \$TOR_DIR not set, trying \$BUILDDIR" + export TOR_DIR="$BUILDDIR" + elif [ -d "$PWD/src/or" -a -d "$PWD/src/tools" ]; then + # Guess the tor directory is the current directory + # But only if it looks like one + echo "$myname: \$TOR_DIR not set, trying \$PWD" + export TOR_DIR="$PWD" + else + echo "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" + unset TOR_DIR + fi +fi -[ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || { - echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)" - echo "$myname: Get chutney: git clone https://git.torproject.org/\ +# mandatory: $CHUTNEY_PATH is the path to the chutney launch script +# if it's not set: +# - if $PWD looks like a chutney directory, set it to $PWD, or +# - set it based on $TOR_DIR, expecting chutney to be next to tor, or +# - fail and tell the user how to clone the chutney repository +if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then + if [ -x "$PWD/chutney" ]; then + echo "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" + export CHUTNEY_PATH="$PWD" + elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \ + -x "$TOR_DIR/../chutney/chutney" ]; then + echo "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" + export CHUTNEY_PATH="$TOR_DIR/../chutney" + else + # TODO: work out how to package and install chutney, + # so users can find it in $PATH + echo "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" + echo "$myname: Get chutney: git clone https://git.torproject.org/\ chutney.git" - echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export CHUTNEY_PATH=\`pwd\`/chutney" - exit 1 -} + echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ +CHUTNEY_PATH=\`pwd\`/chutney" + unset CHUTNEY_PATH + exit 1 + fi +fi -cd "$CHUTNEY_PATH" # For picking up the right tor binaries. -tor_name=tor -tor_gencert_name=tor-gencert -if test "$use_coverage_binary" = true; then - tor_name=tor-cov +# If these varibles aren't set, chutney looks for tor binaries in $PATH +if [ -d "$TOR_DIR" ]; then + tor_name=tor + tor_gencert_name=tor-gencert + if [ "$USE_COVERAGE_BINARY" = true ]; then + tor_name=tor-cov + fi + export CHUTNEY_TOR="${TOR_DIR}/src/or/${tor_name}" + export CHUTNEY_TOR_GENCERT="${TOR_DIR}/src/tools/${tor_gencert_name}" fi -export CHUTNEY_TOR="${TOR_DIR}/src/or/${tor_name}" -export CHUTNEY_TOR_GENCERT="${TOR_DIR}/src/tools/${tor_gencert_name}" +# Set the variables for the chutney network flavour +export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} +export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR + +cd "$CHUTNEY_PATH" ./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2 # Sleep some, waiting for the network to bootstrap.

1 0

[tor/master] Allow clients to retry HSDirs much faster in test networks
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit d8cd994ef6b273cae7277a2ba79aa37b7eb9b1f3 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Jul 18 13:25:15 2016 +1000 Allow clients to retry HSDirs much faster in test networks --- changes/bug19702 | 3 +++ src/or/rendclient.c | 21 +++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug19702 b/changes/bug19702 new file mode 100644 index 0000000..4ec2699 --- /dev/null +++ b/changes/bug19702 @@ -0,0 +1,3 @@ + o Minor bugfixes (test networks): + - Allow clients to retry HSDirs much faster in test networks. + Fixes bug #19702; bugfix on 0.2.7.1-alpha. Patch by teor. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 64d3673..2d47e12 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -469,6 +469,23 @@ rend_client_introduction_acked(origin_circuit_t *circ, /** The period for which a hidden service directory cannot be queried for * the same descriptor ID again. */ #define REND_HID_SERV_DIR_REQUERY_PERIOD (15 * 60) +/** Test networks generate a new consensus every 5 or 10 seconds. + * So allow them to requery HSDirs much faster. */ +#define REND_HID_SERV_DIR_REQUERY_PERIOD_TESTING (5) + +/** Return the period for which a hidden service directory cannot be queried + * for the same descriptor ID again, taking TestingTorNetwork into account. */ +static time_t +hsdir_requery_period(const or_options_t *options) +{ + tor_assert(options); + + if (options->TestingTorNetwork) { + return REND_HID_SERV_DIR_REQUERY_PERIOD_TESTING; + } else { + return REND_HID_SERV_DIR_REQUERY_PERIOD; + } +} /** Contains the last request times to hidden service directories for * certain queries; each key is a string consisting of the @@ -532,7 +549,7 @@ static void directory_clean_last_hid_serv_requests(time_t now) { strmap_iter_t *iter; - time_t cutoff = now - REND_HID_SERV_DIR_REQUERY_PERIOD; + time_t cutoff = now - hsdir_requery_period(get_options()); strmap_t *last_hid_serv_requests = get_last_hid_serv_requests(); for (iter = strmap_iter_init(last_hid_serv_requests); !strmap_iter_done(iter); ) { @@ -635,7 +652,7 @@ pick_hsdir(const char *desc_id, const char *desc_id_base32) time_t last = lookup_last_hid_serv_request(dir, desc_id_base32, 0, 0); const node_t *node = node_get_by_id(dir->identity_digest); - if (last + REND_HID_SERV_DIR_REQUERY_PERIOD >= now || + if (last + hsdir_requery_period(options) >= now || !node || !node_has_descriptor(node)) { SMARTLIST_DEL_CURRENT(responsible_dirs, dir); continue;

1 0

[tor/master] Merge remote-tracking branch 'teor/bug19702'
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit d70fac15ff07f65f4963eb1a0ab299eb335f6700 Merge: 4bdd360 d8cd994 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 26 19:12:23 2016 -0400 Merge remote-tracking branch 'teor/bug19702' changes/bug19702 | 3 +++ src/or/rendclient.c | 21 +++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)

1 0

[snowflake/master] additional proxy timeout check
by serene＠torproject.org 26 Jul '16

26 Jul '16

commit 0ae71952d2d482f5f2de6855d22c76cc9b212564 Author: Serene H <git(a)keroserene.net> Date: Mon Jul 25 15:28:10 2016 -0700 additional proxy timeout check --- proxy/proxypair.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index e6ab563..9fe2012 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -107,6 +107,7 @@ class ProxyPair @relay.onmessage = @onRelayToClientMessage # TODO: Better websocket timeout handling. @timer = setTimeout((=> + return if 0 == @timer log @relay.label + ' timed out connecting.' @relay.onclose()), 5000)

1 0

[snowflake/master] update README
by serene＠torproject.org 26 Jul '16

26 Jul '16

commit c1f623948b13271df79b0373bbc2b54d928bf7f6 Author: Serene Han <keroserene+git(a)gmail.com> Date: Sat Jun 18 15:51:14 2016 -0700 update README --- README.md | 53 +++++++++++++++++++++++++++++++---------------------- client/torrc | 2 +- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index db896e6..79d3e9e 100644 --- a/README.md +++ b/README.md @@ -2,29 +2,32 @@ [![Build Status](https://travis-ci.org/keroserene/snowflake.svg?branch=master)](http… -A Pluggable Transport using WebRTC, inspired by Flashproxy +Pluggable Transport using WebRTC, inspired by Flashproxy. + +### Status + +- [x] Transport: Successfully connects using WebRTC. +- [x] Rendezvous: HTTP signaling (with optional domain fronting) to the Broker + arranges peer-to-peer connections with multitude of volunteer "snowflakes". +- [x] Client multiplexes remote snowflakes. +- [x] Can browse using Tor over Snowflake. +- [ ] Reproducible build with TBB.   **Table of Contents** -- [Status](#status) - [Usage](#usage) - [Dependencies](#dependencies) - [More Info](#more-info) - - [Building a Snowflake](#building-a-snowflake) + - [Building](#building) +- [FAQ](#faq) - [Appendix](#appendix) + - [-- Testing Copy-Paste Via Browser Proxy --](#---testing-copy-paste-via-browser-proxy---) - [-- Testing directly via WebRTC Server --](#---testing-directly-via-webrtc-server---) - - [-- Via Browser Proxy --](#---via-browser-proxy---)  -### Status - -Successfully & automatically bootstraps with a WebRTC transport, using HTTP -signaling (with optional domain fronting) speaking to a multitude of volunteer -"snowflakes". Still lots of work to do. - ### Usage ``` @@ -38,7 +41,7 @@ This should start the client plugin, bootstrapping to 100% using WebRTC. #### Dependencies Client: -- [go-webrtc](https://github.com/keroserene/go-webrtc). +- [go-webrtc](https://github.com/keroserene/go-webrtc) - Go 1.5+ Proxy: @@ -48,19 +51,22 @@ Proxy: #### More Info -The client uses the following `torrc` options: +Tor can plug in the Snowflake client via a correctly configured `torrc`. +For example: + ``` ClientTransportPlugin snowflake exec ./client \ -url https://snowflake-reg.appspot.com/ \ -front www.google.com \ -ice stun:stun.l.google.com:19302 +-max 3 ``` -Which allows it to speak to the Broker, -get matched with a "snowflake" browser proxy, -and negotiate a WebRTC PeerConnection. +The flags `-url` and `-front` allow the Snowflake client to speak to the Broker, +in order to get connected with some volunteer's browser proxy. `-ice` is a +comma-separated list of ICE servers, which are required for NAT traversal. -To see logs, do `tail -F snowflake.log` in a second terminal. +For logging, run `tail -F snowflake.log` in a second terminal. You can modify the `torrc` to use your own broker, or remove the options entirely which will default to the old copy paste @@ -71,11 +77,13 @@ ClientTransportPlugin snowflake exec ./client --meek ``` -#### Building a Snowflake +#### Building + +This describes how to build the in-browser snowflake. For the client, see Usage, +above. -This will only work if there are any browser snowflakes running at all. -To run your own, first make sure coffeescript is installed. -Then, build with: +The client will only work if there are browser snowflakes available. +To run your own: ``` cd proxy/ @@ -91,8 +99,9 @@ cd build/ python -m http.server ``` -Then, open a browser tab to `http://127.0.0.1:8000/snowflake.html`, -which causes you to act as an ephemeral Tor bridge. +Then, open a browser tab to `http://127.0.0.1:8000/snowflake.html` to view +the debug-console of the snowflake., +So long as that tab is open, you are an ephemeral Tor bridge. ### FAQ diff --git a/client/torrc b/client/torrc index c294929..6912760 100644 --- a/client/torrc +++ b/client/torrc @@ -5,6 +5,6 @@ ClientTransportPlugin snowflake exec ./client \ -url https://snowflake-reg.appspot.com/ \ -front www.google.com \ -ice stun:stun.l.google.com:19302 \ --max 4 +-max 3 Bridge snowflake 0.0.3.0:1

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Jul '16

26 Jul '16

commit 505004fe62aaaecb4752ad0cb2d3948616e944e3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 26 18:45:03 2016 +0000 Update translations for bridgedb --- la/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/la/LC_MESSAGES/bridgedb.po b/la/LC_MESSAGES/bridgedb.po index 656f144..17b3b49 100644 --- a/la/LC_MESSAGES/bridgedb.po +++ b/la/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ 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: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-07-21 12:42+0000\n" +"PO-Revision-Date: 2016-07-26 18:42+0000\n" "Last-Translator: Alisa P <parashchenko.alisa(a)yandex.com>\n" "Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n" "MIME-Version: 1.0\n" @@ -201,7 +201,7 @@ msgstr "Salve, amice!" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" -msgstr "" +msgstr "Claves publicae" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -211,7 +211,7 @@ msgstr "" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "Ea littera in linea arcibus et unicornibus et lucibus\npro %s tempore %s %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -225,7 +225,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB pontes classum variorum %sde \"Pluggable Transports\"%s, \nquid dificilor facit coniunctiones tuos ad \nTor Coniunctionem pro omnibus videre et te scire\nusando\nToris\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79

1 0

[tor/master] Remove windows debugging prints: it was an integer overflow hitting ftrapv
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit 90ca4460489bbc92a8de8f32b8aa4bb82416dcbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 26 11:07:53 2016 -0400 Remove windows debugging prints: it was an integer overflow hitting ftrapv --- src/common/compat_time.c | 41 ++--------------------------------------- src/test/test_util.c | 19 ------------------- 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 0d28439..4757225 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -312,7 +312,7 @@ int64_t monotime_diff_nsec(const monotime_t *start, const monotime_t *end) { -n if (BUG(mach_time_info.denom == 0)) { + if (BUG(mach_time_info.denom == 0)) { monotime_init(); } const int64_t diff_ticks = end->abstime_ - start->abstime_; @@ -388,34 +388,24 @@ static GetTickCount64_fn_t GetTickCount64_fn = NULL; static void monotime_init_internal(void) { - puts("win32-mii-1"); tor_assert(!monotime_initialized); BOOL ok = InitializeCriticalSectionAndSpinCount(&monotime_lock, 200); tor_assert(ok); - puts("win32-mii-2"); ok = InitializeCriticalSectionAndSpinCount(&monotime_coarse_lock, 200); tor_assert(ok); - puts("win32-mii-3"); LARGE_INTEGER li; ok = QueryPerformanceFrequency(&li); - puts("win32-mii-4"); tor_assert(ok); - puts("win32-mii-5"); tor_assert(li.QuadPart); - puts("win32-mii-6"); ticks_per_second = li.QuadPart; - printf(I64_FORMAT" ticks per second\n", I64_PRINTF_ARG(ticks_per_second)); last_pctr = 0; pctr_offset = 0; - puts("win32-mii-7"); HANDLE h = load_windows_system_library(TEXT("kernel32.dll")); - puts("win32-mii-8"); if (h) { GetTickCount64_fn = (GetTickCount64_fn_t) GetProcAddress(h, "GetTickCount64"); } - puts("win32-mii-9"); // FreeLibrary(h) ? } @@ -475,16 +465,7 @@ monotime_diff_nsec(const monotime_t *start, monotime_init(); } const int64_t diff_ticks = end->pcount_ - start->pcount_; -#ifdef _WIN32 - puts("m_d_n: 3"); - printf(I64_FORMAT" diff_ticks\n", I64_PRINTF_ARG(diff_ticks)); - printf(I64_FORMAT" ticks per second\n", I64_PRINTF_ARG(ticks_per_second)); -#endif - const int64_t result = (diff_ticks * ONE_BILLION) / ticks_per_second; -#ifdef _WIN32 - printf(I64_FORMAT" res\n", I64_PRINTF_ARG(result)); -#endif - return result; + return (diff_ticks * ONE_BILLION) / ticks_per_second; } int64_t @@ -560,19 +541,10 @@ monotime_init(void) if (!monotime_initialized) { monotime_init_internal(); monotime_initialized = 1; -#ifdef _WIN32 - puts("mi-0"); -#endif monotime_get(&initialized_at); -#ifdef _WIN32 - puts("mi-1"); -#endif #ifdef MONOTIME_COARSE_FN_IS_DIFFERENT monotime_coarse_get(&initialized_at_coarse); #endif -#ifdef _WIN32 - puts("mi-2"); -#endif } } @@ -596,20 +568,11 @@ uint64_t monotime_absolute_nsec(void) { monotime_t now; -#ifdef _WIN32 - puts("m_a_n: 1"); -#endif if (BUG(monotime_initialized == 0)) { monotime_init(); } -#ifdef _WIN32 - puts("m_a_n: 2"); -#endif monotime_get(&now); -#ifdef _WIN32 - puts("m_a_n: 3"); -#endif return monotime_diff_nsec(&initialized_at, &now); } diff --git a/src/test/test_util.c b/src/test/test_util.c index 2dfa109..38df7bb 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5296,31 +5296,12 @@ test_util_monotonic_time(void *arg) uint64_t nsec1, nsec2, usec1, msec1; uint64_t nsecc1, nsecc2, usecc1, msecc1; -#ifdef _WIN32 - puts("Test-1"); -#endif - monotime_get(&mt1); -#ifdef _WIN32 - puts("Test-2"); -#endif monotime_coarse_get(&mtc1); -#ifdef _WIN32 - puts("Test-3"); -#endif nsec1 = monotime_absolute_nsec(); -#ifdef _WIN32 - puts("Test-4"); -#endif usec1 = monotime_absolute_usec(); msec1 = monotime_absolute_msec(); -#ifdef _WIN32 - puts("Test-5"); -#endif nsecc1 = monotime_coarse_absolute_nsec(); -#ifdef _WIN32 - puts("Test-6"); -#endif usecc1 = monotime_coarse_absolute_usec(); msecc1 = monotime_coarse_absolute_msec();

1 0

[tor/master] fix an error message in a configure warning string
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit 4bdd3603f1655a4effba707260b5f3a26ec532ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 26 11:33:02 2016 -0400 fix an error message in a configure warning string --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9cace4b..dca86de 100644 --- a/configure.ac +++ b/configure.ac @@ -1900,7 +1900,7 @@ fi if test "$enable_coverage" = "yes" && test "$have_clang" = "no"; then case "$host_os" in darwin*) - AC_MSG_WARN([Tried to enable coverage on OSX without using the clang compiler. This might not work! If coverage fails, use CC=clang when configuring with --enable-profiling.]) + AC_MSG_WARN([Tried to enable coverage on OSX without using the clang compiler. This might not work! If coverage fails, use CC=clang when configuring with --enable-coverage.]) esac fi

1 0

[tor/master] Fix an integer overflow related to monotonic time on windows.
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit d97fca16d0b37723c2cbe2bacf86601af0e24805 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 26 11:23:58 2016 -0400 Fix an integer overflow related to monotonic time on windows. To maintain precision, to get nanoseconds, we were multiplying our tick count by a billion, then dividing by ticks-per-second. But that apparently isn't such a great idea, since ticks-per-second is sometimes a billion on its own, so our intermediate result was giving us attoseconds. When you're counting in attoseconds, you can only fit about 9 seconds into an int64_t, which is not so great for our purposes. Instead, we now simplify the 1000000000/1000000000 fraction before we start messing with nanoseconds. This has potential to mess us up if some future MS version declares that performance counters will use 1,000,000,007 units per second, but let's burn that bridge when we come to it. --- src/common/compat_time.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 4757225..7676e3a 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -374,8 +374,10 @@ monotime_diff_nsec(const monotime_t *start, /* end of "HAVE_CLOCK_GETTIME" */ #elif defined (_WIN32) -/** Result of QueryPerformanceFrequency, as an int64_t. */ -static int64_t ticks_per_second = 0; +/** Result of QueryPerformanceFrequency, in terms needed to + * convert ticks to nanoseconds. */ +static int64_t nsec_per_tick_numer = 1; +static int64_t nsec_per_tick_denom = 1; /** Lock to protect last_pctr and pctr_offset */ static CRITICAL_SECTION monotime_lock; @@ -397,7 +399,17 @@ monotime_init_internal(void) ok = QueryPerformanceFrequency(&li); tor_assert(ok); tor_assert(li.QuadPart); - ticks_per_second = li.QuadPart; + + uint64_t n = ONE_BILLION; + uint64_t d = li.QuadPart; + /* We need to simplify this or we'll probably overflow the int64. */ + simplify_fraction64(&n, &d); + tor_assert(n <= INT64_MAX); + tor_assert(d <= INT64_MAX); + + nsec_per_tick_numer = (int64_t) n; + nsec_per_tick_denom = (int64_t) d; + last_pctr = 0; pctr_offset = 0; @@ -418,7 +430,8 @@ monotime_get(monotime_t *out) #ifdef TOR_UNIT_TESTS if (monotime_mocking_enabled) { - out->pcount_ = (mock_time_nsec * ticks_per_second) / ONE_BILLION; + out->pcount_ = (mock_time_nsec * nsec_per_tick_denom) + / nsec_per_tick_numer; return; } #endif @@ -465,7 +478,7 @@ monotime_diff_nsec(const monotime_t *start, monotime_init(); } const int64_t diff_ticks = end->pcount_ - start->pcount_; - return (diff_ticks * ONE_BILLION) / ticks_per_second; + return (diff_ticks * nsec_per_tick_numer) / nsec_per_tick_denom; } int64_t

1 0