From nobody Tue Jul 21 17:04:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h4Nz22Bkcz6mCJG for ; Tue, 21 Jul 2026 17:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h4Nz16ns3z3yj1 for ; Tue, 21 Jul 2026 17:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784653470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26ZZ1XX9/GrZIC8xtU8iyTOeF84rryli60A15VY/GmU=; b=lLp7hNMbqAr79qaTx6xVDggqxBYcHKYchFg0omOCXg0Ht1yIA7hIP8YHra3tWNtjt7A1tx qRRJyqpHa94h8Y7HdY3IICq97obO9nOMFU64GNslCEoU0TBUMPz6iKyegl5P/IBsirr4sJ XmFJDLAjH3zh5bURWtgCYSVKvK37LV6btj8oFsmkcy5JuDDy20AcSE+IoZ80Td4aV2ScgO uetz/xnEwHo18KIQVGqtrxL1doz9L4I0YQxNAjlBmShqKNx/0kZaBVeMnrhyGrZAGDmlVq Afo5Fme6W0Z2lB3yj253jbH6WpSzQZM9p2KDNyqBWu9DTTavq8pWyv/aSe3GCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784653470; a=rsa-sha256; cv=none; b=YpOHDZFISriCobMuq7K+hdgQzaIug8WRWGKV1OayV4gP+qz3n1dFZRjnP4yRKAacNvNuX+ 6eXHPZ6i184vWqoZVPLofEdYQN24DPe1JuPBmPhSjuvvOkW4gcdEnYY7LRy9QLvcjW7jBH mgfR5zkyvsXPsM0xEloeiyH0Xh0DVGnyPX0pbxPp2d7uhivWGg2rxvOh0tLdAiM8tstqpF IFHVklVpi37FimBKWYQhGrcOioR7l5sLpFJfM+7v0cMcfBh1yR9EsvWNUfn0E5zXRwHI9o ohtgFxAEBiHMpUxIa2baHAM8jrgQJ/iKebwMfS+kiWEy0LVUgSxNHEWGH6mzMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784653470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26ZZ1XX9/GrZIC8xtU8iyTOeF84rryli60A15VY/GmU=; b=e2ZwE5O7PQsgOsye/55osePt8Rcc7KxEfQbH5+miiX04B/jryfIUChmPo2oImqEsFa10DN t77cAmwYrvhP3tBphY1YcCWzprtGG8HYYblnohWF2OOk3vOIy1fygxmpyKlYP7HAZ9eFpV gtSwjw8v5afTRcgloJxunmeCUJA38deVK5StJnsirRRxI3BTBfYLYmAWM1eU0riaOPbC/x WAEumeEJRCbZPwOIqfx9AqvVRV1zbze1iAkJ1viIPYMu03oX4ynFd9FdwLI01yY2kKCxGQ HGjtmDl1b+ewXD+Dwihxrke5ok/MGcL8uCYVjr3Hk2vUKrWLKwBCd6ymXm6BOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4Nz15NwKzxSj for ; Tue, 21 Jul 2026 17:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36953 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 17:04:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: ad7a1446c1e6 - stable/15 - libfetch: Apply timeout to connection attempts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ad7a1446c1e646eea86e36731b91e05e37026549 Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 17:04:29 +0000 Message-Id: <6a5fa69d.36953.381b9dc0@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ad7a1446c1e646eea86e36731b91e05e37026549 commit ad7a1446c1e646eea86e36731b91e05e37026549 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-13 06:43:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-21 17:03:37 +0000 libfetch: Apply timeout to connection attempts Mark the socket non-blocking before connecting and poll for completion, applying fetchTimeout if set. MFC after: 1 week Reviewed by: op Differential Revision: https://reviews.freebsd.org/D57909 (cherry picked from commit 848f360c8f9ae8d1d97c61f5d63fc624926d5dcd) --- lib/libfetch/common.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index c1888a1518a0..d1a897b98827 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -593,10 +593,13 @@ fetch_socks5_getenv(char **host, int *port) conn_t * fetch_connect(const char *host, int port, int af, int verbose) { + struct timeval now, timeout, delta; + struct pollfd pfd; struct addrinfo *cais = NULL, *sais = NULL, *cai, *sai; const char *bindaddr; conn_t *conn = NULL; int err = 0, sd = -1; + int deltams; char *sockshost; int socksport; @@ -654,15 +657,47 @@ fetch_connect(const char *host, int port, int af, int verbose) fetch_verbose("failed to bind to %s", bindaddr); goto syserr; } + /* make the socket non-blocking */ + (void)fcntl(sd, F_SETFL, O_NONBLOCK); + /* start the clock */ + if (fetchTimeout > 0) { + gettimeofday(&timeout, NULL); + timeout.tv_sec += fetchTimeout; + deltams = fetchTimeout * 1000; + } /* attempt to connect to server address */ - while ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) < 0) { - if (errno == EINTR && fetchRestartCalls) - continue; + if ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) == 0) break; + /* wait for connection */ + if (errno == EINPROGRESS) { + deltams = INFTIM; + pfd.fd = sd; + pfd.events = POLLOUT; + for (;;) { + /* wait for something to happen */ + if (poll(&pfd, 1, deltams) >= 0) + break; + if (errno == EINTR && !fetchRestartCalls) + break; + /* check the clock */ + if (fetchTimeout > 0) { + gettimeofday(&now, NULL); + if (!timercmp(&timeout, &now, >)) { + errno = ETIMEDOUT; + pfd.revents = POLLERR; + break; + } + timersub(&timeout, &now, &delta); + deltams = delta.tv_sec * 1000 + + delta.tv_usec / 1000; + } + } + if (pfd.revents == POLLOUT) { + /* connection established */ + err = 0; + break; + } } - /* success? */ - if (err == 0) - break; /* clean up before next attempt */ close(sd); sd = -1;