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.10.4.3 2000/06/28 14:34:40 guus Exp $
+ $Id: tincd.c,v 1.10.4.9 2000/09/06 11:49:05 guus Exp $
*/
#include "config.h"
#include <sys/types.h>
#include <syslog.h>
#include <unistd.h>
+#include <signal.h>
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#include "encr.h"
#include "net.h"
#include "netutl.h"
+#include "protocol.h"
#include "system.h"
static int do_detach = 1;
char *confbase = NULL; /* directory in which all config files are */
-char *configfilename = NULL; /* configuration file name */
+/* char *configfilename = NULL; /* configuration file name, moved to config.c */
char *identname; /* program name for syslog */
char *netname = NULL; /* name of the vpn network */
char *pidfilename; /* pid file location */
{
if(netname)
{
- configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR));
- sprintf(configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname);
+ asprintf(&configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname);
}
else
{
- configfilename = xmalloc(17+strlen(CONFDIR));
- sprintf(configfilename, "%s/tinc/tinc.conf", CONFDIR);
+ asprintf(&configfilename, "%s/tinc/tinc.conf", CONFDIR);
}
}
if(netname)
{
- pidfilename = xmalloc(strlen(netname)+20);
- sprintf(pidfilename, "/var/run/tinc.%s.pid", netname);
- confbase = xmalloc(strlen(netname)+8+strlen(CONFDIR));
- sprintf(confbase, "%s/tinc/%s/", CONFDIR, netname);
- identname = xmalloc(strlen(netname)+7);
- sprintf(identname, "tinc.%s", netname);
+ asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname);
+ asprintf(&confbase, "%s/tinc/%s/", CONFDIR, netname);
+ asprintf(&identname, "tinc.%s", netname);
}
else
{
pidfilename = "/var/run/tinc.pid";
- confbase = xmalloc(7+strlen(CONFDIR));
- sprintf(confbase, "%s/tinc/", CONFDIR);
+ asprintf(&confbase, "%s/tinc/", CONFDIR);
identname = "tinc";
}
}
if(show_version)
{
- printf(_("%s version %s\n"), PACKAGE, 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 and others,\n"
"see the AUTHORS file for a complete list.\n\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
if(security_init())
return 1;
- if(setup_network_connections())
- cleanup_and_exit(1);
+ for(;;)
+ {
+ setup_network_connections();
+
+ main_loop();
- main_loop();
+ cleanup_and_exit(1);
- cleanup_and_exit(1);
- return 1;
+ syslog(LOG_ERR, _("Unrecoverable error, restarting in %d seconds!"), MAXTIMEOUT);
+ sleep(MAXTIMEOUT);
+ }
}
RETSIGTYPE
syslog(LOG_NOTICE, _("Got SEGV signal, trying to re-execute"));
signal(SIGSEGV, sigsegv_square);
-
close_network_connections();
remove_pid(pidfilename);
execvp(g_argv[0], g_argv);
sighup_handler(int a)
{
if(debug_lvl > 0)
- syslog(LOG_NOTICE, _("Got HUP signal"));
- close_network_connections();
- setup_network_connections();
- /* FIXME: read config-file and re-establish network connections */
+ 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"));
+ syslog(LOG_NOTICE, _("Got INT signal, exiting"));
cleanup_and_exit(0);
}
sigusr2_handler(int a)
{
if(debug_lvl > 1)
- syslog(LOG_NOTICE, _("Forcing new key generation"));
+ syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
regenerate_keys();
}
sighuh(int a)
{
if(cp_file)
- syslog(LOG_NOTICE, _("Got unexpected signal %d after %s line %d"),
- a, cp_file, cp_line);
+ syslog(LOG_NOTICE, _("Got unexpected %s after %s line %d"),
+ strsignal(a), cp_file, cp_line);
else
- syslog(LOG_NOTICE, _("Got unexpected signal %d"), a);
+ syslog(LOG_NOTICE, _("Got unexpected %s"), strsignal(a));
}
void
signal(SIGINT, sigint_handler);
signal(SIGUSR1, sigusr1_handler);
signal(SIGUSR2, sigusr2_handler);
- signal(SIGCHLD, parent_exit);
+// signal(SIGCHLD, parent_exit);
}
RETSIGTYPE parent_exit(int a)
{
- syslog(LOG_NOTICE, _("Got SIGCHLD: exitting immediately"));
exit(0);
}