X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol.c;h=86224c29f46d82ccdd0f42f3b8990296d19ba3a0;hb=f6020a5224c9c4c17c11c5f9d2c8441638ac04fc;hp=bcafc09fe75185f975b79c0a0193ae98e4d28092;hpb=ab4d289fafd1d391583935ab4c306f1f508ea1d0;p=tinc

diff --git a/src/control.c b/src/control.c
index bcafc09f..86224c29 100644
--- a/src/control.c
+++ b/src/control.c
@@ -134,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) {
@@ -153,10 +152,22 @@ bool init_control(void) {
 	sockaddr_t sa;
 	socklen_t len = sizeof sa;
 
-	if(getsockname(listen_socket[0].tcp, (struct sockaddr *)&sa, &len))
+	// 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
+	} 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);