Attachment 180444 Details for Bug 217262 – Proposed patch

[patch] Proposed patch

ipfw_table_value.diff (text/plain), 1.15 KB, created by Andrey V. Elsukov on 2017-03-02 18:46:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey V. Elsukov

Created: 2017-03-02 18:46:58 UTC

Size: 1.15 KB

patch

obsolete

>Index: sys/netpfil/ipfw/ip_fw2.c
>===================================================================
>--- sys/netpfil/ipfw/ip_fw2.c	(revision 314507)
>+++ sys/netpfil/ipfw/ip_fw2.c	(working copy)
>@@ -1511,8 +1511,8 @@ do {								\
> 				    if (!match)
> 					break;
> 				    if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
>-					match =
>-					    ((ipfw_insn_u32 *)cmd)->d[0] == v;
>+					match = ((ipfw_insn_u32 *)cmd)->d[0] ==
>+					    TARG_VAL(chain, v, tag);
> 				    else
> 					tablearg = v;
> 				} else if (is_ipv6) {
>@@ -1524,7 +1524,8 @@ do {								\
> 							sizeof(struct in6_addr),
> 							pkey, &v);
> 					if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
>-						match = ((ipfw_insn_u32 *)cmd)->d[0] == v;
>+						match = ((ipfw_insn_u32 *)cmd)->d[0] ==
>+						    TARG_VAL(chain, v, tag);
> 					if (match)
> 						tablearg = v;
> 				}
>@@ -1536,7 +1537,8 @@ do {								\
> 					match = ipfw_lookup_table_extended(chain,
> 					    cmd->arg1, 0, &args->f_id, &v);
> 					if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
>-						match = ((ipfw_insn_u32 *)cmd)->d[0] == v;
>+						match = ((ipfw_insn_u32 *)cmd)->d[0] ==
>+						    TARG_VAL(chain, v, tag);
> 					if (match)
> 						tablearg = v;
> 				}

Actions: View | Diff

Attachments on bug 217262: 180444