nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

conn: MetricsPort listener is a listener port

Browse Source 
The connection type for the listener part was missing from the "is
connection a listener" function.

This lead to our periodic event that retries our listeners to keep
trying to bind() again on an already opened MetricsPort.

Closes #40370

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2021-05-12 15:13:50 -04:00
parent ce8d6d143c
commit 5f009a59da
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket40370 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfix (metrics port):
- Fix a bug that made tor try to re-bind() every 60 seconds on an already
open MetricsPort. Fixes bug 40370; bugfix on 0.4.5.1-alpha.

1
src/core/mainloop/connection.c
View File

@ -4944,6 +4944,7 @@ connection_is_listener(connection_t *conn)
conn->type == CONN_TYPE_AP_NATD_LISTENER || conn->type == CONN_TYPE_AP_NATD_LISTENER ||
conn->type == CONN_TYPE_AP_HTTP_CONNECT_LISTENER || conn->type == CONN_TYPE_AP_HTTP_CONNECT_LISTENER ||
conn->type == CONN_TYPE_DIR_LISTENER || conn->type == CONN_TYPE_DIR_LISTENER ||
conn->type == CONN_TYPE_METRICS_LISTENER ||
conn->type == CONN_TYPE_CONTROL_LISTENER) conn->type == CONN_TYPE_CONTROL_LISTENER)
return 1; return 1;
return 0; return 0;