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

diff --git a/src/tincd.c b/src/tincd.c
index 4aba579f..9e0ad4aa 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.81 2003/08/02 21:33:52 guus Exp $
+    $Id: tincd.c,v 1.10.4.86 2003/08/17 09:03:30 guus Exp $
 */
 
 #include "system.h"
@@ -79,7 +79,7 @@ char *pidfilename = NULL;			/* pid file location */
 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'},
@@ -300,11 +300,16 @@ static bool keygen(int bits)
 		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"));
 
@@ -319,7 +324,7 @@ static bool keygen(int bits)
 	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;
@@ -339,11 +344,35 @@ static bool keygen(int bits)
 */
 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);
 
@@ -352,12 +381,12 @@ static void make_names(void)
 
 	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");
 	}
 }
 
@@ -394,7 +423,7 @@ int main(int argc, char **argv)
 	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 */
 
@@ -452,23 +481,10 @@ int main2(int argc, char **argv)
 	if(!detach())
 		return 1;
 		
-	for(;;) {
-		if(setup_network_connections()) {
-			int status;
-			status = main_loop();
-
-		        close_network_connections();
-
-			ifdebug(CONNECTIONS)
-				dump_device_stats();
 
-			logger(LOG_NOTICE, _("Terminating"));
-			return status;
-		}
-
-		logger(LOG_ERR, _("Unrecoverable error"));
-		cp_trace();
+	/* Setup sockets and open device. If it doesn't work, don't give up but try again. */
 
+	while(!setup_network_connections()) {
 		if(do_detach) {
 			logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
 			sleep(maxtimeout);
@@ -477,4 +493,18 @@ int main2(int argc, char **argv)
 			return 1;
 		}
 	}
+
+	/* Start main loop. It only exits when tinc is killed. */
+
+	status = main_loop();
+
+	/* Shutdown properly. */
+
+	close_network_connections();
+
+	ifdebug(CONNECTIONS)
+		dump_device_stats();
+
+	logger(LOG_NOTICE, _("Terminating"));
+	return status;
 }