X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ac7aa92290cf67c4e9541c02e10b9f232928c588..e51094b7210fc31fa67cc218c1bd30de841a426e:/clientname.c diff --git a/clientname.c b/clientname.c index 5dbaaf97..b54e745f 100644 --- a/clientname.c +++ b/clientname.c @@ -1,20 +1,20 @@ /* -*- c-file-style: "linux" -*- - + rsync -- fast file replication program - + Copyright (C) 1992-2001 by Andrew Tridgell Copyright (C) 2001, 2002 by Martin Pool - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -22,7 +22,7 @@ /** * @file clientname.c - * + * * Functions for looking up the remote name or addr of a socket. * * This file is now converted to use the new-style getaddrinfo() @@ -39,7 +39,7 @@ extern int am_server; /** - * Return the IP addr of the client as a string + * Return the IP addr of the client as a string **/ char *client_addr(int fd) { @@ -50,19 +50,18 @@ char *client_addr(int fd) static char addr_buf[100]; static int initialised; - if (initialised) return addr_buf; + if (initialised) + return addr_buf; initialised = 1; - if (am_server) { - /* daemon over --rsh mode */ + if (am_server) { /* daemon over --rsh mode */ strcpy(addr_buf, "0.0.0.0"); if ((ssh_client = getenv("SSH_CLIENT")) != NULL) { /* truncate SSH_CLIENT to just IP address */ - p = strchr(ssh_client, ' '); - if (p) { - len = MIN((unsigned int) (p - ssh_client), - sizeof(addr_buf) - 1); + if ((p = strchr(ssh_client, ' ')) != NULL) { + len = MIN((unsigned int) (p - ssh_client), + sizeof addr_buf - 1); strncpy(addr_buf, ssh_client, len); *(addr_buf + len) = '\0'; } @@ -101,58 +100,56 @@ char *client_name(int fd) static char name_buf[100]; static char port_buf[100]; static int initialised; - struct sockaddr_storage ss, *ssp; - struct sockaddr_in sin; -#ifdef INET6 - struct sockaddr_in6 sin6; -#endif + struct sockaddr_storage ss; socklen_t ss_len; - if (initialised) return name_buf; + if (initialised) + return name_buf; strcpy(name_buf, default_name); initialised = 1; - if (am_server) { - /* daemon over --rsh mode */ + memset(&ss, 0, sizeof ss); + if (am_server) { /* daemon over --rsh mode */ char *addr = client_addr(fd); -#ifdef INET6 - int dots = 0; - char *p; + struct addrinfo hint, *answer; + int err; - for (p = addr; *p && (dots <= 3); p++) { - if (*p == '.') - dots++; - } - if (dots > 3) { - /* more than 4 parts to IP address, must be ipv6 */ - ssp = (struct sockaddr_storage *) &sin6; - ss_len = sizeof sin6; - memset(ssp, 0, ss_len); - inet_pton(AF_INET6, addr, &sin6.sin6_addr); - sin6.sin6_family = AF_INET6; - } else + memset(&hint, 0, sizeof hint); + +#ifdef AI_NUMERICHOST + hint.ai_flags = AI_NUMERICHOST; #endif - { - ssp = (struct sockaddr_storage *) &sin; - ss_len = sizeof sin; - memset(ssp, 0, ss_len); - inet_pton(AF_INET, addr, &sin.sin_addr); - sin.sin_family = AF_INET; + hint.ai_socktype = SOCK_STREAM; + + if ((err = getaddrinfo(addr, NULL, &hint, &answer)) != 0) { + rprintf(FERROR, RSYNC_NAME ": malformed address %s: %s\n", + addr, gai_strerror(err)); + return name_buf; } + switch (answer->ai_family) { + case AF_INET: + ss_len = sizeof (struct sockaddr_in); + memcpy(&ss, answer->ai_addr, ss_len); + break; +#ifdef INET6 + case AF_INET6: + ss_len = sizeof (struct sockaddr_in6); + memcpy(&ss, answer->ai_addr, ss_len); + break; +#endif + } + freeaddrinfo(answer); } else { ss_len = sizeof ss; - ssp = &ss; - client_sockaddr(fd, &ss, &ss_len); - } - if (!lookup_name(fd, ssp, ss_len, name_buf, sizeof name_buf, + if (!lookup_name(fd, &ss, ss_len, name_buf, sizeof name_buf, port_buf, sizeof port_buf)) - check_name(fd, ssp, name_buf); + check_name(fd, &ss, name_buf); return name_buf; } @@ -169,17 +166,16 @@ void client_sockaddr(int fd, struct sockaddr_storage *ss, socklen_t *ss_len) { - memset(ss, 0, sizeof(*ss)); + memset(ss, 0, sizeof *ss); if (getpeername(fd, (struct sockaddr *) ss, ss_len)) { /* FIXME: Can we really not continue? */ - rprintf(FERROR, RSYNC_NAME ": getpeername on fd%d failed: %s\n", - fd, strerror(errno)); + rsyserr(FERROR, errno, "getpeername on fd%d failed", fd); exit_cleanup(RERR_SOCKETIO); } #ifdef INET6 - if (get_sockaddr_family(ss) == AF_INET6 && + if (get_sockaddr_family(ss) == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)ss)->sin6_addr)) { /* OK, so ss is in the IPv6 family, but it is really * an IPv4 address: something like @@ -190,12 +186,12 @@ void client_sockaddr(int fd, struct sockaddr_in6 sin6; struct sockaddr_in *sin; - memcpy(&sin6, ss, sizeof(sin6)); + memcpy(&sin6, ss, sizeof sin6); sin = (struct sockaddr_in *)ss; - memset(sin, 0, sizeof(*sin)); + memset(sin, 0, sizeof *sin); sin->sin_family = AF_INET; - *ss_len = sizeof(struct sockaddr_in); -#if HAVE_SOCKADDR_SIN_LEN + *ss_len = sizeof (struct sockaddr_in); +#if HAVE_SOCKADDR_IN_LEN sin->sin_len = *ss_len; #endif sin->sin_port = sin6.sin6_port; @@ -204,8 +200,8 @@ void client_sockaddr(int fd, * (IN6_V4MAPPED_TO_SINADDR ?), but it does not seem * to be present in the Linux headers. */ memcpy(&sin->sin_addr, &sin6.sin6_addr.s6_addr[12], - sizeof(sin->sin_addr)); - } + sizeof sin->sin_addr); + } #endif } @@ -221,7 +217,7 @@ int lookup_name(int fd, const struct sockaddr_storage *ss, char *port_buf, size_t port_buf_len) { int name_err; - + /* reverse lookup */ name_err = getnameinfo((struct sockaddr *) ss, ss_len, name_buf, name_buf_len, @@ -250,7 +246,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai, { int ss_family = get_sockaddr_family(ss); const char fn[] = "compare_addrinfo_sockaddr"; - + if (ai->ai_family != ss_family) { rprintf(FERROR, "%s: response family %d != %d\n", @@ -264,18 +260,19 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai, sin1 = (const struct sockaddr_in *) ss; sin2 = (const struct sockaddr_in *) ai->ai_addr; - + return memcmp(&sin1->sin_addr, &sin2->sin_addr, sizeof sin1->sin_addr); } + #ifdef INET6 - else if (ss_family == AF_INET6) { + if (ss_family == AF_INET6) { const struct sockaddr_in6 *sin1, *sin2; sin1 = (const struct sockaddr_in6 *) ss; sin2 = (const struct sockaddr_in6 *) ai->ai_addr; - if (ai->ai_addrlen < sizeof(struct sockaddr_in6)) { + if (ai->ai_addrlen < sizeof (struct sockaddr_in6)) { rprintf(FERROR, "%s: too short sockaddr_in6; length=%d\n", fn, ai->ai_addrlen); @@ -293,10 +290,9 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai, return 0; } #endif /* INET6 */ - else { - /* don't know */ - return 1; - } + + /* don't know */ + return 1; } @@ -318,7 +314,7 @@ int check_name(int fd, int error; int ss_family = get_sockaddr_family(ss); - memset(&hints, 0, sizeof(hints)); + memset(&hints, 0, sizeof hints); hints.ai_family = ss_family; hints.ai_flags = AI_CANONNAME; hints.ai_socktype = SOCK_STREAM;