/* -*- c-file-style: "linux" -*-
+ rsync -- fast file replication program
+
Copyright (C) 1992-2001 by Andrew Tridgell <tridge@samba.org>
- Copyright (C) 2001 by Martin Pool <mbp@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
* @file socket.c
*
* Socket functions used in rsync.
+ *
+ * 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"
}
+/**
+ * Try to set the local address for a newly-created socket. Return -1
+ * if this fails.
+ **/
+int try_bind_local(int s,
+ int ai_family, int ai_socktype,
+ const char *bind_address)
+{
+ int error;
+ struct addrinfo bhints, *bres_all, *r;
+
+ memset(&bhints, 0, sizeof(bhints));
+ bhints.ai_family = ai_family;
+ bhints.ai_socktype = ai_socktype;
+ bhints.ai_flags = AI_PASSIVE;
+ if ((error = getaddrinfo(bind_address, NULL, &bhints, &bres_all))) {
+ rprintf(FERROR, RSYNC_NAME ": getaddrinfo %s: %s\n",
+ bind_address, gai_strerror(error));
+ return -1;
+ }
+
+ for (r = bres_all; r; r = r->ai_next) {
+ if (bind(s, r->ai_addr, r->ai_addrlen) == -1)
+ continue;
+ return s;
+ }
+
+ /* no error message; there might be some problem that allows
+ * creation of the socket but not binding, perhaps if the
+ * machine has no ipv6 address of this name. */
+ return -1;
+}
+
/**
* Open a socket to a tcp remote host with the specified port .
int type = SOCK_STREAM;
int error;
int s;
- int result;
struct addrinfo hints, *res0, *res;
char portbuf[10];
char *h;
if (s < 0)
continue;
- if (bind_address) {
- struct addrinfo bhints, *bres;
-
- memset(&bhints, 0, sizeof(bhints));
- bhints.ai_family = res->ai_family;
- bhints.ai_socktype = type;
- bhints.ai_flags = AI_PASSIVE;
- error = getaddrinfo(bind_address, NULL, &bhints, &bres);
- if (error) {
- rprintf(FERROR, RSYNC_NAME ": getaddrinfo: "
- "bind address %s <noport>: %s\n",
- bind_address, gai_strerror(error));
+ if (bind_address)
+ if (try_bind_local(s, res->ai_family, type,
+ bind_address) == -1) {
+ close(s);
+ s = -1;
continue;
}
- if (bres->ai_next) {
- /* I'm not at all sure that this is the right
- * response here... -- mbp */
- rprintf(FERROR, RSYNC_NAME ": getaddrinfo: "
- "bind address %s resolved to multiple hosts\n",
- bind_address);
- freeaddrinfo(bres);
- continue;
- }
- bind(s, bres->ai_addr, bres->ai_addrlen);
- }
if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
close(s);
fd_set fds;
int fd;
struct sockaddr_storage addr;
- int addrlen = sizeof(addr);
+ socklen_t addrlen = sizeof addr;
/* close log file before the potentially very long select so
file can be trimmed by another process instead of growing
char *client_addr(int fd)
{
struct sockaddr_storage ss;
- int length = sizeof(ss);
+ socklen_t length = sizeof ss;
static char addr_buf[100];
static int initialised;
/**
- * Return the DNS name of the client
+ * Return the DNS name of the client.
+ *
+ * The name is statically cached so that repeated lookups are quick,
+ * so there is a limit of one lookup per customer.
**/
char *client_name(int fd)
{
struct sockaddr_storage ss;
- int length = sizeof(ss);
+ socklen_t length = sizeof ss;
static char name_buf[100];
static char port_buf[100];
char *def = "UNKNOWN";
#ifdef 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
+ * "::ffff:10.130.1.2". If we use it as-is, then the
+ * reverse lookup might fail or perhaps something else
+ * bad might happen. So instead we convert it to an
+ * equivalent address in the IPv4 address family. */
struct sockaddr_in6 sin6;
struct sockaddr_in *sin;
sin->sin_len = length;
#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. */
memcpy(&sin->sin_addr, &sin6.sin6_addr.s6_addr[12],
sizeof(sin->sin_addr));
}
break;
}
- /* TODO: Do a forward lookup as well to prevent spoofing */
-
if (res == NULL) {
strcpy(name_buf, def);
rprintf(FERROR, RSYNC_NAME ": "
- "reverse name lookup mismatch on fd%d - spoofed address?\n",
- fd);
+ "reverse name lookup for \"%s\" failed on fd%d - spoofed address? \n",
+ name_buf, fd);
}
freeaddrinfo(res0);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff