August 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 262f30dd339410c1a5a106fcb6e077b8d439e61e Merge: 58c2b35b5 bba64c988 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 19 10:37:21 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/ticket31406 | 3 +++ src/app/config/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] dirauth: Change dizum IP address
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 15 08:16:53 2019 -0400 dirauth: Change dizum IP address New IP address from 194.109.206.212 to 45.66.33.45. Signed request from Alex de Joode, operator of dizum: https://trac.torproject.org/projects/tor/ticket/31406 Published descriptor by dizum on August 12th, 2019: -- r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 15:28:40 45.66.33.45 443 80 s Authority Fast Running Stable V2Dir Valid v Tor 0.4.0.5 pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1 w Bandwidth=20 Unmeasured=1 p reject 1-65535 -- Finally, confirmed by DNS: $ dig +short tor.dizum.com 45.66.33.45 Closes #31406 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket31406 | 3 +++ src/or/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket31406 b/changes/ticket31406 new file mode 100644 index 000000000..0ebe6f6c4 --- /dev/null +++ b/changes/ticket31406 @@ -0,0 +1,3 @@ + o Minor features (directory authority): + - A new IP address the directory authority "dizum" has been changed. Closes + ticket 31406; diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index 08a919b05..278f08bfc 100644 --- a/src/or/auth_dirs.inc +++ b/src/or/auth_dirs.inc @@ -7,7 +7,7 @@ "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 " "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", "Serge orport=9001 bridge " "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533", "gabelmoo orport=443 "

1 0

[tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 90f4ed2335fee8bba6e232c6d92078cb133f5b9e Merge: 20943d00f 5653b93a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 19 10:37:21 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31406 | 3 +++ src/app/config/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] dirauth: Change dizum IP address
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 15 08:16:53 2019 -0400 dirauth: Change dizum IP address New IP address from 194.109.206.212 to 45.66.33.45. Signed request from Alex de Joode, operator of dizum: https://trac.torproject.org/projects/tor/ticket/31406 Published descriptor by dizum on August 12th, 2019: -- r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 15:28:40 45.66.33.45 443 80 s Authority Fast Running Stable V2Dir Valid v Tor 0.4.0.5 pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1 w Bandwidth=20 Unmeasured=1 p reject 1-65535 -- Finally, confirmed by DNS: $ dig +short tor.dizum.com 45.66.33.45 Closes #31406 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket31406 | 3 +++ src/or/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket31406 b/changes/ticket31406 new file mode 100644 index 000000000..0ebe6f6c4 --- /dev/null +++ b/changes/ticket31406 @@ -0,0 +1,3 @@ + o Minor features (directory authority): + - A new IP address the directory authority "dizum" has been changed. Closes + ticket 31406; diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index 08a919b05..278f08bfc 100644 --- a/src/or/auth_dirs.inc +++ b/src/or/auth_dirs.inc @@ -7,7 +7,7 @@ "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 " "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", "Serge orport=9001 bridge " "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533", "gabelmoo orport=443 "

1 0

[tor/maint-0.3.5] dirauth: Change dizum IP address
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 15 08:16:53 2019 -0400 dirauth: Change dizum IP address New IP address from 194.109.206.212 to 45.66.33.45. Signed request from Alex de Joode, operator of dizum: https://trac.torproject.org/projects/tor/ticket/31406 Published descriptor by dizum on August 12th, 2019: -- r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 15:28:40 45.66.33.45 443 80 s Authority Fast Running Stable V2Dir Valid v Tor 0.4.0.5 pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1 w Bandwidth=20 Unmeasured=1 p reject 1-65535 -- Finally, confirmed by DNS: $ dig +short tor.dizum.com 45.66.33.45 Closes #31406 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket31406 | 3 +++ src/or/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket31406 b/changes/ticket31406 new file mode 100644 index 000000000..0ebe6f6c4 --- /dev/null +++ b/changes/ticket31406 @@ -0,0 +1,3 @@ + o Minor features (directory authority): + - A new IP address the directory authority "dizum" has been changed. Closes + ticket 31406; diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index 08a919b05..278f08bfc 100644 --- a/src/or/auth_dirs.inc +++ b/src/or/auth_dirs.inc @@ -7,7 +7,7 @@ "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 " "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", "Serge orport=9001 bridge " "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533", "gabelmoo orport=443 "

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.5
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 5653b93a1d25e173bebb8f45d364e3a578572789 Merge: d253b31ce 5a1c3e44f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 19 10:37:21 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/ticket31406 | 3 +++ src/app/config/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] practracker: Make exceptions.txt happy
by dgoulet＠torproject.org 19 Aug '19

19 Aug '19

