[tor-commits] [tor/master] Always include socket rebinding code

nickm at torproject.org nickm at torproject.org
Wed Sep 12 13:06:41 UTC 2018


commit d8157097b42b6377d0cd83c758efce5825df83f2
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Tue Jul 17 13:04:06 2018 +0000

    Always include socket rebinding code
---
 src/core/mainloop/connection.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index aeaff3784..47a93e43a 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -146,10 +146,11 @@
  * EADDRINUSE.
  * 2) If so, it will close the appropriate old listener connection and
  * 3) Attempts bind()'ing the new listener socket again.
+ *
+ * Just to be safe, we are enabling listener rebind code on all platforms,
+ * to account for unexpected cases where it may be needed.
  */
-#if defined(__linux__) || defined(_WIN32)
 #define ENABLE_LISTENER_REBIND
-#endif
 
 static connection_t *connection_listener_new(
                                const struct sockaddr *listensockaddr,





More information about the tor-commits mailing list