GUACAMOLE-1841: Ensure that children get killed even under windows.

apache · Oct 17, 2023 · d2a7c72 · d2a7c72
1 parent b845e18
commit d2a7c72
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/guacd/proc.c b/src/guacd/proc.c
@@ -49,6 +49,7 @@
 #include <io.h>
 #include <handleapi.h>
 #include <sys/cygwin.h>
+#include <stdio.h>
 #endif
 
 /**
@@ -363,6 +364,13 @@ guacd_proc* guacd_proc_self = NULL;
  */
 static void signal_stop_handler(int signal) {
 
+#ifdef CYGWIN_BUILD
+        /* Convert to a windows PID for logging */
+        pid_t windows_pid = cygwin_internal(CW_CYGWIN_PID_TO_WINPID, guacd_proc_self->pid);
+        fprintf(stderr, "I caught signal %i and am accordingly killing self with cyg %i, win %i\n",
+                guacd_proc_self->pid, windows_pid);
+#endif
+
     /* Stop the current guacd proc */
     guacd_proc_stop(guacd_proc_self);
 
@@ -579,6 +587,14 @@ guacd_proc* guacd_create_proc(const char* protocol) {
  */
 static void guacd_proc_kill(guacd_proc* proc) {
 
+
+#ifdef CYGWIN_BUILD
+    pid_t windows_pid = cygwin_internal(CW_CYGWIN_PID_TO_WINPID, proc->pid);
+
+    guacd_log(GUAC_LOG_DEBUG, "Trying to kill child - cyg: %i, win: %i", proc->pid, windows_pid);
+#endif
+
+
     /* Request orderly termination of process */
     if (kill(proc->pid, SIGTERM))
         guacd_log(GUAC_LOG_DEBUG, "Unable to request termination of "