From nobody Mon Jun 29 15:52:15 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 4gprPr0h6Qz6jNlZ for ; Mon, 29 Jun 2026 15:52:16 +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 4gprPq5C2Cz3LFr for ; Mon, 29 Jun 2026 15:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748335; 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=M8ciUPXjnSbMNusUGlAplE3EhjxoT4CcQ16ogTsAzdM=; b=rstn2supchyLfPGu5BOxcuM5Z8OKeFqiNertQlhBml4cJ2+IoRvQVUggc7qAkB9TQl5ulS QlxeUq4t34OM4LFRJCJ3QCadiHHm9DscJoAaJMH7tS3NPJiSmDVrK8L/h+a+utYc4DmCvX 7tSDbqN5xwCeDH7ptDtRqqVYoSCFblDL4Ne9zUsqbnOiyJP1fEF56T1NJh64FDivH+z0C0 hJuCpR3tsmy1275iadVgF1LJEp9WW4AU/ynWSbBN1EPAhC9mpeMa0I8+S8ZdvbR45GyIIU Fy9pMorWbM0DmG2fV/z1i51/9wYKY+cc+wXFs78/TLJpBAUraCyXrs5FfwGuag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782748335; a=rsa-sha256; cv=none; b=Wdcd6pyEbeQl5jUgpKTzDTmEblY5jz/NGl0O6RQQmYO1CQ7oqRFFJJl7sM7850S32yFaDc dF7dHVg5YLrC/6e6Aze89C9rZN4LOmRT78LAUJQKy8+Ld60SIBLAAYjxCOtwwDk0sjgCn7 VZQRDp7prb+YKGmpHeNE4qBUed2Dz4nxtPAUgGCZ2c5hjfF9qJBJK7oNdyxi4dfEKMNQRn uYLLyFkJl4ggVYPLAq998hCP5AzJZjnu/+rS8uNfCJDyCK1VlXOlI8elk2ZVlBY9K8arQf kqdf1ONfmI3Z9vv8I4Dlq/4YjwZDK8tiWb3ZqYBj1aCK6HWRe9m3cayx/+Fqiw== 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=1782748335; 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=M8ciUPXjnSbMNusUGlAplE3EhjxoT4CcQ16ogTsAzdM=; b=HjFf0ofE2UDX5zjQMyqFCRWHhaNn48vYVuYu7QKgGCpfqlN8eA+RDyrw4S//URcublgJAK qRpzM5inxCS5aabsrZ9qpk4jQzXbCSWEgpJsVCrLmi9IPrLrVx/2z+/xWfzOxQd4vu7HaS +HW0JUXkhHCjLRsLY1sOhcfiMaMCHn6W0N1RYlxioWBoOjwsqrMrNEUMk+PJUaAAvCbdIt wi0gDqzo2yUlho0/5TLkJ0pyXzy1kUc9x1oHH5sBhjK7OwPwzo9Xt9dyiFSBlK3xIx2Gr1 dXyjixf1qcMpk2XzTaAnBToLUOcWJLxLSEUmhbFDhh5kFPp9g/VNvBFPfpABjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gprPq3S5fz136V for ; Mon, 29 Jun 2026 15:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c025 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 15:52:15 +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: d53af4112273 - 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: d53af4112273f7b234a1cdd6694b3a7ca0aae0eb Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 15:52:15 +0000 Message-Id: <6a4294af.3c025.7dc74b17@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d53af4112273f7b234a1cdd6694b3a7ca0aae0eb commit d53af4112273f7b234a1cdd6694b3a7ca0aae0eb Author: Dag-Erling Smørgrav AuthorDate: 2026-06-27 15:34:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-29 13:49:19 +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 --- 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;