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

[translation-tools/master] add reviewed branch for tails-whisperback
by emmapeel＠torproject.org 31 Jul '20

31 Jul '20

commit b196b5142a755463d569450911dcaadd45a82f06 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Jul 31 16:37:36 2020 +0000 add reviewed branch for tails-whisperback --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 03722cc..05d5be3 100644 --- a/config +++ b/config @@ -42,7 +42,7 @@ tor-launcher-properties tor-launcher-properties_completed tor-launcher-network-settings tor-launcher-network-settings_completed tor_outreach_md tor_outreach_md_completed tpo-web tpo-web_completed -whisperback whisperback_completed +whisperback whisperback_completed whisperback_release support-portal support-portal_completed" PIDFILE=/srv/translation.torproject.org/run/update_translations.pid

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 31 Jul '20

31 Jul '20

commit c6b4a5bd93436f9541294dc0902fca6fcdd8c4e0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 31 16:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- nn/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po index 3a06793359..9d1f393a86 100644 --- a/nn/LC_MESSAGES/bridgedb.po +++ b/nn/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-07-31 15:43+0000\n" +"PO-Revision-Date: 2020-07-31 15:48+0000\n" "Last-Translator: Vzc7D3bNeCezymn2sy Xtyc4KN9lQBN55iTSW <Gka7WiR8HiDuwxvcGvK(a)protonmail.com>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -195,7 +195,7 @@ msgstr "Du har gått over fartsavgrensinga. Ver snill og ta det med ro! Minste t msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "" +msgstr "Dersom desse bruene ikkje er det du trenge, kan du svare denne e-posten med ein av følgjande kommandoar i meldinga." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[tor/master] Added tests for bandwidth functions
by nickm＠torproject.org 31 Jul '20

31 Jul '20

