[src/trunk]: src/usr.bin/ftp set SO_KEEPALIVE on control connection

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ff66a2b3f187
branches:  trunk
changeset: 983724:ff66a2b3f187
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Jun 03 10:11:00 2021 +0000

description:
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

diffstat:

 usr.bin/ftp/ftp.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 9978d78b04a6 -r ff66a2b3f187 usr.bin/ftp/ftp.c
--- a/usr.bin/ftp/ftp.c Thu Jun 03 09:22:47 2021 +0000
+++ b/usr.bin/ftp/ftp.c Thu Jun 03 10:11:00 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftp.c,v 1.171 2021/01/06 04:43:14 lukem Exp $  */
+/*     $NetBSD: ftp.c,v 1.172 2021/06/03 10:11:00 lukem 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.171 2021/01/06 04:43:14 lukem Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.172 2021/06/03 10:11:00 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -280,6 +280,11 @@
                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");