-/* -*- c-file-style: "linux" -*-
-
- rsync -- fast file replication program
-
- Copyright (C) 1992-2001 by Andrew Tridgell <tridge@samba.org>
- Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
-
- 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.
-*/
-
-/**
- * @file clientname.c
- *
+/*
* Functions for looking up the remote name or addr of a socket.
*
+ * Copyright (C) 1992-2001 Andrew Tridgell <tridge@samba.org>
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2002-2009 Wayne Davison
+ *
+ * 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 3 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, visit the http://fsf.org website.
+ */
+
+/*
* This file is now converted to use the new-style getaddrinfo()
* interface, which supports IPv6 but is also supported on recent
* IPv4-only machines. On systems that don't have that interface, we
* emulate it using the KAME implementation.
- **/
+ */
#include "rsync.h"
static const char default_name[] = "UNKNOWN";
-extern int am_daemon;
extern int am_server;
**/
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 */
- strcpy(addr_buf, "0.0.0.0");
- if ((ssh_client = getenv("SSH_CLIENT")) != NULL) {
- /* truncate SSH_CLIENT to just IP address */
- 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';
- }
+ strlcpy(addr_buf, "0.0.0.0", sizeof addr_buf);
+ 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);
if (initialised)
return name_buf;
- strcpy(name_buf, default_name);
+ strlcpy(name_buf, default_name, sizeof name_buf);
initialised = 1;
memset(&ss, 0, sizeof ss);
struct addrinfo hint, *answer;
int err;
+ if (strcmp(addr, "0.0.0.0") == 0)
+ return name_buf;
+
memset(&hint, 0, sizeof hint);
#ifdef AI_NUMERICHOST
hint.ai_socktype = SOCK_STREAM;
if ((err = getaddrinfo(addr, NULL, &hint, &answer)) != 0) {
- rprintf(FERROR, RSYNC_NAME ": malformed address %s: %s\n",
+ rprintf(FLOG, "malformed address %s: %s\n",
addr, gai_strerror(err));
return name_buf;
}
memcpy(&ss, answer->ai_addr, ss_len);
break;
#endif
+ default:
+ exit_cleanup(RERR_SOCKETIO);
}
freeaddrinfo(answer);
} else {
client_sockaddr(fd, &ss, &ss_len);
}
- if (!lookup_name(fd, &ss, ss_len, name_buf, sizeof name_buf,
- port_buf, sizeof port_buf))
- check_name(fd, &ss, 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, sizeof name_buf);
return name_buf;
}
if (getpeername(fd, (struct sockaddr *) ss, ss_len)) {
/* FIXME: Can we really not continue? */
- rsyserr(FERROR, errno, "getpeername on fd%d failed", fd);
+ rsyserr(FLOG, errno, "getpeername on fd%d failed", fd);
exit_cleanup(RERR_SOCKETIO);
}
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;
**/
int lookup_name(int fd, const struct sockaddr_storage *ss,
socklen_t ss_len,
- char *name_buf, size_t name_buf_len,
- char *port_buf, size_t port_buf_len)
+ char *name_buf, size_t name_buf_size,
+ char *port_buf, size_t port_buf_size)
{
int name_err;
/* reverse lookup */
name_err = getnameinfo((struct sockaddr *) ss, ss_len,
- name_buf, name_buf_len,
- port_buf, port_buf_len,
+ name_buf, name_buf_size,
+ port_buf, port_buf_size,
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));
+ strlcpy(name_buf, default_name, name_buf_size);
+ 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;
}
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",
- fn, ai->ai_addrlen);
+ rprintf(FLOG, "%s: too short sockaddr_in6; length=%d\n",
+ fn, (int)ai->ai_addrlen);
return 1;
}
**/
int check_name(int fd,
const struct sockaddr_storage *ss,
- char *name_buf)
+ char *name_buf, size_t name_buf_size)
{
struct addrinfo hints, *res, *res0;
int error;
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);
+ strlcpy(name_buf, default_name, name_buf_size);
return error;
}
-
/* Given all these results, we expect that one of them will be
* the same as ss. The comparison is a bit complicated. */
for (res = res0; res; res = res->ai_next) {
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);
- strcpy(name_buf, default_name);
+ rprintf(FLOG, "no known address for \"%s\": "
+ "spoofed address?\n", name_buf);
+ strlcpy(name_buf, default_name, name_buf_size);
} 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);
- strcpy(name_buf, default_name);
+ rprintf(FLOG, "%s is not a known address for \"%s\": "
+ "spoofed address?\n", client_addr(fd), name_buf);
+ strlcpy(name_buf, default_name, name_buf_size);
}
freeaddrinfo(res0);
return 0;
}
-
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff