From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 6 Jan 2020 14:02:49 +0000 (-0500)
Subject: Use tor_api.h entry points in ntmain.c.
X-Git-Tag: tor-0.4.3.1-alpha~32^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dca2629480f143ed8deb71b73b15c7c5ff890571;p=thirdparty%2Ftor.git

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
sync.

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
commit.

Closes ticket 32883.
---

diff --git a/changes/bug32883 b/changes/bug32883
new file mode 100644
index 0000000000..6a15e0221b
--- /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.