Fix the "network" command in tinc shell.

[tinc] / src / names.c

diff --git a/src/names.c b/src/names.c
index 1fb0a8f..6c518f2 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -1,7 +1,7 @@
 /*
     names.c -- generate commonly used (file)names
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2015 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
@@ -21,11 +21,13 @@
 #include "system.h"
 
 #include "logger.h"
+#include "names.h"
 #include "xalloc.h"
 
 char *netname = NULL;
 char *confdir = NULL;           /* base configuration directory */
 char *confbase = NULL;          /* base configuration directory for this instance of tinc */
+bool confbase_given;
 char *identname = NULL;         /* program name for syslog */
 char *unixsocketname = NULL;    /* UNIX socket location */
 char *logfilename = NULL;       /* log file location */
@@ -35,12 +37,16 @@ char *program_name = NULL;
 /*
   Set all files and paths according to netname
 */
-void make_names(void) {
+void make_names(bool daemon) {
 #ifdef HAVE_MINGW
        HKEY key;
        char installdir[1024] = "";
-       long len = sizeof installdir;
+       DWORD len = sizeof installdir;
 #endif
+       confbase_given = confbase;
+
+       if(netname && confbase)
+               logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
 
        if(netname)
                xasprintf(&identname, "tinc.%s", netname);
@@ -49,42 +55,77 @@ 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(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {
                        confdir = xstrdup(installdir);
-                       if(!logfilename)
-                               xasprintf(&logfilename, "%s" SLASH "log" SLASH "%s.log", installdir, identname);
                        if(!confbase) {
                                if(netname)
                                        xasprintf(&confbase, "%s" SLASH "%s", installdir, netname);
                                else
                                        xasprintf(&confbase, "%s", installdir);
                        }
-                       if(!pidfilename)
-                               xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
+                       if(!logfilename)
+                               xasprintf(&logfilename, "%s" SLASH "tinc.log", confbase);
                }
                RegCloseKey(key);
        }
 #endif
        if(!confdir)
-               confdir = xstrdup(CONFDIR);
+               confdir = xstrdup(CONFDIR SLASH "tinc");
 
+       if(!confbase) {
+               if(netname)
+                       xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
+               else
+                       xasprintf(&confbase, CONFDIR SLASH "tinc");
+       }
+
+#ifdef HAVE_MINGW
        if(!logfilename)
-               xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
+               xasprintf(&logfilename, "%s" SLASH "log", confbase);
 
        if(!pidfilename)
-               xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+               xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
+#else
+       bool fallback = false;
+       if(daemon) {
+               if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK))
+                       fallback = true;
+       } else {
+               char fname[PATH_MAX];
+               snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+               if(access(fname, R_OK)) {
+                       snprintf(fname, sizeof fname, "%s" SLASH "pid", confbase);
+                       if(!access(fname, R_OK))
+                               fallback = true;
+               }
+       }
 
-       if(!unixsocketname)
-               xasprintf(&unixsocketname, LOCALSTATEDIR SLASH "run" SLASH "%s.socket", identname);
+       if(!fallback) {
+               if(!logfilename)
+                       xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
 
-       if(netname) {
-               if(!confbase)
-                       xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
-               else
-                       logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
+               if(!pidfilename)
+                       xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
        } else {
-               if(!confbase)
-                       xasprintf(&confbase, CONFDIR SLASH "tinc");
+               if(!logfilename)
+                       xasprintf(&logfilename, "%s" SLASH "log", confbase);
+
+               if(!pidfilename) {
+                       if(daemon)
+                               logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase);
+                       xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
+               }
+       }
+#endif
+
+       if(!unixsocketname) {
+               int len = strlen(pidfilename);
+               unixsocketname = xmalloc(len + 8);
+               memcpy(unixsocketname, pidfilename, len);
+               if(len > 4 && !strcmp(pidfilename + len - 4, ".pid"))
+                       strncpy(unixsocketname + len - 4, ".socket", 8);
+               else
+                       strncpy(unixsocketname + len, ".socket", 8);
        }
 }
 
@@ -96,4 +137,12 @@ void free_names(void) {
        free(logfilename);
        free(confbase);
        free(confdir);
+
+       identname = NULL;
+       netname = NULL;
+       unixsocketname = NULL;
+       pidfilename = NULL;
+       logfilename = NULL;
+       confbase = NULL;
+       confdir = NULL;
 }