From nobody Mon Jul 13 06:45:45 2026 X-Original-To: dev-commits-src-main@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 4gzCcp1vSFz6kSqJ for ; Mon, 13 Jul 2026 06:45:46 +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 4gzCcp0cR2z3kmK for ; Mon, 13 Jul 2026 06:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783925146; 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=vBm+vlFVV1B7Lp4xpBAXXfDSlmS1J0bYab9jC7jvjsM=; b=Vaka6M0jt+MPPgSzyPiBxyYLSWh6ABsEKB9FLG2v8G+fdx/+283mA4CKrXzkA1X+B8HHk/ QXgTI8mcJMUoZof9Hp5PiVJjp0cGpOk1UMUjzldzP++XGAeniehDCP9L7VogJ6RolARFME 8P3FIC1YajOFVcqxFYEF6W7HDWPnht19C+Xpq3/7dg0WXDTNzGZnJvh55oJnC6ApySctlP NwMr5A4sQI0H3MUNH+kdPP96RwiSCPijrnELvdJC0vj722hSujVgLS14C0qxsrmuOFZ4n2 J49+17eMo5ziU3VHZ+L1jo1l2pkr9MgSUEni3VElMGbkzcTfXPcAtkV8g/47sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783925146; a=rsa-sha256; cv=none; b=wORv/felSNl2FTlCeZBSxzYpNWaR+i21UbleSYuNZPo26r38+GvYNMchyfrR7rcJhVxPww CaUT4tghZESw7pIstnNNn/pm/EXpdZgMAuKx1zYNNjTK4A+68FZosa0tEefaJ9e4pFF3Fx wScPWmT4eYgLkLOK1TeMb1wUPOjOwCfM5hcDNXBhUwuez4d5wJONlXnQ241wJi0LDk+gkq emyC5BnY5A/RHeH7n2F8wSXKZ7265HLHF9TES+Kej3TUhEqELSfXyaxTDAjuapbi9K4tX9 mwpgLFvGkF1QaUX63US//NS7i+hm5R48hOxFfp5OyACJklteCRHq7NEZWneYYg== 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=1783925146; 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=vBm+vlFVV1B7Lp4xpBAXXfDSlmS1J0bYab9jC7jvjsM=; b=D6wGwHkk+Ar1nRyuFNaNs3IKdwAQFtrl1bUblkU+bg3agyOOQEKGYB/s0BWm8wtbaaFWXE /6JDMGhNpVP9Npenw81ySOH1yuN5swBc185K31Cyc2sGQ9TSVz/Z87FuNsCoiWDB4d6UbP YmfYYsPeoB1cMLctY05yH3F/gKUkJZO9WqlPenjXBfZTbU7ssFnqXmRppRVqIEq/reeljG 8nT6nmxOE7kSfYtOCTcIeOhYfyFdvn6KBUUuoSsCFLkIH1wL1icnc0D+2hkTNt9agKYokH 12UeYb98K9E/LoBt3nlRAZNOjMnEbrWeTDvjQyAcOJ5AA3dyUv50wSPdrxUXRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzCcn5Z23znvL for ; Mon, 13 Jul 2026 06:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fcf9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 06:45:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 848f360c8f9a - main - libfetch: Apply timeout to connection attempts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 848f360c8f9ae8d1d97c61f5d63fc624926d5dcd Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 06:45:45 +0000 Message-Id: <6a548999.1fcf9.707ee957@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=848f360c8f9ae8d1d97c61f5d63fc624926d5dcd commit 848f360c8f9ae8d1d97c61f5d63fc624926d5dcd Author: Dag-Erling Smørgrav AuthorDate: 2026-07-13 06:43:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-13 06:43: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 --- 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;