X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=5fedd6927174d65e151cadf4338639228f9a6880;hp=cec0ee5e37bcfab21cc13b2f0bf5e96350c5c810;hb=0d0dfd0852e9b2c9a7660880966a3c84790d5ea2;hpb=9bde92ce97d5503ff2d31dcc6f0648902580ec14

diff --git a/src/tincd.c b/src/tincd.c
index cec0ee5e..5fedd692 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-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
@@ -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.85 2003/08/08 22:11:54 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"
@@ -119,7 +121,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"));
 	}
 }
 
@@ -290,8 +292,20 @@ static bool keygen(int bits)
 	char *name = NULL;
 	char *filename;
 
+	get_config_string(lookup_config(config_tree, "Name"), &name);
+
+	if(name) {
+		if(!check_id(name)) {
+			fprintf(stderr, _("Invalid name for myself!\n"));
+			return false;
+		}
+		asprintf(&filename, "%s/hosts/%s", confbase, name);
+		free(name);
+	} else
+		asprintf(&filename, "%s/rsa_key.pub", confbase);
+
 	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"));
@@ -317,13 +331,6 @@ static bool keygen(int bits)
 	fclose(f);
 	free(filename);
 
-	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);
-
 	f = ask_and_open(filename, _("public RSA key"), "a");
 
 	if(!f)
@@ -358,7 +365,7 @@ static void make_names(void)
 #ifdef HAVE_MINGW
 	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
 		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
-			if(!pidfilename)
+			if(!logfilename)
 				asprintf(&logfilename, "%s/log/%s.log", identname);
 			if(!confbase) {
 				if(netname)
@@ -390,6 +397,14 @@ static void make_names(void)
 	}
 }
 
+static void free_names() {
+	if (identname) free(identname);
+	if (netname) free(netname);
+	if (pidfilename) free(pidfilename);
+	if (logfilename) free(logfilename);
+	if (confbase) free(confbase);
+}
+
 int main(int argc, char **argv)
 {
 	program_name = argv[0];
@@ -406,7 +421,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-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"
@@ -447,6 +462,9 @@ int main(int argc, char **argv)
 
 	RAND_load_file("/dev/urandom", 1024);
 
+	ENGINE_load_builtin_engines();
+	ENGINE_register_all_complete();
+
 	OpenSSL_add_all_algorithms();
 
 	if(generate_keys) {
@@ -482,17 +500,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. */
 
@@ -500,11 +511,26 @@ int main2(int argc, char **argv)
 
 	/* Shutdown properly. */
 
-	close_network_connections();
-
 	ifdebug(CONNECTIONS)
 		dump_device_stats();
 
+	close_network_connections();
+
+end:
 	logger(LOG_NOTICE, _("Terminating"));
+
+#ifndef HAVE_MINGW
+	remove_pid(pidfilename);
+#endif
+
+	EVP_cleanup();
+	ENGINE_cleanup();
+	CRYPTO_cleanup_all_ex_data();
+	ERR_remove_state(0);
+	ERR_free_strings();
+
+	exit_configuration(&config_tree);
+	free_names();
+	
 	return status;
 }