commit 81e37b81f1b0329a312a2647cd3601f112d6657b Merge: 9b1aa9a57 d5ccd0fa8 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Aug 19 09:47:52 2019 -0400 practracker: Make exceptions.txt happy Signed-off-by: David Goulet <dgoulet(a)torproject.org> changes/ticket31175 | 3 +++ scripts/maint/practracker/exceptions.txt | 6 ++++++ scripts/maint/practracker/metrics.py | 4 +++- scripts/maint/practracker/practracker.py | 18 ++++++++++++++---- scripts/maint/practracker/problem.py | 11 +++++++++-- scripts/maint/practracker/util.py | 10 +++++++--- 6 files changed, 42 insertions(+), 10 deletions(-) diff --cc scripts/maint/practracker/exceptions.txt index 75a8b5096,fb6b6fd9a..8e4618a72 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@@ -45,9 -45,10 +45,10 @@@ problem function-size /src/app/config/c problem function-size /src/app/config/config.c:parse_port_config() 446 problem function-size /src/app/config/config.c:parse_ports() 168 problem function-size /src/app/config/config.c:getinfo_helper_config() 113 + problem file-size /src/app/config/or_options_st.h 1112 -problem include-count /src/app/main/main.c 67 +problem include-count /src/app/main/main.c 68 problem function-size /src/app/main/main.c:dumpstats() 102 -problem function-size /src/app/main/main.c:tor_init() 133 +problem function-size /src/app/main/main.c:tor_init() 137 problem function-size /src/app/main/main.c:sandbox_init_filter() 291 problem function-size /src/app/main/main.c:run_tor_main_loop() 105 problem function-size /src/app/main/ntmain.c:nt_service_install() 126 @@@ -84,8 -86,9 +86,9 @@@ problem function-size /src/core/or/circ problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 109 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 113 -problem file-size /src/core/or/circuitpadding.c 3006 +problem file-size /src/core/or/circuitpadding.c 3043 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 + problem file-size /src/core/or/circuitpadding.h 809 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 103 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112 problem function-size /src/core/or/circuitstats.c:circuit_build_times_parse_state() 123

1 0

[tor/master] Merge branch 'tor-github/pr/1213'
by dgoulet＠torproject.org 19 Aug '19

19 Aug '19

commit a8e6eab379bdc67ebdec1c3022c11e1e9e90d503 Merge: 81e37b81f 66437710a Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Aug 19 09:49:33 2019 -0400 Merge branch 'tor-github/pr/1213' src/test/test_util.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/master] Teach practracker about .h files
by dgoulet＠torproject.org 19 Aug '19

19 Aug '19

