ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-12 07:25:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename killchild to kill_proxy_sighandler

Browse Source
This commit is contained in:
Matt Johnston 2015-12-15 22:15:44 +08:00
parent 79b43270a7
commit 99bc4f451a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cli-main.c
View File

@ -37,7 +37,7 @@ static void cli_dropbear_log(int priority, const char* format, va_list param);
#ifdef ENABLE_CLI_PROXYCMD #ifdef ENABLE_CLI_PROXYCMD
static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out); static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out);
static void killchild(int signo); static void kill_proxy_sighandler(int signo);
#endif #endif
#if defined(DBMULTI_dbclient) || !defined(DROPBEAR_MULTI) #if defined(DBMULTI_dbclient) || !defined(DROPBEAR_MULTI)
@ -78,9 +78,9 @@ int main(int argc, char ** argv) {
if (cli_opts.proxycmd) { if (cli_opts.proxycmd) {
cli_proxy_cmd(&sock_in, &sock_out, &proxy_cmd_pid); cli_proxy_cmd(&sock_in, &sock_out, &proxy_cmd_pid);
m_free(cli_opts.proxycmd); m_free(cli_opts.proxycmd);
if (signal(SIGINT, killchild) == SIG_ERR || if (signal(SIGINT, kill_proxy_sighandler) == SIG_ERR ||
signal(SIGTERM, killchild) == SIG_ERR || signal(SIGTERM, kill_proxy_sighandler) == SIG_ERR ||
signal(SIGHUP, killchild) == SIG_ERR) { signal(SIGHUP, kill_proxy_sighandler) == SIG_ERR) {
dropbear_exit("signal() error"); dropbear_exit("signal() error");
} }
} else } else
@ -164,11 +164,8 @@ static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) {
} }
} }
static void killchild(int signo) { static void kill_proxy_sighandler(int UNUSED(signo)) {
kill_proxy_command(); kill_proxy_command();
if (signo) {
_exit(1); _exit(1);
}
exit(1);
} }
#endif /* ENABLE_CLI_PROXYCMD */ #endif /* ENABLE_CLI_PROXYCMD */