Add -4 and -6 options.

 Current getaddrinfo() implemetation has a problem of too much resolving
 waiting time on INET6 enabled systems.
 -4 and -6 options can limit name resolving address family and is a possible
 workaround for the problem.

Approved by: jkh

4 files changed, 16 insertions, 5 deletions

diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index 7841f7b..278be80 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -165,6 +165,7 @@ extern struct	cmd cmdtab[];
 extern FILE    *cout;
 extern int	data;
 extern char    *home;
+extern int	family;
 extern int	proxy;
 extern char	reply_string[];
 extern int	NCMDS;
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index bc8adf1..f306406 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -204,7 +204,7 @@ url_get(origline, proxyenv)
 		port = httpport;
 
 	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = AF_UNSPEC;
+	hints.ai_family = family;
 	hints.ai_socktype = SOCK_STREAM;
 	error = getaddrinfo(host, port, &hints, &res);
 	res0 = res;
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index c31cb94..cfdfda8 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -121,7 +121,7 @@ hookup(host0, port)
 	host = hostnamebuf;
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_flags = AI_CANONNAME;
-	hints.ai_family = AF_UNSPEC;
+	hints.ai_family = family;
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_protocol = 0;
 	error = getaddrinfo(host, port, &hints, &res0);
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 48bf77e..4460878 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -70,6 +70,8 @@ __RCSID_SOURCE("$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $");
 #include "ftp_var.h"
 #include "pathnames.h"
 
+int family = AF_UNSPEC;
+
 int main __P((int, char **));
 
 int
@@ -151,8 +153,16 @@ main(argc, argv)
 	if (isatty(fileno(stdout)) && !dumbterm)
 		progress = 1;		/* progress bar on if tty is usable */
 
-	while ((ch = getopt(argc, argv, "adeginpP:s:tUvV")) != -1) {
+	while ((ch = getopt(argc, argv, "46adeginpP:s:tUvV")) != -1) {
 		switch (ch) {
+		case '4':
+			family = AF_INET;
+			break;
+#ifdef INET6
+		case '6':
+			family = AF_INET6;
+			break;
+#endif
 		case 'a':
 			anonftp = 1;
 			break;
@@ -228,7 +238,7 @@ main(argc, argv)
 		int error;
 
 		memset(&hints, 0, sizeof(hints));
-		hints.ai_family = AF_UNSPEC;
+		hints.ai_family = family;
 		hints.ai_socktype = SOCK_STREAM;
 		error = getaddrinfo(src_addr, NULL, &hints, &res);
 		if (error) {
@@ -697,7 +707,7 @@ void
 usage()
 {
 	(void)fprintf(stderr,
-	    "usage: %s [-adeginptUvV] [-P port] [-s src_addr] [host [port]]\n"
+	    "usage: %s [-46adeginptUvV] [-P port] [-s src_addr] [host [port]]\n"
 	    "       %s host:path[/]\n"
 	    "       %s ftp://host[:port]/path[/]\n"
 	    "       %s http://host[:port]/file\n",