Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/*
- socket functions used in rsync
-
- */
+/**
+ * @file socket.c
+ *
+ * Socket functions used in rsync.
+ **/
#include "rsync.h"
#include "lib/addrinfo.h"
#endif
-extern int af;
+// extern int af; /* NO MORE BLOODY GLOBALS! */
/* Establish a proxy connection on an open socket to a web roxy by
* using the CONNECT method. */
-/** Open a socket to a tcp remote host with the specified port .
+/**
+ * Open a socket to a tcp remote host with the specified port .
*
- * Based on code from Warren. Proxy support by Stephen Rothwell
+ * Based on code from Warren. Proxy support by Stephen Rothwell.
+ * getaddrinfo() rewrite contributed by KAME.net.
*
+ * Now that we support IPv6 we need to look up the remote machine's
+ * address first, using @p af_hint to set a preference for the type
+ * of address. Then depending on whether it has v4 or v6 addresses we
+ * try to open a connection.
*
- * @param bind_address Local address to use. Normally NULL to get the stack default.
+ * The loop allows for machines with some addresses which may not be
+ * reachable, perhaps because we can't e.g. route ipv6 to that network
+ * but we can get ip4 packets through.
+ *
+ * @param bind_address Local address to use. Normally NULL to bind
+ * the wildcard address.
+ *
+ * @param af_hint Address family, e.g. AF_INET or AF_INET6.
**/
-int open_socket_out(char *host, int port, const char *bind_address)
+int open_socket_out(char *host, int port, const char *bind_address,
+ int af_hint)
{
int type = SOCK_STREAM;
int error;
}
memset(&hints, 0, sizeof(hints));
- hints.ai_family = af;
+ hints.ai_family = af_hint;
hints.ai_socktype = type;
error = getaddrinfo(h, portbuf, &hints, &res0);
if (error) {
- rprintf(FERROR, "getaddrinfo: %s\n", gai_strerror(error));
+ rprintf(FERROR, RSYNC_NAME ": getaddrinfo: %s %s: %s\n",
+ h, portbuf, gai_strerror(error));
return -1;
}
bhints.ai_flags = AI_PASSIVE;
error = getaddrinfo(bind_address, NULL, &bhints, &bres);
if (error) {
- rprintf(FERROR, "getaddrinfo: %s\n", gai_strerror(error));
+ rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s <noport>: %s\n",
+ bind_address, gai_strerror(error));
continue;
}
if (bres->ai_next) {
- rprintf(FERROR, "getaddrinfo: resolved to multiple hosts\n");
+ rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s resolved to multiple hosts\n",
+ bind_address);
freeaddrinfo(bres);
continue;
}
}
freeaddrinfo(res0);
if (s < 0) {
- rprintf(FERROR, "failed to connect to %s - %s\n", h, strerror(errno));
+ rprintf(FERROR, RSYNC_NAME ": failed to connect to %s: %s\n",
+ h, strerror(errno));
return -1;
}
return s;
**/
int open_socket_out_wrapped (char *host,
int port,
- const char *bind_address)
+ const char *bind_address,
+ int af_hint)
{
char *prog;
if ((prog = getenv ("RSYNC_CONNECT_PROG")) != NULL)
return sock_exec (prog);
else
- return open_socket_out (host, port, bind_address);
+ return open_socket_out (host, port, bind_address,
+ af_hint);
}
* @param bind_address Local address to bind, or NULL to allow it to
* default.
**/
-static int open_socket_in(int type, int port, const char *bind_address)
+static int open_socket_in(int type, int port, const char *bind_address,
+ int af_hint)
{
int one=1;
int s;
int error;
memset(&hints, 0, sizeof(hints));
- hints.ai_family = af;
+ hints.ai_family = af_hint;
hints.ai_socktype = type;
hints.ai_flags = AI_PASSIVE;
snprintf(portbuf, sizeof(portbuf), "%d", port);
error = getaddrinfo(bind_address, portbuf, &hints, &res);
if (error) {
- rprintf(FERROR, "getaddrinfo: %s\n", gai_strerror(error));
+ rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: %s\n",
+ bind_address, gai_strerror(error));
return -1;
}
if (res->ai_next) {
- rprintf(FERROR, "getaddrinfo: resolved to multiple hosts\n");
+ rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: "
+ "resolved to multiple hosts\n",
+ bind_address);
freeaddrinfo(res);
return -1;
}
s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
if (s < 0) {
- rprintf(FERROR, RSYNC_NAME ": socket failed\n");
+ rprintf(FERROR, RSYNC_NAME ": open socket in failed: %s\n",
+ strerror(errno));
freeaddrinfo(res);
return -1;
}
extern char *bind_address;
/* open an incoming socket */
- s = open_socket_in(SOCK_STREAM, port, bind_address);
+ s = open_socket_in(SOCK_STREAM, port, bind_address,
+ global_opts.af_hint);
if (s == -1)
exit_cleanup(RERR_SOCKETIO);
while (1) {
fd_set fds;
int fd;
- struct sockaddr_storage addr;
+ struct sockaddr addr;
int in_addrlen = sizeof(addr);
/* close log file before the potentially very long select so
}
}
-/*******************************************************************
- 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)
{
- struct sockaddr_storage ss;
+ struct sockaddr ss;
int length = sizeof(ss);
static char addr_buf[100];
static int initialised;
initialised = 1;
- if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
+ if (getpeername(fd, &ss, &length)) {
exit_cleanup(RERR_SOCKETIO);
}
- getnameinfo((struct sockaddr *)&ss, length,
+ getnameinfo(&ss, length,
addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
return addr_buf;
}
-/*******************************************************************
- return the DNS name of the client
- ******************************************************************/
+/**
+ * Return the DNS name of the client
+ **/
char *client_name(int fd)
{
- struct sockaddr_storage ss;
+ struct sockaddr ss;
int length = sizeof(ss);
static char name_buf[100];
static char port_buf[100];
strcpy(name_buf,def);
if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
+ /* FIXME: Can we really not continue? */
+ rprintf(FERROR, RSYNC_NAME ": getpeername on fd%d failed: %s\n",
+ strerror(errno));
exit_cleanup(RERR_SOCKETIO);
}
error = getaddrinfo(name_buf, port_buf, &hints, &res0);
if (error) {
strcpy(name_buf, def);
- rprintf(FERROR, "forward name lookup failed\n");
+ rprintf(FERROR,
+ RSYNC_NAME ": forward name lookup for %s failed: %s\n",
+ port_buf,
+ gai_strerror(error));
return name_buf;
}
/* XXX sin6_flowinfo and other fields */
for (res = res0; res; res = res->ai_next) {
- if (res->ai_family != ss.ss_family)
+ if (res->ai_family != ss.sa_family)
continue;
if (res->ai_addrlen != length)
continue;
if (res == NULL) {
strcpy(name_buf, def);
- rprintf(FERROR,
- "reverse name lookup mismatch - spoofed address?\n");
+ rprintf(FERROR, RSYNC_NAME ": "
+ "reverse name lookup mismatch on fd%d - spoofed address?\n",
+ fd);
}
freeaddrinfo(res0);
}
/**
- Convert a string to an IP address. The string can be a name or
- dotted decimal number.
-
- Returns a pointer to a static in_addr struct -- if you call this
- more than once then you should copy it.
-*/
+ * Convert a string to an IP address. The string can be a name or
+ * dotted decimal number.
+ *
+ * Returns a pointer to a static in_addr struct -- if you call this
+ * more than once then you should copy it.
+ *
+ * TODO: Use getaddrinfo() instead, or make this function call getnameinfo
+ **/
struct in_addr *ip_address(const char *str)
{
static struct in_addr ret;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff