Derive UNIX socket filename from PID filename.

[tinc] / src / names.c

diff --git a/src/names.c b/src/names.c
index 1fb0a8f..688e96d 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -66,7 +66,7 @@ void make_names(void) {
        }
 #endif
        if(!confdir)
-               confdir = xstrdup(CONFDIR);
+               confdir = xstrdup(CONFDIR SLASH "tinc");
 
        if(!logfilename)
                xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
@@ -74,8 +74,15 @@ void make_names(void) {
        if(!pidfilename)
                xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
 
-       if(!unixsocketname)
-               xasprintf(&unixsocketname, LOCALSTATEDIR SLASH "run" SLASH "%s.socket", identname);
+       if(!unixsocketname) {
+               int len = strlen(pidfilename);
+               unixsocketname = xmalloc(len + 8);
+               strcpy(unixsocketname, pidfilename);
+               if(len > 4 && !strcmp(pidfilename + len - 4, ".pid"))
+                       strcpy(unixsocketname + len - 4, ".socket");
+               else
+                       strcpy(unixsocketname + len, ".socket");
+       }
 
        if(netname) {
                if(!confbase)