summaryrefslogtreecommitdiff
path: root/usr.bin/ftp/ftp.1
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2007-06-16 08:58:34 +0000
committerMarc Espie <espie@cvs.openbsd.org>2007-06-16 08:58:34 +0000
commit5ba6b2ba2df8fc791ddaed159225dbbcdf674cf5 (patch)
tree6fcf6a2b18e6258d84d0a2dddcd8eaa4d5a2563a /usr.bin/ftp/ftp.1
parent3c0ffca3b0a9e275fb40c1bb21cb96e0da507384 (diff)
implement a `keep-alive' option that sends bytes over an inactive
connection. The FTP protocol provides us with a NOOP operation that is perfectly suitable for that, and so far servers are happy with it. Sending the command slowly is an idea I borrowed from spamd. No change for people not using the option, so it can't break normal ftp. okay beck@, jmc@
Diffstat (limited to 'usr.bin/ftp/ftp.1')
-rw-r--r--usr.bin/ftp/ftp.118
1 files changed, 16 insertions, 2 deletions
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index b6dfe8fae35..ffeae81112b 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ftp.1,v 1.60 2007/06/13 18:43:16 jmc Exp $
+.\" $OpenBSD: ftp.1,v 1.61 2007/06/16 08:58:33 espie Exp $
.\" $NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
.\"
.\" Copyright (c) 1985, 1989, 1990, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)ftp.1 8.3 (Berkeley) 10/9/94
.\"
-.Dd $Mdocdate: June 13 2007 $
+.Dd $Mdocdate: June 16 2007 $
.Dt FTP 1
.Os
.Sh NAME
@@ -40,6 +40,7 @@
.Nm ftp
.Op Fl 46AadEegimnptVv
.Op Fl c Ar cookie
+.Op Fl k Ar seconds
.Op Fl P Ar port
.Op Fl r Ar seconds
.Op Ar host Op Ar port
@@ -134,6 +135,19 @@ Disables file name globbing.
.It Fl i
Turns off interactive prompting during
multiple file transfers.
+.It Fl k Ar seconds
+Sends a byte after each
+.Ar seconds
+period over the control connection during long transfers,
+so that incorrectly configured network equipment won't
+agressively drop it.
+The FTP protocol supports a
+.Dv NOOP
+command that can be used for that purpose.
+This assumes the FTP server can deal with extra commands coming over
+the control connection during a transfer.
+Well-behaved servers queue those commands, and process them after the
+transfer.
.It Fl m
Causes
.Nm