commit a93c3d7a8d98f04f8e651543e4031bb18008aa74 Author: MrSquanchee <usuraj35(a)gmail.com> Date: Sat Apr 4 17:49:50 2020 +0530 Added tests for bandwidth functions Added tests for 1. commit_max 2. advance_obs 3. add_obs 4. rep_hist_fill_bandwidth_history 5. rep_hist_get_bandwidth_lines (Lightly edited by nickm to use new names from bwhist refactoring.) Signed-off-by: Suraj Upadhyay <usuraj35(a)gmail.com> --- src/feature/stats/bwhist.c | 11 ++++------- src/feature/stats/bwhist.h | 7 +++++++ src/test/test_stats.c | 21 ++++++++++++--------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/feature/stats/bwhist.c b/src/feature/stats/bwhist.c index 48e33948da..7cbc5f60a6 100644 --- a/src/feature/stats/bwhist.c +++ b/src/feature/stats/bwhist.c @@ -74,7 +74,7 @@ advance_obs(bw_array_t *b) /** Add n bytes to the number of bytes in b for second * when. */ -static inline void +STATIC void add_obs(bw_array_t *b, time_t when, uint64_t n) { if (when < b->cur_obs_time) @@ -95,7 +95,7 @@ add_obs(bw_array_t *b, time_t when, uint64_t n) } /** Allocate, initialize, and return a new bw_array. */ -static bw_array_t * +STATIC bw_array_t * bw_array_new(void) { bw_array_t *b; @@ -107,11 +107,8 @@ bw_array_new(void) return b; } -#define bw_array_free(val) \ - FREE_AND_NULL(bw_array_t, bw_array_free_, (val)) - /** Free storage held by bandwidth array b. */ -static void +STATIC void bw_array_free_(bw_array_t *b) { if (!b) { @@ -250,7 +247,7 @@ bwhist_bandwidth_assess,(void)) * * It returns the number of bytes written. */ -static size_t +STATIC size_t bwhist_fill_bandwidth_history(char *buf, size_t len, const bw_array_t *b) { char *cp = buf; diff --git a/src/feature/stats/bwhist.h b/src/feature/stats/bwhist.h index d556f5a026..f88b951447 100644 --- a/src/feature/stats/bwhist.h +++ b/src/feature/stats/bwhist.h @@ -31,6 +31,13 @@ typedef struct bw_array_t bw_array_t; STATIC uint64_t find_largest_max(bw_array_t *b); STATIC void commit_max(bw_array_t *b); STATIC void advance_obs(bw_array_t *b); +STATIC bw_array_t *bw_array_new(void); +STATIC void add_obs(bw_array_t *b, time_t when, uint64_t n); +#define bw_array_free(val) \ + FREE_AND_NULL(bw_array_t, bw_array_free_, (val)) +STATIC void bw_array_free_(bw_array_t *b); +STATIC size_t bwhist_fill_bandwidth_history(char *buf, size_t len, + const bw_array_t *b); #endif /* defined(REPHIST_PRIVATE) */ #ifdef TOR_UNIT_TESTS diff --git a/src/test/test_stats.c b/src/test/test_stats.c index 01981f602b..16dd2ca37c 100644 --- a/src/test/test_stats.c +++ b/src/test/test_stats.c @@ -31,6 +31,7 @@ #define MAINLOOP_PRIVATE #define STATEFILE_PRIVATE #define CONFIG_PRIVATE +#define BWHIST_PRIVATE #include "core/or/or.h" #include "lib/err/backtrace.h" @@ -43,6 +44,8 @@ #include "feature/stats/connstats.h" #include "feature/stats/rephist.h" #include "app/config/statefile.h" +#include "feature/stats/bwhist.h" +#include "feature/stats/bw_array_st.h" /** Run unit tests for some stats code. */ static void @@ -382,7 +385,7 @@ mock_get_options(void) #define test_fill_bw(b, buf, rv, str, checkrv) STMT_BEGIN \ buf = tor_malloc_zero(MAX_HIST_VALUE_LEN); \ - rv = rep_hist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b); \ + rv = bwhist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b); \ tt_str_op(buf, OP_EQ, str); \ tt_int_op(rv, OP_EQ, checkrv); \ tor_free(buf); \ @@ -399,7 +402,7 @@ test_fill_bandwidth_history(void *arg) /* Day 1. */ set_test_case(b, 0, 0, 0, 0, 0, 0, 0); buf = tor_malloc_zero(MAX_HIST_VALUE_LEN); - rv = rep_hist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b); + rv = bwhist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b); tt_int_op(rv, OP_EQ, 0); tor_free(buf); /* Day 2. */ @@ -434,14 +437,14 @@ test_fill_bandwidth_history(void *arg) } #define set_test_bw_lines(r, w, dr, dw, when) STMT_BEGIN \ - rep_hist_note_bytes_read(r, when); \ - rep_hist_note_bytes_written(w, when); \ - rep_hist_note_dir_bytes_read(dr, when); \ - rep_hist_note_dir_bytes_written(dw, when); \ + bwhist_note_bytes_read(r, when, false); \ + bwhist_note_bytes_written(w, when, false); \ + bwhist_note_dir_bytes_read(dr, when); \ + bwhist_note_dir_bytes_written(dw, when); \ STMT_END; #define test_get_bw_lines(str, checkstr) STMT_BEGIN \ - str = rep_hist_get_bandwidth_lines(); \ + str = bwhist_get_bandwidth_lines(); \ tt_str_op(str, OP_EQ, checkstr); \ tor_free(str); \ STMT_END; @@ -455,7 +458,7 @@ test_get_bandwidth_lines(void *arg) int len = (67+MAX_HIST_VALUE_LEN)*4; checkstr = tor_malloc_zero(len); time_t now = time(NULL); - bw_arrays_init(); + bwhist_init(); /* Day 1. */ now += 86400; @@ -486,7 +489,7 @@ test_get_bandwidth_lines(void *arg) test_get_bw_lines(str, checkstr); done: tor_free(checkstr); - bw_arrays_free_all(); + bwhist_free_all(); } #define ENT(name) \

1 0

[tor/master] Added tests for bandwidth functions
by nickm＠torproject.org 31 Jul '20

31 Jul '20

