Module Name: src
Committed By: martin
Date: Mon Jun 14 11:45:49 UTC 2021
Modified Files:
src/usr.bin/ftp [netbsd-9]: ftp.c
Log Message:
Pull up following revision(s) (requested by lukem in ticket #1293):
usr.bin/ftp/ftp.c: revision 1.172
set SO_KEEPALIVE on control connection
Attempt to prevent timeouts of the control connection by setting SO_KEEPALIVE.
This matches the equivalent behaviour in ftpd.
Note: This is a much simpler change than adding a background polling event
to invoke "STAT" (or "NOOP") on the control connection during a transfer.
(It's unclear from RFC 959 whether "NOOP" is even permitted during a transfer).
PR bin/56129
To generate a diff of this commit:
cvs rdiff -u -r1.168.2.3 -r1.168.2.4 src/usr.bin/ftp/ftp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.168.2.3 src/usr.bin/ftp/ftp.c:1.168.2.4
--- src/usr.bin/ftp/ftp.c:1.168.2.3 Mon Jun 14 11:28:28 2021
+++ src/usr.bin/ftp/ftp.c Mon Jun 14 11:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.168.2.3 2021/06/14 11:28:28 martin Exp $ */
+/* $NetBSD: ftp.c,v 1.168.2.4 2021/06/14 11:45:48 martin Exp $ */
/*-
* Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-__RCSID("$NetBSD: ftp.c,v 1.168.2.3 2021/06/14 11:28:28 martin Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.168.2.4 2021/06/14 11:45:48 martin Exp $");
#endif
#endif /* not lint */
@@ -280,6 +280,11 @@ hookup(const char *host, const char *por
goto bad;
}
+ if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,
+ (void *)&on, sizeof(on)) == -1) {
+ DWARN("setsockopt %s (ignored)", "SO_KEEPALIVE");
+ }
+
if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE,
(void *)&on, sizeof(on)) == -1) {
DWARN("setsockopt %s (ignored)", "SO_OOBINLINE");
