From c23204251c56d6d860e4909cbef9e4094b6082b7 Mon Sep 17 00:00:00 2001 From: Mats Erik Andersson Date: Fri, 6 May 2011 20:22:28 +0200 Subject: [PATCH 2/2] inetutils.texi: Add IPv6 ability for FTP client. --- ChangeLog | 5 +++++ doc/inetutils.texi | 31 +++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e1a6db..f7a4468 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-05-06 Mats Erik Andersson + * doc/inetutils.texi (ftp invocation): Document new capabilities + related to the recent IPv6 code. A single old misprint. + +2011-05-06 Mats Erik Andersson + * ftp/extern.h (setipany,setipv4,setipv6): New prototypes. * ftp/cmdtab.c (ipanyhelp,ipv4help,ipv6help): New help texts. (cmdtab): Register commands `ipany', `ipv4', and `ipv6'. diff --git a/doc/inetutils.texi b/doc/inetutils.texi index 19e5f88..de80015 100644 --- a/doc/inetutils.texi +++ b/doc/inetutils.texi @@ -794,8 +794,20 @@ ftp address@hidden@dots{}] address@hidden address@hidden @end example @table @option address@hidden -4 address@hidden --ipv4 address@hidden -4 address@hidden --ipv4 +Initially set addressing to IPv4 only. + address@hidden -6 address@hidden --ipv6 address@hidden -6 address@hidden --ipv6 +Initially set addressing to IPv6 only. + @item -A address@hidden --acctive address@hidden --active @opindex -A @opindex --active Enable active mode transfer. @@ -961,6 +973,9 @@ the current working directory on the remote machine is used. If no local file is specified, or @var{local-file} is @samp{-}, output comes to the terminal. address@hidden epsv4 +Toggle the use of EPSV/EPRT for IPv4 addressing. Default is off. + @item form @var{format} Set the file transfer form to @var{format}. The default format is @samp{file}. @@ -1007,6 +1022,15 @@ Set the inactivity timer on the remote server to @var{seconds} seconds. If seconds is omitted, the current inactivity timer is printed. address@hidden ipv4 +Select IPv4 as the only addressing scheme. + address@hidden ipv6 +Select IPv6 as the only addressing scheme. + address@hidden ipany +Allow IPv4 as well as IPv6 addressing. + @item lcd address@hidden Change the working directory on the local machine. If no directory is specified, the user's home directory is used. @@ -1175,7 +1199,10 @@ sends that address to the remote server, who connects back to it. Passive mode is useful when using @command{ftp} through a gateway router or host that controls the directionality of traffic. (Note that though @command{ftp} servers are required to support the address@hidden command by RFC 1123, some do not.) address@hidden command by RFC 1123, some do not.) If @command{epsv4} +has been set to on, the client will attempt @code{EPSV} before address@hidden for IPv4. As a last resort @code{LPSV} is attempted. +With IPv6 only @code{EPSV} and @code{LPSV} are possible. @item prompt Toggle interactive prompting. Interactive prompting occurs during -- 1.7.4.4