/*
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-2007 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.17 2003/08/24 20:38:29 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"
char *identname = NULL; /* program name for syslog */
char *pidfilename = NULL; /* pid file location */
+char *controlfilename = NULL; /* pid file location */
char *logfilename = NULL; /* log file location */
char **g_argv; /* a copy of the cmdline arguments */
" --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"));
if(!pidfilename)
asprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
+ asprintf(&controlfilename, LOCALSTATEDIR "/run/%s.control", identname);
+
if(!logfilename)
asprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
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-2007 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"
/* Slllluuuuuuurrrrp! */
+ srand(time(NULL));
RAND_load_file("/dev/urandom", 1024);
+ ENGINE_load_builtin_engines();
+ ENGINE_register_all_complete();
+
OpenSSL_add_all_algorithms();
if(generate_keys) {
if(!read_server_config())
return 1;
+ if(event_init() < 0) {
+ logger(LOG_ERR, _("Error initializing libevent!"));
+ return 1;
+ }
+
if(lzo_init() != LZO_E_OK) {
logger(LOG_ERR, _("Error initializing LZO compressor!"));
return 1;
return 1;
- /* Setup sockets and open device. If it doesn't work, don't give up but try again. */
+ /* Setup sockets and open device. */
- while(!setup_network_connections()) {
- if(do_detach) {
- logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
- sleep(maxtimeout);
- } else {
- logger(LOG_ERR, _("Not restarting."));
- return 1;
- }
- }
+ if(!setup_network_connections())
+ goto end;
/* Start main loop. It only exits when tinc is killed. */
ifdebug(CONNECTIONS)
dump_device_stats();
+end:
logger(LOG_NOTICE, _("Terminating"));
+
+#ifndef HAVE_MINGW
+ remove_pid(pidfilename);
+#endif
+
+ EVP_cleanup();
+
return status;
}