d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the printing of rule comments.

Browse Source 
Change uint8_t type of opcode argument to int in the print_opcode()
function. Use negative value to print the rest of opcodes, because
zero value is O_NOP, and it can't be uses for this purpose.

Reported by:	lev
MFC after:	1 week
This commit is contained in:
Andrey V. Elsukov 2018-05-10 12:25:01 +00:00
parent cc3c9df80f
commit 51d5442fef
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=333458
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/ipfw/ipfw2.c
View File

@ -1708,7 +1708,7 @@ print_instruction(struct buf_pr *bp, const struct format_opts *fo,
static ipfw_insn *
print_opcode(struct buf_pr *bp, struct format_opts *fo,
struct show_state *state, uint8_t opcode)
struct show_state *state, int opcode)
{
ipfw_insn *cmd;
int l;
@ -1716,7 +1716,7 @@ print_opcode(struct buf_pr *bp, struct format_opts *fo,
for (l = state->rule->act_ofs, cmd = state->rule->cmd;
l > 0; l -= F_LEN(cmd), cmd += F_LEN(cmd)) {
/* We use zero opcode to print the rest of options */
if (opcode != 0 && cmd->opcode != opcode)
if (opcode >= 0 && cmd->opcode != opcode)
continue;
/*
* Skip O_NOP, when we printing the rest
@ -2192,7 +2192,7 @@ show_static_rule(struct cmdline_opts *co, struct format_opts *fo,
O_IP_DSTPORT, HAVE_DSTIP);
/* Print the rest of options */
while (print_opcode(bp, fo, &state, 0))
while (print_opcode(bp, fo, &state, -1))
;
end:
/* Print comment at the end */