X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=c9cd09ee1aac357b3e67d1e1c2a3c9114095e208;hp=124276f1d0a0b41d1342f58b48ce72ab9f6458a9;hb=7f7e158aae8df5c65211bcfa82516e7c243cdd2e;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7 diff --git a/src/tincd.c b/src/tincd.c index 124276f1..c9cd09ee 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,6 +16,8 @@ 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. + + $Id: tincd.c,v 1.10.4.1 2000/06/25 15:16:12 guus Exp $ */ #include "config.h" @@ -41,6 +44,8 @@ #include "net.h" #include "netutl.h" +#include "system.h" + /* The name this program was run with. */ char *program_name; @@ -53,6 +58,9 @@ static int show_version; /* If nonzero, it will attempt to kill a running tincd and exit. */ static int kill_tincd = 0; +/* 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 */ @@ -76,6 +84,7 @@ static struct option const long_options[] = { "timeout", required_argument, NULL, 'p' }, { "help", no_argument, &show_help, 1 }, { "version", no_argument, &show_version, 1 }, + { "no-detach", no_argument, &do_detach, 0 }, { NULL, 0, NULL, 0 } }; @@ -83,18 +92,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 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); } @@ -106,7 +116,7 @@ parse_options(int argc, char **argv, char **envp) int option_index = 0; config_t *p; - while((r = getopt_long(argc, argv, "c:dkn:t:", long_options, &option_index)) != EOF) + while((r = getopt_long(argc, argv, "c:Ddkn:t:", long_options, &option_index)) != EOF) { switch(r) { @@ -116,6 +126,9 @@ parse_options(int argc, char **argv, char **envp) configfilename = xmalloc(strlen(optarg)+1); strcpy(configfilename, optarg); break; + case 'D': /* no detach */ + do_detach = 0; + break; case 'd': /* inc debug level */ debug_lvl++; break; @@ -129,7 +142,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; @@ -141,9 +154,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); } @@ -154,46 +167,54 @@ int detach(void) { int fd; pid_t pid; - - ppid = getpid(); - if((pid = fork()) < 0) - { - perror("fork"); - return -1; - } - if(pid) /* parent process */ + + if(do_detach) { - signal(SIGTERM, parent_exit); - sleep(600); /* wait 10 minutes */ - exit(1); - } + ppid = getpid(); + if((pid = fork()) < 0) + { + perror("fork"); + return -1; + } + if(pid) /* parent process */ + { + signal(SIGTERM, parent_exit); + sleep(600); /* wait 10 minutes */ + exit(1); + } + } + if(write_pidfile()) return -1; - if((fd = open("/dev/tty", O_RDWR)) >= 0) + if(do_detach) { - if(ioctl(fd, TIOCNOTTY, NULL)) + if((fd = open("/dev/tty", O_RDWR)) >= 0) { - perror("ioctl"); - return -1; + if(ioctl(fd, TIOCNOTTY, NULL)) + { + perror("ioctl"); + return -1; + } + close(fd); } - close(fd); - } - kill(ppid, SIGTERM); + if(setsid() < 0) + return -1; + + kill(ppid, SIGTERM); + } - if(setsid() < 0) - return -1; chdir("/"); /* avoid keeping a mointpoint busy */ 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; @@ -208,7 +229,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(); @@ -226,10 +247,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; } @@ -250,16 +271,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; @@ -275,30 +296,30 @@ void make_names(void) if(netname) { configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR)); - sprintf(configfilename, "%s/tinc/%s/tincd.conf", CONFDIR, netname); + sprintf(configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname); } else { configfilename = xmalloc(17+strlen(CONFDIR)); - sprintf(configfilename, "%s/tinc/tincd.conf", CONFDIR); + sprintf(configfilename, "%s/tinc/tinc.conf", CONFDIR); } } if(netname) { pidfilename = xmalloc(strlen(netname)+20); - sprintf(pidfilename, "/var/run/tincd.%s.pid", netname); + sprintf(pidfilename, "/var/run/tinc.%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); + sprintf(identname, "tinc.%s", netname); } else { - pidfilename = "/var/run/tincd.pid"; + pidfilename = "/var/run/tinc.pid"; confbase = xmalloc(7+strlen(CONFDIR)); sprintf(confbase, "%s/tinc/", CONFDIR); - identname = "tincd"; + identname = "tinc"; } } @@ -307,16 +328,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\n"), PACKAGE, VERSION); + 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; } @@ -326,7 +352,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; } @@ -343,7 +369,7 @@ main(int argc, char **argv, char **envp) setup_signals(); if(detach()) - cleanup_and_exit(1); + exit(0); if(security_init()) return 1; @@ -361,7 +387,7 @@ 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); } @@ -369,14 +395,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); } @@ -384,10 +410,10 @@ 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); @@ -400,7 +426,7 @@ RETSIGTYPE sighup_handler(int a) { if(debug_lvl > 0) - syslog(LOG_NOTICE, "Got HUP signal"); + syslog(LOG_NOTICE, _("Got HUP signal")); close_network_connections(); setup_network_connections(); /* FIXME: read config-file and re-establish network connections */ @@ -410,7 +436,7 @@ RETSIGTYPE sigint_handler(int a) { if(debug_lvl > 0) - syslog(LOG_NOTICE, "Got INT signal"); + syslog(LOG_NOTICE, _("Got INT signal")); cleanup_and_exit(0); } @@ -424,7 +450,7 @@ RETSIGTYPE sigusr2_handler(int a) { if(debug_lvl > 1) - syslog(LOG_NOTICE, "Forcing new keys"); + syslog(LOG_NOTICE, _("Forcing new key generation")); regenerate_keys(); } @@ -432,10 +458,10 @@ RETSIGTYPE sighuh(int a) { if(cp_file) - syslog(LOG_NOTICE, "Got unexpected signal after %s line %d.", - cp_file, cp_line); + syslog(LOG_NOTICE, _("Got unexpected signal %d after %s line %d"), + a, cp_file, cp_line); else - syslog(LOG_NOTICE, "Got unexpected signal."); + syslog(LOG_NOTICE, _("Got unexpected signal %d"), a); } void @@ -459,10 +485,10 @@ setup_signals(void) signal(SIGINT, sigint_handler); signal(SIGUSR1, sigusr1_handler); signal(SIGUSR2, sigusr2_handler); + signal(SIGCHLD, parent_exit); } RETSIGTYPE parent_exit(int a) { exit(0); } -