X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=0ccbdee6f13f6e7bca8a95b8efd580132f771afa;hp=74dac49b0dc7eb2b2ff6f1365c780b71b7664dfe;hb=66067cc9c1347fb2de35660d531fdd4be8aede6a;hpb=4fec0cc45774ba313d1823cc64c3afdda3204a2e diff --git a/src/tincd.c b/src/tincd.c index 74dac49b..0ccbdee6 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-2001 Ivo Timmermans + 2000,2001 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,23 +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.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.55 2001/10/28 08:41:19 guus Exp $ +*/ #include "config.h" @@ -43,59 +30,65 @@ #include #include #include +#include +#include +#include #ifdef HAVE_SYS_IOCTL_H # include #endif -#include +#include +#include +#include + #include #include #include "conf.h" -#include "encr.h" #include "net.h" #include "netutl.h" +#include "process.h" +#include "protocol.h" +#include "subnet.h" + +#include "system.h" /* The name this program was run with. */ char *program_name; /* If nonzero, display usage information and exit. */ -static int show_help; +int show_help; /* If nonzero, print the version on standard output and exit. */ -static int show_version; +int show_version; /* If nonzero, it will attempt to kill a running tincd and exit. */ -static int kill_tincd = 0; +int kill_tincd = 0; -/* If zero, don't detach from the terminal. */ -static int do_detach = 1; +/* If nonzero, generate public/private keypair for this host/net. */ +int generate_keys = 0; + +/* If nonzero, use null ciphers and skip all key exchanges. */ +int bypass_security = 0; -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 */ -static pid_t ppid; /* pid of non-detached part */ char **g_argv; /* a copy of the cmdline arguments */ - -void cleanup_and_exit(int); -int detach(void); -int kill_other(void); -void make_names(void); -RETSIGTYPE parent_exit(int a); -void setup_signals(void); -int write_pidfile(void); +char **environment; /* A pointer to the environment on + startup */ static struct option const long_options[] = { - { "kill", no_argument, NULL, 'k' }, + { "config", required_argument, NULL, 'c' }, + { "kill", optional_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 }, + { "generate-keys", optional_argument, NULL, 'K'}, + { "debug", optional_argument, NULL, 'd'}, + { "bypass-security", no_argument, &bypass_security, 1 }, { NULL, 0, NULL, 0 } }; @@ -103,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, --debug[=LEVEL] Increase debug level or set it to LEVEL.\n" + " -k, --kill[=SIGNAL] Attempt to kill a running tincd and exit.\n" + " -n, --net=NETNAME Connect to net NETNAME.\n")); + printf(_(" -K, --generate-keys[=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); } @@ -125,37 +118,47 @@ parse_options(int argc, char **argv, char **envp) { int r; 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:Dd::k::n: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; break; case 'd': /* inc debug level */ - debug_lvl++; + if(optarg) + debug_lvl = atoi(optarg); + else + debug_lvl++; break; case 'k': /* kill old tincds */ - kill_tincd = 1; + kill_tincd = optarg?atoi(optarg):SIGTERM; break; case 'n': /* net name given */ 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 `%s'; BITS must be a number equal to or greater than 512.\n"), + optarg); + usage(1); + } + generate_keys &= ~7; /* Round it to bytes */ + } + else + generate_keys = 1024; break; case '?': usage(1); @@ -165,134 +168,88 @@ parse_options(int argc, char **argv, char **envp) } } -void memory_full(int size) +/* This function prettyprints the key generation process */ + +void indicator(int a, int b, void *p) { - syslog(LOG_ERR, "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes); exiting.", cp_file, cp_line, size); - exit(1); + 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, "?"); + } } /* - Detach from current terminal, write pidfile, kill parent + Generate a public/private RSA keypair, and ask for a file to store + them in. */ -int detach(void) +int keygen(int bits) { - int fd; - pid_t pid; + RSA *rsa_key; + FILE *f; + char *name = NULL; + char *filename; - if(do_detach) - { - 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; + fprintf(stderr, _("Generating %d bits keys:\n"), bits); + rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL); - if(do_detach) + if(!rsa_key) { - if((fd = open("/dev/tty", O_RDWR)) >= 0) - { - if(ioctl(fd, TIOCNOTTY, NULL)) - { - perror("ioctl"); - return -1; - } - close(fd); - } - - if(setsid() < 0) - return -1; - - kill(ppid, SIGTERM); + fprintf(stderr, _("Error during key generation!\n")); + 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.", - VERSION, __DATE__, __TIME__, debug_lvl); else - syslog(LOG_NOTICE, "tincd %s starting, debug level %d.", VERSION, debug_lvl); - - xalloc_fail_func = memory_full; - - return 0; -} + fprintf(stderr, _("Done.\n")); -/* - Close network connections, and terminate neatly -*/ -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.", - total_tap_out, total_socket_out, total_tap_in, total_socket_in); - - closelog(); - kill(ppid, SIGTERM); - exit(c); -} + get_config_string(lookup_config(config_tree, "Name"), &name); -/* - check for an existing tinc for this net, and write pid to pidfile -*/ -int write_pidfile(void) -{ - int pid; - - if((pid = check_pid(pidfilename))) - { - if(netname) - 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); - return 1; - } + if(name) + asprintf(&filename, "%s/hosts/%s", confbase, name); + else + asprintf(&filename, "%s/rsa_key.pub", confbase); - /* if it's locked, write-protected, or whatever */ - if(!write_pid(pidfilename)) - return 1; + if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL) + return -1; - return 0; -} + if(ftell(f)) + fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n")); -/* - kill older tincd for this net -*/ -int kill_other(void) -{ - int pid; + PEM_write_RSAPublicKey(f, rsa_key); + fclose(f); + free(filename); + + asprintf(&filename, "%s/rsa_key.priv", confbase); + if((f = ask_and_safe_open(filename, _("private RSA key"), "a")) == NULL) + return -1; - if(!(pid = read_pid(pidfilename))) - { - if(netname) - fprintf(stderr, "No other tincd is running for net `%s'.\n", netname); - else - fprintf(stderr, "No other tincd is running.\n"); - return 1; - } + if(ftell(f)) + fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n")); - 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"); - remove_pid(pidfilename); + PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL); + fclose(f); + free(filename); return 0; } @@ -302,35 +259,25 @@ int kill_other(void) */ void make_names(void) { - if(!configfilename) - { - if(netname) - { - configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR)); - sprintf(configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname); - } - else - { - configfilename = xmalloc(17+strlen(CONFDIR)); - sprintf(configfilename, "%s/tinc/tinc.conf", CONFDIR); - } - } - if(netname) { - pidfilename = xmalloc(strlen(netname)+20); - 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, "tinc.%s", netname); + if(!pidfilename) + asprintf(&pidfilename, LOCALSTATEDIR "/run/tinc.%s.pid", netname); + if(!confbase) + asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname); + else + syslog(LOG_INFO, _("Both netname and configuration directory given, using the latter...")); + if(!identname) + asprintf(&identname, "tinc.%s", netname); } else { - pidfilename = "/var/run/tinc.pid"; - confbase = xmalloc(7+strlen(CONFDIR)); - sprintf(confbase, "%s/tinc/", CONFDIR); - identname = "tinc"; + if(!pidfilename) + pidfilename = LOCALSTATEDIR "/run/tinc.pid"; + if(!confbase) + asprintf(&confbase, "%s/tinc", CONFDIR); + if(!identname) + identname = "tinc"; } } @@ -339,16 +286,21 @@ main(int argc, char **argv, char **envp) { program_name = argv[0]; + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + + environment = envp; 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-2001 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; } @@ -358,144 +310,60 @@ 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.\n")); return 1; } +#ifdef HAVE_SOLARIS + openlog("tinc", LOG_CONS, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */ +#else + openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */ +#endif + g_argv = argv; make_names(); + init_configuration(&config_tree); + /* Slllluuuuuuurrrrp! */ +cp + RAND_load_file("/dev/urandom", 1024); +cp + if(generate_keys) + { + read_server_config(); + exit(keygen(generate_keys)); + } + if(kill_tincd) - exit(kill_other()); - - if(read_config_file(configfilename)) - return 1; - - setup_signals(); + exit(kill_other(kill_tincd)); + if(read_server_config()) + exit(1); +cp if(detach()) exit(0); +cp + for(;;) + { + if(!setup_network_connections()) + { + main_loop(); + cleanup_and_exit(1); + } + + syslog(LOG_ERR, _("Unrecoverable error")); + cp_trace(); - if(security_init()) - return 1; - - if(setup_network_connections()) - cleanup_and_exit(1); - - main_loop(); - - cleanup_and_exit(1); - return 1; -} - -RETSIGTYPE -sigterm_handler(int a) -{ - if(debug_lvl > 0) - 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"); - cleanup_and_exit(0); -} - -RETSIGTYPE -sigsegv_square(int a) -{ - syslog(LOG_NOTICE, "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."); - - signal(SIGSEGV, sigsegv_square); - - close_network_connections(); - remove_pid(pidfilename); - execvp(g_argv[0], g_argv); -} - -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 */ -} - -RETSIGTYPE -sigint_handler(int a) -{ - if(debug_lvl > 0) - syslog(LOG_NOTICE, "Got INT signal"); - cleanup_and_exit(0); -} - -RETSIGTYPE -sigusr1_handler(int a) -{ - dump_conn_list(); -} - -RETSIGTYPE -sigusr2_handler(int a) -{ - if(debug_lvl > 1) - syslog(LOG_NOTICE, "Forcing new keys"); - 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); -} - -void -setup_signals(void) -{ - int i; - - for(i=0;i<32;i++) - signal(i,sighuh); - - if(signal(SIGTERM, SIG_IGN) != SIG_ERR) - signal(SIGTERM, sigterm_handler); - if(signal(SIGQUIT, SIG_IGN) != SIG_ERR) - signal(SIGQUIT, sigquit_handler); - if(signal(SIGSEGV, SIG_IGN) != SIG_ERR) - signal(SIGSEGV, sigsegv_handler); - if(signal(SIGHUP, SIG_IGN) != SIG_ERR) - signal(SIGHUP, sighup_handler); - signal(SIGPIPE, SIG_IGN); - if(signal(SIGINT, SIG_IGN) != SIG_ERR) - signal(SIGINT, sigint_handler); - signal(SIGUSR1, sigusr1_handler); - signal(SIGUSR2, sigusr2_handler); - signal(SIGCHLD, parent_exit); -} - -RETSIGTYPE parent_exit(int a) -{ - exit(0); + if(do_detach) + { + syslog(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout); + sleep(maxtimeout); + } + else + { + syslog(LOG_ERR, _("Not restarting.")); + exit(1); + } + } } -