#include "system.h"
#include "logger.h"
+#include "names.h"
#include "xalloc.h"
char *netname = 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] = "";
if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
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(!logfilename)
+ xasprintf(&logfilename, "%s" SLASH "tinc.log", confbase);
}
RegCloseKey(key);
}
if(!pidfilename)
xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
#else
- if(!access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) {
+ 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(!fallback) {
if(!logfilename)
xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
xasprintf(&logfilename, "%s" SLASH "log", confbase);
if(!pidfilename) {
- logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase);
+ 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);
}
}
if(!unixsocketname) {
int len = strlen(pidfilename);
unixsocketname = xmalloc(len + 8);
- strcpy(unixsocketname, pidfilename);
+ memcpy(unixsocketname, pidfilename, len);
if(len > 4 && !strcmp(pidfilename + len - 4, ".pid"))
- strcpy(unixsocketname + len - 4, ".socket");
+ strncpy(unixsocketname + len - 4, ".socket", 8);
else
- strcpy(unixsocketname + len, ".socket");
+ strncpy(unixsocketname + len, ".socket", 8);
}
}