[tor-commits] [tor/master] Use tor_api.h entry points in ntmain.c.

nickm at torproject.org nickm at torproject.org
Tue Jan 14 17:44:56 UTC 2020

commit dca2629480f143ed8deb71b73b15c7c5ff890571
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 6 09:02:49 2020 -0500

    Use tor_api.h entry points in ntmain.c.
    When we updated main.c to use the same entry points as tor_api.h, we
    didn't update ntmain.c.  This led to bugs as the two got out of
    There are two calls that we drop in this patch: first, I drop the
    call to set_main_thread(), since that's redundant with the init
    function in compat_winthreads.c (but see #32884).  Second, I drop
    the check for CMD_RUN_TOR: I'll add that back with a subsequent
    Closes ticket 32883.
 changes/bug32883 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/changes/bug32883 b/changes/bug32883
new file mode 100644
index 000000000..6a15e0221
--- /dev/null
+++ b/changes/bug32883
@@ -0,0 +1,5 @@
+  o Code simplification and refactoring (windows services):
+    - The windows service logic now uses the tor_api.h entry points, to
+      avoid needless code duplication, and to prevent bugs related to
+      the different entry points getting out of sync.  Closes ticket
+      32883.

More information about the tor-commits mailing list