**/
char *client_addr(int fd)
{
- struct sockaddr_storage ss;
- socklen_t length = sizeof ss;
- char *ssh_client, *p;
- int len;
static char addr_buf[100];
static int initialised;
+ struct sockaddr_storage ss;
+ socklen_t length = sizeof ss;
+ char *ssh_info, *p;
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);
- strncpy(addr_buf, ssh_client, len);
- *(addr_buf + len) = '\0';
- }
+ if ((ssh_info = getenv("SSH_CONNECTION")) != NULL
+ || (ssh_info = getenv("SSH_CLIENT")) != NULL
+ || (ssh_info = getenv("SSH2_CLIENT")) != NULL) {
+ strlcpy(addr_buf, ssh_info, sizeof addr_buf);
+ /* Truncate the value to just the IP address. */
+ if ((p = strchr(addr_buf, ' ')) != NULL)
+ *p = '\0';
}
} else {
client_sockaddr(fd, &ss, &length);
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)
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(FLOG, "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,
- port_buf, sizeof port_buf))
- check_name(fd, ssp, name_buf);
+ if (lookup_name(fd, &ss, ss_len, name_buf, sizeof name_buf,
+ port_buf, sizeof port_buf) == 0)
+ check_name(fd, &ss, name_buf);
return name_buf;
}
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(FLOG, 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
memset(sin, 0, sizeof *sin);
sin->sin_family = AF_INET;
*ss_len = sizeof (struct sockaddr_in);
-#if HAVE_SOCKADDR_IN_LEN
+#ifdef HAVE_SOCKADDR_IN_LEN
sin->sin_len = *ss_len;
#endif
sin->sin_port = sin6.sin6_port;
* to be present in the Linux headers. */
memcpy(&sin->sin_addr, &sin6.sin6_addr.s6_addr[12],
sizeof sin->sin_addr);
- }
+ }
#endif
}
NI_NAMEREQD | NI_NUMERICSERV);
if (name_err != 0) {
strcpy(name_buf, default_name);
- rprintf(FERROR, RSYNC_NAME ": name lookup failed for %s: %s\n",
- client_addr(fd),
- gai_strerror(name_err));
+ rprintf(FLOG, "name lookup failed for %s: %s\n",
+ client_addr(fd), gai_strerror(name_err));
return name_err;
}
const char fn[] = "compare_addrinfo_sockaddr";
if (ai->ai_family != ss_family) {
- rprintf(FERROR,
- "%s: response family %d != %d\n",
+ rprintf(FLOG, "%s: response family %d != %d\n",
fn, ai->ai_family, ss_family);
return 1;
}
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)) {
- rprintf(FERROR,
- "%s: too short sockaddr_in6; length=%d\n",
+ rprintf(FLOG, "%s: too short sockaddr_in6; length=%d\n",
fn, ai->ai_addrlen);
return 1;
}
return 0;
}
#endif /* INET6 */
- else {
- /* don't know */
- return 1;
- }
+
+ /* don't know */
+ return 1;
}
hints.ai_socktype = SOCK_STREAM;
error = getaddrinfo(name_buf, NULL, &hints, &res0);
if (error) {
- rprintf(FERROR,
- RSYNC_NAME ": forward name lookup for %s failed: %s\n",
+ rprintf(FLOG, "forward name lookup for %s failed: %s\n",
name_buf, gai_strerror(error));
strcpy(name_buf, default_name);
return error;
if (!res0) {
/* We hit the end of the list without finding an
* address that was the same as ss. */
- rprintf(FERROR, RSYNC_NAME
- ": no known address for \"%s\": "
- "spoofed address?\n",
- name_buf);
+ rprintf(FLOG, "no known address for \"%s\": "
+ "spoofed address?\n", name_buf);
strcpy(name_buf, default_name);
} else if (res == NULL) {
/* We hit the end of the list without finding an
* address that was the same as ss. */
- rprintf(FERROR, RSYNC_NAME
- ": %s is not a known address for \"%s\": "
- "spoofed address?\n",
- client_addr(fd),
- name_buf);
+ rprintf(FLOG, "%s is not a known address for \"%s\": "
+ "spoofed address?\n", client_addr(fd), name_buf);
strcpy(name_buf, default_name);
}
freeaddrinfo(res0);
return 0;
}
-
git.samba.org / rsync.git / blobdiff