PERFORCE change 143857 for review
Julian Elischer
julian at FreeBSD.org
Sat Jun 21 04:20:43 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=143857
Change 143857 by julian at julian_trafmon1 on 2008/06/21 04:19:50
more missing opt_vimage.h
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_encap.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcb_clnt.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#6 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#3 (text+ko) ====
@@ -32,6 +32,7 @@
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
#include "opt_inet6.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/proc.h>
==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#3 (text+ko) ====
@@ -26,6 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_vimage.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.23 2006/09/02 08:18:22 rwatson Exp $");
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 (text+ko) ====
@@ -19,16 +19,11 @@
#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \
!defined(KLD_MODULE) && !defined(IPFILTER_LKM)
# include "opt_inet6.h"
-# include "opt_vimage.h"
#endif
#if defined(__FreeBSD_version) && (__FreeBSD_version >= 440000) && \
!defined(KLD_MODULE) && !defined(IPFILTER_LKM)
# include "opt_random_ip_id.h"
#endif
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && \
- !defined(KLD_MODULE) && !defined(IPFILTER_LKM)
-# include "opt_vimage.h"
-#endif
#include <sys/param.h>
#if defined(__FreeBSD__) && !defined(__FreeBSD_version)
# if defined(IPFILTER_LKM)
@@ -68,6 +63,7 @@
# include <sys/select.h>
#endif
#if __FreeBSD_version >= 800000
+# include "opt_vimage.h"
# include <sys/vimage.h>
#else
#define V_path_mtu_discovery path_mtu_discovery
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#3 (text+ko) ====
@@ -32,6 +32,7 @@
#include "opt_carp.h"
#include "opt_bpf.h"
#include "opt_pf.h"
+#include "opt_vimage.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.36 2007/07/28 07:31:29 rwatson Exp $");
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#4 (text+ko) ====
@@ -38,6 +38,7 @@
#ifdef __FreeBSD__
#include "opt_inet.h"
#include "opt_inet6.h"
+#include "opt_vimage.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.54 2008/05/09 23:02:55 julian Exp $");
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#3 (text+ko) ====
@@ -35,6 +35,7 @@
#if defined(__FreeBSD__)
#include "opt_inet.h"
#include "opt_inet6.h"
+#include "opt_vimage.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $");
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#4 (text+ko) ====
@@ -38,6 +38,7 @@
#ifdef __FreeBSD__
#include "opt_inet.h"
#include "opt_inet6.h"
+#include "opt_vimage.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.33 2008/06/05 19:30:20 mlaier Exp $");
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#3 (text+ko) ====
@@ -29,6 +29,7 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_pf.h"
+#include "opt_vimage.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.19 2007/07/03 12:16:07 mlaier Exp $");
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#3 (text+ko) ====
@@ -63,6 +63,8 @@
* @(#)in_cksum.c 8.1 (Berkeley) 6/10/93
*/
+#include "opt_vimage.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#3 (text+ko) ====
@@ -60,6 +60,7 @@
__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $");
#include "opt_config.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/conf.h>
@@ -193,7 +194,7 @@
kdh->dumplength = htod64(dumplen);
kdh->dumptime = htod64(time_second);
kdh->blocksize = htod32(blksz);
- strncpy(kdh->hostname, V_hostname, sizeof(kdh->hostname));
+ strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname));
strncpy(kdh->versionstring, version, sizeof(kdh->versionstring));
if (panicstr != NULL)
strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring));
==== //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#3 (text+ko) ====
@@ -23,6 +23,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_vimage.h"
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.22 2006/11/06 13:41:59 rwatson Exp $");
==== //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#3 (text+ko) ====
@@ -29,6 +29,7 @@
__FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.32 2008/03/16 10:58:05 rwatson Exp $");
#include "opt_device_polling.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#3 (text+ko) ====
@@ -34,6 +34,8 @@
* ISO/IEC 802.1D-2004, June 9, 2004.
*/
+#include "opt_vimage.h"
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $");
==== //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#3 (text+ko) ====
@@ -80,6 +80,7 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_carp.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/mbuf.h>
==== //depot/projects/vimage-commit2/src/sys/net/if_ef.c#3 (text+ko) ====
@@ -29,6 +29,7 @@
#include "opt_inet.h"
#include "opt_ipx.h"
#include "opt_ef.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit2/src/sys/net/if_enc.c#3 (text+ko) ====
@@ -27,6 +27,8 @@
* $FreeBSD$
*/
+#include "opt_vimage.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#3 (text+ko) ====
@@ -38,6 +38,7 @@
#include "opt_netgraph.h"
#include "opt_carp.h"
#include "opt_mbuf_profiling.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#3 (text+ko) ====
@@ -27,6 +27,7 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipx.h"
+#include "opt_vimage.h"
#endif
#ifdef NetBSD1_3
==== //depot/projects/vimage-commit2/src/sys/net/if_stf.c#3 (text+ko) ====
@@ -76,6 +76,7 @@
#include "opt_inet.h"
#include "opt_inet6.h"
+#include "opt_vimage.h"
#include "opt_mac.h"
#include <sys/param.h>
==== //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#3 (text+ko) ====
@@ -34,6 +34,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.15 2005/08/10 06:25:40 obrien Exp $");
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#3 (text+ko) ====
@@ -58,6 +58,8 @@
* from one port to the other only rarely.
*/
+#include "opt_vimage.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#3 (text+ko) ====
@@ -69,6 +69,8 @@
* ng_gif(4) netgraph node type
*/
+#include "opt_vimage.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#3 (text+ko) ====
@@ -26,6 +26,8 @@
* $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $
*/
+#include "opt_vimage.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#3 (text+ko) ====
@@ -26,6 +26,8 @@
* $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.12 2008/06/01 15:13:32 mav Exp $
*/
+#include "opt_vimage.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#3 (text+ko) ====
@@ -40,6 +40,7 @@
#include "opt_carp.h"
#include "opt_sctp.h"
#include "opt_mpath.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#3 (text+ko) ====
@@ -34,6 +34,7 @@
#include "opt_inet.h"
#include "opt_ipfw.h"
#include "opt_mac.h"
+#include "opt_vimage.h"
#ifndef INET
#error "IPDIVERT requires INET."
#endif
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#3 (text+ko) ====
@@ -31,6 +31,7 @@
#define DUMMYNET_DEBUG
#include "opt_inet6.h"
+#include "opt_vimage.h"
/*
* This module implements IP dummynet, a bandwidth limiter/delay emulator
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_encap.c#3 (text+ko) ====
@@ -62,6 +62,7 @@
#include "opt_mrouting.h"
#include "opt_inet.h"
#include "opt_inet6.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#3 (text+ko) ====
@@ -44,6 +44,8 @@
* This currently handles IPPROTO_GRE, IPPROTO_MOBILE
*/
+#include "opt_vimage.h"
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#3 (text+ko) ====
@@ -74,6 +74,8 @@
* enabled.
*/
+#include "opt_vimage.h"
+
#include <sys/types.h>
#include <sys/malloc.h>
#include <sys/param.h>
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#3 (text+ko) ====
@@ -36,6 +36,7 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_tcpdebug.h"
+#include "opt_vimage.h"
#ifndef INET
#error The option TCPDEBUG requires option INET.
==== //depot/projects/vimage-commit2/src/sys/netipsec/key.c#4 (text+ko) ====
@@ -37,6 +37,7 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
+#include "opt_vimage.h"
#include <sys/types.h>
#include <sys/param.h>
==== //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#4 (text+ko) ====
@@ -44,6 +44,7 @@
__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.72 2008/05/16 06:27:03 benno Exp $");
#include "opt_bootp.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -1570,8 +1571,8 @@
printf("hostname %s (ignored) ", p);
} else {
strcpy(nd->my_hostnam, p);
- strcpy(hostname, p);
- printf("hostname %s ", hostname);
+ strcpy(G_hostname, p);
+ printf("hostname %s ", G_hostname);
gctx->sethostname = ifctx;
}
}
==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#3 (text+ko) ====
@@ -36,6 +36,7 @@
__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_diskless.c,v 1.20 2008/03/16 10:58:07 rwatson Exp $");
#include "opt_bootp.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#3 (text+ko) ====
@@ -38,6 +38,7 @@
#include "opt_bootp.h"
#include "opt_nfsroot.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit2/src/sys/rpc/rpcb_clnt.c#4 (text+ko) ====
@@ -66,6 +66,7 @@
*/
#include "opt_inet6.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#6 (text+ko) ====
@@ -42,6 +42,7 @@
__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.20 2008/06/13 22:14:15 rwatson Exp $");
#include "opt_mac.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/kernel.h>
==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#4 (text+ko) ====
@@ -42,6 +42,7 @@
__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.131 2007/10/28 17:55:56 rwatson Exp $");
#include "opt_mac.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/kernel.h>
==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#3 (text+ko) ====
@@ -42,6 +42,7 @@
__FBSDID("$FreeBSD: src/sys/security/mac/mac_socket.c,v 1.11 2007/10/24 19:04:01 rwatson Exp $");
#include "opt_mac.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/kernel.h>
==== //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#6 (text+ko) ====
@@ -44,6 +44,8 @@
* Biba fixed label mandatory integrity policy.
*/
+#include "opt_vimage.h"
+
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/extattr.h>
==== //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#6 (text+ko) ====
@@ -43,6 +43,7 @@
*
* Low-watermark floating label mandatory integrity policy.
*/
+#include "opt_vimage.h"
#include <sys/types.h>
#include <sys/param.h>
==== //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#6 (text+ko) ====
@@ -43,6 +43,7 @@
*
* MLS fixed label mandatory confidentiality policy.
*/
+#include "opt_vimage.h"
#include <sys/types.h>
#include <sys/param.h>
==== //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#6 (text+ko) ====
@@ -45,6 +45,8 @@
* policy entry points.
*/
+#include "opt_vimage.h"
+
#include <sys/types.h>
#include <sys/param.h>
#include <sys/acl.h>
More information about the p4-projects
mailing list