[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-90-gc232042

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  c23204251c56d6d860e4909cbef9e4094b6082b7 (commit)
       via  faa916c08a33b508648932f43696446fcdde9419 (commit)
      from  46dedcf228def17144eff9a063fb6b249146577e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=c23204251c56d6d860e4909cbef9e4094b6082b7


commit c23204251c56d6d860e4909cbef9e4094b6082b7
Author: Mats Erik Andersson <address@hidden>
Date:   Fri May 6 20:22:28 2011 +0200

    inetutils.texi: Add IPv6 ability for FTP client.

diff --git a/ChangeLog b/ChangeLog
index 5e1a6db..f7a4468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-06  Mats Erik Andersson <address@hidden>
 
+       * doc/inetutils.texi (ftp invocation): Document new capabilities
+       related to the recent IPv6 code.  A single old misprint.
+
+2011-05-06  Mats Erik Andersson <address@hidden>
+
        * 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

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=faa916c08a33b508648932f43696446fcdde9419


commit faa916c08a33b508648932f43696446fcdde9419
Author: Mats Erik Andersson <address@hidden>
Date:   Fri May 6 20:09:08 2011 +0200

    ftp: Commands for address family selection.

diff --git a/ChangeLog b/ChangeLog
index f4a39a6..5e1a6db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-06  Mats Erik Andersson <address@hidden>
 
+       * ftp/extern.h (setipany,setipv4,setipv6): New prototypes.
+       * ftp/cmdtab.c (ipanyhelp,ipv4help,ipv6help): New help texts.
+       (cmdtab): Register commands `ipany', `ipv4', and `ipv6'.
+       * ftp/cmds.c (status): Report address family.
+       (setipany,setipv4,setipv6): New functions.
+
+2011-05-06  Mats Erik Andersson <address@hidden>
+
        * src/syslogd.c (fprintlog): Deallocate pointers F_HNAME or F_FNAME
        when F_TYPE is invalidated as F_UNUSED.
        (cfline): Likewise.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 39b6294..4a97f26 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1053,6 +1053,9 @@ status (int argc, char **argv)
     printf ("Connected to %s.\n", hostname);
   else
     printf ("Not connected.\n");
+  printf ("Connection addressing: %s\n",
+         (usefamily == AF_UNSPEC) ? "any"
+           : (usefamily == AF_INET6) ? "IPv6" : "IPv4");
   if (!proxy)
     {
       pswitch (1);
@@ -1158,6 +1161,39 @@ setverbose (int argc, char **argv)
 }
 
 /*
+ * Allow any address family.
+ */
+void
+setipany (int argc, char **argv)
+{
+  usefamily = AF_UNSPEC;
+  printf ("Selecting addresses: %s.\n", "any");
+  code = usefamily;
+}
+
+/*
+ * Restrict to IPv4 addresses.
+ */
+void
+setipv4 (int argc, char **argv)
+{
+  usefamily = AF_INET;
+  printf ("Selecting addresses: %s.\n", "IPv4");
+  code = usefamily;
+}
+
+/*
+ * Restrict to IPv6 addresses.
+ */
+void
+setipv6 (int argc, char **argv)
+{
+  usefamily = AF_INET6;
+  printf ("Selecting addresses: %s.\n", "IPv6");
+  code = usefamily;
+}
+
+/*
  * Toggle use of EPRT/EPRT for IPv4.
  */
 void
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index 8910cf0..65d2096 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -80,6 +80,9 @@ char globhelp[] = "toggle metacharacter expansion of local 
file names";
 char hashhelp[] = "toggle printing `#' for each buffer transferred";
 char helphelp[] = "print local help information";
 char idlehelp[] = "get (set) idle timer on remote side";
+char ipanyhelp[] = "allow all address families";
+char ipv4help[] = "select only IPv4 addresses";
+char ipv6help[] = "select only IPv6 addresses";
 char lcdhelp[] = "change local working directory";
 char lshelp[] = "list contents of remote directory";
 char macdefhelp[] = "define a macro";
@@ -154,6 +157,9 @@ static struct cmd cmdtab[] = {
   {"help", helphelp, 0, 0, 1, help},
   {"idle", idlehelp, 0, 1, 1, site_idle},
   {"image", binaryhelp, 0, 1, 1, setbinary},
+  {"ipany", ipanyhelp, 0, 0, 0, setipany},
+  {"ipv4", ipv4help, 0, 0, 0, setipv4},
+  {"ipv6", ipv6help, 0, 0, 0, setipv6},
   {"lcd", lcdhelp, 0, 0, 0, lcd},
   {"ls", lshelp, 1, 1, 1, ls},
   {"macdef", macdefhelp, 0, 0, 0, macdef},
diff --git a/ftp/extern.h b/ftp/extern.h
index 1c4719f..39bff6f 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -132,6 +132,9 @@ void setform (int, char **);
 void setftmode (int, char **);
 void setglob (int, char **);
 void sethash (int, char **);
+void setipany (int, char **);
+void setipv4 (int, char **);
+void setipv6 (int, char **);
 void setnmap (int, char **);
 void setntrans (int, char **);
 void setpassive (int, char **);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   13 +++++++++++++
 doc/inetutils.texi |   31 +++++++++++++++++++++++++++++--
 ftp/cmds.c         |   36 ++++++++++++++++++++++++++++++++++++
 ftp/cmdtab.c       |    6 ++++++
 ftp/extern.h       |    3 +++
 5 files changed, 87 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils