/*
tincd.c -- the main file for tincd
- Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
+ 2000 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
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-/*
- * $Log: tincd.c,v $
- * Revision 1.9 2000/05/29 21:01:26 zarq
- * Internationalization of tinc.
- *
- * Revision 1.8 2000/05/14 12:22:42 guus
- * Cleanups.
- *
- * Revision 1.7 2000/04/27 13:47:51 zarq
- * Default config file name is tinc.conf, and pidfile is tinc.pid.
- *
- * Revision 1.6 2000/04/18 16:04:10 zarq
- * Address for bugreports changed to tinc@nl.linux.org.
- *
- * Revision 1.5 2000/04/17 16:23:29 zarq
- * Pass the requested size from xmalloc() and xrealloc() on to xalloc_fail_func()
- *
- * Revision 1.4 2000/04/06 18:28:29 zarq
- * New option -D, don't detach.
- *
- */
+ $Id: tincd.c,v 1.10.4.4 2000/06/29 17:09:08 guus Exp $
+*/
#include "config.h"
void memory_full(int size)
{
- syslog(LOG_ERR, _("Memory exhausted (last is %s:%d) (couldn't allocate %d bytes); exiting."), cp_file, cp_line, size);
+ syslog(LOG_ERR, _("Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."), cp_file, cp_line, size);
exit(1);
}
openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
- if(debug_lvl > 1)
- syslog(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d."),
+ 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, debug level %d."), VERSION, debug_lvl);
+ syslog(LOG_NOTICE, _("tincd %s starting"), VERSION, debug_lvl);
xalloc_fail_func = memory_full;
close_network_connections();
if(debug_lvl > 0)
- syslog(LOG_INFO, _("Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d."),
+ 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();
if(geteuid())
{
- fprintf(stderr, _("You must be root to run this program. sorry.\n"));
+ fprintf(stderr, _("You must be root to run this program. Sorry.\n"));
return 1;
}
sigsegv_handler(int a)
{
if(cp_file)
- syslog(LOG_NOTICE, _("Got SEGV signal after %s line %d. Trying to re-execute."),
+ syslog(LOG_NOTICE, _("Got SEGV signal after %s line %d, trying to re-execute"),
cp_file, cp_line);
else
- syslog(LOG_NOTICE, _("Got SEGV signal; trying to re-execute."));
+ syslog(LOG_NOTICE, _("Got SEGV signal, trying to re-execute"));
signal(SIGSEGV, sigsegv_square);
sighuh(int a)
{
if(cp_file)
- syslog(LOG_NOTICE, _("Got unexpected signal (%d) after %s line %d."),
+ syslog(LOG_NOTICE, _("Got unexpected signal %d after %s line %d"),
a, cp_file, cp_line);
else
- syslog(LOG_NOTICE, _("Got unexpected signal (%d)."), a);
+ syslog(LOG_NOTICE, _("Got unexpected signal %d"), 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)