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.11 2000/10/14 17:04:16 guus Exp $
+ $Id: tincd.c,v 1.10.4.23 2000/10/30 10:19:06 guus Exp $
*/
#include "config.h"
#include <syslog.h>
#include <unistd.h>
#include <signal.h>
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/err.h>
+#include <string.h>
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#include <xalloc.h>
#include "conf.h"
-#include "encr.h"
#include "net.h"
#include "netutl.h"
#include "protocol.h"
+#include "subnet.h"
#include "system.h"
/* If zero, don't detach from the terminal. */
static int do_detach = 1;
+/* 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 */
{
{ "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 },
+ { "generate-keys", optional_argument, NULL, 'K'},
{ NULL, 0, NULL, 0 }
};
else
{
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"
- " -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(_(" -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, --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);
{
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:Ddkn:K::", long_options, &option_index)) != EOF)
{
switch(r)
{
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);
}
}
+/* 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, _("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);
openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
- if(debug_lvl > 0)
+ 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"), VERSION, debug_lvl);
+ syslog(LOG_NOTICE, _("tincd %s starting"), VERSION);
xalloc_fail_func = memory_full;
{
close_network_connections();
- if(debug_lvl > 0)
+ 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);
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 (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"
+ 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\n"));
- printf(_("This product includes software developed by Eric Young (eay@mincom.oz.au)\n"));
+ "see the file COPYING for details.\n"));
return 0;
}
make_names();
+ /* Slllluuuuuuurrrrp! */
+
+ RAND_load_file("/dev/urandom", 1024);
+
+ if(generate_keys)
+ exit(keygen(generate_keys));
+
if(kill_tincd)
exit(kill_other());
if(detach())
exit(0);
-/* FIXME: wt* is this suppose to do?
- if(security_init())
- return 1;
-*/
+ if(debug_lvl >= DEBUG_ERROR)
+ ERR_load_crypto_strings();
+
for(;;)
{
- setup_network_connections();
-
- main_loop();
-
- cleanup_and_exit(1);
+ if(!setup_network_connections())
+ {
+ main_loop();
+ cleanup_and_exit(1);
+ }
+
+ syslog(LOG_ERR, _("Unrecoverable error"));
+ cp_trace();
- syslog(LOG_ERR, _("Unrecoverable error, restarting in %d seconds!"), MAXTIMEOUT);
- sleep(MAXTIMEOUT);
+ if(do_detach)
+ {
+ syslog(LOG_NOTICE, _("Restarting in %d seconds!"), MAXTIMEOUT);
+ sleep(MAXTIMEOUT);
+ }
+ else
+ {
+ syslog(LOG_ERR, _("Not restarting."));
+ exit(0);
+ }
}
}
RETSIGTYPE
sigterm_handler(int a)
{
- if(debug_lvl > 0)
+ if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got TERM signal"));
+
cleanup_and_exit(0);
}
RETSIGTYPE
sigquit_handler(int a)
{
- if(debug_lvl > 0)
+ 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, _("Not restarting."));
+ exit(0);
+ }
}
RETSIGTYPE
sighup_handler(int a)
{
- if(debug_lvl > 0)
- syslog(LOG_NOTICE, _("Got HUP signal, rereading configuration and restarting"));
+ if(debug_lvl > DEBUG_NOTHING)
+ syslog(LOG_NOTICE, _("Got HUP signal"));
sighup = 1;
}
RETSIGTYPE
sigint_handler(int a)
{
- if(debug_lvl > 0)
+ if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got INT signal, exiting"));
cleanup_and_exit(0);
}
RETSIGTYPE
sigusr2_handler(int a)
{
- if(debug_lvl > 1)
- syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
-/* FIXME: reprogram this.
- regenerate_keys();
-*/
+ dump_subnet_list();
}
RETSIGTYPE
sighuh(int a)
{
- if(cp_file)
- syslog(LOG_NOTICE, _("Got unexpected %s after %s line %d"),
- strsignal(a), cp_file, cp_line);
- else
- syslog(LOG_NOTICE, _("Got unexpected %s"), strsignal(a));
+ syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
+ cp_trace();
}
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)
projects / tinc / blobdiff