[tor-commits] [tor/master] conn: MetricsPort listener is a listener port

[nickm at torproject.org]

commit 5f009a59dab69f4e46572e2ef4fd40b1bb053d67
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed May 12 15:13:50 2021 -0400

    conn: MetricsPort listener is a listener port
    
    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 at torproject.org>
---
 changes/ticket40370            | 4 ++++
 src/core/mainloop/connection.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/ticket40370 b/changes/ticket40370
new file mode 100644
index 0000000000..fcdb0eb173
--- /dev/null
+++ b/changes/ticket40370
@@ -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.
+
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index ada542629a..c827af7a9a 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -4944,6 +4944,7 @@ connection_is_listener(connection_t *conn)
       conn->type == CONN_TYPE_AP_NATD_LISTENER ||
       conn->type == CONN_TYPE_AP_HTTP_CONNECT_LISTENER ||
       conn->type == CONN_TYPE_DIR_LISTENER ||
+      conn->type == CONN_TYPE_METRICS_LISTENER ||
       conn->type == CONN_TYPE_CONTROL_LISTENER)
     return 1;
   return 0;