Date: Mon, 6 Mar 2017 00:41:59 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314718 - head/sys/netpfil/ipfw/nat64 Message-ID: <201703060041.v260fx8I056380@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Mon Mar 6 00:41:59 2017 New Revision: 314718 URL: https://svnweb.freebsd.org/changeset/base/314718 Log: Fix the build. Use new ipfw_lookup_table() in the nat64 too. Reported by: cy MFC after: 2 weeks Modified: head/sys/netpfil/ipfw/nat64/nat64stl.c Modified: head/sys/netpfil/ipfw/nat64/nat64stl.c ============================================================================== --- head/sys/netpfil/ipfw/nat64/nat64stl.c Sun Mar 5 23:59:04 2017 (r314717) +++ head/sys/netpfil/ipfw/nat64/nat64stl.c Mon Mar 6 00:41:59 2017 (r314718) @@ -184,7 +184,7 @@ nat64stl_handle_icmp6(struct ip_fw_chain * IPv4 mapped address. */ ip6i = mtodo(m, hlen); - if (ipfw_lookup_table_extended(chain, cfg->map64, + if (ipfw_lookup_table(chain, cfg->map64, sizeof(struct in6_addr), &ip6i->ip6_dst, &tablearg) == 0) { m_freem(m); return (NAT64RETURN); @@ -204,6 +204,7 @@ ipfw_nat64stl(struct ip_fw_chain *chain, { ipfw_insn *icmd; struct nat64stl_cfg *cfg; + in_addr_t dst4; uint32_t tablearg; int ret; @@ -219,11 +220,12 @@ ipfw_nat64stl(struct ip_fw_chain *chain, switch (args->f_id.addr_type) { case 4: - ret = ipfw_lookup_table(chain, cfg->map46, - htonl(args->f_id.dst_ip), &tablearg); + dst4 = htonl(args->f_id.dst_ip); + ret = ipfw_lookup_table(chain, cfg->map46, sizeof(in_addr_t), + &dst4, &tablearg); break; case 6: - ret = ipfw_lookup_table_extended(chain, cfg->map64, + ret = ipfw_lookup_table(chain, cfg->map64, sizeof(struct in6_addr), &args->f_id.src_ip6, &tablearg); break; default:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703060041.v260fx8I056380>