PERFORCE change 143264 for review
Julian Elischer
julian at FreeBSD.org
Tue Jun 10 21:22:00 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=143264
Change 143264 by julian at julian_trafmon1 on 2008/06/10 21:21:43
Candidate for initial commit
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/boot/common/dev_net.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/pxe.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/kern/sched_4bsd.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_debug.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/mips/include/sysarch.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_var.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/route.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip6.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_encap.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_auth.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_cc_functions.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_crc32.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_peeloff.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/key_debug.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_impl.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcb_clnt.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac/mac_policy.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#2 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ====
@@ -34,6 +34,7 @@
#include <sys/sysctl.h>
#include <sys/kernel.h>
#include <sys/kerneldump.h>
+#include <sys/vimage.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/elf.h>
@@ -118,7 +119,7 @@
kdh->dumplength = htod64(dumplen);
kdh->dumptime = htod64(time_second);
kdh->blocksize = htod32(blksz);
- strncpy(kdh->hostname, hostname, sizeof(kdh->hostname));
+ strncpy(kdh->hostname, V_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/amd64/amd64/minidump_machdep.c#2 (text) ====
@@ -34,6 +34,7 @@
#include <sys/kernel.h>
#include <sys/kerneldump.h>
#include <sys/msgbuf.h>
+#include <sys/vimage.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/atomic.h>
@@ -94,7 +95,7 @@
kdh->dumplength = htod64(dumplen);
kdh->dumptime = htod64(time_second);
kdh->blocksize = htod32(blksz);
- strncpy(kdh->hostname, hostname, sizeof(kdh->hostname));
+ strncpy(kdh->hostname, V_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/arm/arm/dump_machdep.c#2 (text+ko) ====
@@ -34,6 +34,7 @@
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/kerneldump.h>
+#include <sys/vimage.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/elf.h>
@@ -116,7 +117,7 @@
kdh->dumplength = htod64(dumplen);
kdh->dumptime = htod64(time_second);
kdh->blocksize = htod32(blksz);
- strncpy(kdh->hostname, hostname, sizeof(kdh->hostname));
+ strncpy(kdh->hostname, V_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/boot/common/dev_net.c#2 (text+ko) ====
@@ -62,6 +62,7 @@
#include <machine/stdarg.h>
#include <sys/param.h>
#include <sys/socket.h>
+#include <sys/vimage.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -245,7 +246,7 @@
return (EIO);
}
if (debug)
- printf("net_open: client name: %s\n", hostname);
+ printf("net_open: client name: %s\n", V_hostname);
/*
* Ignore the gateway from whoami (unreliable).
==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/pxe.c#2 (text+ko) ====
@@ -27,6 +27,7 @@
*/
#include <sys/cdefs.h>
+#include <sys/vimage.h>
__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.23 2007/10/12 17:09:43 ps Exp $");
#include <stand.h>
@@ -308,7 +309,7 @@
}
setenv("boot.nfsroot.server", inet_ntoa(rootip), 1);
setenv("boot.nfsroot.path", rootpath, 1);
- setenv("dhcp.host-name", hostname, 1);
+ setenv("dhcp.host-name", V_hostname, 1);
}
}
pxe_opens++;
==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 (text+ko) ====
@@ -58,6 +58,7 @@
#include <sys/fs/zfs.h>
#include <sys/callb.h>
#include <sys/sunddi.h>
+#include <sys/vimage.h>
int zio_taskq_threads = 0;
SYSCTL_DECL(_vfs_zfs);
@@ -602,11 +603,11 @@
*/
if (nvlist_lookup_uint64(newconfig, ZPOOL_CONFIG_HOSTID,
&hostid) == 0 && root_mounted()) {
- char *hostname;
+ char *V_hostname;
unsigned long myhostid = 0;
VERIFY(nvlist_lookup_string(newconfig,
- ZPOOL_CONFIG_HOSTNAME, &hostname) == 0);
+ ZPOOL_CONFIG_HOSTNAME, &V_hostname) == 0);
(void) ddi_strtoul(hw_serial, NULL, 10, &myhostid);
if ((unsigned long)hostid != myhostid) {
==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#2 (text+ko) ====
@@ -71,6 +71,7 @@
#include <sys/user.h>
#include <sys/vmmeter.h>
#include <sys/vnode.h>
+#include <sys/vimage.h>
#include <net/if.h>
@@ -1008,7 +1009,7 @@
"bytes packets errs drop fifo frame compressed");
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
linux_ifname(ifp, ifname, sizeof ifname);
sbuf_printf(sb, "%6.6s:", ifname);
sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu ",
==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#2 (text+ko) ====
@@ -56,6 +56,7 @@
#include <sys/sx.h>
#include <sys/tty.h>
#include <sys/uio.h>
+#include <sys/vimage.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
@@ -2047,7 +2048,7 @@
/* Determine the (relative) unit number for ethernet interfaces */
ethno = 0;
IFNET_RLOCK();
- TAILQ_FOREACH(ifscan, &ifnet, if_link) {
+ TAILQ_FOREACH(ifscan, &V_ifnet, if_link) {
if (ifscan == ifp) {
IFNET_RUNLOCK();
return (snprintf(buffer, buflen, "eth%d", ethno));
@@ -2086,7 +2087,7 @@
index = 0;
is_eth = (len == 3 && !strncmp(lxname, "eth", len)) ? 1 : 0;
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
/*
* Allow Linux programs to use FreeBSD names. Don't presume
* we never have an interface named "eth", so don't make
@@ -2130,7 +2131,7 @@
/* handle the 'request buffer size' case */
if (ifc.ifc_buf == PTROUT(NULL)) {
ifc.ifc_len = 0;
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
struct sockaddr *sa = ifa->ifa_addr;
if (sa->sa_family == AF_INET)
@@ -2157,7 +2158,7 @@
/* Return all AF_INET addresses of all interfaces */
IFNET_RLOCK(); /* could sleep XXX */
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
int addrs = 0;
bzero(&ifr, sizeof(ifr));
==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#2 (text+ko) ====
@@ -64,6 +64,7 @@
#include <sys/vnode.h>
#include <sys/wait.h>
#include <sys/cpuset.h>
+#include <sys/vimage.h>
#include <security/mac/mac_framework.h>
@@ -761,7 +762,7 @@
#else /* something other than i386 or amd64 - assume we and Linux agree */
strlcpy(utsname.machine, machine, LINUX_MAX_UTSNAME);
#endif /* __i386__ */
- strlcpy(utsname.domainname, domainname, LINUX_MAX_UTSNAME);
+ strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME);
return (copyout(&utsname, args->buf, sizeof(utsname)));
}
==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#2 (text+ko) ====
@@ -50,6 +50,7 @@
#include <sys/uio.h>
#include <sys/syslog.h>
#include <sys/un.h>
+#include <sys/vimage.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -588,7 +589,7 @@
* XXX: Avoid undefined symbol error with an IPv4 only
* kernel.
*/
- && ip6_v6only
+ && V_ip6_v6only
#endif
) {
int v6only;
==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#2 (text+ko) ====
@@ -36,6 +36,7 @@
#include <sys/filedesc.h>
#include <sys/sockio.h>
#include <sys/socket.h>
+#include <sys/vimage.h>
#include <net/if.h>
@@ -103,7 +104,7 @@
* entry per physical interface?
*/
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link)
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link)
if (TAILQ_EMPTY(&ifp->if_addrhead))
ifnum++;
else
==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#2 (text+ko) ====
@@ -43,6 +43,7 @@
#include <sys/sysctl.h>
#include <sys/sysproto.h>
#include <sys/un.h>
+#include <sys/vimage.h>
#include <vm/vm.h>
@@ -426,7 +427,7 @@
break;
case SVR4_SI_HOSTNAME:
- str = hostname;
+ str = V_hostname;
break;
case SVR4_SI_RELEASE:
@@ -454,7 +455,7 @@
break;
case SVR4_SI_SRPC_DOMAIN:
- str = domainname;
+ str = V_domainname;
break;
case SVR4_SI_PLATFORM:
==== //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#2 (text+ko) ====
@@ -77,6 +77,7 @@
#include <sys/bus.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
+#include <sys/vimage.h>
#include <machine/clock.h>
#endif
#if defined(__i386__)
@@ -460,7 +461,7 @@
#if defined(__FreeBSD__) && (__FreeBSD_version >= 500000)
IFNET_RLOCK();
#endif
- for (ifp = TAILQ_FIRST(&ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) {
+ for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) {
/* read from if_snd unlocked */
if (!TBR_IS_ENABLED(&ifp->if_snd))
continue;
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#2 (text+ko) ====
@@ -15,6 +15,7 @@
#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
+#include <sys/vimage.h>
#if defined(__NetBSD__)
# if (NetBSD >= 199905) && !defined(IPFILTER_LKM) && defined(_KERNEL)
# if (__NetBSD_Version__ < 301000000)
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 (text+ko) ====
@@ -16,6 +16,7 @@
#include <sys/param.h>
#include <sys/time.h>
#include <sys/file.h>
+#include <sys/vimage.h>
#if !defined(_KERNEL)
# include <stdio.h>
# include <stdlib.h>
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 (text+ko) ====
@@ -1208,7 +1208,7 @@
# define bzero(s,z) memset(s, 0, z)
# define bcmp(a,b,z) memcmp(a, b, z)
-# define ifnet net_device
+# define V_ifnet net_device
# define if_xname name
# define if_unit ifindex
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ====
@@ -39,6 +39,7 @@
#include <sys/errno.h>
#include <sys/types.h>
#include <sys/file.h>
+#include <sys/vimage.h>
#if __FreeBSD_version >= 220000
# include <sys/fcntl.h>
# include <sys/filio.h>
@@ -110,6 +111,7 @@
# include <sys/malloc.h>
#endif
#include <sys/kernel.h>
+#include <sys/vimage.h>
#ifdef CSUM_DATA_VALID
#include <machine/in_cksum.h>
#endif
@@ -234,7 +236,7 @@
fr_running = 1;
if (fr_control_forwarding & 1)
- ipforwarding = 1;
+ V_ipforwarding = 1;
SPL_X(s);
#if (__FreeBSD_version >= 300000)
@@ -257,7 +259,7 @@
int s;
#endif
if (fr_control_forwarding & 2)
- ipforwarding = 0;
+ V_ipforwarding = 0;
SPL_NET(s);
@@ -652,11 +654,11 @@
ip->ip_tos = oip->ip_tos;
ip->ip_id = fin->fin_ip->ip_id;
#if (__FreeBSD_version > 460000)
- ip->ip_off = path_mtu_discovery ? IP_DF : 0;
+ ip->ip_off = V_path_mtu_discovery ? IP_DF : 0;
#else
ip->ip_off = 0;
#endif
- ip->ip_ttl = ip_defttl;
+ ip->ip_ttl = V_ip_defttl;
ip->ip_sum = 0;
hlen = sizeof(*oip);
break;
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 (text+ko) ====
@@ -16,6 +16,7 @@
#include <sys/param.h>
#include <sys/time.h>
#include <sys/file.h>
+#include <sys/vimage.h>
#ifdef __hpux
# include <sys/timeout.h>
#endif
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#2 (text+ko) ====
@@ -38,6 +38,7 @@
#include <sys/errno.h>
#include <sys/types.h>
#include <sys/file.h>
+#include <sys/vimage.h>
#ifndef _KERNEL
# include <stdio.h>
# include <string.h>
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 (text+ko) ====
@@ -16,6 +16,7 @@
#include <sys/param.h>
#include <sys/time.h>
#include <sys/file.h>
+#include <sys/vimage.h>
#if defined(_KERNEL) && defined(__NetBSD_Version__) && \
(__NetBSD_Version__ >= 399002000)
# include <sys/kauth.h>
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 (text+ko) ====
@@ -16,6 +16,7 @@
#include <sys/param.h>
#include <sys/time.h>
#include <sys/file.h>
+#include <sys/vimage.h>
#if !defined(AIX)
# include <sys/fcntl.h>
#endif
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#2 (text+ko) ====
@@ -15,6 +15,7 @@
#include <sys/types.h>
#include <sys/param.h>
#include <sys/file.h>
+#include <sys/vimage.h>
#if defined(__NetBSD__) && (NetBSD >= 199905) && !defined(IPFILTER_LKM) && \
defined(_KERNEL)
# if (__NetBSD_Version__ < 399001400)
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 (text+ko) ====
@@ -15,6 +15,7 @@
#include <sys/types.h>
#include <sys/param.h>
#include <sys/file.h>
+#include <sys/vimage.h>
#if !defined(_KERNEL) && !defined(__KERNEL__)
# include <stdio.h>
# include <stdlib.h>
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#2 (text+ko) ====
@@ -91,6 +91,7 @@
#include <sys/kthread.h>
#include <sys/lock.h>
#include <sys/sx.h>
+#include <sys/vimage.h>
#else
#include <sys/rwlock.h>
#endif
@@ -144,6 +145,7 @@
#include <machine/in_cksum.h>
#include <sys/limits.h>
#include <sys/ucred.h>
+#include <sys/vimage.h>
#include <security/mac/mac_framework.h>
extern int ip_optcopy(struct ip *, struct ip *);
@@ -1916,13 +1918,13 @@
h->ip_hl = sizeof(*h) >> 2;
h->ip_tos = IPTOS_LOWDELAY;
#ifdef __FreeBSD__
- h->ip_off = path_mtu_discovery ? IP_DF : 0;
+ h->ip_off = V_path_mtu_discovery ? IP_DF : 0;
h->ip_len = len;
#else
h->ip_off = htons(ip_mtudisc ? IP_DF : 0);
h->ip_len = htons(len);
#endif
- h->ip_ttl = ttl ? ttl : ip_defttl;
+ h->ip_ttl = ttl ? ttl : V_ip_defttl;
h->ip_sum = 0;
if (eh == NULL) {
#ifdef __FreeBSD__
@@ -2953,7 +2955,7 @@
sport = pd->hdr.tcp->th_sport;
dport = pd->hdr.tcp->th_dport;
#ifdef __FreeBSD__
- pi = &tcbinfo;
+ pi = &V_tcbinfo;
#else
tb = &tcbtable;
#endif
@@ -2964,7 +2966,7 @@
sport = pd->hdr.udp->uh_sport;
dport = pd->hdr.udp->uh_dport;
#ifdef __FreeBSD__
- pi = &udbinfo;
+ pi = &V_udbinfo;
#else
tb = &udbtable;
#endif
@@ -3102,7 +3104,7 @@
int hlen;
u_int8_t hdr[60];
u_int8_t *opt, optlen;
- u_int16_t mss = tcp_mssdflt;
+ u_int16_t mss = V_tcp_mssdflt;
hlen = th_off << 2; /* hlen <= sizeof(hdr) */
if (hlen <= sizeof(struct tcphdr))
@@ -3147,7 +3149,7 @@
#endif /* INET6 */
struct rtentry *rt = NULL;
int hlen = 0; /* make the compiler happy */
- u_int16_t mss = tcp_mssdflt;
+ u_int16_t mss = V_tcp_mssdflt;
switch (af) {
#ifdef INET
@@ -3195,7 +3197,7 @@
if (rt && rt->rt_ifp) {
mss = rt->rt_ifp->if_mtu - hlen - sizeof(struct tcphdr);
- mss = max(tcp_mssdflt, mss);
+ mss = max(V_tcp_mssdflt, mss);
RTFREE(rt);
}
mss = min(mss, offer);
@@ -3251,7 +3253,7 @@
u_short reason;
int rewrite = 0;
int tag = -1, rtableid = -1;
- u_int16_t mss = tcp_mssdflt;
+ u_int16_t mss = V_tcp_mssdflt;
int asd = 0;
int match = 0;
@@ -6135,7 +6137,7 @@
if (r->rt == PF_FASTROUTE) {
in_rtalloc(ro, 0);
if (ro->ro_rt == 0) {
- ipstat.ips_noroute++;
+ V_ipstat.ips_noroute++;
goto bad;
}
@@ -6266,16 +6268,16 @@
if ((ifp->if_capabilities & IFCAP_CSUM_IPv4) &&
ifp->if_bridge == NULL) {
m0->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT;
- ipstat.ips_outhwcsum++;
+ V_ipstat.ips_outhwcsum++;
} else {
ip->ip_sum = 0;
ip->ip_sum = in_cksum(m0, ip->ip_hl << 2);
}
/* Update relevant hardware checksum stats for TCP/UDP */
if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
- tcpstat.tcps_outhwcsum++;
+ V_tcpstat.tcps_outhwcsum++;
else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
- udpstat.udps_outhwcsum++;
+ V_udpstat.udps_outhwcsum++;
error = (*ifp->if_output)(ifp, m0, sintosa(dst), NULL);
goto done;
}
@@ -6285,7 +6287,7 @@
* Must be able to put at least 8 bytes per fragment.
*/
if (ip->ip_off & htons(IP_DF)) {
- ipstat.ips_cantfrag++;
+ V_ipstat.ips_cantfrag++;
if (r->rt != PF_DUPTO) {
#ifdef __FreeBSD__
/* icmp_error() expects host byte ordering */
@@ -6342,7 +6344,7 @@
}
if (error == 0)
- ipstat.ips_fragmented++;
+ V_ipstat.ips_fragmented++;
done:
if (r->rt != PF_DUPTO)
@@ -6615,17 +6617,17 @@
if (sum) {
switch (p) {
case IPPROTO_TCP:
- tcpstat.tcps_rcvbadsum++;
+ V_tcpstat.tcps_rcvbadsum++;
break;
case IPPROTO_UDP:
- udpstat.udps_badsum++;
+ V_udpstat.udps_badsum++;
break;
case IPPROTO_ICMP:
- icmpstat.icps_checksum++;
+ V_icmpstat.icps_checksum++;
break;
#ifdef INET6
case IPPROTO_ICMPV6:
- icmp6stat.icp6s_checksum++;
+ V_icmp6stat.icp6s_checksum++;
break;
#endif /* INET6 */
}
@@ -6711,17 +6713,17 @@
m->m_pkthdr.csum_flags |= flag_bad;
switch (p) {
case IPPROTO_TCP:
- tcpstat.tcps_rcvbadsum++;
+ V_tcpstat.tcps_rcvbadsum++;
break;
case IPPROTO_UDP:
- udpstat.udps_badsum++;
+ V_udpstat.udps_badsum++;
break;
case IPPROTO_ICMP:
- icmpstat.icps_checksum++;
+ V_icmpstat.icps_checksum++;
break;
#ifdef INET6
case IPPROTO_ICMPV6:
- icmp6stat.icp6s_checksum++;
+ V_icmp6stat.icp6s_checksum++;
break;
#endif /* INET6 */
}
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#2 (text+ko) ====
@@ -54,6 +54,7 @@
#include <sys/device.h>
#endif
#include <sys/time.h>
+#include <sys/vimage.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -141,9 +142,9 @@
struct ifnet *ifp;
IFNET_RLOCK();
- TAILQ_FOREACH(ifg, &ifg_head, ifg_next)
+ TAILQ_FOREACH(ifg, &V_ifg_head, ifg_next)
pfi_attach_ifgroup(ifg);
- TAILQ_FOREACH(ifp, &ifnet, if_link)
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link)
pfi_attach_ifnet(ifp);
IFNET_RUNLOCK();
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#2 (text+ko) ====
@@ -86,6 +86,7 @@
#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
+#include <sys/vimage.h>
#else
#include <sys/timeout.h>
#include <sys/pool.h>
@@ -136,6 +137,7 @@
#include <sys/limits.h>
#include <sys/lock.h>
#include <sys/mutex.h>
+#include <sys/vimage.h>
#include <net/pfil.h>
#endif /* __FreeBSD__ */
@@ -3713,7 +3715,7 @@
* order to support scoped addresses. In order to support stateful
* filtering we have change this to lo0 as it is the case in IPv4.
*/
- chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &loif[0] : ifp, m,
+ chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &V_loif[0] : ifp, m,
NULL, inp);
if (chk && *m) {
m_freem(*m);
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#2 (text+ko) ====
@@ -50,6 +50,7 @@
#include <sys/socket.h>
#include <sys/kernel.h>
#include <sys/time.h>
+#include <sys/vimage.h>
#ifndef __FreeBSD__
#include <sys/pool.h>
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#2 (text+ko) ====
@@ -40,11 +40,13 @@
#include <sys/mbuf.h>
#include <sys/md5.h>
#include <sys/time.h>
+#include <sys/vimage.h>
#include <sys/random.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/systm.h>
#include <sys/time.h>
+#include <sys/vimage.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -127,9 +129,9 @@
struct pf_state_host *src, *dst;
/* Seed if this is the first use, reseed if requested. */
- if (isn_last_reseed == 0) {
- read_random(&isn_secret, sizeof(isn_secret));
- isn_last_reseed = ticks;
+ if (V_isn_last_reseed == 0) {
+ read_random(&V_isn_secret, sizeof(V_isn_secret));
+ V_isn_last_reseed = ticks;
}
if (s->direction == PF_IN) {
@@ -141,28 +143,28 @@
}
/* Compute the md5 hash and return the ISN. */
- MD5Init(&isn_ctx);
- MD5Update(&isn_ctx, (u_char *) &dst->port, sizeof(u_short));
- MD5Update(&isn_ctx, (u_char *) &src->port, sizeof(u_short));
+ MD5Init(&V_isn_ctx);
+ MD5Update(&V_isn_ctx, (u_char *) &dst->port, sizeof(u_short));
+ MD5Update(&V_isn_ctx, (u_char *) &src->port, sizeof(u_short));
#ifdef INET6
if (s->af == AF_INET6) {
- MD5Update(&isn_ctx, (u_char *) &dst->addr,
+ MD5Update(&V_isn_ctx, (u_char *) &dst->addr,
sizeof(struct in6_addr));
- MD5Update(&isn_ctx, (u_char *) &src->addr,
+ MD5Update(&V_isn_ctx, (u_char *) &src->addr,
sizeof(struct in6_addr));
} else
#endif
{
- MD5Update(&isn_ctx, (u_char *) &dst->addr,
+ MD5Update(&V_isn_ctx, (u_char *) &dst->addr,
sizeof(struct in_addr));
- MD5Update(&isn_ctx, (u_char *) &src->addr,
+ MD5Update(&V_isn_ctx, (u_char *) &src->addr,
sizeof(struct in_addr));
}
- MD5Update(&isn_ctx, (u_char *) &isn_secret, sizeof(isn_secret));
- MD5Final((u_char *) &md5_buffer, &isn_ctx);
+ MD5Update(&V_isn_ctx, (u_char *) &V_isn_secret, sizeof(V_isn_secret));
+ MD5Final((u_char *) &md5_buffer, &V_isn_ctx);
new_isn = (tcp_seq) md5_buffer[0];
- isn_offset += ISN_STATIC_INCREMENT +
+ V_isn_offset += ISN_STATIC_INCREMENT +
(arc4random() & ISN_RANDOM_INCREMENT);
- new_isn += isn_offset;
+ new_isn += V_isn_offset;
return (new_isn);
}
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#2 (text+ko) ====
@@ -66,6 +66,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
+#include <sys/vimage.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#2 (text+ko) ====
@@ -46,6 +46,7 @@
#include <sys/taskqueue.h>
#include <sys/priv.h>
#include <sys/syslog.h>
+#include <sys/vimage.h>
#include <netinet/in.h>
#include <netinet/in_pcb.h>
@@ -1962,18 +1963,18 @@
if (ret)
goto err1;
- if (port > ipport_lastauto) {
- if (next_port != ipport_firstauto) {
+ if (port > V_ipport_lastauto) {
+ if (next_port != V_ipport_firstauto) {
kvl_delete(ps, port);
- next_port = ipport_firstauto;
+ next_port = V_ipport_firstauto;
goto retry;
}
ret = EADDRNOTAVAIL;
goto err2;
}
- if (port == ipport_lastauto)
- next_port = ipport_firstauto;
+ if (port == V_ipport_lastauto)
+ next_port = V_ipport_firstauto;
else
next_port = port + 1;
@@ -1997,7 +1998,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list