commit 708f51637f138a14e5093e442f5ba7b5f8f2479d Author: MrSquanchee <usuraj35(a)gmail.com> Date: Sat Apr 4 17:49:50 2020 +0530 Added tests for bandwidth functions Added tests for 1. commit_max 2. advance_obs 3. add_obs 4. rep_hist_fill_bandwidth_history 5. rep_hist_get_bandwidth_lines Signed-off-by: Suraj Upadhyay <usuraj35(a)gmail.com> --- changes/ticket33812 | 7 ++ src/test/test_stats.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+) diff --git a/changes/ticket33812 b/changes/ticket33812 new file mode 100644 index 0000000000..bf8dd6e442 --- /dev/null +++ b/changes/ticket33812 @@ -0,0 +1,7 @@ + o Code simplification and refactoring: + - Move the bandwidth structure and function declarations + to new file. Include this module in other files. + Remove REPHIST_PRIVATE. + o Testing: + - Add unit tests for bandwidth statistics manipulation functions. + Closes ticket 33812. Patch by MrSquanchee diff --git a/src/test/test_stats.c b/src/test/test_stats.c index f0715c2e45..01981f602b 100644 --- a/src/test/test_stats.c +++ b/src/test/test_stats.c @@ -30,6 +30,7 @@ #define CIRCUITLIST_PRIVATE #define MAINLOOP_PRIVATE #define STATEFILE_PRIVATE +#define CONFIG_PRIVATE #include "core/or/or.h" #include "lib/err/backtrace.h" @@ -250,6 +251,244 @@ test_rephist_mtbf(void *arg) tor_free(ddir_fname); } +static void +test_commit_max(void *arg) +{ + (void) arg; + bw_array_t *b = bw_array_new(); + time_t now = b->cur_obs_time; + + commit_max(b); + tt_int_op(b->next_period, OP_EQ, now + 2*86400); + + b->total_in_period = 100; + b->max_total = 10; + commit_max(b); + tor_assert(b->total_in_period == 0); + tor_assert(b->max_total == 0); + tt_int_op(b->totals[1], OP_EQ, 100); + tt_int_op(b->maxima[1], OP_EQ, 10); + tt_int_op(b->next_period, OP_EQ, now + 3*86400); + + commit_max(b); + tt_int_op(b->next_period, OP_EQ, now + 4*86400); + + commit_max(b); + tt_int_op(b->next_period, OP_EQ, now + 5*86400); + + b->total_in_period = 100; + b->max_total = 10; + commit_max(b); + tor_assert(!b->next_max_idx); + tt_int_op(b->cur_obs_idx, OP_EQ, 0); + tt_int_op(b->totals[4], OP_EQ, 100); + tt_int_op(b->maxima[4], OP_EQ, 10); + tt_int_op(b->next_period, OP_EQ, now + 6*86400); + done: + bw_array_free(b); +} + +#define test_obs(b, idx, time, tot, max) STMT_BEGIN \ + tt_int_op(b->cur_obs_idx, OP_EQ, idx); \ + tt_int_op(b->cur_obs_time, OP_EQ, time); \ + tt_int_op(b->total_obs, OP_EQ, tot); \ + tt_int_op(b->max_total, OP_EQ, max); \ + STMT_END; + +static void +test_advance_obs(void *arg) +{ + (void) arg; + int iter, tot = 0; + bw_array_t *b = bw_array_new(); + time_t now = b->cur_obs_time; + + for (iter = 0; iter < 10; ++iter) { + b->obs[b->cur_obs_idx] += 10; + tot += 10; + advance_obs(b); + if (iter == 9) { + /* The current value under cur_obs_idx was zeroed in last iterN. */ + test_obs(b, 0, now+iter+1, tot - 10, tot); + break; + } + test_obs(b, iter+1, now+iter+1, tot, tot); + } + + b->total_in_period = 100; + b->cur_obs_time = now + NUM_SECS_BW_SUM_INTERVAL - 1; + advance_obs(b); + test_obs(b, 1, now+NUM_SECS_BW_SUM_INTERVAL, 80, 0); + tt_int_op(b->maxima[0], OP_EQ, 100); + tt_int_op(b->totals[0], OP_EQ, 100); + tt_int_op(b->num_maxes_set, OP_EQ, 1); + done: + bw_array_free(b); +} + +#define test_add_obs_(b, now, checknow, bw, tot) STMT_BEGIN \ + tot += bw; \ + add_obs(b, now, bw); \ + tt_int_op(b->cur_obs_time, OP_EQ, checknow); \ + tt_int_op(b->obs[b->cur_obs_idx], OP_EQ, bw); \ + tt_int_op(b->total_in_period, OP_EQ, tot); \ + STMT_END; + +static void +test_add_obs(void *arg) +{ + (void) arg; + bw_array_t *b = bw_array_new(); + time_t now = b->cur_obs_time; + uint64_t bw = 0, tot = 0; + /* Requests for the past should not be entertained. */ + test_add_obs_(b, now-1, now, bw, tot); + /* Test the expected functionalities for random values. */ + now += 53; + bw = 97; + test_add_obs_(b, now, now, bw, tot); + + now += 60*60; + bw = 90; + test_add_obs_(b, now, now, bw, tot); + + now += 24*60*60; + bw = 100; + tot = 0; + test_add_obs_(b, now, now, bw, tot); + done: + bw_array_free(b); +} + +static or_options_t mock_options; + +static const or_options_t * +mock_get_options(void) +{ + return &mock_options; +} + +#define MAX_HIST_VALUE_LEN 21*NUM_TOTALS + +#define set_test_case(b, max, idx, a1, a2, a3, a4, a5) STMT_BEGIN \ + b->num_maxes_set = max; \ + b->next_max_idx = idx; \ + b->totals[0] = a1; \ + b->totals[1] = a2; \ + b->totals[2] = a3; \ + b->totals[3] = a4; \ + b->totals[4] = a5; \ + STMT_END; + +#define test_fill_bw(b, buf, rv, str, checkrv) STMT_BEGIN \ + buf = tor_malloc_zero(MAX_HIST_VALUE_LEN); \ + rv = rep_hist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b); \ + tt_str_op(buf, OP_EQ, str); \ + tt_int_op(rv, OP_EQ, checkrv); \ + tor_free(buf); \ + STMT_END; + +static void +test_fill_bandwidth_history(void *arg) +{ + (void) arg; + bw_array_t *b = bw_array_new(); + char *buf; + size_t rv; + /* Remember bandwidth is rounded down to the nearest 1K. */ + /* Day 1. */ + set_test_case(b, 0, 0, 0, 0, 0, 0, 0); + buf = tor_malloc_zero(MAX_HIST_VALUE_LEN); + rv = rep_hist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b); + tt_int_op(rv, OP_EQ, 0); + tor_free(buf); + /* Day 2. */ + set_test_case(b, 1, 1, 1000, 0, 0, 0, 0); + test_fill_bw(b, buf, rv, "0", 1); + /* Day 3. */ + set_test_case(b, 2, 2, 1000, 1500, 0, 0, 0); + test_fill_bw(b, buf, rv, "0,1024", 6); + /* Day 4. */ + set_test_case(b, 3, 3, 1000, 1500, 3500, 0, 0); + test_fill_bw(b, buf, rv, "0,1024,3072", 11); + /* Day 5. */ + set_test_case(b, 4, 4, 1000, 1500, 3500, 8000, 0); + test_fill_bw(b, buf, rv, "0,1024,3072,7168", 16); + /* Day 6. */ + set_test_case(b, 5, 0, 1000, 1500, 3500, 8000, 6000); + test_fill_bw(b, buf, rv, "0,1024,3072,7168,5120", 21); + /* Day 7. */ + /* Remember oldest entry first. */ + set_test_case(b, 5, 1, 10000, 1500, 3500, 8000, 6000); + test_fill_bw(b, buf, rv, "1024,3072,7168,5120,9216", 24); + /* Mocking get_options to manipulate RelayBandwidthRate. */ + MOCK(get_options, mock_get_options); + /* Limits bandwidth to 1 KBps. */ + /* Cutoff is set to 88473600. */ + mock_options.RelayBandwidthRate = 1024; + set_test_case(b, 5, 2, 88573600, 88473600, 10000, 8000, 6000); + test_fill_bw(b, buf, rv, "9216,7168,5120,88473600,88473600", 32); + done: + UNMOCK(get_options); + bw_array_free(b); +} + +#define set_test_bw_lines(r, w, dr, dw, when) STMT_BEGIN \ + rep_hist_note_bytes_read(r, when); \ + rep_hist_note_bytes_written(w, when); \ + rep_hist_note_dir_bytes_read(dr, when); \ + rep_hist_note_dir_bytes_written(dw, when); \ + STMT_END; + +#define test_get_bw_lines(str, checkstr) STMT_BEGIN \ + str = rep_hist_get_bandwidth_lines(); \ + tt_str_op(str, OP_EQ, checkstr); \ + tor_free(str); \ + STMT_END; + +static void +test_get_bandwidth_lines(void *arg) +{ + (void) arg; + char *str, *checkstr; + char t[ISO_TIME_LEN+1]; + int len = (67+MAX_HIST_VALUE_LEN)*4; + checkstr = tor_malloc_zero(len); + time_t now = time(NULL); + bw_arrays_init(); + + /* Day 1. */ + now += 86400; + set_test_bw_lines(5000, 5500, 3000, 3500, now - 6*60*60); + /* Day 2. */ + now += 86400; + set_test_bw_lines(50000, 55000, 30000, 35000, now - 6*60*60); + /* Day 3. */ + now += 86400; + set_test_bw_lines(25000, 27500, 15000, 17500, now - 6*60*60); + /* Day 4. */ + now += 86400; + set_test_bw_lines(90000, 76000, 60000, 45000, now - 6*60*60); + /* Day 5. */ + now += 86400; + set_test_bw_lines(500, 55000, 30000, 35000, now - 6*60*60); + set_test_bw_lines(0, 0, 0, 0, now); + format_iso_time(t, now); + tor_snprintf(checkstr, len, "write-history %s (86400 s) " + "5120,54272,26624,75776,54272\n" + "read-history %s (86400 s) " + "4096,49152,24576,89088,0\n" + "dirreq-write-history %s (86400 s) " + "3072,34816,17408,44032,34816\n" + "dirreq-read-history %s (86400 s) " + "2048,29696,14336,59392,29696\n", + t, t, t, t); + test_get_bw_lines(str, checkstr); + done: + tor_free(checkstr); + bw_arrays_free_all(); +} + #define ENT(name) \ { #name, test_ ## name , 0, NULL, NULL } #define FORK(name) \ @@ -258,6 +497,11 @@ test_rephist_mtbf(void *arg) struct testcase_t stats_tests[] = { FORK(stats), ENT(rephist_mtbf), + FORK(commit_max), + FORK(advance_obs), + FORK(add_obs), + FORK(fill_bandwidth_history), + FORK(get_bandwidth_lines), END_OF_TESTCASES };

