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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
