X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/1c79356b52d46aa6b508fb032f5ae709b1f2897b..8ad349bb6ed4a0be06e34c92be0d98b92e078db4:/bsd/conf/MASTER

diff --git a/bsd/conf/MASTER b/bsd/conf/MASTER
index 52e02e133..90cb6ba5c 100644
--- a/bsd/conf/MASTER
+++ b/bsd/conf/MASTER
@@ -87,6 +87,7 @@ options		TIMEZONE=0, PST=0
 
 options		QUOTA		# 				# <quota>
 options		INET
+options		ABSOLUTETIME_SCALAR_TYPE
 options		NEW_VM_CODE	#				# <newvm>
 options		OLD_VM_CODE	#				# <!newvm>
 options		HW_AST		# Hardware ast support		# <hw_ast>
@@ -114,7 +115,6 @@ options		NORMA_VM	# NORMA virtual memory support	# <norma_vm>
 options		NORMA_TASK	# NORMA task support		# <norma_task>
 options		NORMA_ETHER	# NORMA across ethernet		# <norma_ether>
 options		SIMPLE_CLOCK	# don't assume fixed tick	# <simple_clock>
-options		STAT_TIME	# Use statistical timing	# <!timing>
 options		XPR_DEBUG	# kernel tracing		# <xpr_debug>
 options		KDEBUG		# kernel tracing		# <kdebug>
 options		DDM_DEBUG	# driverkit-style tracing	# <ddm_debug>
@@ -132,30 +132,39 @@ options		ROUTING		# routing			# <routing>
 options		TPIP		#				# <tpip>
 options		TUN		#				# <tun>
 options		VLAN		#				# <vlan>
+options		BOND		#				# <bond>
+options		NETMIBS		#				# <netmibs>
 options         IPDIVERT        # Divert sockets (for NAT)      # <ipdivert>
 options         IPFIREWALL      # IP Firewalling (used by NAT)  # <ipfirewall>
 #options        IPFIREWALL_VERBOSE      #                       # <ipfirewall>
 options         IPFIREWALL_FORWARD      #Transparent proxy      # <ipfirewall>
 options         IPFIREWALL_DEFAULT_TO_ACCEPT    # allow everything by default   # <ipfirewall>
-options         IPFIREWALL_KEXT # Kernel extension              # <ipfirewall>
+#options         IPFIREWALL_KEXT # Kernel extension              # <ipfirewall>
+options		DUMMYNET	# dummynet support		# <dummynet>
+options		IPFW2		# IP firewall (new version)	# <ipfw2>
 options		MULTICAST	# Internet Protocol Class-D	$
+options		TCPDEBUG	# TCP debug			# <tcpdebug>
+options		RANDOM_IP_ID	# random (not sequential) ip ids	# <randomipid>
+options		TCP_DROP_SYNFIN	# Drop TCP packets with SYN+FIN set	# <tcpdrop_synfin>
+options		ICMP_BANDLIM	# ICMP bandwidth limiting sysctl
+options		AUDIT		# Security event auditing	# <audit>
 
 
 #
 #	4.4 general kernel 
 #
-options 	COMPAT_43	# 4.3 BSD compatibility		# <compat_43>
+options 	COMPAT_43_TTY	# 4.3 BSD tty compat	# <compat_43_tty>
+options		COMPAT_43_SOCKET	# 4.3 BSD socket compat	# <compat_43_socket>
 options 	DIAGNOSTIC	# diagnostics				# <diagnostic>
 options		KTRACE		# ktrace support			# <ktrace>
+options		GPROF		# build profiling			# <profile>
 
 #
 #	4.4 filesystems 
 #
 options		FFS		# Fast Filesystem Support	# <ffs>
 options		HFS		# HFS/HFS+ support		# <hfs>
-options		HFS_HARDLINKS	# HFS+ hardlink support		# <hfs>
 options		FIFO		# fifo support			# <fifo>
-options		PORTAL		# portal_fs support		# <portal>
 options		UNION		# union_fs support		# <union>
 options		FDESC		# fdesc_fs support		# <fdesc>
 options		CD9660		# ISO 9660 CD-ROM support	# <cd9660>
@@ -185,20 +194,27 @@ options		OBJCTEST	# Objc internal test		# <objctest>
 options		KERNEL_STACK	# MI kernel stack support	# <kernstack>
 profile				# build a profiling kernel	# <profile>
 
+#
+#  Point-to-Point Protocol support
+#
+pseudo-device ppp 2						# <ppp>
+
 #       
-# IPv6 (Kame Stable 20000425) Support 
+# IPv6 Support
 #       
 options         "INET6"         		# kernel IPv6 Support           # <inet6>
-options		MAPPED_ADDR_ENABLED     	# enable IPv4, on IPv6 socket	# <inet6>
 options         IPSEC                  		# IP security            	# <ipsec>
 options         IPSEC_ESP              		# IP security            	# <ipsec>
 options         "IPV6FIREWALL"         		# IPv6 Firewall Feature   	# <ipv6firewall>
-options         "IPV6FIREWALL_DEFAULT_TO_ACCEPT"  #IPv6 Firewall Feature   	# <ipv6firewall>
-options         "IPV6FIREWALL_VERBOSE" 		#IPv6 Firewall Feature   	# <ipv6firewall>
-options		NATPT				# KAME/IPv6 NAT feature		#<natpt>
-pseudo-device   gif     2		# <gif>
+options         "IPV6FIREWALL_DEFAULT_TO_ACCEPT"	#IPv6 Firewall Feature   	# <ipv6firewall>
+#options         "IPV6FIREWALL_VERBOSE" 		#IPv6 Firewall Feature   	# <ipv6firewall>
+
+pseudo-device   gif     1		# <gif>
 pseudo-device   dummy   2		# <dummy>
 pseudo-device   faith   1		# <faith>
+pseudo-device   stf 	1 		# <stf>
+
+options			crypto			# <ipsec,crypto>
 
 makeoptions	LIBDRIVER = "libDriver_kern.o"			# <libdriver>
 makeoptions	LIBOBJC   = "libkobjc.o"			# <kernobjc>
@@ -230,14 +246,31 @@ pseudo-device	loop
 #
 #  UCB pseudo terminal service
 #
-pseudo-device	pty	32 init pty_init
+pseudo-device	pty	128 init pty_init
+
+#
+# vnode device
+pseudo-device	vndevice	4	init	vndevice_init
+
+#
+# memory device
+pseudo-device	mdevdevice	1	init	mdevinit
+
+#
 #
 # packet filter device
 #
 pseudo-device	bpfilter	4	init	bpf_init
 
+#
+# fsevents device
+pseudo-device	fsevents	1	init	fsevents_init
+
 #
 #  shim to "linux" mach disk drivers  (mach drivers must also be turned on)
 #
 # now using iokit disk shim, this is code is obsolete
 #pseudo-device diskshim
+
+pseudo-device	random		1	init	random_init
+