1 0

[tor/master] Changes 33812 : Add ticket number to all paragraphs
by nickm＠torproject.org 31 Jul '20

31 Jul '20

commit 5ca03f1ebd3fa1d5febea78fb7d5475b441c17ac Author: MrSquanchee <usuraj35(a)gmail.com> Date: Mon May 18 19:23:47 2020 +0530 Changes 33812 : Add ticket number to all paragraphs Signed-off-by: Suraj Upadhyay <usuraj35(a)gmail.com> --- changes/ticket33812 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/ticket33812 b/changes/ticket33812 index bf8dd6e442..87628c53c1 100644 --- a/changes/ticket33812 +++ b/changes/ticket33812 @@ -1,7 +1,7 @@ o Code simplification and refactoring: - Move the bandwidth structure and function declarations to new file. Include this module in other files. - Remove REPHIST_PRIVATE. + Remove REPHIST_PRIVATE. Closes ticket 33812. o Testing: - Add unit tests for bandwidth statistics manipulation functions. Closes ticket 33812. Patch by MrSquanchee

1 0

[tor/master] Extract bw_array_t and related constants into a header.
by nickm＠torproject.org 31 Jul '20

31 Jul '20

commit b5068e4826df147e61205aea8d8df247968c7a0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 31 10:46:52 2020 -0400 Extract bw_array_t and related constants into a header. This will be used for testing. Partially reproduces work by MrSquanchee in #33812. --- src/feature/stats/bw_array_st.h | 57 +++++++++++++++++++++++++++++++++++++++++ src/feature/stats/bwhist.c | 43 +------------------------------ src/feature/stats/include.am | 1 + 3 files changed, 59 insertions(+), 42 deletions(-) diff --git a/src/feature/stats/bw_array_st.h b/src/feature/stats/bw_array_st.h new file mode 100644 index 0000000000..2d05ff0f77 --- /dev/null +++ b/src/feature/stats/bw_array_st.h @@ -0,0 +1,57 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file bw_array_st.h + * @brief Declaration for bw_array_t structure and related constants + **/ + +#ifndef TOR_FEATURE_STATS_BW_ARRAY_ST_H +#define TOR_FEATURE_STATS_BW_ARRAY_ST_H + +/** For how many seconds do we keep track of individual per-second bandwidth + * totals? */ +#define NUM_SECS_ROLLING_MEASURE 10 +/** How large are the intervals for which we track and report bandwidth use? */ +#define NUM_SECS_BW_SUM_INTERVAL (24*60*60) +/** How far in the past do we remember and publish bandwidth use? */ +#define NUM_SECS_BW_SUM_IS_VALID (5*24*60*60) +/** How many bandwidth usage intervals do we remember? (derived) */ +#define NUM_TOTALS (NUM_SECS_BW_SUM_IS_VALID/NUM_SECS_BW_SUM_INTERVAL) + +/** Structure to track bandwidth use, and remember the maxima for a given + * time period. + */ +struct bw_array_t { + /** Observation array: Total number of bytes transferred in each of the last + * NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */ + uint64_t obs[NUM_SECS_ROLLING_MEASURE]; + int cur_obs_idx; /**< Current position in obs. */ + time_t cur_obs_time; /**< Time represented in obs[cur_obs_idx] */ + uint64_t total_obs; /**< Total for all members of obs except + * obs[cur_obs_idx] */ + uint64_t max_total; /**< Largest value that total_obs has taken on in the + * current period. */ + uint64_t total_in_period; /**< Total bytes transferred in the current + * period. */ + + /** When does the next period begin? */ + time_t next_period; + /** Where in 'maxima' should the maximum bandwidth usage for the current + * period be stored? */ + int next_max_idx; + /** How many values in maxima/totals have been set ever? */ + int num_maxes_set; + /** Circular array of the maximum + * bandwidth-per-NUM_SECS_ROLLING_MEASURE usage for the last + * NUM_TOTALS periods */ + uint64_t maxima[NUM_TOTALS]; + /** Circular array of the total bandwidth usage for the last NUM_TOTALS + * periods */ + uint64_t totals[NUM_TOTALS]; +}; + +#endif /* !defined(TOR_FEATURE_STATS_BW_ARRAY_ST_H) */ diff --git a/src/feature/stats/bwhist.c b/src/feature/stats/bwhist.c index e74a2881f5..48e33948da 100644 --- a/src/feature/stats/bwhist.c +++ b/src/feature/stats/bwhist.c @@ -23,51 +23,10 @@ #include "app/config/statefile.h" #include "feature/relay/routermode.h" +#include "feature/stats/bw_array_st.h" #include "app/config/or_state_st.h" #include "app/config/or_options_st.h" -/** For how many seconds do we keep track of individual per-second bandwidth - * totals? */ -#define NUM_SECS_ROLLING_MEASURE 10 -/** How large are the intervals for which we track and report bandwidth use? */ -#define NUM_SECS_BW_SUM_INTERVAL (24*60*60) -/** How far in the past do we remember and publish bandwidth use? */ -#define NUM_SECS_BW_SUM_IS_VALID (5*24*60*60) -/** How many bandwidth usage intervals do we remember? (derived) */ -#define NUM_TOTALS (NUM_SECS_BW_SUM_IS_VALID/NUM_SECS_BW_SUM_INTERVAL) - -/** Structure to track bandwidth use, and remember the maxima for a given - * time period. - */ -struct bw_array_t { - /** Observation array: Total number of bytes transferred in each of the last - * NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */ - uint64_t obs[NUM_SECS_ROLLING_MEASURE]; - int cur_obs_idx; /**< Current position in obs. */ - time_t cur_obs_time; /**< Time represented in obs[cur_obs_idx] */ - uint64_t total_obs; /**< Total for all members of obs except - * obs[cur_obs_idx] */ - uint64_t max_total; /**< Largest value that total_obs has taken on in the - * current period. */ - uint64_t total_in_period; /**< Total bytes transferred in the current - * period. */ - - /** When does the next period begin? */ - time_t next_period; - /** Where in 'maxima' should the maximum bandwidth usage for the current - * period be stored? */ - int next_max_idx; - /** How many values in maxima/totals have been set ever? */ - int num_maxes_set; - /** Circular array of the maximum - * bandwidth-per-NUM_SECS_ROLLING_MEASURE usage for the last - * NUM_TOTALS periods */ - uint64_t maxima[NUM_TOTALS]; - /** Circular array of the total bandwidth usage for the last NUM_TOTALS - * periods */ - uint64_t totals[NUM_TOTALS]; -}; - /** Shift the current period of b forward by one. */ STATIC void commit_max(bw_array_t *b) diff --git a/src/feature/stats/include.am b/src/feature/stats/include.am index bc13882f4b..5be519936f 100644 --- a/src/feature/stats/include.am +++ b/src/feature/stats/include.am @@ -9,6 +9,7 @@ LIBTOR_APP_A_SOURCES += \ # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ + src/feature/stats/bw_array_st.h \ src/feature/stats/bwhist.h \ src/feature/stats/connstats.h \ src/feature/stats/geoip_stats.h \

