From nobody Sun Feb 1 21:40:46 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 4f438G5qSfz6QjCk for ; Sun, 01 Feb 2026 21:40: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f438G4kB4z3FZK for ; Sun, 01 Feb 2026 21:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769982046; 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=v9oE0SzD4+WBIjnVypXKjA6mhw+kaZmx4aZUEvwJm5Y=; b=FHlHHW144JE3LOcaXdhCn06JT8pbV8ixTkEIPdXnTrmHj4xJ9HXYwDufbiXjR10hkoZXnj NrLhl+oapCk0myH1Qc+ElPlBteawIRA9h4yawPWknAVEwzdFYFg2NYjFI9XvqJi0y1geVD P21fRu67ikHiLvnBrkPIlsC+PJNybLmLZiOJMq6GL6ESIHnpkDAxQa5hKkCSaWKObbUidT qoo0vQjYjpoC0JspvmAJhhuMiy9L380nBP70FHtpL7yeCPpcz2pwjvdeGiZMrkMmw9Eb+2 dDZ7Di161gGraqhLYyOTfLTtZ0ZeqwfZa5p7iZpVJDywA8VP3xESsTZH+Wrh6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769982046; a=rsa-sha256; cv=none; b=gz7/meOFdRYlIMbjjdf4trAoDPy8xs3GiVw0VgSySYv9bU2PN8TXAqtqpY4KvC+OR3SHd8 NSnPMiCXDoCvJi+SfnSwZt0off/JxBgeb04cwxDn+HQMG2lucXXoVYUfu5xFF0zjpujUxw nPRfXKDeuDH468ADbEGifrpr4Qb9sUrWpqKSzyiw7PjJinOkFwSKNUowiwJFX1bLZTvEU6 kIGLJbwXtQrBSzCUZ6V/G5oOV6KV5ov2hKhqvOlb9SjLd7owtLghJvV7+Y22b9wTOXbomL MqN+aX4BtQTxIJjzQ60wTMswAlPgbR69BkRFDc2wy4wDymvG4kyzUIX9DOmjeg== 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=1769982046; 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=v9oE0SzD4+WBIjnVypXKjA6mhw+kaZmx4aZUEvwJm5Y=; b=bJjP9nFWgsJfNqatb5CRl521wA5vZ+DDb9QunasiKAMImwSnmedghSxEAx7x8YRF7+doOz G5cym9t1A0oYs63jh2LLkSAl325B2b1XGIdNhSLPQXbSP514yibnQewInw8TRZRRoK29NN zdIcs3k+Z8c5EM/FFf99aG1AKJdNGGQykVzpCSKLjUVEPcfNDunkRHZXj/grty1RAiM5JD 670ec4e7s90BZJa/6j7IDY/zh2Dj/K0lz0M97l62ByX/K2SyrGT5lX+l4QIOkqgGA032E7 vz/gQsxXER3qlb81gL9bHZQSoo3xJ2ONBgQ8VFD9S/F8eULis0fJScAbx41MiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f438G48pszy8K for ; Sun, 01 Feb 2026 21:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c4fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Feb 2026 21:40:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 38901e30663d - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 38901e30663d02225c689ccfcd3e820606633a62 Auto-Submitted: auto-generated Date: Sun, 01 Feb 2026 21:40:46 +0000 Message-Id: <697fc85e.3c4fb.53f980cd@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=38901e30663d02225c689ccfcd3e820606633a62 commit 38901e30663d02225c689ccfcd3e820606633a62 Author: Konstantin Belousov AuthorDate: 2026-01-20 12:09:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-01 21:38:48 +0000 sbin/setkey: add -Z option to disable receive timeouts (cherry picked from commit d47c1c2cf562a7583758387cd652e98b91ab83f6) --- 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();