X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=a06f3fe37fbddad06c53269b854e356e3d637d79;hp=6d577570f2fe58f212c8639ba9150b1c55ec866c;hb=52b842f8076d507d3a6ea07045d085ae21d1aa10;hpb=0b02ebc4d98182cf79c670e7e556ac7f4f859b75 diff --git a/src/tincd.c b/src/tincd.c index 6d577570..a06f3fe3 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,20 +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.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.15 2000/10/21 11:52:08 guus Exp $ +*/ #include "config.h" @@ -40,6 +30,9 @@ #include #include #include +#include +#include +#include #ifdef HAVE_SYS_IOCTL_H # include @@ -53,6 +46,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; @@ -69,10 +65,10 @@ 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 */ +/* If nonzero, generate public/private keypair for this host/net. */ +static int generate_keys = 0; + char *identname; /* program name for syslog */ -char *netname = NULL; /* name of the vpn network */ char *pidfilename; /* pid file location */ static pid_t ppid; /* pid of non-detached part */ char **g_argv; /* a copy of the cmdline arguments */ @@ -89,10 +85,10 @@ static struct option const long_options[] = { { "kill", no_argument, NULL, 'k' }, { "net", required_argument, NULL, 'n' }, - { "timeout", required_argument, NULL, 'p' }, { "help", no_argument, &show_help, 1 }, { "version", no_argument, &show_version, 1 }, { "no-detach", no_argument, &do_detach, 0 }, + { "keygen", optional_argument, NULL, 'K'}, { NULL, 0, NULL, 0 } }; @@ -100,19 +96,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 tinc@nl.linux.org.\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")); + printf(_(" -K, --keygen[=BITS] Generate public/private RSA keypair.\n" + " --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); } @@ -124,15 +120,15 @@ parse_options(int argc, char **argv, char **envp) int option_index = 0; config_t *p; - while((r = getopt_long(argc, argv, "c:Ddkn:t:", long_options, &option_index)) != EOF) + while((r = getopt_long(argc, argv, "c:Ddkn:K::", long_options, &option_index)) != EOF) { switch(r) { 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; @@ -147,12 +143,19 @@ parse_options(int argc, char **argv, char **envp) netname = xmalloc(strlen(optarg)+1); strcpy(netname, optarg); break; - case 't': /* timeout */ - if(!(p = add_config_val(&config, TYPE_INT, optarg))) - { - printf("Invalid timeout value `%s'.\n", optarg); - usage(1); - } + case 'K': /* generate public/private keypair */ + if(optarg) + { + generate_keys = atoi(optarg); + if(generate_keys < 512) + { + fprintf(stderr, _("Invalid argument! BITS must be a number equal to or greater than 512.\n")); + usage(1); + } + generate_keys &= ~7; /* Round it to bytes */ + } + else + generate_keys = 1024; break; case '?': usage(1); @@ -162,9 +165,69 @@ parse_options(int argc, char **argv, char **envp) } } +/* This function prettyprints the key generation process */ + +void indicator(int a, int b, void *p) +{ + switch(a) + { + case 0: + fprintf(stderr, "."); + break; + case 1: + fprintf(stderr, "+"); + break; + case 2: + fprintf(stderr, "-"); + break; + case 3: + switch(b) + { + case 0: + fprintf(stderr, " p\n"); + break; + case 1: + fprintf(stderr, " q\n"); + break; + default: + fprintf(stderr, "?"); + } + break; + default: + fprintf(stderr, "?"); + } +} + +/* Generate a public/private RSA keypair, and possibly store it into the configuration file. */ + +int keygen(int bits) +{ + RSA *rsa_key; + + fprintf(stderr, _("Seeding the PRNG: please press some keys or move\nthe mouse if this program seems to have halted...\n")); + RAND_load_file("/dev/random", 1024); /* OpenSSL PRNG state apparently uses 1024 bytes, but it seems pretty sufficient anyway :) */ + + fprintf(stderr, _("Generating %d bits keys:\n"), bits); + rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL); + if(!rsa_key) + { + fprintf(stderr, _("Error during key generation!")); + return -1; + } + else + fprintf(stderr, _("Done.\n")); + + fprintf(stderr, _("Please copy the private key to tinc.conf and the\npublic key to your host configuration file:\n\n")); + printf("PublicKey = %s\n", BN_bn2hex(rsa_key->n)); + printf("PrivateKey = %s\n", BN_bn2hex(rsa_key->d)); + + fflush(stdin); + return 0; +} + 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); } @@ -188,7 +251,7 @@ int detach(void) if(pid) /* parent process */ { signal(SIGTERM, parent_exit); - sleep(600); /* wait 10 minutes */ +// sleep(600); /* wait 10 minutes */ exit(1); } } @@ -218,11 +281,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 > 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, debug level %d.", VERSION, debug_lvl); + syslog(LOG_NOTICE, _("tincd %s starting"), VERSION); xalloc_fail_func = memory_full; @@ -236,8 +299,8 @@ 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.", + 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); closelog(); @@ -255,10 +318,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; } @@ -279,16 +342,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; @@ -299,35 +362,23 @@ int kill_other(void) */ 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"; } } @@ -336,16 +387,24 @@ main(int argc, char **argv, char **envp) { program_name = argv[0]; + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + + /* Do some intl stuff right now */ + + unknown = _("unknown"); + 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, Guus Sliepen 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")); return 0; } @@ -355,7 +414,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; } @@ -363,10 +422,13 @@ main(int argc, char **argv, char **envp) make_names(); + if(generate_keys) + exit(keygen(generate_keys)); + if(kill_tincd) exit(kill_other()); - if(read_config_file(configfilename)) + if(read_server_config()) return 1; setup_signals(); @@ -374,72 +436,92 @@ main(int argc, char **argv, char **envp) if(detach()) exit(0); +/* FIXME: wt* is this suppose to do? if(security_init()) return 1; - - if(setup_network_connections()) - cleanup_and_exit(1); - - main_loop(); - - cleanup_and_exit(1); - return 1; +*/ + for(;;) + { + if(!setup_network_connections()) + { + main_loop(); + cleanup_and_exit(1); + } + + syslog(LOG_ERR, _("Unrecoverable error")); + cp_trace(); + + if(do_detach) + { + syslog(LOG_NOTICE, _("Restarting in %d seconds!"), MAXTIMEOUT); + sleep(MAXTIMEOUT); + } + else + { + syslog(LOG_ERR, _("Aieee! Not restarting.")); + exit(0); + } + } } RETSIGTYPE sigterm_handler(int a) { - if(debug_lvl > 0) - syslog(LOG_NOTICE, "Got TERM signal"); + if(debug_lvl > DEBUG_NOTHING) + syslog(LOG_NOTICE, _("Got TERM signal")); cleanup_and_exit(0); } RETSIGTYPE sigquit_handler(int a) { - if(debug_lvl > 0) - syslog(LOG_NOTICE, "Got QUIT signal"); + if(debug_lvl > DEBUG_NOTHING) + 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_ERR, _("Got another SEGV signal: not restarting")); exit(0); } RETSIGTYPE sigsegv_handler(int a) { - if(cp_file) - 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_ERR, _("Got SEGV signal")); + cp_trace(); - signal(SIGSEGV, sigsegv_square); - - close_network_connections(); - remove_pid(pidfilename); - execvp(g_argv[0], g_argv); + if(do_detach) + { + syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds...")); + signal(SIGSEGV, sigsegv_square); + close_network_connections(); + sleep(5); + remove_pid(pidfilename); + execvp(g_argv[0], g_argv); + } + else + { + syslog(LOG_NOTICE, _("Aieee! Not restarting.")); + exit(0); + } } 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 */ + if(debug_lvl > DEBUG_NOTHING) + 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"); + if(debug_lvl > DEBUG_NOTHING) + syslog(LOG_NOTICE, _("Got INT signal, exiting")); cleanup_and_exit(0); } @@ -452,19 +534,18 @@ sigusr1_handler(int a) RETSIGTYPE sigusr2_handler(int a) { - if(debug_lvl > 1) - syslog(LOG_NOTICE, "Forcing new keys"); + if(debug_lvl > DEBUG_NOTHING) + 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); - else - syslog(LOG_NOTICE, "Got unexpected signal (%d).", a); + syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a)); + cp_trace(); } void @@ -488,11 +569,10 @@ setup_signals(void) signal(SIGINT, sigint_handler); signal(SIGUSR1, sigusr1_handler); signal(SIGUSR2, sigusr2_handler); - signal(SIGCHLD, parent_exit); + signal(SIGCHLD, SIG_IGN); } RETSIGTYPE parent_exit(int a) { exit(0); } -