diff options
author | Christian Pointner <equinox@spreadspace.org> | 2015-05-13 04:47:29 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2015-05-13 04:47:29 +0200 |
commit | 127c6e6e696aa0811835663a439170adc8bd7b8c (patch) | |
tree | a850063b7862297a0ca8e85669e24132edd3763a /src/tcpproxy.c | |
parent | fixed initscript (diff) |
fix exit-code after signal
Diffstat (limited to 'src/tcpproxy.c')
-rw-r--r-- | src/tcpproxy.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/tcpproxy.c b/src/tcpproxy.c index baa5214..a22744a 100644 --- a/src/tcpproxy.c +++ b/src/tcpproxy.c @@ -30,6 +30,9 @@ #include <errno.h> #include <string.h> #include <sys/select.h> +#include <sys/types.h> +#include <unistd.h> +#include <signal.h> #include "datatypes.h" #include "options.h" @@ -73,8 +76,8 @@ int main_loop(options_t* opt, listeners_t* listeners) if(FD_ISSET(sig_fd, &readfds)) { return_value = signal_handle(); - if(return_value == 1) break; - if(return_value == 2) { + if(return_value == SIGINT || return_value == SIGQUIT || return_value == SIGTERM) break; + if(return_value == SIGHUP) { if(opt->config_file_) { log_printf(NOTICE, "re-reading config file: %s", opt->config_file_); read_configfile(opt->config_file_, listeners); @@ -82,9 +85,9 @@ int main_loop(options_t* opt, listeners_t* listeners) log_printf(NOTICE, "ignoring SIGHUP: no config file specified"); return_value = 0; - } else if(return_value == 3) { + } else if(return_value == SIGUSR1) { listeners_print(listeners); - } else if(return_value == 4) { + } else if(return_value == SIGUSR2) { clients_print(&clients); } } @@ -233,8 +236,10 @@ int main(int argc, char* argv[]) log_printf(NOTICE, "normal shutdown"); else if(ret < 0) log_printf(NOTICE, "shutdown after error"); - else + else { log_printf(NOTICE, "shutdown after signal"); + kill(getpid(), ret); + } log_close(); |