Fix --logfile under Windows.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 98dea25..9e0ad4a 100644 (file)
--- 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.80 2003/08/02 20:50:38 guus Exp $
+    $Id: tincd.c,v 1.10.4.86 2003/08/17 09:03:30 guus Exp $
 */
 
 #include "system.h"
@@ -41,6 +41,7 @@
 #include <getopt.h>
 
 #include "conf.h"
+#include "device.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
@@ -78,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'},
@@ -299,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"));
 
@@ -318,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;
@@ -338,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);
 
@@ -351,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");
        }
 }
 
@@ -393,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 */
 
@@ -451,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);
@@ -476,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;
 }