diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-02-05 17:17:04 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-02-05 17:17:04 +0000 |
| commit | 817cf018312f5788c92bbf49fe07b3a0698f11e7 (patch) | |
| tree | 6ff1f0828f265d87b48190fb9b193a44aa44e12a | |
| parent | 4b332ce62a2f661036febca494f2c1f6a03d52b2 (diff) | |
| parent | 62b98716ff4823cff6f8e70c262766d1f25f252f (diff) | |
| download | tor-817cf018312f5788c92bbf49fe07b3a0698f11e7.tar.gz tor-817cf018312f5788c92bbf49fe07b3a0698f11e7.zip | |
Merge branch 'maint-0.4.4' into release-0.4.4
| -rw-r--r-- | scripts/maint/practracker/exceptions.txt | 1 | ||||
| -rw-r--r-- | src/test/test_switch_id.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 35e860d8b1..a84a434cd6 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -130,6 +130,7 @@ problem function-size /src/core/or/command.c:command_process_create_cell() 156 problem function-size /src/core/or/command.c:command_process_relay_cell() 132 problem dependency-violation /src/core/or/command.c 9 problem file-size /src/core/or/connection_edge.c 4655 +problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 130 problem include-count /src/core/or/connection_edge.c 65 problem function-size /src/core/or/connection_edge.c:connection_ap_expire_beginning() 117 problem function-size /src/core/or/connection_edge.c:connection_ap_handshake_rewrite() 193 diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index a911269c99..f97af55d17 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -31,6 +31,8 @@ static const struct { { NULL, 0 } }; +#if !defined(_WIN32) + /* Returns the first port that we think we can bind to without special * permissions. Usually this function returns 1024. */ static uint16_t @@ -67,8 +69,6 @@ unprivileged_port_range_start(void) return result; } -#if !defined(_WIN32) - #define PORT_TEST_RANGE_START 600 #define PORT_TEST_RANGE_END 1024 |