Updating HEAD branch #4; Merging CABAL -> HEAD.
This commit is contained in:
Ivo Timmermans
parent
e64ef59df4
commit
462ab530e5
58 changed files with 9898 additions and 2867 deletions
526
src/tincd.c
526
src/tincd.c
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
tincd.c -- the main file for tincd
|
||||
Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
|
||||
2000 Guus Sliepen <guus@sliepen.warande.net>
|
||||
Copyright (C) 1998-2002 Ivo Timmermans <itimmermans@bigfoot.com>
|
||||
2000-2002 Guus Sliepen <guus@sliepen.warande.net>
|
||||
|
||||
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,13 +17,13 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
$Id: tincd.c,v 1.11 2000/10/18 20:12:10 zarq Exp $
|
||||
$Id: tincd.c,v 1.12 2002/04/09 15:26:01 zarq Exp $
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <fcntl.h>
|
||||
#include <getopt.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -31,20 +31,27 @@
|
|||
#include <syslog.h>
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
#include <termios.h>
|
||||
|
||||
#ifdef HAVE_SYS_IOCTL_H
|
||||
# include <sys/ioctl.h>
|
||||
#endif
|
||||
|
||||
#include <pidfile.h>
|
||||
#include <openssl/rand.h>
|
||||
#include <openssl/rsa.h>
|
||||
#include <openssl/pem.h>
|
||||
#include <openssl/evp.h>
|
||||
|
||||
#include <utils.h>
|
||||
#include <xalloc.h>
|
||||
|
||||
#include "conf.h"
|
||||
#include "encr.h"
|
||||
#include "net.h"
|
||||
#include "netutl.h"
|
||||
#include "process.h"
|
||||
#include "protocol.h"
|
||||
#include "subnet.h"
|
||||
|
||||
#include "system.h"
|
||||
|
||||
|
|
@ -52,38 +59,37 @@
|
|||
char *program_name;
|
||||
|
||||
/* If nonzero, display usage information and exit. */
|
||||
static int show_help;
|
||||
int show_help;
|
||||
|
||||
/* If nonzero, print the version on standard output and exit. */
|
||||
static int show_version;
|
||||
int show_version;
|
||||
|
||||
/* If nonzero, it will attempt to kill a running tincd and exit. */
|
||||
static int kill_tincd = 0;
|
||||
int kill_tincd = 0;
|
||||
|
||||
/* If zero, don't detach from the terminal. */
|
||||
static int do_detach = 1;
|
||||
/* If nonzero, generate public/private keypair for this host/net. */
|
||||
int generate_keys = 0;
|
||||
|
||||
/* If nonzero, use null ciphers and skip all key exchanges. */
|
||||
int bypass_security = 0;
|
||||
|
||||
char *identname; /* program name for syslog */
|
||||
char *pidfilename; /* pid file location */
|
||||
static pid_t ppid; /* pid of non-detached part */
|
||||
char **g_argv; /* a copy of the cmdline arguments */
|
||||
|
||||
void cleanup_and_exit(int);
|
||||
int detach(void);
|
||||
int kill_other(void);
|
||||
void make_names(void);
|
||||
RETSIGTYPE parent_exit(int a);
|
||||
void setup_signals(void);
|
||||
int write_pidfile(void);
|
||||
char **environment; /* A pointer to the environment on
|
||||
startup */
|
||||
|
||||
static struct option const long_options[] =
|
||||
{
|
||||
{ "kill", no_argument, NULL, 'k' },
|
||||
{ "config", required_argument, NULL, 'c' },
|
||||
{ "kill", optional_argument, NULL, 'k' },
|
||||
{ "net", required_argument, NULL, 'n' },
|
||||
{ "timeout", required_argument, NULL, 'p' },
|
||||
{ "help", no_argument, &show_help, 1 },
|
||||
{ "version", no_argument, &show_version, 1 },
|
||||
{ "no-detach", no_argument, &do_detach, 0 },
|
||||
{ "generate-keys", optional_argument, NULL, 'K'},
|
||||
{ "debug", optional_argument, NULL, 'd'},
|
||||
{ "bypass-security", no_argument, &bypass_security, 1 },
|
||||
{ NULL, 0, NULL, 0 }
|
||||
};
|
||||
|
||||
|
|
@ -95,14 +101,14 @@ usage(int status)
|
|||
else
|
||||
{
|
||||
printf(_("Usage: %s [option]...\n\n"), program_name);
|
||||
printf(_(" -c, --config=DIR Read configuration options from DIR.\n"
|
||||
" -D, --no-detach Don't fork and detach.\n"
|
||||
" -d Increase debug level.\n"
|
||||
" -k, --kill Attempt to kill a running tincd and exit.\n"
|
||||
" -n, --net=NETNAME Connect to net NETNAME.\n"
|
||||
" -t, --timeout=TIMEOUT Seconds to wait before giving a timeout.\n"));
|
||||
printf(_(" --help Display this help and exit.\n"
|
||||
" --version Output version information and exit.\n\n"));
|
||||
printf(_(" -c, --config=DIR Read configuration options from DIR.\n"
|
||||
" -D, --no-detach Don't fork and detach.\n"
|
||||
" -d, --debug[=LEVEL] Increase debug level or set it to LEVEL.\n"
|
||||
" -k, --kill[=SIGNAL] Attempt to kill a running tincd and exit.\n"
|
||||
" -n, --net=NETNAME Connect to net NETNAME.\n"));
|
||||
printf(_(" -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
|
||||
" --help Display this help and exit.\n"
|
||||
" --version Output version information and exit.\n\n"));
|
||||
printf(_("Report bugs to tinc@nl.linux.org.\n"));
|
||||
}
|
||||
exit(status);
|
||||
|
|
@ -113,38 +119,77 @@ parse_options(int argc, char **argv, char **envp)
|
|||
{
|
||||
int r;
|
||||
int option_index = 0;
|
||||
config_t *p;
|
||||
|
||||
while((r = getopt_long(argc, argv, "c:Ddkn:t:", long_options, &option_index)) != EOF)
|
||||
while((r = getopt_long(argc, argv, "c:Dd::k::n:K::", long_options, &option_index)) != EOF)
|
||||
{
|
||||
switch(r)
|
||||
{
|
||||
case 0: /* long option */
|
||||
break;
|
||||
case 'c': /* config file */
|
||||
confbase = xmalloc(strlen(optarg)+1);
|
||||
strcpy(confbase, optarg);
|
||||
break;
|
||||
case 'D': /* no detach */
|
||||
do_detach = 0;
|
||||
break;
|
||||
case 'd': /* inc debug level */
|
||||
debug_lvl++;
|
||||
break;
|
||||
case 'k': /* kill old tincds */
|
||||
kill_tincd = 1;
|
||||
break;
|
||||
case 'n': /* net name given */
|
||||
netname = xmalloc(strlen(optarg)+1);
|
||||
strcpy(netname, optarg);
|
||||
break;
|
||||
case 't': /* timeout */
|
||||
if(!(p = add_config_val(&config, TYPE_INT, optarg)))
|
||||
{
|
||||
printf(_("Invalid timeout value `%s'.\n"), optarg);
|
||||
usage(1);
|
||||
}
|
||||
break;
|
||||
case 'c': /* config file */
|
||||
confbase = xmalloc(strlen(optarg)+1);
|
||||
strcpy(confbase, optarg);
|
||||
break;
|
||||
case 'D': /* no detach */
|
||||
do_detach = 0;
|
||||
break;
|
||||
case 'd': /* inc debug level */
|
||||
if(optarg)
|
||||
debug_lvl = atoi(optarg);
|
||||
else
|
||||
debug_lvl++;
|
||||
break;
|
||||
case 'k': /* kill old tincds */
|
||||
if(optarg)
|
||||
{
|
||||
if(!strcasecmp(optarg, "HUP"))
|
||||
kill_tincd = SIGHUP;
|
||||
else if(!strcasecmp(optarg, "TERM"))
|
||||
kill_tincd = SIGTERM;
|
||||
else if(!strcasecmp(optarg, "KILL"))
|
||||
kill_tincd = SIGKILL;
|
||||
else if(!strcasecmp(optarg, "USR1"))
|
||||
kill_tincd = SIGUSR1;
|
||||
else if(!strcasecmp(optarg, "USR2"))
|
||||
kill_tincd = SIGUSR2;
|
||||
else if(!strcasecmp(optarg, "WINCH"))
|
||||
kill_tincd = SIGWINCH;
|
||||
else if(!strcasecmp(optarg, "INT"))
|
||||
kill_tincd = SIGINT;
|
||||
else if(!strcasecmp(optarg, "ALRM"))
|
||||
kill_tincd = SIGALRM;
|
||||
else
|
||||
{
|
||||
kill_tincd = atoi(optarg);
|
||||
if(!kill_tincd)
|
||||
{
|
||||
fprintf(stderr, _("Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, USR1, USR2, WINCH, INT or ALRM.\n"), optarg);
|
||||
usage(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
kill_tincd = SIGTERM;
|
||||
break;
|
||||
case 'n': /* net name given */
|
||||
netname = xmalloc(strlen(optarg)+1);
|
||||
strcpy(netname, optarg);
|
||||
break;
|
||||
case 'K': /* generate public/private keypair */
|
||||
if(optarg)
|
||||
{
|
||||
generate_keys = atoi(optarg);
|
||||
if(generate_keys < 512)
|
||||
{
|
||||
fprintf(stderr, _("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"),
|
||||
optarg);
|
||||
usage(1);
|
||||
}
|
||||
generate_keys &= ~7; /* Round it to bytes */
|
||||
}
|
||||
else
|
||||
generate_keys = 1024;
|
||||
break;
|
||||
case '?':
|
||||
usage(1);
|
||||
default:
|
||||
|
|
@ -153,134 +198,88 @@ parse_options(int argc, char **argv, char **envp)
|
|||
}
|
||||
}
|
||||
|
||||
void memory_full(int size)
|
||||
/* This function prettyprints the key generation process */
|
||||
|
||||
void indicator(int a, int b, void *p)
|
||||
{
|
||||
syslog(LOG_ERR, _("Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."), cp_file, cp_line, size);
|
||||
exit(1);
|
||||
switch(a)
|
||||
{
|
||||
case 0:
|
||||
fprintf(stderr, ".");
|
||||
break;
|
||||
case 1:
|
||||
fprintf(stderr, "+");
|
||||
break;
|
||||
case 2:
|
||||
fprintf(stderr, "-");
|
||||
break;
|
||||
case 3:
|
||||
switch(b)
|
||||
{
|
||||
case 0:
|
||||
fprintf(stderr, " p\n");
|
||||
break;
|
||||
case 1:
|
||||
fprintf(stderr, " q\n");
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "?");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "?");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
Detach from current terminal, write pidfile, kill parent
|
||||
Generate a public/private RSA keypair, and ask for a file to store
|
||||
them in.
|
||||
*/
|
||||
int detach(void)
|
||||
int keygen(int bits)
|
||||
{
|
||||
int fd;
|
||||
pid_t pid;
|
||||
RSA *rsa_key;
|
||||
FILE *f;
|
||||
char *name = NULL;
|
||||
char *filename;
|
||||
|
||||
if(do_detach)
|
||||
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
|
||||
rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
|
||||
|
||||
if(!rsa_key)
|
||||
{
|
||||
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);
|
||||
}
|
||||
fprintf(stderr, _("Error during key generation!\n"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(write_pidfile())
|
||||
else
|
||||
fprintf(stderr, _("Done.\n"));
|
||||
|
||||
get_config_string(lookup_config(config_tree, "Name"), &name);
|
||||
|
||||
if(name)
|
||||
asprintf(&filename, "%s/hosts/%s", confbase, name);
|
||||
else
|
||||
asprintf(&filename, "%s/rsa_key.pub", confbase);
|
||||
|
||||
if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL)
|
||||
return -1;
|
||||
|
||||
if(do_detach)
|
||||
{
|
||||
if((fd = open("/dev/tty", O_RDWR)) >= 0)
|
||||
{
|
||||
if(ioctl(fd, TIOCNOTTY, NULL))
|
||||
{
|
||||
perror("ioctl");
|
||||
return -1;
|
||||
}
|
||||
close(fd);
|
||||
}
|
||||
if(ftell(f))
|
||||
fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
|
||||
|
||||
if(setsid() < 0)
|
||||
return -1;
|
||||
PEM_write_RSAPublicKey(f, rsa_key);
|
||||
fclose(f);
|
||||
free(filename);
|
||||
|
||||
kill(ppid, SIGTERM);
|
||||
}
|
||||
|
||||
chdir("/"); /* avoid keeping a mointpoint busy */
|
||||
asprintf(&filename, "%s/rsa_key.priv", confbase);
|
||||
if((f = ask_and_safe_open(filename, _("private RSA key"), "a")) == NULL)
|
||||
return -1;
|
||||
|
||||
openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
|
||||
if(ftell(f))
|
||||
fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
|
||||
|
||||
if(debug_lvl > 0)
|
||||
syslog(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"),
|
||||
VERSION, __DATE__, __TIME__, debug_lvl);
|
||||
else
|
||||
syslog(LOG_NOTICE, _("tincd %s starting"), VERSION, debug_lvl);
|
||||
|
||||
xalloc_fail_func = memory_full;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
Close network connections, and terminate neatly
|
||||
*/
|
||||
void cleanup_and_exit(int c)
|
||||
{
|
||||
close_network_connections();
|
||||
|
||||
if(debug_lvl > 0)
|
||||
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);
|
||||
|
||||
closelog();
|
||||
kill(ppid, SIGTERM);
|
||||
exit(c);
|
||||
}
|
||||
|
||||
/*
|
||||
check for an existing tinc for this net, and write pid to pidfile
|
||||
*/
|
||||
int write_pidfile(void)
|
||||
{
|
||||
int pid;
|
||||
|
||||
if((pid = check_pid(pidfilename)))
|
||||
{
|
||||
if(netname)
|
||||
fprintf(stderr, _("A tincd is already running for net `%s' with pid %d.\n"),
|
||||
netname, pid);
|
||||
else
|
||||
fprintf(stderr, _("A tincd is already running with pid %d.\n"), pid);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* if it's locked, write-protected, or whatever */
|
||||
if(!write_pid(pidfilename))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
kill older tincd for this net
|
||||
*/
|
||||
int kill_other(void)
|
||||
{
|
||||
int pid;
|
||||
|
||||
if(!(pid = read_pid(pidfilename)))
|
||||
{
|
||||
if(netname)
|
||||
fprintf(stderr, _("No other tincd is running for net `%s'.\n"), netname);
|
||||
else
|
||||
fprintf(stderr, _("No other tincd is running.\n"));
|
||||
return 1;
|
||||
}
|
||||
|
||||
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)
|
||||
fprintf(stderr, _("Removing stale lock file.\n"));
|
||||
remove_pid(pidfilename);
|
||||
PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
|
||||
fclose(f);
|
||||
free(filename);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -293,17 +292,18 @@ void make_names(void)
|
|||
if(netname)
|
||||
{
|
||||
if(!pidfilename)
|
||||
asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname);
|
||||
asprintf(&pidfilename, LOCALSTATEDIR "/run/tinc.%s.pid", netname);
|
||||
if(!confbase)
|
||||
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
|
||||
else
|
||||
syslog(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
|
||||
if(!identname)
|
||||
asprintf(&identname, "tinc.%s", netname);
|
||||
}
|
||||
else
|
||||
{
|
||||
netname = "bla";
|
||||
if(!pidfilename)
|
||||
pidfilename = "/var/run/tinc.pid";
|
||||
pidfilename = LOCALSTATEDIR "/run/tinc.pid";
|
||||
if(!confbase)
|
||||
asprintf(&confbase, "%s/tinc", CONFDIR);
|
||||
if(!identname)
|
||||
|
|
@ -320,20 +320,17 @@ main(int argc, char **argv, char **envp)
|
|||
bindtextdomain (PACKAGE, LOCALEDIR);
|
||||
textdomain (PACKAGE);
|
||||
|
||||
/* Do some intl stuff right now */
|
||||
|
||||
unknown = _("unknown");
|
||||
|
||||
environment = envp;
|
||||
parse_options(argc, argv, envp);
|
||||
|
||||
if(show_version)
|
||||
{
|
||||
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, VERSION, __DATE__, __TIME__, PROT_CURRENT);
|
||||
printf(_("Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n"
|
||||
"See the AUTHORS file for a complete list.\n\n"
|
||||
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
|
||||
"and you are welcome to redistribute it under certain conditions;\n"
|
||||
"see the file COPYING for details.\n"));
|
||||
printf(_("Copyright (C) 1998-2002 Ivo Timmermans, Guus Sliepen and others.\n"
|
||||
"See the AUTHORS file for a complete list.\n\n"
|
||||
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
|
||||
"and you are welcome to redistribute it under certain conditions;\n"
|
||||
"see the file COPYING for details.\n"));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -341,164 +338,63 @@ main(int argc, char **argv, char **envp)
|
|||
if(show_help)
|
||||
usage(0);
|
||||
|
||||
if(geteuid())
|
||||
{
|
||||
fprintf(stderr, _("You must be root to run this program. Sorry.\n"));
|
||||
return 1;
|
||||
}
|
||||
#ifdef HAVE_SOLARIS
|
||||
openlog("tinc", LOG_CONS, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
|
||||
#else
|
||||
openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
|
||||
#endif
|
||||
|
||||
g_argv = argv;
|
||||
|
||||
make_names();
|
||||
init_configuration(&config_tree);
|
||||
|
||||
/* Slllluuuuuuurrrrp! */
|
||||
cp
|
||||
RAND_load_file("/dev/urandom", 1024);
|
||||
|
||||
#ifdef HAVE_SSLEAY_ADD_ALL_ALGORITHMS
|
||||
SSLeay_add_all_algorithms();
|
||||
#else
|
||||
OpenSSL_add_all_algorithms();
|
||||
#endif
|
||||
|
||||
cp
|
||||
if(generate_keys)
|
||||
{
|
||||
read_server_config();
|
||||
exit(keygen(generate_keys));
|
||||
}
|
||||
|
||||
if(kill_tincd)
|
||||
exit(kill_other());
|
||||
exit(kill_other(kill_tincd));
|
||||
|
||||
if(read_server_config())
|
||||
return 1;
|
||||
|
||||
setup_signals();
|
||||
|
||||
exit(1);
|
||||
cp
|
||||
if(detach())
|
||||
exit(0);
|
||||
|
||||
/* FIXME: wt* is this suppose to do?
|
||||
if(security_init())
|
||||
return 1;
|
||||
*/
|
||||
cp
|
||||
for(;;)
|
||||
{
|
||||
if(!setup_network_connections())
|
||||
{
|
||||
main_loop();
|
||||
cleanup_and_exit(1);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
syslog(LOG_ERR, _("Unrecoverable error"));
|
||||
cp_trace();
|
||||
|
||||
if(do_detach)
|
||||
{
|
||||
syslog(LOG_NOTICE, _("Restarting in %d seconds!"), MAXTIMEOUT);
|
||||
sleep(MAXTIMEOUT);
|
||||
syslog(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
|
||||
sleep(maxtimeout);
|
||||
}
|
||||
else
|
||||
{
|
||||
syslog(LOG_ERR, _("Aieee! Not restarting."));
|
||||
exit(0);
|
||||
syslog(LOG_ERR, _("Not restarting."));
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
sigterm_handler(int a)
|
||||
{
|
||||
if(debug_lvl > 0)
|
||||
syslog(LOG_NOTICE, _("Got TERM signal"));
|
||||
cleanup_and_exit(0);
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
sigquit_handler(int a)
|
||||
{
|
||||
if(debug_lvl > 0)
|
||||
syslog(LOG_NOTICE, _("Got QUIT signal"));
|
||||
cleanup_and_exit(0);
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
sigsegv_square(int a)
|
||||
{
|
||||
syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
|
||||
exit(0);
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
sigsegv_handler(int a)
|
||||
{
|
||||
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);
|
||||
close_network_connections();
|
||||
sleep(5);
|
||||
remove_pid(pidfilename);
|
||||
execvp(g_argv[0], g_argv);
|
||||
}
|
||||
else
|
||||
{
|
||||
syslog(LOG_NOTICE, _("Aieee! Not restarting."));
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
sighup_handler(int a)
|
||||
{
|
||||
if(debug_lvl > 0)
|
||||
syslog(LOG_NOTICE, _("Got HUP signal, rereading configuration and restarting"));
|
||||
sighup = 1;
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
sigint_handler(int a)
|
||||
{
|
||||
if(debug_lvl > 0)
|
||||
syslog(LOG_NOTICE, _("Got INT signal, exiting"));
|
||||
cleanup_and_exit(0);
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
sigusr1_handler(int a)
|
||||
{
|
||||
dump_conn_list();
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
sigusr2_handler(int a)
|
||||
{
|
||||
if(debug_lvl > 1)
|
||||
syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
|
||||
/* FIXME: reprogram this.
|
||||
regenerate_keys();
|
||||
*/
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
sighuh(int a)
|
||||
{
|
||||
syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
|
||||
cp_trace();
|
||||
}
|
||||
|
||||
void
|
||||
setup_signals(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
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, parent_exit);
|
||||
}
|
||||
|
||||
RETSIGTYPE parent_exit(int a)
|
||||
{
|
||||
exit(0);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue