From owner-svn-src-head@FreeBSD.ORG  Wed Jun 10 19:25:46 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 973DF1065672;
	Wed, 10 Jun 2009 19:25:46 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 862418FC24;
	Wed, 10 Jun 2009 19:25:46 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AJPkdW023660;
	Wed, 10 Jun 2009 19:25:46 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AJPkIV023656;
	Wed, 10 Jun 2009 19:25:46 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200906101925.n5AJPkIV023656@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 10 Jun 2009 19:25:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193947 - head/sys/netipsec
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 19:25:47 -0000

Author: bz
Date: Wed Jun 10 19:25:46 2009
New Revision: 193947
URL: http://svn.freebsd.org/changeset/base/193947

Log:
  Properly hide IPv4 only variables and functions under #ifdef INET.

Modified:
  head/sys/netipsec/ipsec.c
  head/sys/netipsec/ipsec_input.c
  head/sys/netipsec/xform_ipip.c

Modified: head/sys/netipsec/ipsec.c
==============================================================================
--- head/sys/netipsec/ipsec.c	Wed Jun 10 19:25:21 2009	(r193946)
+++ head/sys/netipsec/ipsec.c	Wed Jun 10 19:25:46 2009	(r193947)
@@ -1702,6 +1702,7 @@ vshiftl(unsigned char *bitmap, int nbit,
 	}
 }
 
+#ifdef INET
 /* Return a printable string for the IPv4 address. */
 static char *
 inet_ntoa4(struct in_addr ina)
@@ -1716,6 +1717,7 @@ inet_ntoa4(struct in_addr ina)
 	    ucp[2] & 0xff, ucp[3] & 0xff);
 	return (buf[i]);
 }
+#endif
 
 /* Return a printable string for the address. */
 char *

Modified: head/sys/netipsec/ipsec_input.c
==============================================================================
--- head/sys/netipsec/ipsec_input.c	Wed Jun 10 19:25:21 2009	(r193946)
+++ head/sys/netipsec/ipsec_input.c	Wed Jun 10 19:25:46 2009	(r193947)
@@ -103,7 +103,9 @@
 #define IPSEC_ISTAT(p,x,y,z) ((p) == IPPROTO_ESP ? (x)++ : \
 			    (p) == IPPROTO_AH ? (y)++ : (z)++)
 
+#ifdef INET
 static void ipsec4_common_ctlinput(int, struct sockaddr *, void *, int);
+#endif
 
 /*
  * ipsec_common_input gets called when an IPsec-protected packet

Modified: head/sys/netipsec/xform_ipip.c
==============================================================================
--- head/sys/netipsec/xform_ipip.c	Wed Jun 10 19:25:21 2009	(r193946)
+++ head/sys/netipsec/xform_ipip.c	Wed Jun 10 19:25:46 2009	(r193947)
@@ -171,7 +171,9 @@ _ipip_input(struct mbuf *m, int iphlen, 
 {
 	INIT_VNET_NET(curvnet);
 	INIT_VNET_IPSEC(curvnet);
+#ifdef INET
 	register struct sockaddr_in *sin;
+#endif
 	register struct ifnet *ifp;
 	register struct ifaddr *ifa;
 	struct ip *ipo;