/*
tincd.c -- the main file for tincd
- Copyright (C) 1998,99 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.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.11 2000/10/14 17:04:16 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"
/* The name this program was run with. */
char *program_name;
/* If zero, don't detach from the terminal. */
static int do_detach = 1;
-char *confbase = NULL; /* directory in which all config files are */
-char *configfilename = NULL; /* configuration file name */
char *identname; /* program name for syslog */
char *netname = NULL; /* name of the vpn network */
char *pidfilename; /* pid file location */
usage(int status)
{
if(status != 0)
- fprintf(stderr, "Try `%s --help\' for more information.\n", program_name);
+ fprintf(stderr, _("Try `%s --help\' for more information.\n"), program_name);
else
{
- printf("Usage: %s [option]...\n\n", program_name);
- printf(" -c, --config=FILE Read configuration options from FILE.\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("Report bugs to zarq@iname.com.\n");
+ 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(_("Report bugs to tinc@nl.linux.org.\n"));
}
exit(status);
}
case 0: /* long option */
break;
case 'c': /* config file */
- configfilename = xmalloc(strlen(optarg)+1);
- strcpy(configfilename, optarg);
+ confbase = xmalloc(strlen(optarg)+1);
+ strcpy(confbase, optarg);
break;
case 'D': /* no detach */
do_detach = 0;
case 't': /* timeout */
if(!(p = add_config_val(&config, TYPE_INT, optarg)))
{
- printf("Invalid timeout value `%s'.\n", optarg);
+ printf(_("Invalid timeout value `%s'.\n"), optarg);
usage(1);
}
break;
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((pid = check_pid(pidfilename)))
{
if(netname)
- fprintf(stderr, "A tincd is already running for net `%s' with pid %d.\n",
+ 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);
+ fprintf(stderr, _("A tincd is already running with pid %d.\n"), pid);
return 1;
}
if(!(pid = read_pid(pidfilename)))
{
if(netname)
- fprintf(stderr, "No other tincd is running for net `%s'.\n", netname);
+ fprintf(stderr, _("No other tincd is running for net `%s'.\n"), netname);
else
- fprintf(stderr, "No other tincd is running.\n");
+ 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");
+ fprintf(stderr, _("Removing stale lock file.\n"));
remove_pid(pidfilename);
return 0;
*/
void make_names(void)
{
- if(!configfilename)
- {
- if(netname)
- {
- configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR));
- sprintf(configfilename, "%s/tinc/%s/tincd.conf", CONFDIR, netname);
- }
- else
- {
- configfilename = xmalloc(17+strlen(CONFDIR));
- sprintf(configfilename, "%s/tinc/tincd.conf", CONFDIR);
- }
- }
-
if(netname)
{
- pidfilename = xmalloc(strlen(netname)+20);
- sprintf(pidfilename, "/var/run/tincd.%s.pid", netname);
- confbase = xmalloc(strlen(netname)+8+strlen(CONFDIR));
- sprintf(confbase, "%s/tinc/%s/", CONFDIR, netname);
- identname = xmalloc(strlen(netname)+7);
- sprintf(identname, "tincd.%s", netname);
+ if(!pidfilename)
+ asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname);
+ if(!confbase)
+ asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
+ if(!identname)
+ asprintf(&identname, "tinc.%s", netname);
}
else
{
- pidfilename = "/var/run/tincd.pid";
- confbase = xmalloc(7+strlen(CONFDIR));
- sprintf(confbase, "%s/tinc/", CONFDIR);
- identname = "tincd";
+ if(!pidfilename)
+ pidfilename = "/var/run/tinc.pid";
+ if(!confbase)
+ asprintf(&confbase, "%s/tinc", CONFDIR);
+ if(!identname)
+ identname = "tinc";
}
}
{
program_name = argv[0];
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
parse_options(argc, argv, envp);
if(show_version)
{
- printf("%s version %s\nCopyright (C) 1998,99 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"
- "and you are welcome to redistribute it under certain conditions;\n"
- "see the file COPYING for details.\n\n", PACKAGE, VERSION);
- printf("This product includes software developed by Eric Young (eay@mincom.oz.au)\n");
+ 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"
+ "and you are welcome to redistribute it under certain conditions;\n"
+ "see the file COPYING for details.\n\n"));
+ printf(_("This product includes software developed by Eric Young (eay@mincom.oz.au)\n"));
return 0;
}
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;
}
if(kill_tincd)
exit(kill_other());
- if(read_config_file(configfilename))
+ if(read_server_config())
return 1;
setup_signals();
if(detach())
exit(0);
+/* FIXME: wt* is this suppose to do?
if(security_init())
return 1;
+*/
+ for(;;)
+ {
+ setup_network_connections();
- if(setup_network_connections())
- cleanup_and_exit(1);
+ 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
sigterm_handler(int a)
{
if(debug_lvl > 0)
- syslog(LOG_NOTICE, "Got TERM signal");
+ syslog(LOG_NOTICE, _("Got TERM signal"));
cleanup_and_exit(0);
}
sigquit_handler(int a)
{
if(debug_lvl > 0)
- syslog(LOG_NOTICE, "Got QUIT signal");
+ syslog(LOG_NOTICE, _("Got QUIT signal"));
cleanup_and_exit(0);
}
RETSIGTYPE
sigsegv_square(int a)
{
- syslog(LOG_NOTICE, "Got another SEGV signal: not restarting");
+ syslog(LOG_NOTICE, _("Got another SEGV signal: not restarting"));
exit(0);
}
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);
-
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 keys");
+ syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
+/* FIXME: reprogram this.
regenerate_keys();
+*/
}
RETSIGTYPE
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)
{
exit(0);
}
-
projects / tinc / blobdiff