static const char default_name[] = "UNKNOWN";
-static int lookup_name(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);
-
-static int check_name(const struct sockaddr_storage *ss,
- socklen_t ss_len,
- char *name_buf,
- const char *port_buf);
/* Establish a proxy connection on an open socket to a web roxy by
* using the CONNECT method. */
char *cp;
snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", host, port);
- if (write(fd, buffer, strlen(buffer)) != strlen(buffer)) {
+ if (write(fd, buffer, strlen(buffer)) != (int) strlen(buffer)) {
rprintf(FERROR, "failed to write to proxy: %s\n",
strerror(errno));
return -1;
initialised = 1;
- if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
- exit_cleanup(RERR_SOCKETIO);
- }
+ client_sockaddr(fd, &ss, &length);
getnameinfo((struct sockaddr *)&ss, length,
- addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
+ addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
+
return addr_buf;
}
strcpy(name_buf, default_name);
initialised = 1;
- 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));
- exit_cleanup(RERR_SOCKETIO);
- }
+ client_sockaddr(fd, &ss, &ss_len);
- if (!lookup_name(&ss, ss_len, name_buf, sizeof name_buf, port_buf, sizeof port_buf))
- check_name(&ss, ss_len, name_buf, port_buf);
+ if (!lookup_name(fd, &ss, ss_len, name_buf, sizeof name_buf, port_buf, sizeof port_buf))
+ check_name(fd, &ss, ss_len, name_buf, port_buf);
return name_buf;
}
+
/**
- * Look up a name from @p ss into @p name_buf.
+ * Get the sockaddr for the client.
**/
-static int lookup_name(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)
+void client_sockaddr(int fd,
+ struct sockaddr_storage *ss,
+ socklen_t *ss_len)
{
- int name_err;
-
+ 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));
+ exit_cleanup(RERR_SOCKETIO);
+ }
+
#ifdef INET6
if (get_sockaddr_family(ss) == AF_INET6 &&
IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)ss)->sin6_addr)) {
sin = (struct sockaddr_in *)ss;
memset(sin, 0, sizeof(*sin));
sin->sin_family = AF_INET;
- ss_len = sizeof(struct sockaddr_in);
+ *ss_len = sizeof(struct sockaddr_in);
#ifdef HAVE_SOCKADDR_LEN
- sin->sin_len = ss_len;
+ sin->sin_len = *ss_len;
#endif
sin->sin_port = sin6.sin6_port;
- /* FIXME: Isn't there a macro we can use here rather
- * than grovelling through the struct? It might be
- * wrong on some systems. */
+
+ /* There is a macro to extract the mapped part
+ * (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));
}
#endif
+}
+
+/**
+ * Look up a name from @p ss into @p name_buf.
+ **/
+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)
+{
+ int name_err;
+
/* reverse lookup */
name_err = getnameinfo((struct sockaddr *) ss, ss_len,
name_buf, name_buf_len,
NI_NAMEREQD | NI_NUMERICSERV);
if (name_err != 0) {
strcpy(name_buf, default_name);
- rprintf(FERROR, RSYNC_NAME ": name lookup failed: %s\n",
+ rprintf(FERROR, RSYNC_NAME ": name lookup failed for %s: %s\n",
+ client_addr(fd),
gai_strerror(name_err));
return name_err;
}
/* Do a forward lookup on name_buf and make sure it corresponds to ss
* -- otherwise we may be being spoofed. If we suspect we are, then
* we don't abort the connection but just emit a warning. */
-static int check_name(const struct sockaddr_storage *ss,
- socklen_t ss_len,
- char *name_buf,
- const char *port_buf)
+int check_name(int fd,
+ const struct sockaddr_storage *ss,
+ socklen_t ss_len,
+ char *name_buf,
+ const char *port_buf)
{
struct addrinfo hints, *res, *res0;
int error;
memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_UNSPEC;
- hints.ai_flags = AI_CANONNAME;
+ hints.ai_flags = get_sockaddr_family(ss);
hints.ai_socktype = SOCK_STREAM;
error = getaddrinfo(name_buf, port_buf, &hints, &res0);
if (error) {
- strcpy(name_buf, default_name);
rprintf(FERROR,
RSYNC_NAME ": forward name lookup for %s:%s failed: %s\n",
name_buf, port_buf,
gai_strerror(error));
+ strcpy(name_buf, default_name);
return error;
}
}
if (res == NULL) {
- strcpy(name_buf, default_name);
/* We hit the end of the list without finding an
* address that was the same as ss. */
rprintf(FERROR, RSYNC_NAME
- ": no address record for \"%s\" corresponds to peer name: spoofed address?\n",
+ ": %s is not a known address for \"%s\": "
+ "spoofed address?\n",
+ client_addr(fd),
name_buf);
+ strcpy(name_buf, default_name);
}
freeaddrinfo(res0);
/**
* Run a program on a local tcp socket, so that we can talk to it's
- * stdin and stdout. This is used to launch ssh and similar
- * connection helper programs for rsync.
+ * stdin and stdout. This is used to fake a connection to a daemon
+ * for testing -- not for the normal case of running SSH.
*
* @return a socket which is attached to a subprocess running
* "prog". stdin and stdout are attached. stderr is left attached to
int sock_exec(const char *prog)
{
int fd[2];
+
if (socketpair_tcp(fd) != 0) {
rprintf (FERROR, RSYNC_NAME
": socketpair_tcp failed (%s)\n",
close(1);
dup(fd[1]);
dup(fd[1]);
- if (verbose > 3)
+ if (verbose > 3) {
+ /* Can't use rprintf because we've forked. */
fprintf (stderr,
RSYNC_NAME ": execute socket program \"%s\"\n",
prog);
+ }
exit (system (prog));
}
close (fd[1]);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff