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.2 2000/11/16 22:12:23 zarq Exp $
+ $Id: process.c,v 1.1.2.17 2000/11/28 08:59:27 zarq Exp $
*/
#include "config.h"
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <stdlib.h>
#include <unistd.h>
+#include <termios.h>
#include <list.h>
#include <pidfile.h>
#include "conf.h"
#include "process.h"
+#include "subnet.h"
+#include "connection.h"
#include "system.h"
-/* A list containing all our children */
-list_t *child_pids;
-
/* If zero, don't detach from the terminal. */
int do_detach = 1;
-static pid_t ppid;
-
extern char *identname;
extern char *pidfilename;
extern char **g_argv;
+sigset_t emptysigset;
+
void memory_full(int size)
{
syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
exit(1);
}
+/* Some functions the less gifted operating systems might lack... */
+
+#ifndef HAVE_FCLOSEALL
+int fcloseall(void)
+{
+ fflush(stdin);
+ fflush(stdout);
+ fflush(stderr);
+ fclose(stdin);
+ fclose(stdout);
+ fclose(stderr);
+}
+#endif
+
/*
Close network connections, and terminate neatly
*/
void cleanup_and_exit(int c)
{
+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);
+ syslog(LOG_NOTICE, _("Terminating"));
+
closelog();
- kill(ppid, SIGTERM);
exit(c);
}
int write_pidfile(void)
{
int pid;
-
+cp
if((pid = check_pid(pidfilename)))
{
if(netname)
/* if it's locked, write-protected, or whatever */
if(!write_pid(pidfilename))
return 1;
-
+cp
return 0;
}
int kill_other(void)
{
int pid;
-
+cp
if(!(pid = read_pid(pidfilename)))
{
if(netname)
if(kill(pid, SIGTERM) && errno == ESRCH)
fprintf(stderr, _("Removing stale lock file.\n"));
remove_pid(pidfilename);
-
+cp
return 0;
}
*/
int detach(void)
{
- int fd;
- pid_t pid;
-
+cp
setup_signals();
- if(do_detach)
- {
- ppid = getpid();
-
- if((pid = fork()) < 0)
- {
- perror("fork");
- return -1;
- }
- if(pid) /* parent process */
- {
- signal(SIGTERM, parent_exit);
- sleep(600); /* wait 10 minutes */
- exit(1);
- }
- }
+ /* First check if we can open a fresh new pidfile */
if(write_pidfile())
return -1;
+ /* If we succeeded in doing that, detach */
+
if(do_detach)
{
- if((fd = open("/dev/tty", O_RDWR)) >= 0)
+ if(daemon(0, 0) < 0)
{
- if(ioctl(fd, TIOCNOTTY, NULL))
- {
- perror("ioctl");
- return -1;
- }
- close(fd);
+ fprintf(stderr, _("Couldn't detach from terminal: %m"));
+ return -1;
}
- if(setsid() < 0)
- return -1;
-
- kill(ppid, SIGTERM);
+ /* Now UPDATE the pid in the pidfile, because we changed it... */
+
+ if(!write_pid(pidfilename))
+ return -1;
}
- chdir("/"); /* avoid keeping a mointpoint busy */
-
openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("tincd %s starting"), VERSION);
xalloc_fail_func = memory_full;
-
+cp
return 0;
}
void _execute_script(const char *name) __attribute__ ((noreturn));
void _execute_script(const char *name)
{
- int error = 0;
char *scriptname;
char *s;
-
+cp
if(netname)
{
asprintf(&s, "NETNAME=%s", netname);
}
#endif
- if(chdir(confbase) < 0)
- /* This cannot fail since we already read config files from this
- directory. - Guus */
- /* Yes this can fail, somebody could have removed this directory
- when we didn't pay attention. - Ivo */
- {
- if(chdir("/") < 0)
- /* Now if THIS fails, something wicked is going on. - Ivo */
- syslog(LOG_ERR, _("Couldn't chdir to `/': %m"));
-
- /* Continue anyway. */
- }
+ chdir("/");
asprintf(&scriptname, "%s/%s", confbase, name);
/* Close all file descriptors */
- closelog();
+ closelog(); /* <- this means we cannot use syslog() here anymore! */
fcloseall();
- /* Open standard input */
- if(open("/dev/null", O_RDONLY) < 0)
- {
- syslog(LOG_ERR, _("Opening `/dev/null' failed: %m"));
- error = 1;
- }
-
- if(!error)
- {
- /* Standard output directly goes to syslog */
- openlog(name, LOG_CONS | LOG_PID, LOG_DAEMON);
- /* Standard error as well */
- if(dup2(1, 2) < 0)
- {
- syslog(LOG_ERR, _("System call `%s' failed: %m"),
- "dup2");
- error = 1;
- }
- }
-
- if(error && debug_lvl > 1)
- syslog(LOG_INFO, _("This means that any output the script generates will not be shown in syslog."));
-
execl(scriptname, NULL);
/* No return on success */
- if(errno != ENOENT) /* Ignore if the file does not exist */
- syslog(LOG_WARNING, _("Error executing `%s': %m"), scriptname);
-
- /* No need to free things */
- exit(0);
+ if(errno != ENOENT) /* Ignore if the file does not exist */
+ exit(-1); /* Some error while trying execl(). */
+ else
+ exit(0);
}
/*
int execute_script(const char *name)
{
pid_t pid;
-
+ int status;
+cp
if((pid = fork()) < 0)
{
syslog(LOG_ERR, _("System call `%s' failed: %m"),
if(pid)
{
- list_append(child_pids, (void*)(int)pid);
- return 0;
+ if(debug_lvl >= DEBUG_STATUS)
+ syslog(LOG_INFO, _("Executing script %s"), name);
+
+ if(waitpid(pid, &status, 0) == pid)
+ {
+ if(WIFEXITED(status)) /* Child exited by itself */
+ {
+ if(WEXITSTATUS(status))
+ {
+ syslog(LOG_ERR, _("Process %d (%s) exited with non-zero status %d"), pid, name, WEXITSTATUS(status));
+ return -1;
+ }
+ else
+ return 0;
+ }
+ else if(WIFSIGNALED(status)) /* Child was killed by a signal */
+ {
+ syslog(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"),
+ pid, name, WTERMSIG(status), strsignal(WTERMSIG(status)));
+ return -1;
+ }
+ else /* Something strange happened */
+ {
+ syslog(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid, name);
+ return -1;
+ }
+ }
+ else
+ {
+ syslog(LOG_ERR, _("System call `%s' failed: %m"), "waitpid");
+ return -1;
+ }
}
-
+cp
/* Child here */
- _execute_script(name);
-}
-
-/*
- Check a child (the pointer data is actually an integer, the PID of
- that child. A non-zero return value means that the child has exited
- and can be removed from our list.
-*/
-int check_child(void *data)
-{
- pid_t pid;
- int status;
-
- pid = (pid_t) data;
- pid = waitpid(pid, &status, WNOHANG);
- if(WIFEXITED(status))
- {
- if(WIFSIGNALED(status)) /* Child was killed by a signal */
- {
- syslog(LOG_ERR, _("Child with PID %d was killed by signal %d (%s)"),
- pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
- return -1;
- }
- if(WEXITSTATUS(status) != 0)
- {
- syslog(LOG_INFO, _("Child with PID %d exited with code %d"),
- WEXITSTATUS(status));
- }
- return -1;
- }
-
- /* Child is still running */
- return 0;
-}
-/*
- Check the status of all our children.
-*/
-void check_children(void)
-{
- list_forall_nodes(child_pids, check_child);
+ _execute_script(name);
}
*/
RETSIGTYPE
-sigterm_handler(int a)
+sigterm_handler(int a, siginfo_t *info, void *b)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got TERM signal"));
}
RETSIGTYPE
-sigquit_handler(int a)
+sigquit_handler(int a, siginfo_t *info, void *b)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got QUIT signal"));
}
RETSIGTYPE
-sigsegv_square(int a)
+sigsegv_square(int a, siginfo_t *info, void *b)
{
syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
+ cp_trace();
exit(0);
}
RETSIGTYPE
-sigsegv_handler(int a)
+sigsegv_handler(int a, siginfo_t *info, void *b)
{
+ struct sigaction act;
syslog(LOG_ERR, _("Got SEGV signal"));
cp_trace();
if(do_detach)
{
syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
- signal(SIGSEGV, sigsegv_square);
+
+ act.sa_handler = NULL;
+ act.sa_mask = emptysigset;
+ act.sa_flags = SA_SIGINFO;
+ act.sa_sigaction = sigsegv_square;
+
close_network_connections();
sleep(5);
remove_pid(pidfilename);
}
RETSIGTYPE
-sighup_handler(int a)
+sighup_handler(int a, siginfo_t *info, void *b)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got HUP signal"));
}
RETSIGTYPE
-sigint_handler(int a)
+sigint_handler(int a, siginfo_t *info, void *b)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got INT signal, exiting"));
}
RETSIGTYPE
-sigusr1_handler(int a)
+sigusr1_handler(int a, siginfo_t *info, void *b)
{
- dump_conn_list();
+ dump_connection_list();
}
RETSIGTYPE
-sigusr2_handler(int a)
+sigusr2_handler(int a, siginfo_t *info, void *b)
{
dump_subnet_list();
}
RETSIGTYPE
-sighuh(int a)
+unexpected_signal_handler(int a, siginfo_t *info, void *b)
{
syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
cp_trace();
}
+struct {
+ int signal;
+ void (*handler)(int, siginfo_t *, void *);
+} sighandlers[] = {
+ { SIGHUP, sighup_handler },
+ { SIGTERM, sigterm_handler },
+ { SIGQUIT, sigquit_handler },
+ { SIGSEGV, sigsegv_handler },
+ { SIGPIPE, NULL },
+ { SIGINT, sigint_handler },
+ { SIGUSR1, sigusr1_handler },
+ { SIGUSR2, sigusr2_handler },
+ { SIGCHLD, NULL },
+ { 0, NULL }
+};
+
void
setup_signals(void)
{
int i;
+ struct sigaction act;
- for(i=0;i<32;i++)
- signal(i,sighuh);
-
- if(signal(SIGTERM, SIG_IGN) != SIG_ERR)
- signal(SIGTERM, sigterm_handler);
- if(signal(SIGQUIT, SIG_IGN) != SIG_ERR)
- signal(SIGQUIT, sigquit_handler);
- if(signal(SIGSEGV, SIG_IGN) != SIG_ERR)
- signal(SIGSEGV, sigsegv_handler);
- if(signal(SIGHUP, SIG_IGN) != SIG_ERR)
- signal(SIGHUP, sighup_handler);
- signal(SIGPIPE, SIG_IGN);
- if(signal(SIGINT, SIG_IGN) != SIG_ERR)
- signal(SIGINT, sigint_handler);
- signal(SIGUSR1, sigusr1_handler);
- signal(SIGUSR2, sigusr2_handler);
- signal(SIGCHLD, SIG_IGN);
-}
+ sigemptyset(&emptysigset);
+ act.sa_handler = NULL;
+ act.sa_mask = emptysigset;
+ act.sa_flags = SA_SIGINFO;
-RETSIGTYPE parent_exit(int a)
-{
- exit(0);
+ /* Set a default signal handler for every signal, errors will be
+ ignored. */
+ for(i = 0; i < NSIG; i++)
+ {
+ act.sa_sigaction = unexpected_signal_handler;
+ sigaction(sighandlers[i].signal, &act, NULL);
+ }
+
+ /* 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));
+ }
}