diff options
| author | Andrey V. Elsukov <ae@FreeBSD.org> | 2017-03-06 00:41:59 +0000 |
|---|---|---|
| committer | Andrey V. Elsukov <ae@FreeBSD.org> | 2017-03-06 00:41:59 +0000 |
| commit | 53de37f8ca93019f38b66657ba5f2bf53beff012 (patch) | |
| tree | 7c0e4d305269951052c13121a553906112198729 /sys/netpfil | |
| parent | 28e8da65176c8eb39cc87ba571fc4b4b51f39ef4 (diff) | |
| download | src-53de37f8ca93019f38b66657ba5f2bf53beff012.tar.gz src-53de37f8ca93019f38b66657ba5f2bf53beff012.zip | |
Fix the build. Use new ipfw_lookup_table() in the nat64 too.
Reported by: cy
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=314718
Diffstat (limited to 'sys/netpfil')
| -rw-r--r-- | sys/netpfil/ipfw/nat64/nat64stl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/netpfil/ipfw/nat64/nat64stl.c b/sys/netpfil/ipfw/nat64/nat64stl.c index 927b7aac5519..968e74e55723 100644 --- a/sys/netpfil/ipfw/nat64/nat64stl.c +++ b/sys/netpfil/ipfw/nat64/nat64stl.c @@ -184,7 +184,7 @@ nat64stl_handle_icmp6(struct ip_fw_chain *chain, struct nat64stl_cfg *cfg, * 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, struct ip_fw_args *args, { 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, struct ip_fw_args *args, 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: |