From nobody Fri Feb 21 11:17:53 2025 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 4Yznfn51bpz5pdYw; Fri, 21 Feb 2025 11:17:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yznfn4KrFz3mk4; Fri, 21 Feb 2025 11:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740136673; 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=nNzvv+A99Ue/71R5a+shJtyC7uIGIOVU3nZG+wlNKL0=; b=SJ765Bmo0E+R/MSZZgoOxsi95EeYFhqDxyfHdLncw9PvTNnfOaQ1tpLWwf7slphBjT0baf 6IuNDflt9vdjReaqfIFGIa9juQ8oPzBB4oxuiYsv50doyuna1IsWKdy5GlkAmlA3ZeH7Dk j+1ZVgCz55Cit5ptPWEvkiUNinopVl8QExGoM5uIH+PfSbRUTblYKaNswCAnWAZHpyMxtQ ZrG2512NlWv9pShEOxgleYrfod0nGZZky3sbt7Ie/pTQb8n3nI0aUQEEZXzeYb9QG4f32t vDZNzsA0zgpTSEeGabE7IR84fmyn5suF0T8ZpipcI5LqBdYxC8GsvKO0sAk8oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740136673; a=rsa-sha256; cv=none; b=GwfyMcXgY+J0B2R/AJyOkCccq74tWidzKcGpTxGz++Z0Jw0va/Au6hESo918TuyA6h57i+ dPkRhn198ZGBJ183j23/yaH8nrJm0bnGl9aG9ak/WXP8zzc4WD8xJ0WjIIBG+DUlVDkAP5 /qnd4VrIllRqP8LjQi+EZfaAWBvAnoxpYzt5NQdd0glUqIz089EOyY/lZ1lcVnwUmwvLis eHUZTgjI8oP/rEFHSn255lvNObtgprRMfG65KCHX8TfkyJRqA2yt6+rl3hLH3oTT9RX9bj eAOQ5X3m+QffccWz531dUPALOP3qUs82jLGYwkMaHT91R1ox46z2VNGpaZoIcg== 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=1740136673; 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=nNzvv+A99Ue/71R5a+shJtyC7uIGIOVU3nZG+wlNKL0=; b=HOUqInWKNyd0df4dxH+80fhhThAP+tCtbEss1I2j26nxTH1CAjp6sDfOqnJts9Fe71YXrZ E34Gs7FmeWFFH9jBtmwrAzEWYpZJHJ6EHJqlvx0bjQvnrNyWv3IpF4hsB5SAGK5ZTC6qEe b/k+/fRI4QaUhlsFf+whzSZkjKavwTGqT6K6hqUEj7h4uNMgcrmq+Xfm25KPnz9DcXFAbQ cacUszVJypaDHXDfBr19XAF589MBbg9ocBnQSTwvwUQjqtLNdJzpXRetNbkmeUEwjX+tLS NUvXaN73ogz8xCh2WxCo0G5s5upyZHyj4tbjZ23upWVrtx2dFFGVHesgj5sh0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yznfn3jSlz4Bf; Fri, 21 Feb 2025 11:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51LBHrVE016094; Fri, 21 Feb 2025 11:17:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51LBHrMc016091; Fri, 21 Feb 2025 11:17:53 GMT (envelope-from git) Date: Fri, 21 Feb 2025 11:17:53 GMT Message-Id: <202502211117.51LBHrMc016091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: fd258b6dd15b - stable/14 - ipfw: make 'ipfw show' output compatible with 'ipfw add' command 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fd258b6dd15b663767a2c919489ba278333abd95 Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=fd258b6dd15b663767a2c919489ba278333abd95 commit fd258b6dd15b663767a2c919489ba278333abd95 Author: Andrey V. Elsukov AuthorDate: 2025-02-11 09:48:17 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-02-21 11:16:15 +0000 ipfw: make 'ipfw show' output compatible with 'ipfw add' command If rule was added in compact form and rule body is empty, print 'proto ip' opcode to be compatible with ipfw(8) syntax parser. Before: $ ipfw add allow proto ip 000700 allow After: $ ipfw add allow proto ip 000700 allow proto ip (cherry picked from commit 706a03f61bbb6e0cf10e6c3727966495b30d763e) --- sbin/ipfw/ipfw2.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 7a8601aad46a..beff243ecdbd 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -2380,6 +2380,13 @@ show_static_rule(struct cmdline_opts *co, struct format_opts *fo, if (rule->flags & IPFW_RULE_JUSTOPTS) { state.flags |= HAVE_PROTO | HAVE_SRCIP | HAVE_DSTIP; + /* + * Print `proto ip` if all opcodes has been already printed. + */ + if (memchr(state.printed, 0, rule->act_ofs) == NULL) { + bprintf(bp, " proto ip"); + goto end; + } goto justopts; }