commit 9a1e9b1d6c66e05049a6441e27f8388ad21c16a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 10:31:02 2019 -0400 Teach practracker about .h files I'm using 500 as a file size limit, and 15 as an include limit. This affects comparatively few files, but I think they are the worst ones. Closes ticket 31175. --- changes/ticket31175 | 3 +++ scripts/maint/practracker/metrics.py | 4 +++- scripts/maint/practracker/practracker.py | 18 ++++++++++++++---- scripts/maint/practracker/problem.py | 11 +++++++++-- scripts/maint/practracker/util.py | 10 +++++++--- 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/changes/ticket31175 b/changes/ticket31175 new file mode 100644 index 000000000..cff13761a --- /dev/null +++ b/changes/ticket31175 @@ -0,0 +1,3 @@ + o Minor features (development tools): + - Our best-practices tracker now looks at headers as well as + C files. Closes ticket 31175. diff --git a/scripts/maint/practracker/metrics.py b/scripts/maint/practracker/metrics.py index 82f1cd64e..9f69b2ac1 100644 --- a/scripts/maint/practracker/metrics.py +++ b/scripts/maint/practracker/metrics.py @@ -27,7 +27,9 @@ def get_function_lines(f): # Skip lines that look like they are defining functions with these # names: they aren't real function definitions. - REGEXP_CONFUSE_TERMS = {"MOCK_IMPL", "ENABLE_GCC_WARNINGS", "ENABLE_GCC_WARNING", "DUMMY_TYPECHECK_INSTANCE", + REGEXP_CONFUSE_TERMS = {"MOCK_IMPL", "MOCK_DECL", "HANDLE_DECL", + "ENABLE_GCC_WARNINGS", "ENABLE_GCC_WARNING", + "DUMMY_TYPECHECK_INSTANCE", "DISABLE_GCC_WARNING", "DISABLE_GCC_WARNINGS"} in_function = False diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 7e51edb48..0fdfd4a40 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -35,6 +35,10 @@ MAX_FILE_SIZE = 3000 # lines MAX_FUNCTION_SIZE = 100 # lines # Recommended number of #includes MAX_INCLUDE_COUNT = 50 +# Recommended file size for headers +MAX_H_FILE_SIZE = 500 +# Recommended include count for headers +MAX_H_INCLUDE_COUNT = 15 # Map from problem type to functions that adjust for tolerance TOLERANCE_FNS = { @@ -161,8 +165,12 @@ def main(argv): help="Make all warnings into errors") parser.add_argument("--terse", action="store_true", help="Do not emit helpful instructions.") + parser.add_argument("--max-h-file-size", default=MAX_H_FILE_SIZE, + help="Maximum lines per .H file") + parser.add_argument("--max-h-include-count", default=MAX_H_INCLUDE_COUNT, + help="Maximum includes per .H file") parser.add_argument("--max-file-size", default=MAX_FILE_SIZE, - help="Maximum lines per C file size") + help="Maximum lines per C file") parser.add_argument("--max-include-count", default=MAX_INCLUDE_COUNT, help="Maximum includes per C file") parser.add_argument("--max-function-size", default=MAX_FUNCTION_SIZE, @@ -180,9 +188,11 @@ def main(argv): # 0) Configure our thresholds of "what is a problem actually" filt = problem.ProblemFilter() - filt.addThreshold(problem.FileSizeItem("*", int(args.max_file_size))) - filt.addThreshold(problem.IncludeCountItem("*", int(args.max_include_count))) - filt.addThreshold(problem.FunctionSizeItem("*", int(args.max_function_size))) + filt.addThreshold(problem.FileSizeItem("*.c", int(args.max_file_size))) + filt.addThreshold(problem.IncludeCountItem("*.c", int(args.max_include_count))) + filt.addThreshold(problem.FileSizeItem("*.h", int(args.max_h_file_size))) + filt.addThreshold(problem.IncludeCountItem("*.h", int(args.max_h_include_count))) + filt.addThreshold(problem.FunctionSizeItem("*.c", int(args.max_function_size))) # 1) Get all the .c files we care about files_list = util.get_tor_c_files(TOR_TOPDIR) diff --git a/scripts/maint/practracker/problem.py b/scripts/maint/practracker/problem.py index 73519d446..13c8e5514 100644 --- a/scripts/maint/practracker/problem.py +++ b/scripts/maint/practracker/problem.py @@ -108,10 +108,11 @@ class ProblemFilter(object): self.thresholds = dict() def addThreshold(self, item): - self.thresholds[item.get_type()] = item + self.thresholds[(item.get_type(),item.get_file_type())] = item def matches(self, item): - filt = self.thresholds.get(item.get_type(), None) + key = (item.get_type(), item.get_file_type()) + filt = self.thresholds.get(key, None) if filt is None: return False return item.is_worse_than(filt) @@ -158,6 +159,12 @@ class Item(object): def get_type(self): return self.problem_type + def get_file_type(self): + if self.problem_location.endswith(".h"): + return "*.h" + else: + return "*.c" + class FileSizeItem(Item): """ Denotes a problem with the size of a .c file. diff --git a/scripts/maint/practracker/util.py b/scripts/maint/practracker/util.py index 5a8876a0f..695668f56 100644 --- a/scripts/maint/practracker/util.py +++ b/scripts/maint/practracker/util.py @@ -5,12 +5,14 @@ import os EXCLUDE_SOURCE_DIRS = {"src/test/", "src/trunnel/", "src/rust/", "src/ext/", ".git/"} +EXCLUDE_FILES = {"orconfig.h"} + def _norm(p): return os.path.normcase(os.path.normpath(p)) def get_tor_c_files(tor_topdir): """ - Return a list with the .c filenames we want to get metrics of. + Return a list with the .c and .h filenames we want to get metrics of. """ files_list = [] exclude_dirs = { _norm(os.path.join(tor_topdir, p)) for p in EXCLUDE_SOURCE_DIRS } @@ -23,8 +25,10 @@ def get_tor_c_files(tor_topdir): directories.sort() filenames.sort() for filename in filenames: - # We only care about .c files - if not filename.endswith(".c"): + # We only care about .c and .h files + if not (filename.endswith(".c") or filename.endswith(".h")): + continue + if filename in EXCLUDE_FILES: continue full_path = os.path.join(root,filename)

1 0

[tor/master] test_util: Do not check for ENETUNREACH unless it exists.
by dgoulet＠torproject.org 19 Aug '19

19 Aug '19

commit 66437710afd9e06ef8bed21f18359db08594a313 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 6 11:35:50 2019 -0400 test_util: Do not check for ENETUNREACH unless it exists. Fixes bug 31352; bug not in any released Tor. --- src/test/test_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 41ecbfd38..c56d3488b 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5399,11 +5399,13 @@ test_util_socketpair(void *arg) tt_skip(); } #endif /* defined(__FreeBSD__) */ +#ifdef ENETUNREACH if (ersatz && socketpair_result == -ENETUNREACH) { /* We can also fail with -ENETUNREACH if we have no network stack at * all. */ tt_skip(); } +#endif tt_int_op(0, OP_EQ, socketpair_result); tt_assert(SOCKET_OK(fds[0]));

1 0