1 0

[tor/master] test_stats : Removed CONFIG_PRIVATE
by nickm＠torproject.org 31 Jul '20

31 Jul '20

commit bb585c5e371ff395a8b21c1ebc72d4da1ebf05f2 Author: MrSquanchee <usuraj35(a)gmail.com> Date: Mon May 18 18:55:19 2020 +0530 test_stats : Removed CONFIG_PRIVATE Signed-off-by: Suraj Upadhyay <usuraj35(a)gmail.com> --- src/test/test_stats.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_stats.c b/src/test/test_stats.c index 16dd2ca37c..ecf8f9a7d5 100644 --- a/src/test/test_stats.c +++ b/src/test/test_stats.c @@ -30,7 +30,6 @@ #define CIRCUITLIST_PRIVATE #define MAINLOOP_PRIVATE #define STATEFILE_PRIVATE -#define CONFIG_PRIVATE #define BWHIST_PRIVATE #include "core/or/or.h"

1 0

[tor/master] Remove now-outdated part of 33812 changes file.
by nickm＠torproject.org 31 Jul '20

31 Jul '20

commit 700e8a8bb070d20ce6febde0c20dd9acde911856 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 31 11:01:15 2020 -0400 Remove now-outdated part of 33812 changes file. --- changes/ticket33812 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/changes/ticket33812 b/changes/ticket33812 index 87628c53c1..9c675df19c 100644 --- a/changes/ticket33812 +++ b/changes/ticket33812 @@ -1,7 +1,3 @@ - o Code simplification and refactoring: - - Move the bandwidth structure and function declarations - to new file. Include this module in other files. - Remove REPHIST_PRIVATE. Closes ticket 33812. o Testing: - Add unit tests for bandwidth statistics manipulation functions. - Closes ticket 33812. Patch by MrSquanchee + Closes ticket 33812. Patch by MrSquanchee.

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 31 Jul '20

