X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=cd1b96e69a75e83c6fde274acb04038d26e2d3c5;hp=35793a27e66cce6a613799d868bc5a584b2f27ed;hb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36;hpb=125c4978812cffa5154ce5378a276f43f78417d8 diff --git a/src/process.c b/src/process.c index 35793a27..cd1b96e6 100644 --- a/src/process.c +++ b/src/process.c @@ -1,7 +1,7 @@ /* process.c -- process management functions - Copyright (C) 1999-2001 Ivo Timmermans , - 2000,2001 Guus Sliepen + Copyright (C) 1999-2002 Ivo Timmermans , + 2000-2002 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: process.c,v 1.1.2.21 2001/03/01 21:32:04 guus Exp $ + $Id: process.c,v 1.1.2.33 2002/02/10 21:57:54 guus Exp $ */ #include "config.h" @@ -42,7 +42,9 @@ #include "conf.h" #include "process.h" #include "subnet.h" +#include "device.h" #include "connection.h" +#include "device.h" #include "system.h" @@ -55,6 +57,12 @@ extern char **g_argv; sigset_t emptysigset; +static int saved_debug_lvl = 0; + +extern int sighup; +extern int sigalrm; +extern int do_purge; + void memory_full(int size) { syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size); @@ -85,8 +93,7 @@ cp close_network_connections(); if(debug_lvl > DEBUG_NOTHING) - syslog(LOG_INFO, _("Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"), - total_tap_out, total_socket_out, total_tap_in, total_socket_in); + dump_device_stats(); syslog(LOG_NOTICE, _("Terminating")); @@ -121,7 +128,7 @@ cp /* kill older tincd for this net */ -int kill_other(void) +int kill_other(int signal) { int pid; cp @@ -136,7 +143,7 @@ cp errno = 0; /* No error, sometimes errno is only changed on error */ /* ESRCH is returned when no process with that pid is found */ - if(kill(pid, SIGTERM) && errno == ESRCH) + if(kill(pid, signal) && errno == ESRCH) fprintf(stderr, _("Removing stale lock file.\n")); remove_pid(pidfilename); cp @@ -164,7 +171,7 @@ cp { if(daemon(0, 0) < 0) { - fprintf(stderr, _("Couldn't detach from terminal: %m")); + fprintf(stderr, _("Couldn't detach from terminal: %s"), strerror(errno)); return -1; } @@ -197,17 +204,29 @@ void _execute_script(const char *name) char *scriptname; char *s; cp +#ifdef HAVE_UNSETENV + unsetenv("NETNAME"); + unsetenv("DEVICE"); + unsetenv("INTERFACE"); +#endif + if(netname) { asprintf(&s, "NETNAME=%s", netname); putenv(s); /* Don't free s! see man 3 putenv */ } -#ifdef HAVE_UNSETENV - else + + if(device) { - unsetenv("NETNAME"); + asprintf(&s, "DEVICE=%s", device); + putenv(s); /* Don't free s! see man 3 putenv */ + } + + if(interface) + { + asprintf(&s, "INTERFACE=%s", interface); + putenv(s); /* Don't free s! see man 3 putenv */ } -#endif chdir("/"); @@ -327,6 +346,7 @@ sigsegv_handler(int a, siginfo_t *info, void *b) act.sa_mask = emptysigset; act.sa_flags = SA_SIGINFO; act.sa_sigaction = sigsegv_square; + sigaction(SIGSEGV, &act, NULL); close_network_connections(); sleep(5); @@ -336,7 +356,7 @@ sigsegv_handler(int a, siginfo_t *info, void *b) else { syslog(LOG_NOTICE, _("Not restarting.")); - exit(0); + exit(1); } } @@ -350,22 +370,51 @@ sighup_handler(int a, siginfo_t *info, void *b) RETSIGTYPE sigint_handler(int a, siginfo_t *info, void *b) +{ + if(saved_debug_lvl) + { + syslog(LOG_NOTICE, _("Reverting to old debug level (%d)"), + saved_debug_lvl); + debug_lvl = saved_debug_lvl; + saved_debug_lvl = 0; + } + else + { + syslog(LOG_NOTICE, _("Temporarily setting debug level to 5. Kill me with SIGINT again to go back to level %d."), + debug_lvl); + saved_debug_lvl = debug_lvl; + debug_lvl = 5; + } +} + +RETSIGTYPE +sigalrm_handler(int a, siginfo_t *info, void *b) { if(debug_lvl > DEBUG_NOTHING) - syslog(LOG_NOTICE, _("Got INT signal, exiting")); - cleanup_and_exit(0); + syslog(LOG_NOTICE, _("Got ALRM signal")); + sigalrm = 1; } RETSIGTYPE sigusr1_handler(int a, siginfo_t *info, void *b) { - dump_connection_list(); + dump_connections(); } RETSIGTYPE sigusr2_handler(int a, siginfo_t *info, void *b) { - dump_subnet_list(); + dump_device_stats(); + dump_nodes(); + dump_edges(); + dump_subnets(); +} + +RETSIGTYPE +sigwinch_handler(int a, siginfo_t *info, void *b) +{ + extern int do_purge; + do_purge = 1; } RETSIGTYPE @@ -375,6 +424,16 @@ unexpected_signal_handler(int a, siginfo_t *info, void *b) cp_trace(); } +RETSIGTYPE +ignore_signal_handler(int a, siginfo_t *info, void *b) +{ + if(debug_lvl >= DEBUG_SCARY_THINGS) + { + syslog(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a)); + cp_trace(); + } +} + struct { int signal; void (*handler)(int, siginfo_t *, void *); @@ -383,11 +442,13 @@ struct { { SIGTERM, sigterm_handler }, { SIGQUIT, sigquit_handler }, { SIGSEGV, sigsegv_handler }, - { SIGPIPE, NULL }, + { SIGPIPE, ignore_signal_handler }, { SIGINT, sigint_handler }, { SIGUSR1, sigusr1_handler }, { SIGUSR2, sigusr2_handler }, - { SIGCHLD, NULL }, + { SIGCHLD, ignore_signal_handler }, + { SIGALRM, sigalrm_handler }, + { SIGWINCH, sigwinch_handler }, { 0, NULL } }; @@ -406,17 +467,24 @@ setup_signals(void) ignored. */ for(i = 0; i < NSIG; i++) { - act.sa_sigaction = unexpected_signal_handler; - sigaction(sighandlers[i].signal, &act, NULL); + if(!do_detach) + act.sa_sigaction = (void(*)(int, siginfo_t *, void *))SIG_DFL; + else + act.sa_sigaction = unexpected_signal_handler; + sigaction(i, &act, NULL); } + /* If we didn't detach, allow coredumps */ + if(!do_detach) + sighandlers[3].handler = (void(*)(int, siginfo_t *, void *))SIG_DFL; + /* Then, for each known signal that we want to catch, assign a handler to the signal, with error checking this time. */ for(i = 0; sighandlers[i].signal; i++) { act.sa_sigaction = sighandlers[i].handler; if(sigaction(sighandlers[i].signal, &act, NULL) < 0) - fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %m\n"), - sighandlers[i].signal, strsignal(sighandlers[i].signal)); + fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"), + sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno)); } }