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

diff --git a/src/tincd.c b/src/tincd.c
index cec0ee5e..ce22b7b6 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -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: tincd.c,v 1.10.4.90 2003/12/07 14:31:09 guus Exp $
 */
 
 #include "system.h"
@@ -31,14 +31,12 @@
 #include <sys/mman.h>
 #endif
 
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <openssl/evp.h>
+#include <gnutls/gnutls.h>
 
 #include <lzo1x.h>
 
 #include <getopt.h>
+#include <pidfile.h>
 
 #include "conf.h"
 #include "device.h"
@@ -285,13 +283,17 @@ static void indicator(int a, int b, void *p)
 */
 static bool keygen(int bits)
 {
+	fprintf(stderr, _("Use certtool!\n"));
+	return false;
+
+#if 0
 	RSA *rsa_key;
 	FILE *f;
 	char *name = NULL;
 	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"));
@@ -337,6 +339,7 @@ static bool keygen(int bits)
 	free(filename);
 
 	return true;
+#endif
 }
 
 /*
@@ -358,7 +361,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)
@@ -436,7 +439,7 @@ int main(int argc, char **argv)
 	{
 		logger(LOG_ERR, _("mlockall() not supported on this platform!"));
 #endif
-		return -1;
+		return 1;
 	}
 
 	g_argv = argv;
@@ -445,9 +448,7 @@ int main(int argc, char **argv)
 
 	/* Slllluuuuuuurrrrp! */
 
-	RAND_load_file("/dev/urandom", 1024);
-
-	OpenSSL_add_all_algorithms();
+	gnutls_global_init();
 
 	if(generate_keys) {
 		read_server_config();
@@ -482,17 +483,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 +499,12 @@ int main2(int argc, char **argv)
 	ifdebug(CONNECTIONS)
 		dump_device_stats();
 
+end:
 	logger(LOG_NOTICE, _("Terminating"));
+
+#ifndef HAVE_MINGW
+	remove_pid(pidfilename);
+#endif
+	
 	return status;
 }