[tor-commits] [tor/master] Argh. The unset value for OwningControllerFD is NOT -1.

nickm at torproject.org nickm at torproject.org
Tue Oct 16 21:57:10 UTC 2018


commit e97adaf8dc13a4f500fab3d70c9c31400a01954f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 16 17:57:00 2018 -0400

    Argh. The unset value for OwningControllerFD is NOT -1.
---
 src/core/mainloop/mainloop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 0f3fbbcce..a24b34375 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -1503,7 +1503,7 @@ get_my_roles(const or_options_t *options)
    * requires tor to have basic functionnalities. */
   int is_client = options_any_client_port_set(options) ||
                   options->ControlPort_set ||
-                  options->OwningControllerFD >= 0;
+                  options->OwningControllerFD != UINT64_MAX;
 
   if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE;
   if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT;



More information about the tor-commits mailing list