tor

commit 43f4324e29855bced51cb9c8f126bfb35e93fb2c
parent 3121e5c103473255002761ac9aed6874b10aa78d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 21 May 2020 10:08:48 -0400

Merge remote-tracking branch 'tor-github/pr/1899/head'

Diffstat:
A
changes/ticket34211
 | 
3
+++
M
src/app/main/main.c
 | 
20
++++++++++++++++++++

2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/changes/ticket34211 b/changes/ticket34211
@@ -0,0 +1,3 @@
+  o Minor features (windows):
+    - Add support for console control signals like Ctrl+C in Windows
+      Closes ticket 34211. Patch from Damon Harris (TheDcoder).
diff --git a/src/app/main/main.c b/src/app/main/main.c
@@ -294,6 +294,19 @@ process_signal(int sig)
   }
 }
 
+#ifdef _WIN32
+/** Activate SIGINT on reciving a control signal in console */
+static BOOL WINAPI
+process_win32_console_ctrl(DWORD ctrl_type)
+{
+  /* Ignore type of the ctrl signal */
+  (void) ctrl_type;
+
+  activate_signal(SIGINT);
+  return TRUE;
+}
+#endif
+
 /**
  * Write current memory usage information to the log.
  */
@@ -496,6 +509,13 @@ handle_signals(void)
                       &signal_handlers[i].signal_value);
     }
   }
+
+#ifdef _WIN32
+    /* Windows lacks traditional POSIX signals but WinAPI provides a function
+     * to handle control signals like Ctrl+C in the console, we can use this to
+     * simulate the SIGINT signal */
+    if (enabled) SetConsoleCtrlHandler(process_win32_console_ctrl, TRUE);
+#endif
 }
 
 /* Cause the signal handler for signal_num to be called in the event loop. */