/*
tincd.c -- the main file for tincd
- Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
- 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-2005 Ivo Timmermans
+ 2000-2008 Guus Sliepen <guus@tinc-vpn.org>
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
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.80 2003/08/02 20:50:38 guus Exp $
+ $Id$
*/
#include "system.h"
#include <openssl/rsa.h>
#include <openssl/pem.h>
#include <openssl/evp.h>
+#include <openssl/engine.h>
-#include <lzo1x.h>
+#include LZO1X_H
#include <getopt.h>
+#include "pidfile.h"
#include "conf.h"
+#include "device.h"
#include "logger.h"
#include "net.h"
#include "netutl.h"
char *logfilename = NULL; /* log file location */
char **g_argv; /* a copy of the cmdline arguments */
-int exitstatus = 0;
+static int status;
static struct option const long_options[] = {
{"config", required_argument, NULL, 'c'},
" --pidfile=FILENAME Write PID to FILENAME.\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"));
+ printf(_("Report bugs to tinc@tinc-vpn.org.\n"));
}
}
char *filename;
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
- rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
+ rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
if(!rsa_key) {
fprintf(stderr, _("Error during key generation!\n"));
fprintf(stderr, _("Done.\n"));
asprintf(&filename, "%s/rsa_key.priv", confbase);
- f = ask_and_safe_open(filename, _("private RSA key"), true, "a");
+ f = ask_and_open(filename, _("private RSA key"), "a");
if(!f)
return false;
-
+
+#ifdef HAVE_FCHMOD
+ /* Make it unreadable for others. */
+ fchmod(fileno(f), 0600);
+#endif
+
if(ftell(f))
fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
else
asprintf(&filename, "%s/rsa_key.pub", confbase);
- f = ask_and_safe_open(filename, _("public RSA key"), false, "a");
+ f = ask_and_open(filename, _("public RSA key"), "a");
if(!f)
return false;
*/
static void make_names(void)
{
+#ifdef HAVE_MINGW
+ HKEY key;
+ char installdir[1024] = "";
+ long len = sizeof(installdir);
+#endif
+
if(netname)
asprintf(&identname, "tinc.%s", netname);
else
identname = xstrdup("tinc");
+#ifdef HAVE_MINGW
+ if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
+ if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
+ if(!logfilename)
+ asprintf(&logfilename, "%s/log/%s.log", identname);
+ if(!confbase) {
+ if(netname)
+ asprintf(&confbase, "%s/%s", installdir, netname);
+ else
+ asprintf(&confbase, "%s", installdir);
+ }
+ }
+ RegCloseKey(key);
+ if(*installdir)
+ return;
+ }
+#endif
+
if(!pidfilename)
asprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
if(netname) {
if(!confbase)
- asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
+ asprintf(&confbase, CONFDIR "/tinc/%s", netname);
else
logger(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
} else {
if(!confbase)
- asprintf(&confbase, "%s/tinc", CONFDIR);
+ asprintf(&confbase, CONFDIR "/tinc");
}
}
if(show_version) {
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
VERSION, __DATE__, __TIME__, PROT_CURRENT);
- printf(_("Copyright (C) 1998-2003 Ivo Timmermans, Guus Sliepen and others.\n"
+ printf(_("Copyright (C) 1998-2008 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"
if(kill_tincd)
return !kill_other(kill_tincd);
- openlogger("tinc", LOGMODE_STDERR);
+ openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
/* Lock all pages into memory if requested */
RAND_load_file("/dev/urandom", 1024);
+ ENGINE_load_builtin_engines();
+ ENGINE_register_all_complete();
+
OpenSSL_add_all_algorithms();
if(generate_keys) {
if(!detach())
return 1;
- for(;;) {
- if(setup_network_connections()) {
- int status;
- status = main_loop();
- close_network_connections();
+ /* Setup sockets and open device. */
- ifdebug(CONNECTIONS)
- dump_device_stats();
+ if(!setup_network_connections())
+ goto end;
- logger(LOG_NOTICE, _("Terminating"));
- return status;
- }
+ /* Start main loop. It only exits when tinc is killed. */
- logger(LOG_ERR, _("Unrecoverable error"));
- cp_trace();
+ status = main_loop();
- if(do_detach) {
- logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
- sleep(maxtimeout);
- } else {
- logger(LOG_ERR, _("Not restarting."));
- return 1;
- }
- }
+ /* Shutdown properly. */
+
+ close_network_connections();
+
+ ifdebug(CONNECTIONS)
+ dump_device_stats();
+
+end:
+ logger(LOG_NOTICE, _("Terminating"));
+
+#ifndef HAVE_MINGW
+ remove_pid(pidfilename);
+#endif
+
+ EVP_cleanup();
+
+ return status;
}
projects / tinc / blobdiff