Attachment #180444 for bug #217262

View | Details | Raw Unified | Return to bug 217262
Collapse All | Expand All




				    if (!match)
					break;
				    if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
					match = ((ipfw_insn_u32 *)cmd)->d[0] ==
					    TARG_VAL(chain, v, tag);
				    else
					tablearg = v;
				} else if (is_ipv6) {

							sizeof(struct in6_addr),
							pkey, &v);
					if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
						match = ((ipfw_insn_u32 *)cmd)->d[0] ==
						    TARG_VAL(chain, v, tag);
					if (match)
						tablearg = v;
				}

					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] ==
						    TARG_VAL(chain, v, tag);
					if (match)
						tablearg = v;
				}

Return to bug 217262

Lines 1511-1518 do { \ Link Here

(-)sys/netpfil/ipfw/ip_fw2.c (-4 / +6 lines)
1511	if (!match)	1511	if (!match)
1512	break;	1512	break;
1513	if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))	1513	if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
1514	match =	1514	match = ((ipfw_insn_u32 *)cmd)->d[0] ==
1515	((ipfw_insn_u32 *)cmd)->d[0] == v;	1515	TARG_VAL(chain, v, tag);
1516	else	1516	else
1517	tablearg = v;	1517	tablearg = v;
1518	} else if (is_ipv6) {	1518	} else if (is_ipv6) {
Lines 1524-1530 do { \ Link Here
1524	sizeof(struct in6_addr),	1524	sizeof(struct in6_addr),
1525	pkey, &v);	1525	pkey, &v);
1526	if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))	1526	if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
1527	match = ((ipfw_insn_u32 *)cmd)->d[0] == v;	1527	match = ((ipfw_insn_u32 *)cmd)->d[0] ==
		1528	TARG_VAL(chain, v, tag);
1528	if (match)	1529	if (match)
1529	tablearg = v;	1530	tablearg = v;
1530	}	1531	}
Lines 1536-1542 do { \ Link Here
1536	match = ipfw_lookup_table_extended(chain,	1537	match = ipfw_lookup_table_extended(chain,
1537	cmd->arg1, 0, &args->f_id, &v);	1538	cmd->arg1, 0, &args->f_id, &v);
1538	if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))	1539	if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
1539	match = ((ipfw_insn_u32 *)cmd)->d[0] == v;	1540	match = ((ipfw_insn_u32 *)cmd)->d[0] ==
		1541	TARG_VAL(chain, v, tag);
1540	if (match)	1542	if (match)
1541	tablearg = v;	1543	tablearg = v;
1542	}	1544	}