From: rl1987 <rl1987@sdf.lonestar.org>
Date: Tue, 2 Oct 2018 12:47:05 +0000 (+0300)
Subject: Refrain from listener rebinding when address families differ
X-Git-Tag: tor-0.3.5.3-alpha~14^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bb00a74bc4ebdb154e0f9289ed4ab362ee5c564;p=thirdparty%2Ftor.git

Refrain from listener rebinding when address families differ
---

diff --git a/changes/bug27928 b/changes/bug27928
new file mode 100644
index 0000000000..a4ea63e8fe
--- /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 9ef0561a55..5ebfac6bee 100644
--- 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) {