/*
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
#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] = "";
else
xasprintf(&confbase, "%s", installdir);
}
- if(!pidfilename)
- xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
}
RegCloseKey(key);
}
if(!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(!fallback) {
+ if(!logfilename)
+ xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
+
+ if(!pidfilename)
+ xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+ } else {
+ 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);
else
strcpy(unixsocketname + len, ".socket");
}
-
- if(!confbase) {
- if(netname)
- xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
- else
- xasprintf(&confbase, CONFDIR SLASH "tinc");
- }
}
void free_names(void) {