From nobody Tue Jul 21 17:04:41 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 4h4NzG2fTBz6mCFn for ; Tue, 21 Jul 2026 17:04:42 +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 4h4NzF55Q0z40YL for ; Tue, 21 Jul 2026 17:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784653481; 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=rao/SW+ZKlSIM2AHpFE6RacYLNj137kiFeUg2LoBDww=; b=AyWIeMAftRs33aONzyJQC0/cn1CFNUKPFtbJlAYnXDbsIVZ5z9uSLL6evoMhC04ygOffgh aNYuDeASHBmSoZbE7wVOe4mwyCGcPeXj7nR9NtmuukuVyKBNN5RoV5OS9EKP1C0UFTaG6Z 7c73ezKW5a64vd798LCLR90erKBIXYP+my7UTKbxwI6Ft/OwwPiT3sYx8N4X/KYs8Y6eI/ J56Qbl/e9Wr8w9b9gH986ARAZcyYlIerk8/GTkghcuVLQZTu2BsTekFVaO3GLGRbpacp2r NRCkt26rCfgq0bHtUJANvJHBSbK75YkxYZpOasQRb+BewpM6JOTNx48jFHThtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784653481; a=rsa-sha256; cv=none; b=l6QoJOHq+GWEuLabVwpfR7vGplF/QolQ2dZDdTeJFjIN5YXR+QWfMMrps//5rGEX2JUfxj YUvbXTnKoxPmro9+jkg+lh5gm8pzBuPBu964XHN77oZKAlmTU/OP4vDEh6N6FOiCRCBClc 20X0ryxW7ChMF1MbC2NIDq0oYriaR/0Vnw2QJkvvY8dBC3ks81UQ8grAaQn8CNLberZgTk egl19iFD5y/p+oJpkE6O6Qts0/IlT1/bWhjeQokc3OLdNKPtIs8Tg1ho3GxuKwinjIM3+v vtKPW8lu+xYEHMg9OMrDkLn4FM9xp+k0Kh/dicq86ll2wl3NXTi6TVnGap//DQ== 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=1784653481; 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=rao/SW+ZKlSIM2AHpFE6RacYLNj137kiFeUg2LoBDww=; b=OGQaA1CN2dyiwv93sBR8xpc204ruxd+ZjsHmqrjt60tdeypqPGMpMjyepVBPJqroWJ9QZS PHy1idzPaKGecHXjOM4ktjbb8UnLsxGNmvlPSa5Q7SrUHLtdyqfLgRtJlFvWOLqZX21XA4 XJp+76REzu+InRa4Pu5w+lrUSp+InR+1bgZPaEijL44w/mQIYB2gOJS0noaHrIoYjQwx/D cpgrr4buGxJ+VoXH1jvsfPrf9Kz8SUjv/uJhvAh0W4Cq4AvD93b03LxXi6WQbZFTMUtYnH NEmFjmHxVKza5FZWGnlRDhePcgL3Q47WaSKZm90wsrPg7tdPP6l7tR1vF+O6+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4NzF3tjHzxVn for ; Tue, 21 Jul 2026 17:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34659 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 17:04:41 +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: 74a92173dc61 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 74a92173dc614b5f83c12886b014db10c1c19716 Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 17:04:41 +0000 Message-Id: <6a5fa6a9.34659.156dd6e1@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=74a92173dc614b5f83c12886b014db10c1c19716 commit 74a92173dc614b5f83c12886b014db10c1c19716 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-13 06:43:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-21 17:04:27 +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 011519af7640..4e48a290083c 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -594,10 +594,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; @@ -655,15 +658,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;