j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Write loopback address instead of "any" address in pidfile.

Browse source
This commit is contained in:
Guus Sliepen 2011-07-17 20:01:24 +02:00
parent 25091454da
commit f6020a5224
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/control.c
View file

@ -152,10 +152,22 @@ bool init_control(void) {
sockaddr_t sa; sockaddr_t sa;
socklen_t len = sizeof 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); 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); localhost = sockaddr2hostname(&sa);
}
fprintf(f, "%d %s %s\n", (int)getpid(), controlcookie, localhost); fprintf(f, "%d %s %s\n", (int)getpid(), controlcookie, localhost);