tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-23 14:04:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

update signal code

Browse Source
This commit is contained in:
manojampalam 2016-03-28 22:45:49 -07:00
parent 56ad915376
commit e3b1997252
4 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
contrib/win32/win32compat/signal.c
View File

@ -101,6 +101,8 @@ extern struct _children children;
sighandler_t
sw_signal(int signum, sighandler_t handler) {
sighandler_t prev;
debug2("signal() sig:%d, handler:%p", signum, handler);
if (signum >= W32_SIGMAX) {
errno = EINVAL;
return W32_SIG_ERR;
@ -115,6 +117,7 @@ int
sw_sigprocmask(int how, const sigset_t *set, sigset_t *oldset) {
/* this is only used by sshd to block SIGCHLD while doing waitpid() */
/* our implementation of waidpid() is never interrupted, so no need to implement this for now*/
debug3("sigprocmask() how:%d");
return 0;
}
@ -122,6 +125,7 @@ sw_sigprocmask(int how, const sigset_t *set, sigset_t *oldset) {
int
sw_raise(int sig) {
debug("raise sig:%d", sig);
if (sig == W32_SIGSEGV)
return raise(SIGSEGV); /* raise native exception handler*/
@ -145,11 +149,8 @@ sw_raise(int sig) {
case W32_SIGCHLD:
sw_cleanup_child_zombies();
break;
case W32_SIGINT:
/* TODO - execute sigint default handler */
break;
default:
break;
ExitThread(1);
}
return 0;
@ -173,6 +174,7 @@ sw_process_pending_signals() {
sigset_t pending_tmp = pending_signals;
BOOL sig_int = FALSE; /* has any signal actually interrupted */
debug3("process_signals()");
int i, exp[] = { W32_SIGCHLD , W32_SIGINT , W32_SIGALRM };
/* check for expected signals*/
@ -180,6 +182,7 @@ sw_process_pending_signals() {
sigdelset(&pending_tmp, exp[i]);
if (pending_tmp) {
/* unexpected signals queued up */
debug("process_signals() - ERROR unexpected signals in queue: %d", pending_tmp);
errno = ENOTSUP;
DebugBreak();
return -1;
@ -192,12 +195,10 @@ sw_process_pending_signals() {
if (sigismember(&pending_tmp, exp[i])) {
if (sig_handlers[exp[i]] != W32_SIG_IGN) {
sw_raise(exp[i]);
sig_int = TRUE;
}
else { /* W32_SIG_IGN */
/* for SIGCHLD process zombies */
if (exp[i] == W32_SIGCHLD)
sw_cleanup_child_zombies();
/* dont error EINTR for SIG_ALRM, */
/* sftp client is not expecting it */
if (exp[i] != W32_SIGALRM)
sig_int = TRUE;
}
sigdelset(&pending_tmp, exp[i]);
@ -210,11 +211,9 @@ sw_process_pending_signals() {
DebugBreak();
if (sig_int) {
/* processed a signal that was set not to be ignored */
debug("process_queued_signals: WARNING - A signal has interrupted and was processed");
/* there are parts of code that do not tolerate EINT during IO, so returning 0 here*/
//errno = EINTR;
//return -1;
errno = EINTR;
return -1;
}
return 0;
@ -241,6 +240,7 @@ wait_for_any_event(HANDLE* events, int num_events, DWORD milli_seconds)
num_all_events = num_events + live_children;
if (num_all_events > MAXIMUM_WAIT_OBJECTS) {
debug("wait() - ERROR max events reached");
errno = ENOTSUP;
return -1;
}
@ -252,6 +252,7 @@ wait_for_any_event(HANDLE* events, int num_events, DWORD milli_seconds)
memcpy(all_events, children.handles, live_children * sizeof(HANDLE));
memcpy(all_events + live_children, events, num_events * sizeof(HANDLE));
debug3("wait() on %d events and %d childres", num_events, live_children);
/* TODO - implement signal catching and handling */
if (num_all_events) {
DWORD ret = WaitForMultipleObjectsEx(num_all_events, all_events, FALSE,
@ -259,8 +260,10 @@ wait_for_any_event(HANDLE* events, int num_events, DWORD milli_seconds)
if ((ret >= WAIT_OBJECT_0) && (ret <= WAIT_OBJECT_0 + num_all_events - 1)) {
//woken up by event signalled
/* is this due to a child process going down*/
if (children.num_children && ((ret - WAIT_OBJECT_0) < children.num_children))
if (children.num_children && ((ret - WAIT_OBJECT_0) < children.num_children)) {
sigaddset(&pending_signals, W32_SIGCHLD);
sw_child_to_zombie(ret - WAIT_OBJECT_0);
}
}
else if (ret == WAIT_IO_COMPLETION) {
/* APC processed due to IO or signal*/

1
contrib/win32/win32compat/signal_internal.h
View File

@ -23,7 +23,6 @@ struct _children {
int sw_add_child(HANDLE child, DWORD pid);
int sw_remove_child_at_index(DWORD index);
int sw_child_to_zombie(DWORD index);
int sw_remove_child(HANDLE child);
void sw_cleanup_child_zombies();
struct _timer_info {

1
contrib/win32/win32compat/signal_sigalrm.c
View File

@ -48,6 +48,7 @@ sw_alarm(unsigned int sec) {
ULONGLONG sec_passed;
int ret = 0;
debug3("alarm() %d secs", sec);
errno = 0;
/* cancel any live timer if seconds is 0*/
if (sec == 0) {

17
contrib/win32/win32compat/signal_sigchld.c
View File

@ -127,26 +127,11 @@ sw_child_to_zombie(DWORD index) {
return 0;
}
int
sw_remove_child(HANDLE child) {
HANDLE* handles = children.handles;
DWORD num_children = children.num_children;
while (num_children) {
if (*handles == child)
return sw_remove_child_at_index(children.num_children - num_children);
handles++;
num_children--;
}
errno = EINVAL;
return -1;
}
int waitpid(int pid, int *status, int options) {
DWORD index, ret, ret_id, exit_code, timeout = 0;
HANDLE process = NULL;
debug3("waitpid - pid:%d, options:%d", pid, options);
if (options & (~WNOHANG)) {
errno = ENOTSUP;
DebugBreak();