From nobody Tue Jan 27 00:45:08 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 4f0RWs4YxYz6PtQ3 for ; Tue, 27 Jan 2026 00:45:13 +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 4f0RWs3Htxz3fj5 for ; Tue, 27 Jan 2026 00:45:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769474713; 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=LspzAOU15nswXcPgHej4+up2Cw840byKceXrGeIq23nbOgodB2u9f2C2e85YKbI9P4ZFoe 5p6b+k0ede6CtNhaJUdShHmpZf92wfOCyLZ74kH6Kq+Lx+bEvRJzeN1dKXSTO7gfey/EtX aXdmEj+ejeLMV8YFUrbf4tSspbUJDKZrypdGrLFSPj/8oqfiCjjUG5Hg7tFzYoOkFB3c64 wGCaUsqracnqkFCNviSN7hGreNsTPMcOM4ZN6oW4ZP0Pj0cSw4Eoekm0biLS3qqhjXuhty o0pVjt4IHsj35fT9FhMh/h3dV9Cv+dT9vUp4kQI1tmv1zgp2CdNtz2B7SomoNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769474713; 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=MMCyek4bG0xfERhLeAbCIEhE8dK3AgNK8xSECKEOOkCyK5JLPbLzMpbF+sGw0yKBtTsZAh a8NSYX/a4WE/HNNwI7QCcVDBTxQ2Ak4bBBUFyXDpzZHPU0A5jym6jZSyeIHSHmg3eiLK3O 08XRaoCvYp2NFZyVivmmUxZ5gkY/4beIGpx4jbwyb/93CSr0wQJJOk5IGiNXr2G9pAhFFG c9ei+DXK3T7aEp5sG78VltQ+5lgoUzYML5S2TEGgsrYVCPx9nHnzkFZyaBz7BFoKwtUY5q R0a6W3XzpQL00KaGDdcrYt9TjU7kPdjD1bquq1vDRJxJdKkNrImdN0dRys5JAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769474713; a=rsa-sha256; cv=none; b=glZQQ3UKBCTjwY2vYC9xvntBO9B1wukwA7Cna7ktpqC9kicE5OjGfS42lzYZ/YIYpdTDiy Mzou1inp7l11jx7vmLLteHsRzzjnUkBl5DEa+aIENBqCMbf6oKXzIgI1VQZTDYxYf92L1B NG6sWEduz7O4yBrCegSu0fsUiUW4BF6VUb3LEDQp8dbmDDg+r2Yr/TN8gk6wPRaYLw5+eP dayir9jIepWE0oTJjUVlGGbzmJ0OXugxEzGMpxoupvdAEiwNtg6yYJIIJ9j/Xz1vdBdnV1 LUxwBfrvRkcAibp0FCBcB/y3RGTK9Z5Oyq8khRGqp8nIkMK0i2BHbfDatRFeBQ== 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 4f0RWs29PZzlLv for ; Tue, 27 Jan 2026 00:45:13 +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 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 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();