X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=0e0bc15883c522ba068736675c28c0447ac9538d;hp=433b5e64d710bc8e597022de1660aeb8059bd578;hb=3831f51a53088bfcc1d148fd54b3083afe7fde32;hpb=18e044bde3b508c991910218989b4bacc3a4934e diff --git a/src/tincd.c b/src/tincd.c index 433b5e64..0e0bc158 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -1,6 +1,7 @@ /* tincd.c -- the main file for tincd - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans + 2000 Guus Sliepen 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 @@ -15,14 +16,9 @@ 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.4 2000/04/06 18:28:29 zarq - * New option -D, don't detach. - * - */ + $Id: tincd.c,v 1.10.4.8 2000/08/17 16:51:08 guus Exp $ +*/ #include "config.h" @@ -47,6 +43,9 @@ #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; @@ -64,7 +63,7 @@ static int kill_tincd = 0; 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 */ @@ -94,19 +93,19 @@ static void 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=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 tinc@nl.linux.org.\n")); } exit(status); } @@ -144,7 +143,7 @@ parse_options(int argc, char **argv, char **envp) 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; @@ -156,9 +155,9 @@ parse_options(int argc, char **argv, char **envp) } } -void memory_full(void) +void memory_full(int size) { - syslog(LOG_ERR, "Memory exhausted; exiting."); + syslog(LOG_ERR, _("Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."), cp_file, cp_line, size); exit(1); } @@ -212,11 +211,11 @@ int detach(void) 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; @@ -231,7 +230,7 @@ void cleanup_and_exit(int c) 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(); @@ -249,10 +248,10 @@ int write_pidfile(void) 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; } @@ -273,16 +272,16 @@ int kill_other(void) 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; @@ -297,31 +296,25 @@ void make_names(void) { if(netname) { - configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR)); - sprintf(configfilename, "%s/tinc/%s/tincd.conf", CONFDIR, netname); + asprintf(&configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname); } else { - configfilename = xmalloc(17+strlen(CONFDIR)); - sprintf(configfilename, "%s/tinc/tincd.conf", CONFDIR); + asprintf(&configfilename, "%s/tinc/tinc.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); + asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname); + asprintf(&confbase, "%s/tinc/%s/", CONFDIR, netname); + asprintf(&identname, "tinc.%s", netname); } else { - pidfilename = "/var/run/tincd.pid"; - confbase = xmalloc(7+strlen(CONFDIR)); - sprintf(confbase, "%s/tinc/", CONFDIR); - identname = "tincd"; + pidfilename = "/var/run/tinc.pid"; + asprintf(&confbase, "%s/tinc/", CONFDIR); + identname = "tinc"; } } @@ -330,16 +323,21 @@ main(int argc, char **argv, char **envp) { 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; } @@ -349,7 +347,7 @@ main(int argc, char **argv, char **envp) 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; } @@ -371,20 +369,24 @@ main(int argc, char **argv, char **envp) 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 sigterm_handler(int a) { if(debug_lvl > 0) - syslog(LOG_NOTICE, "Got TERM signal"); + syslog(LOG_NOTICE, _("Got TERM signal")); cleanup_and_exit(0); } @@ -392,14 +394,14 @@ RETSIGTYPE 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); } @@ -407,13 +409,12 @@ RETSIGTYPE 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); @@ -423,17 +424,15 @@ RETSIGTYPE 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); } @@ -447,7 +446,7 @@ RETSIGTYPE sigusr2_handler(int a) { if(debug_lvl > 1) - syslog(LOG_NOTICE, "Forcing new keys"); + syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation")); regenerate_keys(); } @@ -455,10 +454,10 @@ RETSIGTYPE 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 @@ -482,11 +481,10 @@ setup_signals(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); } -