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

Fix the build. Use new ipfw_lookup_table() in the nat64 too.

Browse Source 
Reported by:	cy
MFC after:	2 weeks
This commit is contained in:
Andrey V. Elsukov 2017-03-06 00:41:59 +00:00
parent 28e8da6517
commit 53de37f8ca
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netpfil/ipfw/nat64/nat64stl.c
View File

@ -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: