From nobody Tue Jan 27 00:45:08 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 4f0RWm3rGYz6PtB7 for ; Tue, 27 Jan 2026 00:45:08 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0RWm2cMXz3fh4 for ; Tue, 27 Jan 2026 00:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769474708; 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=wciNiNEPdGdTs/VBMf85WHo7IcB9fqUHTolwVcyz5S0=; b=t1Z+71NY2jEhA0AUqgjM0ajB92Q01cvJa8gEnClM7QjdCd7C5A/FIEbdNoIQtmUr+wI7Ak +00OeUzlEnFGfiT8rcR7ihbHioyMtJZC1keHmWfnjpBaUlMAeY6InVYCtwQLUL9l68JhvS pUMn8zx1uFZdyIkC4jxApbqgRtuuY/s4DPZok6Bb2hRtYfXZhXig4Xeg9rtQuWgbeYsIni xepd2yFIMpHUGeXIjVheT+jGLHTqxTHJpkL7VOWgt4xqki7ZW/IB9fpEV+Ftd2zbTbYI3w L+fpaxMakM/Fnpujknzcj2Zqa2AZID+rTC1vnJBJebBEMWX2t0LRNj1vTWZzSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769474708; 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=wciNiNEPdGdTs/VBMf85WHo7IcB9fqUHTolwVcyz5S0=; b=Zwy++uWoIpoqXI7BUfDuqOBKttM3wjKxWIcMm4xN8x4J+Aly7Jhe9Befg6zuKGRvHQZlJ/ 4BrMaGNsHZGvNRLnRNd+ptkb0iGxVJmatVIG5ILFK0U+HLOEOJuuR8QIgF8Lg3CN1uR1V0 Fh9w4vZmlJmdujDLXQ0fQKm3JPNnMwl78XGkK3/mFkGqBBQ4yWprThRsOazzuw7+CqkD2T RRdyTVYgxMxpDZrn4VkRmj5bjyg0e//yMuAsfLqQ4FF4MGanVzK8cLt4qGlZ4kdCzAR4H+ /IqbemmJgMT3tEk5+Wm+hdGgpI2lxIOkLbCi2OKTBwbWJocmcVd5cWIpctpVug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769474708; a=rsa-sha256; cv=none; b=BI8/DlTBbS01KXe/hPAWJCWsKyPS+dCAV/PkKuEKDFV4OAGkbU0XTaaKZ22WhLgkVpCv23 EcJp2utdVLh3S6gzWaaBzk0SgO4QjOrkaArNEgOqC6VvO34kVJLocnWOT/zO17Xff+36uD dylZa3qJcQRjAR6mSfEV5Gn8WKfRPUimxXsl1OdJ/VOSKzR82qi8JA8/yzKfM3nNAuT+XC HVx9xpLj+wFzy4Jp8lZlpGQRqkcRNCW8OI+8O5PpOAtg+aor809f9fziWqdlCugYzhuTE8 xbHYip2GXlhm6JtTtKcjbJyjaBp7Q0B2WJ13AsWkA37P7bSG/VWvQCVVPM31cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0RWm2C1szlLt for ; Tue, 27 Jan 2026 00:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id dbcd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 00:45:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d47c1c2cf562 - main - sbin/setkey: add -Z option to disable receive timeouts 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d47c1c2cf562a7583758387cd652e98b91ab83f6 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 00:45:08 +0000 Message-Id: <69780a94.dbcd.7c991638@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d47c1c2cf562a7583758387cd652e98b91ab83f6 commit d47c1c2cf562a7583758387cd652e98b91ab83f6 Author: Konstantin Belousov AuthorDate: 2026-01-20 12:09:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-27 00:44:03 +0000 sbin/setkey: add -Z option to disable receive timeouts Sponsored by: NVidia networking MFC after: 1 week --- sbin/setkey/setkey.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c index f7268d8f1e10..3caf83c8eebc 100644 --- a/sbin/setkey/setkey.c +++ b/sbin/setkey/setkey.c @@ -86,6 +86,7 @@ static int f_policy = 0; static int f_hexdump = 0; static int f_tflag = 0; static int f_scope = 0; +static int f_notimeout = 0; static time_t thiszone; extern int lineno; @@ -129,7 +130,7 @@ main(int ac, char **av) thiszone = gmt2local(0); - while ((c = getopt(ac, av, "acde:f:ghltvxDFP")) != -1) { + while ((c = getopt(ac, av, "abcde:f:ghltvxDFPZ")) != -1) { switch (c) { case 'c': f_mode = MODE_SCRIPT; @@ -187,6 +188,9 @@ main(int ac, char **av) case 'v': f_verbose = 1; break; + case 'Z': + f_notimeout = 1; + break; default: usage(); /*NOTREACHED*/ @@ -332,16 +336,18 @@ sendkeymsg(char *buf, size_t len) u_char rbuf[1024 * 32]; /* XXX: Enough ? Should I do MSG_PEEK ? */ ssize_t l; struct sadb_msg *msg; - - { struct timeval tv; - tv.tv_sec = 1; - tv.tv_usec = 0; - if (setsockopt(so, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) { - perror("setsockopt"); - goto end; + + + if (!f_notimeout) { + tv.tv_sec = 1; + tv.tv_usec = 0; + if (setsockopt(so, SOL_SOCKET, SO_RCVTIMEO, &tv, + sizeof(tv)) < 0) { + perror("setsockopt"); + goto end; + } } - } if (f_forever) shortdump_hdr();