 @@ -1,14 +1,14 @@
-/*	$NetBSD: ftp.c,v 1.27 2009/02/22 19:11:48 joerg Exp $	*/
+/*	$NetBSD: ftp.c,v 1.28 2009/08/06 14:02:38 tnn Exp $	*/
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer
  *    in this position and unchanged.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -610,29 +610,32 @@ ftp_setup(conn_t *cconn, conn_t *dconn,
 	f = fetchIO_unopen(io, ftp_readfn, ftp_writefn, ftp_closefn);
 	if (f == NULL)
 		free(io);
 	return (f);
+}
 /*
  * Transfer file
  */
 static fetchIO *
 ftp_transfer(conn_t *conn, const char *oper, const char *file, const char *op_arg,
     int mode, off_t offset, const char *flags)
+{
-	struct sockaddr_storage sa;
+	union anonymous {
-	struct sockaddr_in6 *sin6;
+		struct sockaddr_storage ss;
-	struct sockaddr_in *sin4;
+		struct sockaddr sa;
 		struct sockaddr_in6 sin6;
 		struct sockaddr_in sin4;
 	} u;
 	const char *bindaddr;
 	const char *filename;
 	int filenamelen, type;
 	int low, pasv, verbose;
 	int e, sd = -1;
 	socklen_t l;
 	char *s;
 	fetchIO *df;
 	/* check flags */
 	low = CHECK_FLAG('l');
 	pasv = !CHECK_FLAG('a');
 	verbose = CHECK_FLAG('v');
 @@ -640,50 +643,50 @@ ftp_transfer(conn_t *conn, const char *o
 	/* passive mode */
 	if (!pasv)
 		pasv = ((s = getenv("FTP_PASSIVE_MODE")) != NULL &&
 		    strncasecmp(s, "no", 2) != 0);
 	/* isolate filename */
 	filename = ftp_filename(file, &filenamelen, &type, op_arg != NULL);
 	/* set transfer mode and data type */
 	if ((e = ftp_mode_type(conn, 0, type)) != FTP_OK)
 		goto ouch;
 	/* find our own address, bind, and listen */
-	l = sizeof(sa);
+	l = sizeof(u.ss);
-	if (getsockname(conn->sd, (struct sockaddr *)&sa, &l) == -1)
+	if (getsockname(conn->sd, &u.sa, &l) == -1)
 		goto sysouch;
-	if (sa.ss_family == AF_INET6)
+	if (u.ss.ss_family == AF_INET6)
-		unmappedaddr((struct sockaddr_in6 *)&sa, &l);
+		unmappedaddr(&u.sin6, &l);
 retry_mode:
 	/* open data socket */
-	if ((sd = socket(sa.ss_family, SOCK_STREAM, IPPROTO_TCP)) == -1) {
+	if ((sd = socket(u.ss.ss_family, SOCK_STREAM, IPPROTO_TCP)) == -1) {
 		fetch_syserr();
 		return (NULL);
+	}
 	if (pasv) {
 		unsigned char addr[64];
 		char *ln, *p;
 		unsigned int i;
 		int port;
 		/* send PASV command */
 		if (verbose)
 			fetch_info("setting passive mode");
-		switch (sa.ss_family) {
+		switch (u.ss.ss_family) {
 		case AF_INET:
 			if ((e = ftp_cmd(conn, "PASV")) != FTP_PASSIVE_MODE)
 				goto ouch;
 			break;
 		case AF_INET6:
 			if ((e = ftp_cmd(conn, "EPSV")) != FTP_EPASSIVE_MODE) {
 				if (e == -1)
 					goto ouch;
 				if ((e = ftp_cmd(conn, "LPSV")) !=
 				    FTP_LPASSIVE_MODE)
 					goto ouch;
+			}
 			break;
 @@ -736,151 +739,147 @@ retry_mode:
 			/* Close socket and retry with passive mode. */
 			pasv = 0;
 			close(sd);
 			sd = -1;
 			goto retry_mode;
+		}
 		/* seek to required offset */
 		if (offset)
 			if (ftp_cmd(conn, "REST %lu", (unsigned long)offset) != FTP_FILE_OK)
 				goto sysouch;
 		/* construct sockaddr for data socket */
-		l = sizeof(sa);
+		l = sizeof(u.ss);
-		if (getpeername(conn->sd, (struct sockaddr *)&sa, &l) == -1)
+		if (getpeername(conn->sd, &u.sa, &l) == -1)
 			goto sysouch;
-		if (sa.ss_family == AF_INET6)
+		if (u.ss.ss_family == AF_INET6)
-			unmappedaddr((struct sockaddr_in6 *)&sa, &l);
+			unmappedaddr(&u.sin6, &l);
-		switch (sa.ss_family) {
+		switch (u.ss.ss_family) {
 		case AF_INET6:
 			sin6 = (struct sockaddr_in6 *)&sa;
 			if (e == FTP_EPASSIVE_MODE)
-				sin6->sin6_port = htons(port);
+				u.sin6.sin6_port = htons(port);
 			else {
-				memcpy(&sin6->sin6_addr, addr + 2, 16);
+				memcpy(&u.sin6.sin6_addr, addr + 2, 16);
-				memcpy(&sin6->sin6_port, addr + 19, 2);
+				memcpy(&u.sin6.sin6_port, addr + 19, 2);
+			}
 			break;
 		case AF_INET:
 			sin4 = (struct sockaddr_in *)&sa;
 			if (e == FTP_EPASSIVE_MODE)
-				sin4->sin_port = htons(port);
+				u.sin4.sin_port = htons(port);
 			else {
-				memcpy(&sin4->sin_addr, addr, 4);
+				memcpy(&u.sin4.sin_addr, addr, 4);
-				memcpy(&sin4->sin_port, addr + 4, 2);
+				memcpy(&u.sin4.sin_port, addr + 4, 2);
+			}
 			break;
 		default:
 			e = FTP_PROTOCOL_ERROR; /* XXX: error code should be prepared */
 			break;
+		}
 		/* connect to data port */
 		if (verbose)
 			fetch_info("opening data connection");
 		bindaddr = getenv("FETCH_BIND_ADDRESS");
 		if (bindaddr != NULL && *bindaddr != '\0' &&
-		    fetch_bind(sd, sa.ss_family, bindaddr) != 0)
+		    fetch_bind(sd, u.ss.ss_family, bindaddr) != 0)
 			goto sysouch;
-		if (connect(sd, (struct sockaddr *)&sa, l) == -1)
+		if (connect(sd, &u.sa, l) == -1)
 			goto sysouch;
 		/* make the server initiate the transfer */
 		if (verbose)
 			fetch_info("initiating transfer");
 		if (op_arg)
 			e = ftp_cmd(conn, "%s%s%s", oper, *op_arg ? " " : "", op_arg);
 		else
 			e = ftp_cmd(conn, "%s %.*s", oper,
 			    filenamelen, filename);
 		if (e != FTP_CONNECTION_ALREADY_OPEN && e != FTP_OPEN_DATA_CONNECTION)
 			goto ouch;
 	} else {
 		uint32_t a;
 		uint16_t p;
 #if defined(IPV6_PORTRANGE) || defined(IP_PORTRANGE)
 		int arg;
 #endif
 		int d;
 		char *ap;
 		char hname[INET6_ADDRSTRLEN];
-		switch (sa.ss_family) {
+		switch (u.ss.ss_family) {
 		case AF_INET6:
-			((struct sockaddr_in6 *)&sa)->sin6_port = 0;
+			u.sin6.sin6_port = 0;
 #ifdef IPV6_PORTRANGE
 			arg = low ? IPV6_PORTRANGE_DEFAULT : IPV6_PORTRANGE_HIGH;
 			if (setsockopt(sd, IPPROTO_IPV6, IPV6_PORTRANGE,
 				(char *)&arg, sizeof(arg)) == -1)
 				goto sysouch;
 #endif
 			break;
 		case AF_INET:
-			((struct sockaddr_in *)&sa)->sin_port = 0;
+			u.sin4.sin_port = 0;
 #ifdef IP_PORTRANGE
 			arg = low ? IP_PORTRANGE_DEFAULT : IP_PORTRANGE_HIGH;
 			if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE,
 				(char *)&arg, sizeof(arg)) == -1)
 				goto sysouch;
 #endif
 			break;
+		}
 		if (verbose)
 			fetch_info("binding data socket");
-		if (bind(sd, (struct sockaddr *)&sa, l) == -1)
+		if (bind(sd, &u.sa, l) == -1)
 			goto sysouch;
 		if (listen(sd, 1) == -1)
 			goto sysouch;
 		/* find what port we're on and tell the server */
-		if (getsockname(sd, (struct sockaddr *)&sa, &l) == -1)
+		if (getsockname(sd, &u.sa, &l) == -1)
 			goto sysouch;
-		switch (sa.ss_family) {
+		switch (u.ss.ss_family) {
 		case AF_INET:
-			sin4 = (struct sockaddr_in *)&sa;
+			a = ntohl(u.sin4.sin_addr.s_addr);
-			a = ntohl(sin4->sin_addr.s_addr);
+			p = ntohs(u.sin4.sin_port);
 			p = ntohs(sin4->sin_port);
 			e = ftp_cmd(conn, "PORT %d,%d,%d,%d,%d,%d",
 			    (a >> 24) & 0xff, (a >> 16) & 0xff,
 			    (a >> 8) & 0xff, a & 0xff,
 			    (p >> 8) & 0xff, p & 0xff);
 			break;
 		case AF_INET6:
 #define UC(b)	(((int)b)&0xff)
 			e = -1;
-			sin6 = (struct sockaddr_in6 *)&sa;
+			u.sin6.sin6_scope_id = 0;
-			sin6->sin6_scope_id = 0;
+			if (getnameinfo(&u.sa, l,
 			if (getnameinfo((struct sockaddr *)&sa, l,
 				hname, sizeof(hname),
 				NULL, 0, NI_NUMERICHOST) == 0) {
 				e = ftp_cmd(conn, "EPRT |%d|%s|%d|", 2, hname,
-				    htons(sin6->sin6_port));
+				    htons(u.sin6.sin6_port));
 				if (e == -1)
 					goto ouch;
+			}
 			if (e != FTP_OK) {
-				ap = (char *)&sin6->sin6_addr;
+				ap = (char *)&u.sin6.sin6_addr;
 				e = ftp_cmd(conn,
 				    "LPRT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
 , 16,
 				    UC(ap[0]), UC(ap[1]), UC(ap[2]), UC(ap[3]),
 				    UC(ap[4]), UC(ap[5]), UC(ap[6]), UC(ap[7]),
 				    UC(ap[8]), UC(ap[9]), UC(ap[10]), UC(ap[11]),
 				    UC(ap[12]), UC(ap[13]), UC(ap[14]), UC(ap[15]),
 ,
-				    (ntohs(sin6->sin6_port) >> 8) & 0xff,
+				    (ntohs(u.sin6.sin6_port) >> 8) & 0xff,
-				    ntohs(sin6->sin6_port)        & 0xff);
+				    ntohs(u.sin6.sin6_port)        & 0xff);
+			}
 			break;
 		default:
 			e = FTP_PROTOCOL_ERROR; /* XXX: error code should be prepared */
 			goto ouch;
+		}
 		if (e != FTP_OK)
 			goto ouch;
 		/* seek to required offset */
 		if (offset)
 			if (ftp_cmd(conn, "REST %llu", (unsigned long long)offset) != FTP_FILE_OK)
 				goto sysouch;