From owner-svn-src-all@FreeBSD.ORG Wed Dec 16 03:38:24 2009 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52708106566C; Wed, 16 Dec 2009 03:38:24 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 0C15C8FC08; Wed, 16 Dec 2009 03:38:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id nBG3WpIx003024; Tue, 15 Dec 2009 20:32:51 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Tue, 15 Dec 2009 20:33:20 -0700 (MST) Message-Id: <20091215.203320.789626515546446979.imp@bsdimp.com> To: luigi@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <20091215.201621.756168950458235997.imp@bsdimp.com> References: <200912151615.nBFGFEOq068598@svn.freebsd.org> <20091215.201621.756168950458235997.imp@bsdimp.com> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r200580 - in head/sys: conf net netinet netinet/ipfw X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2009 03:38:24 -0000 In message: <20091215.201621.756168950458235997.imp@bsdimp.com> "M. Warner Losh" writes: : In message: <200912151615.nBFGFEOq068598@svn.freebsd.org> : Luigi Rizzo writes: : : Log: : : Start splitting ip_fw2.c and ip_fw.h into smaller components. : : At this time we pull out from ip_fw2.c the logging functions, and : : support for dynamic rules, and move kernel-only stuff into : : netinet/ipfw/ip_fw_private.h : : : : No ABI change involved in this commit, unless I made some mistake. : : ip_fw.h has changed, though not in the userland-visible part. : ... : : netinet/ipfw/ip_fw_nat.c : : minor rearrangement to remove LOOKUP_NAT from the : : main headers. This require a new function pointer. : : This broke the build. : : Here's the fix: : : Index: sys/netinet/ipfw/ip_fw_nat.c : =================================================================== : --- sys/netinet/ipfw/ip_fw_nat.c (revision 200593) : +++ sys/netinet/ipfw/ip_fw_nat.c (working copy) : @@ -70,12 +70,6 @@ : static VNET_DEFINE(eventhandler_tag, ifaddr_event_tag); : #define V_ifaddr_event_tag VNET(ifaddr_event_tag) : : -extern ipfw_nat_t *ipfw_nat_ptr; : -extern ipfw_nat_cfg_t *ipfw_nat_cfg_ptr; : -extern ipfw_nat_cfg_t *ipfw_nat_del_ptr; : -extern ipfw_nat_cfg_t *ipfw_nat_get_cfg_ptr; : -extern ipfw_nat_cfg_t *ipfw_nat_get_log_ptr; : - : static void : ifaddr_change(void *arg __unused, struct ifnet *ifp) : { I committed this fix. If there's a problem, feel free to back it out. Warner