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.2 2000/06/28 11:38:01 guus Exp $
+ $Id: tincd.c,v 1.10.4.6 2000/06/30 11:45:16 guus Exp $
*/
#include "config.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(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();
}
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)