From owner-svn-src-head@freebsd.org  Mon Mar  6 00:42:00 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D105CF7B52;
 Mon,  6 Mar 2017 00:42:00 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 49AFD1A53;
 Mon,  6 Mar 2017 00:42:00 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v260fxp4056381;
 Mon, 6 Mar 2017 00:41:59 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v260fx8I056380;
 Mon, 6 Mar 2017 00:41:59 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201703060041.v260fx8I056380@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 6 Mar 2017 00:41:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314718 - head/sys/netpfil/ipfw/nat64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Mar 2017 00:42:00 -0000

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: