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.14 2000/10/20 19:46:58 guus Exp $
+ $Id: tincd.c,v 1.10.4.19 2000/10/29 09:19:27 guus Exp $
*/
#include "config.h"
#include <signal.h>
#include <openssl/rand.h>
#include <openssl/rsa.h>
+#include <string.h>
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#include <xalloc.h>
#include "conf.h"
-#include "encr.h"
#include "net.h"
#include "netutl.h"
#include "protocol.h"
+#include "subnet.h"
#include "system.h"
{
int r;
int option_index = 0;
- config_t *p;
-
+
while((r = getopt_long(argc, argv, "c:Ddkn:K::", long_options, &option_index)) != EOF)
{
switch(r)
if(pid) /* parent process */
{
signal(SIGTERM, parent_exit);
-// sleep(600); /* wait 10 minutes */
+ sleep(600); /* wait 10 minutes */
exit(1);
}
}
openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
- if(debug_lvl > 0)
+ if(debug_lvl > DEBUG_NOTHING)
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);
+ syslog(LOG_NOTICE, _("tincd %s starting"), VERSION);
xalloc_fail_func = memory_full;
{
close_network_connections();
- if(debug_lvl > 0)
+ 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);
{
main_loop();
cleanup_and_exit(1);
- }
+ }
syslog(LOG_ERR, _("Unrecoverable error"));
cp_trace();
}
else
{
- syslog(LOG_ERR, _("Aieee! Not restarting."));
+ syslog(LOG_ERR, _("Not restarting."));
exit(0);
}
}
RETSIGTYPE
sigterm_handler(int a)
{
- if(debug_lvl > 0)
+ if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got TERM signal"));
+
cleanup_and_exit(0);
}
RETSIGTYPE
sigquit_handler(int a)
{
- if(debug_lvl > 0)
+ if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got QUIT signal"));
cleanup_and_exit(0);
}
}
else
{
- syslog(LOG_NOTICE, _("Aieee! Not restarting."));
+ syslog(LOG_NOTICE, _("Not restarting."));
exit(0);
}
}
RETSIGTYPE
sighup_handler(int a)
{
- if(debug_lvl > 0)
- syslog(LOG_NOTICE, _("Got HUP signal, rereading configuration and restarting"));
+ if(debug_lvl > DEBUG_NOTHING)
+ syslog(LOG_NOTICE, _("Got HUP signal"));
sighup = 1;
}
RETSIGTYPE
sigint_handler(int a)
{
- if(debug_lvl > 0)
+ if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got INT signal, exiting"));
cleanup_and_exit(0);
}
RETSIGTYPE
sigusr2_handler(int a)
{
- if(debug_lvl > 1)
- syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
+ dump_subnet_list();
/* FIXME: reprogram this.
+ if(debug_lvl > DEBUG_NOTHING)
+ syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
regenerate_keys();
*/
}