Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / control.c

diff --git a/src/control.c b/src/control.c
index 01f25aa..86224c2 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -26,6 +26,7 @@
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
+#include "netutl.h"
 #include "protocol.h"
 #include "route.h"
 #include "splay_tree.h"
@@ -133,7 +134,6 @@ bool control_h(connection_t *c, char *request) {
 bool init_control(void) {
        randomize(controlcookie, sizeof controlcookie / 2);
        bin2hex(controlcookie, controlcookie, sizeof controlcookie / 2);
-       controlcookie[sizeof controlcookie - 1] = 0;
 
        FILE *f = fopen(pidfilename, "w");
        if(!f) {
@@ -146,8 +146,32 @@ bool init_control(void) {
 #else
        chmod(pidfilename, 0600);
 #endif
+       // Get the address and port of the first listening socket
+
+       char *localhost = NULL;
+       sockaddr_t sa;
+       socklen_t len = sizeof sa;
+
+       // Make sure we have a valid address, and map 0.0.0.0 and :: to 127.0.0.1 and ::1.
+
+       if(getsockname(listen_socket[0].tcp, (struct sockaddr *)&sa, &len)) {
+               xasprintf(&localhost, "127.0.0.1 port %d", myport);
+       } else {
+               if(sa.sa.sa_family == AF_INET) {
+                       if(sa.in.sin_addr.s_addr == 0)
+                               sa.in.sin_addr.s_addr = htonl(0x7f000001);
+               } else if(sa.sa.sa_family == AF_INET6) {
+                       static const uint8_t zero[16] = {0};
+                       if(!memcmp(sa.in6.sin6_addr.s6_addr, zero, sizeof zero))
+                               sa.in6.sin6_addr.s6_addr[15] = 1;
+               }
+
+               localhost = sockaddr2hostname(&sa);
+       }
+
+       fprintf(f, "%d %s %s\n", (int)getpid(), controlcookie, localhost);
 
-       fprintf(f, "%s %s %d\n", controlcookie, myport, getpid());
+       free(localhost);
        fclose(f);
 
        return true;