From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Christopher Baines Newsgroups: gmane.lisp.guile.devel Subject: [PATCH v3] Define SO_RCVTIMEO and SO_SNDTIMEO. Date: Sun, 18 Sep 2022 16:17:34 +0200 Message-ID: <20220918141734.17544-1-mail@cbaines.net> References: <20220917080512.17824-1-mail@cbaines.net> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29859"; mail-complaints-to="usenet@ciao.gmane.io" To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Sun Sep 18 16:18:00 2022 Return-path: Envelope-to: guile-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oZv7Q-0007dE-Gh for guile-devel@m.gmane-mx.org; Sun, 18 Sep 2022 16:18:00 +0200 Original-Received: from localhost ([::1]:48056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZv7O-00012Z-TC for guile-devel@m.gmane-mx.org; Sun, 18 Sep 2022 10:17:58 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZv78-000129-Gz for guile-devel@gnu.org; Sun, 18 Sep 2022 10:17:42 -0400 Original-Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:48097) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZv76-0008BO-PB for guile-devel@gnu.org; Sun, 18 Sep 2022 10:17:42 -0400 Original-Received: from localhost (unknown [134.157.22.165]) by mira.cbaines.net (Postfix) with ESMTPSA id 96E7927BBE9 for ; Sun, 18 Sep 2022 15:17:36 +0100 (BST) Original-Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id da228529 for ; Sun, 18 Sep 2022 14:17:34 +0000 (UTC) X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220917080512.17824-1-mail@cbaines.net> Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.io gmane.lisp.guile.devel:21353 Archived-At: These are important for reliable networking, since they prevent network operations from hanging indefinitely. * libguile/socket.c (scm_init_socket): Define SO_RCVTIMEO and SO_SNDTIMEO. (scm_getsockopt, scm_setsockopt): Include SO_RCVTIMEO and SO_SNDTIMEO in docstring and handle them. * doc/ref/posix.texi (Network Sockets and Communication): Document them. --- doc/ref/posix.texi | 2 ++ libguile/socket.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi index 19911a427..5c7dce90d 100644 --- a/doc/ref/posix.texi +++ b/doc/ref/posix.texi @@ -3229,6 +3229,8 @@ Manual}, or @command{man 7 socket}. @defvarx SO_NO_CHECK @defvarx SO_PRIORITY @defvarx SO_REUSEPORT +@defvarx SO_RCVTIMEO +@defvarx SO_SNDTIMEO The @var{value} taken or returned is an integer. @end defvar diff --git a/libguile/socket.c b/libguile/socket.c index b3482c8f3..8451aadac 100644 --- a/libguile/socket.c +++ b/libguile/socket.c @@ -35,6 +35,7 @@ #endif #include #include +#include #ifdef HAVE_WINSOCK2_H #include @@ -502,6 +503,12 @@ SCM_DEFINE (scm_getsockopt, "getsockopt", 3, 0, 0, "timeout support (ie.@: without @code{struct linger}), only\n" "@var{enable} has an effect but the value in Guile is always a\n" "pair.\n" + "@end defvar" + "\n" + "@defvar SO_RCVTIMEO\n" + "@defvarx SO_SNDTIMEO\n" + "@var{value} is a pair of integers @code{(@var{SECONDS}\n" + ". @var{MICROSECONDS})}.\n" "@end defvar") #define FUNC_NAME s_scm_getsockopt { @@ -522,6 +529,16 @@ SCM_DEFINE (scm_getsockopt, "getsockopt", 3, 0, 0, if (getsockopt (fd, ilevel, ioptname, (void *) &optval, &optlen) == -1) SCM_SYSERROR; +#if defined(SO_RCVTIMEO) && defined(SO_SNDTIMEO) + if (ioptname == SO_RCVTIMEO || ioptname == SO_SNDTIMEO) + { + struct timeval *opt_time = (struct timeval *) &optval; + + return scm_cons (scm_from_long (opt_time->tv_sec), + scm_from_long (opt_time->tv_usec)); + } +#endif + if (ilevel == SOL_SOCKET) { #ifdef SO_LINGER @@ -590,6 +607,12 @@ SCM_DEFINE (scm_setsockopt, "setsockopt", 4, 0, 0, "(ie.@: without @code{struct linger}), only @var{ENABLE} has an\n" "effect but the value in Guile is always a pair.\n" "@end defvar\n" + "\n" + "@defvar SO_RCVTIMEO\n" + "@defvarx SO_SNDTIMEO\n" + "@var{value} is a pair of integers @code{(@var{SECONDS}\n" + ". @var{MICROSECONDS})}.\n" + "@end defvar\n" "\n" "@c Note that we refer only to ``man ip'' here. On GNU/Linux it's\n" "@c ``man 7 ip'' but on NetBSD it's ``man 4 ip''.\n" @@ -633,6 +656,8 @@ SCM_DEFINE (scm_setsockopt, "setsockopt", 4, 0, 0, struct ip_mreq opt_mreq; #endif + struct timeval opt_time; + const void *optval = NULL; socklen_t optlen = 0; @@ -682,6 +707,19 @@ SCM_DEFINE (scm_setsockopt, "setsockopt", 4, 0, 0, } #endif +#if defined(SO_RCVTIMEO) && defined(SO_SNDTIMEO) + if (ioptname == SO_RCVTIMEO || ioptname == SO_SNDTIMEO) + { + SCM_ASSERT_TYPE (scm_is_pair (value), value, SCM_ARG4, FUNC_NAME, + "value"); + opt_time.tv_sec = scm_to_ulong (SCM_CAR (value)); + opt_time.tv_usec = scm_to_ulong (SCM_CDR (value)); + + optlen = sizeof (opt_time); + optval = &opt_time; + } +#endif + if (optval == NULL) { /* Most options take an int. */ @@ -1768,6 +1806,12 @@ scm_init_socket () #ifdef SO_REUSEPORT /* new in Linux 3.9 */ scm_c_define ("SO_REUSEPORT", scm_from_int (SO_REUSEPORT)); #endif +#ifdef SO_RCVTIMEO + scm_c_define ("SO_RCVTIMEO", scm_from_int (SO_RCVTIMEO)); +#endif +#ifdef SO_SNDTIMEO + scm_c_define ("SO_SNDTIMEO", scm_from_int (SO_SNDTIMEO)); +#endif /* recv/send options. */ #ifdef MSG_DONTWAIT -- 2.37.3