31 Jul '20

commit d422013b58518d69546f845b2b29b05c29f0ebc5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 31 15:45:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- nn/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po index 7e5bff48ac..3a06793359 100644 --- a/nn/LC_MESSAGES/bridgedb.po +++ b/nn/LC_MESSAGES/bridgedb.po @@ -5,13 +5,14 @@ # Translators: # Bjørn I., 2014-2015 # Finn Brudal <finnbrudal(a)yahoo.com>, 2016 +# Vzc7D3bNeCezymn2sy Xtyc4KN9lQBN55iTSW <Gka7WiR8HiDuwxvcGvK(a)protonmail.com>, 2020 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-07-31 15:43+0000\n" +"Last-Translator: Vzc7D3bNeCezymn2sy Xtyc4KN9lQBN55iTSW <Gka7WiR8HiDuwxvcGvK(a)protonmail.com>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,7 +93,7 @@ msgstr "Denne QR-koden inneheld brulinjene dine. Skann han med ein QR-lesar for #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB møtte på ein feil" #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." @@ -177,7 +178,7 @@ msgstr "%sK%snyt til bruer" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[Dette er ein automatisert e-post]" #: bridgedb/strings.py:35 msgid "Here are your bridges:"

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'bradegl/bug33855-01' into tor-browser-78.0.1esr-10.0-1
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit b7f592dca30bfd25d772caba480ea9d81dea9cd5 Merge: 3d5d9212e1f4 f7094ffb9dd9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jul 31 15:22:22 2020 +0000 Merge remote-tracking branch 'bradegl/bug33855-01' into tor-browser-78.0.1esr-10.0-1 browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+)

1 0