Merge remote-tracking branch 'tor-github/pr/1671'

6 files changed, 50 insertions, 36 deletions

diff --git a/changes/bug32778 b/changes/bug32778
new file mode 100644
index 0000000000..ccb6104692
--- /dev/null
+++ b/changes/bug32778
@@ -0,0 +1,3 @@
+  o Minor bugfixes (windows service):
+    - Initialize publish/subscribe system when running as a windows service.
+      Fixes bug 32778; bugfix on 0.4.1.1-alpha.
diff --git a/changes/bug32883 b/changes/bug32883
deleted file mode 100644
index 6a15e0221b..0000000000
--- a/changes/bug32883
+++ /dev/null
@@ -1,5 +0,0 @@
-  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.
diff --git a/src/app/main/main.c b/src/app/main/main.c
index b533406eaa..689bc526ab 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1191,7 +1191,7 @@ run_tor_main_loop(void)
 }
 
 /** Install the publish/subscribe relationships for all the subsystems. */
-static void
+void
 pubsub_install(void)
 {
     pubsub_builder_t *builder = pubsub_builder_new();
@@ -1203,7 +1203,7 @@ pubsub_install(void)
 
 /** Connect the mainloop to its publish/subscribe message delivery events if
  * appropriate, and configure the global channels appropriately. */
-static void
+void
 pubsub_connect(void)
 {
   if (get_options()->command == CMD_RUN_TOR) {
@@ -1274,13 +1274,6 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
 #endif
   }
 
-  if (tor_cfg->run_tor_only && get_options()->command != CMD_RUN_TOR) {
-    log_err(LD_CONFIG, "Unsupported command when running as an NT service.");
-    result = -1;
-    tor_cleanup();
-    goto done;
-  }
-
   switch (get_options()->command) {
   case CMD_RUN_TOR:
     nt_service_set_state(SERVICE_RUNNING);
diff --git a/src/app/main/main.h b/src/app/main/main.h
index 209d419f0a..e6ed978c61 100644
--- a/src/app/main/main.h
+++ b/src/app/main/main.h
@@ -25,4 +25,7 @@ int tor_init(int argc, char **argv);
 
 int run_tor_main_loop(void);
 
+void pubsub_install(void);
+void pubsub_connect(void);
+
 #endif /* !defined(TOR_MAIN_H) */
diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c
index 96da1690f2..4941199759 100644
--- a/src/app/main/ntmain.c
+++ b/src/app/main/ntmain.c
@@ -29,8 +29,6 @@
 #include "lib/evloop/compat_libevent.h"
 #include "lib/fs/winlib.h"
 #include "lib/log/win32err.h"
-#include "feature/api/tor_api.h"
-#include "feature/api/tor_api_internal.h"
 
 #include <windows.h>
 #define GENSRV_SERVICENAME  "tor"
@@ -265,6 +263,7 @@ nt_service_control(DWORD request)
 static void
 nt_service_body(int argc, char **argv)
 {
+  int r;
   (void) argc; /* unused */
   (void) argv; /* unused */
   nt_service_loadlibrary();
@@ -284,20 +283,28 @@ nt_service_body(int argc, char **argv)
     return;
   }
 
-  tor_main_configuration_t *cfg = tor_main_configuration_new();
-  cfg->run_tor_only = 1;
-  if (tor_main_configuration_set_command_line(cfg, backup_argc,
-                                              backup_argv) < 0)
+  pubsub_install();
+  r = tor_init(backup_argc, backup_argv);
+
+  if (r) {
+    /* Failed to start the Tor service */
+    r = NT_SERVICE_ERROR_TORINIT_FAILED;
+    service_status.dwCurrentState = SERVICE_STOPPED;
+    service_status.dwWin32ExitCode = r;
+    service_status.dwServiceSpecificExitCode = r;
+    service_fns.SetServiceStatus_fn(hStatus, &service_status);
     return;
+  }
+
+  pubsub_connect();
 
   /* Set the service's status to SERVICE_RUNNING and start the main
    * event loop */
   service_status.dwCurrentState = SERVICE_RUNNING;
   service_fns.SetServiceStatus_fn(hStatus, &service_status);
-
-  tor_run_main(cfg);
-
-  tor_main_configuration_free(cfg);
+  set_main_thread();
+  run_tor_main_loop();
+  tor_cleanup();
 }
 
 /** Main service entry point. Starts the service control dispatcher and waits
@@ -319,15 +326,33 @@ nt_service_main(void)
     errmsg = format_win32_error(result);
     printf("Service error %d : %s\n", (int) result, errmsg);
     tor_free(errmsg);
+
+    pubsub_install();
     if (result == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) {
-      tor_main_configuration_t *cfg = tor_main_configuration_new();
-      cfg->run_tor_only = 1;
-      if (tor_main_configuration_set_command_line(cfg, backup_argc,
-                                                  backup_argv) < 0)
+      if (tor_init(backup_argc, backup_argv))
         return;
-
-      tor_run_main(cfg);
-      tor_main_configuration_free(cfg);
+      pubsub_connect();
+      switch (get_options()->command) {
+      case CMD_RUN_TOR:
+        run_tor_main_loop();
+        break;
+      case CMD_LIST_FINGERPRINT:
+      case CMD_HASH_PASSWORD:
+      case CMD_VERIFY_CONFIG:
+      case CMD_DUMP_CONFIG:
+      case CMD_KEYGEN:
+      case CMD_KEY_EXPIRATION:
+        log_err(LD_CONFIG, "Unsupported command (--list-fingerprint, "
+               "--hash-password, --keygen, --dump-config, --verify-config, "
+               "or --key-expiration) in NT service.");
+        break;
+      case CMD_RUN_UNITTESTS:
+      case CMD_IMMEDIATE:
+      default:
+        log_err(LD_CONFIG, "Illegal command number %d: internal error.",
+                get_options()->command);
+      }
+      tor_cleanup();
     }
   }
 }
diff --git a/src/feature/api/tor_api_internal.h b/src/feature/api/tor_api_internal.h
index ef06cd7e6f..d52b2caf44 100644
--- a/src/feature/api/tor_api_internal.h
+++ b/src/feature/api/tor_api_internal.h
@@ -29,11 +29,6 @@ struct tor_main_configuration_t {
 
   /** Socket that Tor will use as an owning control socket. Owned. */
   tor_socket_t owning_controller_socket;
-
-  /** Disable commands other than "run tor". Not for use from outside Tor
-   * itself; if you need to use this for embedding, please contact the tor
-   * developers.  */
-  int run_tor_only;
 };
 
 #endif /* !defined(TOR_API_INTERNAL_H) */