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)
This commit is contained in:
Andrey V. Elsukov 2025-02-11 12:48:17 +03:00 committed by Franco Fichtner
parent 11140653cd
commit fd3d1a7d1e

View file

@ -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;
}