Refrain from listener rebinding when address families differ

diff --git a/changes/bug27928 b/changes/bug27928
new file mode 100644 (file)
index 0000000..a4ea63e
--- /dev/null
+++ b/changes/bug27928
@@ -0,0 +1,4 @@
+  o Minor bugfixes (networking):
+    - Refrain from attempting socket rebinding when old
+      and new listeners are in different address families.
+      Fixes bug 27928; bugfix on 0.3.5.1-alpha.

diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index 9ef0561a554febaaeb4b9201c6e3eabfaeb988e1..5ebfac6bee48da41da57bdf58f1df9f8f5da6f14 100644 (file)
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -2798,6 +2798,7 @@ retry_listener_ports(smartlist_t *old_conns,
         }
 #ifdef ENABLE_LISTENER_REBIND
         const int may_need_rebind =
+          tor_addr_family(&wanted->addr) == tor_addr_family(&conn->addr) &&
           port_matches_exact && bool_neq(tor_addr_is_null(&wanted->addr),
                                          tor_addr_is_null(&conn->addr));
         if (replacements && may_need_rebind) {