X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=f4ecebff3a9b50b100f5190c38e1eac0d9c77d08;hp=8eb0be5e3f3ceee6848e20db13fda8106026b500;hb=4f47da5b87ef7da608c7e44026122f3d95deb2eb;hpb=d3f889c8076dff9c00ebfe1459cb36425f8da41d diff --git a/src/tincd.c b/src/tincd.c index 8eb0be5e..f4ecebff 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -17,7 +17,7 @@ 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.41 2001/01/07 17:09:07 guus Exp $ + $Id: tincd.c,v 1.10.4.56 2001/11/16 22:40:26 zarq Exp $ */ #include "config.h" @@ -38,38 +38,15 @@ # include #endif -#ifdef HAVE_OPENSSL_RAND_H -# include -#else -# include -#endif - -#ifdef HAVE_OPENSSL_RSA_H -# include -#else -# include -#endif - -#ifdef HAVE_OPENSSL_ERR_H -# include -#else -# include -#endif - -#ifdef HAVE_OPENSSL_PEM_H -# include -#else -# include -#endif - - +#include +#include +#include #include #include #include "conf.h" #include "net.h" -#include "netutl.h" #include "process.h" #include "protocol.h" #include "subnet.h" @@ -80,19 +57,19 @@ 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; - -/* If zero, don't detach from the terminal. */ -extern int do_detach; +int kill_tincd = 0; /* If nonzero, generate public/private keypair for this host/net. */ -static int generate_keys = 0; +int generate_keys = 0; + +/* If nonzero, use null ciphers and skip all key exchanges. */ +int bypass_security = 0; char *identname; /* program name for syslog */ char *pidfilename; /* pid file location */ @@ -103,12 +80,14 @@ char **environment; /* A pointer to the environment on static struct option const long_options[] = { { "config", required_argument, NULL, 'c' }, - { "kill", no_argument, NULL, 'k' }, + { "kill", optional_argument, NULL, 'k' }, { "net", required_argument, NULL, 'n' }, { "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 } }; @@ -122,8 +101,8 @@ usage(int status) 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" + " -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" @@ -139,7 +118,7 @@ parse_options(int argc, char **argv, char **envp) int r; int option_index = 0; - while((r = getopt_long(argc, argv, "c:Ddkn:K::", long_options, &option_index)) != EOF) + while((r = getopt_long(argc, argv, "c:Dd::k::n:K::", long_options, &option_index)) != EOF) { switch(r) { @@ -159,7 +138,7 @@ parse_options(int argc, char **argv, char **envp) 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); @@ -229,6 +208,7 @@ int keygen(int bits) { RSA *rsa_key; FILE *f; + char *name = NULL; char *filename; fprintf(stderr, _("Generating %d bits keys:\n"), bits); @@ -236,22 +216,36 @@ int keygen(int bits) if(!rsa_key) { - fprintf(stderr, _("Error during key generation!")); + fprintf(stderr, _("Error during key generation!\n")); return -1; - } + } else fprintf(stderr, _("Done.\n")); - asprintf(&filename, "%s/rsa_key.pub", confbase); - if((f = ask_and_safe_open(filename, _("public RSA key"))) == NULL) + get_config_string(lookup_config(config_tree, "Name"), &name); + + if(name) + asprintf(&filename, "%s/hosts/%s", confbase, name); + else + asprintf(&filename, "%s/rsa_key.pub", confbase); + + if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL) return -1; + + if(ftell(f)) + fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n")); + 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"))) == NULL) + if((f = ask_and_safe_open(filename, _("private RSA key"), "a")) == NULL) return -1; + + if(ftell(f)) + fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n")); + PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL); fclose(f); free(filename); @@ -295,10 +289,6 @@ main(int argc, char **argv, char **envp) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - /* Do some intl stuff right now */ - - unknown = _("unknown"); - environment = envp; parse_options(argc, argv, envp); @@ -323,31 +313,36 @@ main(int argc, char **argv, char **envp) return 1; } - openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */ +#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) - exit(keygen(generate_keys)); - + { + read_server_config(); + exit(keygen(generate_keys)); + } + if(kill_tincd) - exit(kill_other()); + exit(kill_other(kill_tincd)); if(read_server_config()) - return 1; + exit(1); cp if(detach()) exit(0); cp - if(debug_lvl >= DEBUG_ERROR) - ERR_load_crypto_strings(); - for(;;) { if(!setup_network_connections()) @@ -361,14 +356,13 @@ cp if(do_detach) { - syslog(LOG_NOTICE, _("Restarting in %d seconds!"), MAXTIMEOUT); - sleep(MAXTIMEOUT); + syslog(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout); + sleep(maxtimeout); } else { syslog(LOG_ERR, _("Not restarting.")); - exit(0); + exit(1); } } } -