X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=bde1b9bc538e4b05a6a922dbb2bb1ed8b9926ce8;hb=01f47c46af514a9d7f39c143e4558a8426a0d3eb;hp=9e0ad4aabb87043268a8b0c559827273b11904d9;hpb=5e7c52610f8c8b9c38e437ef166a08372d5b8a61;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index 9e0ad4aa..bde1b9bc 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     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
@@ -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.86 2003/08/17 09:03:30 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -35,10 +35,12 @@
 #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"
@@ -76,6 +78,7 @@ bool use_logfile = false;
 
 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 */
 
@@ -119,7 +122,7 @@ static void usage(bool status)
 				"      --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"));
 	}
 }
 
@@ -291,7 +294,7 @@ static bool keygen(int bits)
 	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"));
@@ -376,6 +379,8 @@ static void make_names(void)
 	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);
 
@@ -406,7 +411,7 @@ int main(int argc, char **argv)
 	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"
@@ -445,8 +450,12 @@ int main(int argc, char **argv)
 
 	/* 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) {
@@ -457,6 +466,11 @@ int main(int argc, char **argv)
 	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;
@@ -482,17 +496,10 @@ int main2(int argc, char **argv)
 		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. */
 
@@ -505,6 +512,14 @@ int main2(int argc, char **argv)
 	ifdebug(CONNECTIONS)
 		dump_device_stats();
 
+end:
 	logger(LOG_NOTICE, _("Terminating"));
+
+#ifndef HAVE_MINGW
+	remove_pid(pidfilename);
+#endif
+
+	EVP_cleanup();
+	
 	return status;
 }