mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

signal improvements to sessvc

This commit is contained in:
jsorg71 2009-05-29 02:05:22 +00:00
parent 48e06d5267
commit 2f27bcef10
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sesman/sessvc/sessvc.c
View File

@ -32,6 +32,23 @@
#include "os_calls.h" #include "os_calls.h"
#include "arch.h" #include "arch.h"
static int g_term = 0;
/*****************************************************************************/
void DEFAULT_CC
term_signal_handler(int sig)
{
g_writeln("xrdp-sessvc: term_signal_handler: got signal %d", sig);
g_term = 1;
}
/*****************************************************************************/
void DEFAULT_CC
nil_signal_handler(int sig)
{
g_writeln("xrdp-sessvc: nil_signal_handler: got signal %d", sig);
}
/******************************************************************************/ /******************************************************************************/
int DEFAULT_CC int DEFAULT_CC
main(int argc, char** argv) main(int argc, char** argv)
@ -40,6 +57,7 @@ main(int argc, char** argv)
int chansrv_pid; int chansrv_pid;
int wm_pid; int wm_pid;
int x_pid; int x_pid;
int lerror;
char exe_path[262]; char exe_path[262];
if (argc < 3) if (argc < 3)
@ -47,6 +65,10 @@ main(int argc, char** argv)
g_writeln("xrdp-sessvc: exiting, not enough params"); g_writeln("xrdp-sessvc: exiting, not enough params");
return 1; return 1;
} }
g_signal_kill(term_signal_handler); /* SIGKILL */
g_signal_terminate(term_signal_handler); /* SIGTERM */
g_signal_user_interrupt(term_signal_handler); /* SIGINT */
g_signal_pipe(nil_signal_handler); /* SIGPIPE */
x_pid = g_atoi(argv[1]); x_pid = g_atoi(argv[1]);
wm_pid = g_atoi(argv[2]); wm_pid = g_atoi(argv[2]);
g_writeln("xrdp-sessvc: waiting for X (pid %d) and WM (pid %d)", g_writeln("xrdp-sessvc: waiting for X (pid %d) and WM (pid %d)",
@ -60,18 +82,29 @@ main(int argc, char** argv)
} }
else if (chansrv_pid == 0) /* child */ else if (chansrv_pid == 0) /* child */
{ {
g_set_current_dir(XRDP_SBIN_PATH);
g_snprintf(exe_path, 261, "%s/xrdp-chansrv", XRDP_SBIN_PATH); g_snprintf(exe_path, 261, "%s/xrdp-chansrv", XRDP_SBIN_PATH);
g_execvp(exe_path, 0); g_execvp(exe_path, 0);
/* should not get here */ /* should not get here */
g_writeln("xrdp-sessvc: g_execvp failed");
return 1; return 1;
} }
lerror = 0;
/* wait for window manager to get done */ /* wait for window manager to get done */
ret = g_waitpid(wm_pid); ret = g_waitpid(wm_pid);
while ((ret == 0) && !g_term)
{
ret = g_waitpid(wm_pid);
}
if (ret < 0)
{
lerror = g_get_errno();
}
/* kill X server */ /* kill X server */
g_sigterm(x_pid); g_sigterm(x_pid);
/* kill channel server */ /* kill channel server */
g_sigterm(chansrv_pid); g_sigterm(chansrv_pid);
g_writeln("xrdp-sessvc: WM is dead (waitpid said %d, errno is %d) " g_writeln("xrdp-sessvc: WM is dead (waitpid said %d, errno is %d) "
"exiting...", ret, g_get_errno()); "exiting...", ret, lerror);
return 0; return 0;
} }