diff options
| author |   espie <espie@openbsd.org> | 2008-03-10 22:56:43 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2008-03-10 22:56:43 +0000 |
| commit | ce04b5fad68e7c75ba6ce7921ec3813c7ebcf26a (patch) | |
| tree | 1ec95862bb64df59b41cccfec78f7891147058e6 | |
| parent | Minor tweaks, including behind-the-scenes fixes. (diff) | |
| download | wireguard-openbsd-ce04b5fad68e7c75ba6ce7921ec3813c7ebcf26a.tar.xz wireguard-openbsd-ce04b5fad68e7c75ba6ce7921ec3813c7ebcf26a.zip | |
turn on keepalive by default (one byte every 60 seconds)
okay beck@, deraadt@, krw@
| -rw-r--r-- | usr.bin/ftp/ftp.1 | 7 | ||||
| -rw-r--r-- | usr.bin/ftp/ftp.c | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1 index bb5213a6074..248413a5885 100644 --- a/usr.bin/ftp/ftp.1 +++ b/usr.bin/ftp/ftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftp.1,v 1.67 2008/03/09 15:35:42 jmc Exp $ +.\" $OpenBSD: ftp.1,v 1.68 2008/03/10 22:56:43 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: March 9 2008 $ +.Dd $Mdocdate: March 10 2008 $ .Dt FTP 1 .Os .Sh NAME @@ -164,6 +164,9 @@ 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. +By default, +.Nm +will send a byte every 60 seconds. .It Fl m Causes .Nm diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c index 3a9cf82bd69..39625c78f2f 100644 --- a/usr.bin/ftp/ftp.c +++ b/usr.bin/ftp/ftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp.c,v 1.67 2007/06/16 08:58:33 espie Exp $ */ +/* $OpenBSD: ftp.c,v 1.68 2008/03/10 22:56:43 espie Exp $ */ /* $NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $ */ /* @@ -60,7 +60,7 @@ */ #if !defined(lint) && !defined(SMALL) -static const char rcsid[] = "$OpenBSD: ftp.c,v 1.67 2007/06/16 08:58:33 espie Exp $"; +static const char rcsid[] = "$OpenBSD: ftp.c,v 1.68 2008/03/10 22:56:43 espie Exp $"; #endif /* not lint and not SMALL */ #include <sys/types.h> @@ -325,7 +325,7 @@ command(const char *fmt, ...) return (r); } -int keep_alive_timeout = 0; /* 0 -> no timeout */ +int keep_alive_timeout = 60; /* 0 -> no timeout */ static int full_noops_sent = 0; static time_t last_timestamp = 0; /* 0 -> no measurement yet */ |