X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/61f543cade5926794ed16807d2e83fbe4f03252d..9a689986c6d416c66195d2a16f54fcb74dc7d805:/socket.c diff --git a/socket.c b/socket.c index 010d38e9..8e895ca8 100644 --- a/socket.c +++ b/socket.c @@ -30,8 +30,6 @@ #include "lib/addrinfo.h" #endif -// extern int af; /* NO MORE BLOODY GLOBALS! */ - /* Establish a proxy connection on an open socket to a web roxy by * using the CONNECT method. */ static int establish_proxy_connection(int fd, char *host, int port) @@ -604,7 +602,7 @@ char *client_name(int fd) } #ifdef INET6 - if (ss.ss_family == AF_INET6 && + if (ss.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&ss)->sin6_addr)) { struct sockaddr_in6 sin6; struct sockaddr_in *sin;