X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol.c;h=7f46a7093dd0e16ede03e247b6189c6e81c39898;hb=fec279a9c54ec8a13bd1ba4c7bec0d2a15454992;hp=01f25aab2d141e6ba62230eb4d4da739fed1ea29;hpb=a05fa7f88264599a43f9e411287e018259dc22b1;p=tinc

diff --git a/src/control.c b/src/control.c
index 01f25aab..7f46a709 100644
--- 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,20 @@ bool init_control(void) {
 #else
 	chmod(pidfilename, 0600);
 #endif
+	// Get the address and port of the first listening socket
 
-	fprintf(f, "%s %s %d\n", controlcookie, myport, getpid());
+	char *localhost = NULL;
+	sockaddr_t sa;
+	socklen_t len = sizeof sa;
+
+	if(getsockname(listen_socket[0].tcp, (struct sockaddr *)&sa, &len))
+		xasprintf(&localhost, "127.0.0.1 port %d", myport);
+	else
+		localhost = sockaddr2hostname(&sa);
+
+	fprintf(f, "%d %s %s\n", (int)getpid(), controlcookie, localhost);
+
+	free(localhost);
 	fclose(f);
 
 	return true;