xnu-792.1.5.tar.gz

[apple/xnu.git] / bsd / kern / sysctl_init.c

diff --git a/bsd/kern/sysctl_init.c b/bsd/kern/sysctl_init.c
index 3b659c97ebc1e0a02d5e8fa83ecf3f6b8dfbc523..e50013d3882c485eac7b25a1e43690f72fff1da3 100644 (file)
--- a/bsd/kern/sysctl_init.c
+++ b/bsd/kern/sysctl_init.c
@@ -21,38 +21,101 @@
  */
 
 #include <sys/param.h>
-#include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
 extern struct sysctl_oid sysctl__debug_bpf_bufsize;
 extern struct sysctl_oid sysctl__debug_bpf_maxbufsize;
+extern struct sysctl_oid sysctl__debug_bpf_maxdevices;
+extern struct sysctl_oid sysctl__debug_iokit;
 
 #if TUN
 extern struct sysctl_oid sysctl__debug_if_tun_debug;
 #endif
 
-#if COMPAT_43
+#if COMPAT_43_TTY
 #ifndef NeXT
 extern struct sysctl_oid sysctl__debug_ttydebug;
 #endif
 #endif
 
+extern struct sysctl_oid sysctl__hw_machine;
+extern struct sysctl_oid sysctl__hw_model;
+extern struct sysctl_oid sysctl__hw_ncpu;
+extern struct sysctl_oid sysctl__hw_activecpu;
+extern struct sysctl_oid sysctl__hw_physicalcpu;
+extern struct sysctl_oid sysctl__hw_physicalcpu_max;
+extern struct sysctl_oid sysctl__hw_logicalcpu;
+extern struct sysctl_oid sysctl__hw_logicalcpu_max;
+extern struct sysctl_oid sysctl__hw_byteorder;
+extern struct sysctl_oid sysctl__hw_cputype;
+extern struct sysctl_oid sysctl__hw_cpusubtype;
+extern struct sysctl_oid sysctl__hw_physmem;
+extern struct sysctl_oid sysctl__hw_usermem;
+extern struct sysctl_oid sysctl__hw_pagesize;
+extern struct sysctl_oid sysctl__hw_epoch;
+extern struct sysctl_oid sysctl__hw_vectorunit;
+extern struct sysctl_oid sysctl__hw_busfrequency;
+extern struct sysctl_oid sysctl__hw_busfrequency_min;
+extern struct sysctl_oid sysctl__hw_busfrequency_max;
+extern struct sysctl_oid sysctl__hw_cpufrequency;
+extern struct sysctl_oid sysctl__hw_cpufrequency_min;
+extern struct sysctl_oid sysctl__hw_cpufrequency_max;
+extern struct sysctl_oid sysctl__hw_cachelinesize;
+extern struct sysctl_oid sysctl__hw_l1icachesize;
+extern struct sysctl_oid sysctl__hw_l1dcachesize;
+extern struct sysctl_oid sysctl__hw_l2settings;
+extern struct sysctl_oid sysctl__hw_l2cachesize;
+extern struct sysctl_oid sysctl__hw_l3settings;
+extern struct sysctl_oid sysctl__hw_l3cachesize;
+extern struct sysctl_oid sysctl__hw_tbfrequency;
+extern struct sysctl_oid sysctl__hw_memsize;
+
+extern struct sysctl_oid sysctl__hw_optional;
+extern struct sysctl_oid sysctl__hw_optional_floatingpoint;
+
+extern struct sysctl_oid sysctl__hw_pagesize_compat;
+extern struct sysctl_oid sysctl__hw_busfrequency_compat;
+extern struct sysctl_oid sysctl__hw_cpufrequency_compat;
+extern struct sysctl_oid sysctl__hw_cachelinesize_compat;
+extern struct sysctl_oid sysctl__hw_l1icachesize_compat;
+extern struct sysctl_oid sysctl__hw_l1dcachesize_compat;
+extern struct sysctl_oid sysctl__hw_l2cachesize_compat;
+extern struct sysctl_oid sysctl__hw_l3cachesize_compat;
+extern struct sysctl_oid sysctl__hw_tbfrequency_compat;
+
 extern struct sysctl_oid sysctl__kern_sysv_shmmax;
 extern struct sysctl_oid sysctl__kern_sysv_shmmin;
 extern struct sysctl_oid sysctl__kern_sysv_shmmni;
 extern struct sysctl_oid sysctl__kern_sysv_shmseg;
 extern struct sysctl_oid sysctl__kern_sysv_shmall;
+extern struct sysctl_oid sysctl__kern_sysv_ipcs;
+extern struct sysctl_oid sysctl__kern_sysv_ipcs_shm;
+extern struct sysctl_oid sysctl__kern_sysv_ipcs_sem;
+extern struct sysctl_oid sysctl__kern_sysv_ipcs_msg;
+
+extern struct sysctl_oid sysctl__kern_sysv_semmni;
+extern struct sysctl_oid sysctl__kern_sysv_semmns;
+extern struct sysctl_oid sysctl__kern_sysv_semmnu;
+extern struct sysctl_oid sysctl__kern_sysv_semmsl;
+extern struct sysctl_oid sysctl__kern_sysv_semume;
 
 extern struct sysctl_oid sysctl__kern_dummy;
 extern struct sysctl_oid sysctl__kern_ipc_maxsockbuf;
+extern struct sysctl_oid sysctl__kern_ipc_mbstat;
 extern struct sysctl_oid sysctl__kern_ipc_nmbclusters;
 extern struct sysctl_oid sysctl__kern_ipc_sockbuf_waste_factor;
 extern struct sysctl_oid sysctl__kern_ipc_somaxconn;
 extern struct sysctl_oid sysctl__kern_ipc_sosendminchain;
+extern struct sysctl_oid sysctl__kern_ipc_sorecvmincopy;
 extern struct sysctl_oid sysctl__kern_ipc_maxsockets;
+extern struct sysctl_oid sysctl__kern_posix;
+extern struct sysctl_oid sysctl__kern_posix_sem;
+extern struct sysctl_oid sysctl__kern_posix_sem_max;
+extern struct sysctl_oid sysctl__kern_sugid_scripts;
 extern struct sysctl_oid sysctl__net_inet_icmp_icmplim;
 extern struct sysctl_oid sysctl__net_inet_icmp_maskrepl;
+extern struct sysctl_oid sysctl__net_inet_icmp_timestamp;
 extern struct sysctl_oid sysctl__net_inet_icmp_bmcastecho;
 extern struct sysctl_oid sysctl__net_inet_icmp_log_redirect;
 extern struct sysctl_oid sysctl__net_inet_icmp_drop_redirect;
@@ -75,24 +138,49 @@ extern struct sysctl_oid sysctl__net_inet_ip_sourceroute;
 extern struct sysctl_oid sysctl__net_inet_ip_subnets_are_local;
 extern struct sysctl_oid sysctl__net_inet_ip_keepfaith;
 extern struct sysctl_oid sysctl__net_inet_ip_maxfragpackets;
+extern struct sysctl_oid sysctl__net_inet_ip_maxfragsperpacket;
+extern struct sysctl_oid sysctl__net_inet_ip_maxfrags;
 extern struct sysctl_oid sysctl__net_inet_ip_check_interface;
 extern struct sysctl_oid sysctl__net_inet_ip_check_route_selfref;
+extern struct sysctl_oid sysctl__net_inet_ip_use_route_genid;
 #if NGIF > 0
 extern struct sysctl_oid sysctl__net_inet_ip_gifttl;
 #endif
 
 #if DUMMYNET
-extern struct sysctl_oid sysctl__net_inet_ip_dummynet_calls;
-extern struct sysctl_oid sysctl__net_inet_ip_dummynet_debug;
-extern struct sysctl_oid sysctl__net_inet_ip_dummynet_idle;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_hash_size;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_curr_time;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_ready_heap;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_extract_heap;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_searches;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_search_steps;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_expire;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_max_chain_len;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_red_lookup_depth;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_red_avg_pkt_size;
+extern struct sysctl_oid sysctl__net_inet_ip_dummynet_red_max_pkt_size;
 extern struct sysctl_oid sysctl__net_inet_ip_dummynet;
 #endif
 
 #if IPFIREWALL && !IPFIREWALL_KEXT
+extern struct sysctl_oid sysctl__net_inet_ip_fw_enable;
 extern struct sysctl_oid sysctl__net_inet_ip_fw_debug;
 extern struct sysctl_oid sysctl__net_inet_ip_fw_verbose;
 extern struct sysctl_oid sysctl__net_inet_ip_fw_verbose_limit;
 extern struct sysctl_oid sysctl__net_inet_ip_fw_one_pass;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_autoinc_step;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_buckets;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_curr_dyn_buckets;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_count;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_max;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_static_count;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_ack_lifetime;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_syn_lifetime;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_fin_lifetime;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_rst_lifetime;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_udp_lifetime;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_short_lifetime;
+extern struct sysctl_oid sysctl__net_inet_ip_fw_dyn_keepalive;
 extern struct sysctl_oid sysctl__net_inet_ip_fw;
 #endif
 
@@ -100,6 +188,7 @@ extern struct sysctl_oid sysctl__net_inet_ip_linklocal;
 extern struct sysctl_oid sysctl__net_inet_ip_linklocal_stat;
 extern struct sysctl_oid sysctl__net_inet_ip_linklocal_in;
 extern struct sysctl_oid sysctl__net_inet_ip_linklocal_in_allowbadttl;
+extern struct sysctl_oid sysctl__net_inet_ip_maxchainsent;
 
 extern struct sysctl_oid sysctl__net_inet_raw_maxdgram;
 extern struct sysctl_oid sysctl__net_inet_raw_recvspace;
@@ -113,14 +202,18 @@ extern struct sysctl_oid sysctl__net_inet_tcp_keepidle;
 extern struct sysctl_oid sysctl__net_inet_tcp_keepinit;
 extern struct sysctl_oid sysctl__net_inet_tcp_keepintvl;
 extern struct sysctl_oid sysctl__net_inet_tcp_mssdflt;
+extern struct sysctl_oid sysctl__net_inet_tcp_minmss;
+extern struct sysctl_oid sysctl__net_inet_tcp_minmssoverload;
 extern struct sysctl_oid sysctl__net_inet_tcp_recvspace;
 extern struct sysctl_oid sysctl__net_inet_tcp_sendspace;
+extern struct sysctl_oid sysctl__net_inet_tcp_slowlink_wsize;
 extern struct sysctl_oid sysctl__net_inet_tcp_blackhole;
 extern struct sysctl_oid sysctl__net_inet_tcp_tcp_lq_overflow;
 extern struct sysctl_oid sysctl__net_inet_tcp_path_mtu_discovery;
 extern struct sysctl_oid sysctl__net_inet_tcp_slowstart_flightsize;
 extern struct sysctl_oid sysctl__net_inet_tcp_local_slowstart_flightsize;
 extern struct sysctl_oid sysctl__net_inet_tcp_newreno;
+extern struct sysctl_oid sysctl__net_inet_tcp_packetchain;
 extern struct sysctl_oid sysctl__net_inet_tcp_tcbhashsize;
 extern struct sysctl_oid sysctl__net_inet_tcp_do_tcpdrain;
 extern struct sysctl_oid sysctl__net_inet_tcp_icmp_may_rst;
@@ -134,11 +227,18 @@ extern struct sysctl_oid sysctl__net_inet_tcp_drop_synfin;
 #if TCPDEBUG
 extern struct sysctl_oid sysctl__net_inet_tcp_tcpconsdebug;
 #endif
+extern struct sysctl_oid sysctl__net_inet_tcp_sockthreshold;
+extern struct sysctl_oid sysctl__net_inet_tcp_reass_maxsegments;
+extern struct sysctl_oid sysctl__net_inet_tcp_reass_cursegments;
+extern struct sysctl_oid sysctl__net_inet_tcp_reass_overflows;
+extern struct sysctl_oid sysctl__net_inet_tcp_reass;
+
 extern struct sysctl_oid sysctl__net_inet_udp_log_in_vain;
 extern struct sysctl_oid sysctl__net_inet_udp_checksum;
 extern struct sysctl_oid sysctl__net_inet_udp_maxdgram;
 extern struct sysctl_oid sysctl__net_inet_udp_recvspace;
 extern struct sysctl_oid sysctl__net_inet_udp_blackhole;
+extern struct sysctl_oid sysctl__net_inet_udp_pcbcount;
 
 #if NETAT
 extern struct sysctl_oid sysctl__net_appletalk_debug;
@@ -161,7 +261,7 @@ extern struct sysctl_oid sysctl__net_link_ether_inet_maxtries;
 extern struct sysctl_oid sysctl__net_link_ether_inet_proxyall;
 extern struct sysctl_oid sysctl__net_link_ether_inet_prune_intvl;
 extern struct sysctl_oid sysctl__net_link_ether_inet_useloopback;
-extern struct sysctl_oid sysctl__net_link_ether_inet_log_arp_wrong_iface;
+extern struct sysctl_oid sysctl__net_link_ether_inet_log_arp_warnings;
 extern struct sysctl_oid sysctl__net_link_ether_inet_apple_hwcksum_tx;
 extern struct sysctl_oid sysctl__net_link_ether_inet_apple_hwcksum_rx;
 
@@ -169,6 +269,7 @@ extern struct sysctl_oid sysctl__net_link_ether_inet_apple_hwcksum_rx;
 extern struct sysctl_oid sysctl__net_link_generic_system_ifcount;
 extern struct sysctl_oid sysctl__net_link_generic;
 extern struct sysctl_oid sysctl__net_link_generic_ifdata;
+extern struct sysctl_oid sysctl__net_link_generic_ifalldata;
 extern struct sysctl_oid sysctl__net_link_generic_system;
 #endif
 
@@ -199,6 +300,17 @@ extern struct sysctl_oid sysctl__vfs_nfs_diskless_rootpath;
 extern struct sysctl_oid sysctl__vfs_nfs_diskless_swappath;
 extern struct sysctl_oid sysctl__vfs_nfs_nfsstats;
 #endif
+#if NFSCLIENT
+extern struct sysctl_oid sysctl__vfs_generic_nfs_client_initialdowndelay;
+extern struct sysctl_oid sysctl__vfs_generic_nfs_client_nextdowndelay;
+extern struct sysctl_oid sysctl__vfs_generic_nfs_client;
+extern struct sysctl_oid sysctl__vfs_generic_nfs;
+#endif
+
+extern struct sysctl_oid sysctl__vfs_generic;
+extern struct sysctl_oid sysctl__vfs_generic_vfsidlist;
+extern struct sysctl_oid sysctl__vfs_generic_ctlbyfsid;
+extern struct sysctl_oid sysctl__vfs_generic_noremotehang;
 
 extern struct sysctl_oid sysctl__kern_ipc;
 extern struct sysctl_oid sysctl__kern_sysv;
@@ -254,6 +366,7 @@ extern struct sysctl_oid sysctl__net_inet_tcp_stats;
 extern struct sysctl_oid sysctl__net_inet_udp_stats;
 extern struct sysctl_oid sysctl__kern;
 extern struct sysctl_oid sysctl__hw;
+extern struct sysctl_oid sysctl__machdep;
 extern struct sysctl_oid sysctl__net;
 extern struct sysctl_oid sysctl__debug;
 extern struct sysctl_oid sysctl__vfs;
@@ -269,6 +382,7 @@ extern struct sysctl_oid sysctl__net_inet6_ip6_forwarding;
 extern struct sysctl_oid sysctl__net_inet6_ip6_redirect;
 extern struct sysctl_oid sysctl__net_inet6_ip6_hlim;
 extern struct sysctl_oid sysctl__net_inet6_ip6_maxfragpackets;
+extern struct sysctl_oid sysctl__net_inet6_ip6_maxfrags;
 extern struct sysctl_oid sysctl__net_inet6_ip6_accept_rtadv;
 extern struct sysctl_oid sysctl__net_inet6_ip6_keepfaith;
 extern struct sysctl_oid sysctl__net_inet6_ip6_log_interval;
@@ -284,12 +398,12 @@ extern struct sysctl_oid sysctl__net_inet6_ip6_use_tempaddr;
 extern struct sysctl_oid sysctl__net_inet6_ip6_v6only;
 extern struct sysctl_oid sysctl__net_inet6_ip6_auto_linklocal;
 extern struct sysctl_oid sysctl__net_inet6_ip6_rip6stats;
+extern struct sysctl_oid sysctl__net_inet6_ip6_mrt6stat;
 extern struct sysctl_oid sysctl__net_inet6_ip6_rtexpire;
 extern struct sysctl_oid sysctl__net_inet6_ip6_rtminexpire;
 extern struct sysctl_oid sysctl__net_inet6_ip6_rtmaxcache;
 extern struct sysctl_oid sysctl__net_inet6_ip6_temppltime;
 extern struct sysctl_oid sysctl__net_inet6_ip6_tempvltime;
-extern struct sysctl_oid sysctl__net_inet6_ip6_auto_on;
 #if IPV6FIREWALL
 extern struct sysctl_oid sysctl__net_inet6_ip6_fw;
 extern struct sysctl_oid sysctl__net_inet6_ip6_fw_debug;
@@ -324,6 +438,7 @@ extern struct sysctl_oid sysctl__net_inet6_ipsec6_esp_randpad;
 #endif
 #if IPSEC
 extern struct sysctl_oid sysctl__net_inet_ipsec;
+extern struct sysctl_oid sysctl__net_inet_ipsec_esp_port;
 extern struct sysctl_oid sysctl__net_inet_ipsec_bypass;
 extern struct sysctl_oid sysctl__net_inet_ipsec_def_policy;
 extern struct sysctl_oid sysctl__net_inet_ipsec_esp_randpad;
@@ -339,6 +454,7 @@ extern struct sysctl_oid sysctl__net_inet_ipsec_debug;
 extern struct sysctl_oid sysctl__net_inet_ipsec_stats;
 extern struct sysctl_oid sysctl__net_key;
 extern struct sysctl_oid sysctl__net_key_debug;
+extern struct sysctl_oid sysctl__net_key_prefered_oldsa;
 extern struct sysctl_oid sysctl__net_key_spi_trycnt;
 extern struct sysctl_oid sysctl__net_key_spi_minval;
 extern struct sysctl_oid sysctl__net_key_spi_maxval;
@@ -347,7 +463,10 @@ extern struct sysctl_oid sysctl__net_key_larval_lifetime;
 extern struct sysctl_oid sysctl__net_key_blockacq_count;
 extern struct sysctl_oid sysctl__net_key_blockacq_lifetime;
 extern struct sysctl_oid sysctl__net_key_esp_keymin;
+extern struct sysctl_oid sysctl__net_key_esp_auth;
 extern struct sysctl_oid sysctl__net_key_ah_keymin;
+extern struct sysctl_oid sysctl__net_key_natt_keepalive_interval;
+extern struct sysctl_oid sysctl__net_key_pfkeystat;
 #endif
 
 
@@ -355,36 +474,103 @@ struct sysctl_oid *newsysctl_list[] =
 {
     &sysctl__kern,
     &sysctl__hw,
+    &sysctl__machdep,
     &sysctl__net,
     &sysctl__debug,
     &sysctl__vfs,
     &sysctl__sysctl,
     &sysctl__debug_bpf_bufsize,
-    &sysctl__debug_bpf_maxbufsize
+    &sysctl__debug_bpf_maxbufsize,
+    &sysctl__debug_bpf_maxdevices,
+    &sysctl__debug_iokit
 #if TUN
     ,&sysctl__debug_if_tun_debug
 #endif
 
-#if COMPAT_43
+#if COMPAT_43_TTY
 #ifndef NeXT
     ,&sysctl__debug_ttydebug
 #endif
 #endif
 
+    ,&sysctl__kern_posix
+    ,&sysctl__kern_posix_sem
+    ,&sysctl__kern_posix_sem_max
+
     ,&sysctl__kern_sysv_shmmax
     ,&sysctl__kern_sysv_shmmin
     ,&sysctl__kern_sysv_shmmni
     ,&sysctl__kern_sysv_shmseg
     ,&sysctl__kern_sysv_shmall
+    ,&sysctl__kern_sysv_ipcs
+    ,&sysctl__kern_sysv_ipcs_shm
+    ,&sysctl__kern_sysv_ipcs_sem
+    ,&sysctl__kern_sysv_ipcs_msg
+    ,&sysctl__kern_sysv_semmni
+    ,&sysctl__kern_sysv_semmns
+    ,&sysctl__kern_sysv_semmnu
+    ,&sysctl__kern_sysv_semmsl
+    ,&sysctl__kern_sysv_semume
     ,&sysctl__kern_dummy
+
     ,&sysctl__kern_ipc_maxsockbuf
+    ,&sysctl__kern_ipc_mbstat
     ,&sysctl__kern_ipc_nmbclusters
     ,&sysctl__kern_ipc_sockbuf_waste_factor
     ,&sysctl__kern_ipc_somaxconn
     ,&sysctl__kern_ipc_sosendminchain
+    ,&sysctl__kern_ipc_sorecvmincopy
     ,&sysctl__kern_ipc_maxsockets
+
+    ,&sysctl__kern_sugid_scripts
+
+    ,&sysctl__hw_machine
+    ,&sysctl__hw_model
+    ,&sysctl__hw_ncpu
+    ,&sysctl__hw_activecpu
+    ,&sysctl__hw_physicalcpu
+    ,&sysctl__hw_physicalcpu_max
+    ,&sysctl__hw_logicalcpu
+    ,&sysctl__hw_logicalcpu_max
+    ,&sysctl__hw_byteorder
+    ,&sysctl__hw_cputype
+    ,&sysctl__hw_cpusubtype
+    ,&sysctl__hw_physmem
+    ,&sysctl__hw_usermem
+    ,&sysctl__hw_pagesize
+    ,&sysctl__hw_epoch
+    ,&sysctl__hw_vectorunit
+    ,&sysctl__hw_busfrequency
+    ,&sysctl__hw_busfrequency_min
+    ,&sysctl__hw_busfrequency_max
+    ,&sysctl__hw_cpufrequency
+    ,&sysctl__hw_cpufrequency_min
+    ,&sysctl__hw_cpufrequency_max
+    ,&sysctl__hw_cachelinesize
+    ,&sysctl__hw_l1icachesize
+    ,&sysctl__hw_l1dcachesize
+    ,&sysctl__hw_l2settings
+    ,&sysctl__hw_l2cachesize
+    ,&sysctl__hw_l3settings
+    ,&sysctl__hw_l3cachesize
+    ,&sysctl__hw_tbfrequency
+    ,&sysctl__hw_memsize
+    ,&sysctl__hw_optional
+    ,&sysctl__hw_optional_floatingpoint
+
+    ,&sysctl__hw_pagesize_compat
+    ,&sysctl__hw_busfrequency_compat
+    ,&sysctl__hw_cpufrequency_compat
+    ,&sysctl__hw_cachelinesize_compat
+    ,&sysctl__hw_l1icachesize_compat
+    ,&sysctl__hw_l1dcachesize_compat
+    ,&sysctl__hw_l2cachesize_compat
+    ,&sysctl__hw_l3cachesize_compat
+    ,&sysctl__hw_tbfrequency_compat
+
     ,&sysctl__net_inet_icmp_icmplim
     ,&sysctl__net_inet_icmp_maskrepl
+    ,&sysctl__net_inet_icmp_timestamp
     ,&sysctl__net_inet_icmp_bmcastecho
     ,&sysctl__net_inet_icmp_drop_redirect
     ,&sysctl__net_inet_icmp_log_redirect
@@ -405,29 +591,55 @@ struct sysctl_oid *newsysctl_list[] =
     ,&sysctl__net_inet_ip_subnets_are_local
     ,&sysctl__net_inet_ip_keepfaith
     ,&sysctl__net_inet_ip_maxfragpackets
+    ,&sysctl__net_inet_ip_maxfragsperpacket
+    ,&sysctl__net_inet_ip_maxfrags
     ,&sysctl__net_inet_ip_check_interface
     ,&sysctl__net_inet_ip_check_route_selfref
+    ,&sysctl__net_inet_ip_use_route_genid
 #if NGIF > 0
     ,&sysctl__net_inet_ip_gifttl
 #endif
 #if DUMMYNET
-    ,&sysctl__net_inet_ip_dummynet_calls
-    ,&sysctl__net_inet_ip_dummynet_debug
-    ,&sysctl__net_inet_ip_dummynet_idle
+    ,&sysctl__net_inet_ip_dummynet_hash_size
+    ,&sysctl__net_inet_ip_dummynet_curr_time
+    ,&sysctl__net_inet_ip_dummynet_ready_heap
+    ,&sysctl__net_inet_ip_dummynet_extract_heap
+    ,&sysctl__net_inet_ip_dummynet_searches
+    ,&sysctl__net_inet_ip_dummynet_search_steps
+    ,&sysctl__net_inet_ip_dummynet_expire
+    ,&sysctl__net_inet_ip_dummynet_max_chain_len
+    ,&sysctl__net_inet_ip_dummynet_red_lookup_depth
+    ,&sysctl__net_inet_ip_dummynet_red_avg_pkt_size
+    ,&sysctl__net_inet_ip_dummynet_red_max_pkt_size
     ,&sysctl__net_inet_ip_dummynet
 #endif
 
 #if IPFIREWALL && !IPFIREWALL_KEXT
+    ,&sysctl__net_inet_ip_fw_enable
     ,&sysctl__net_inet_ip_fw_debug
     ,&sysctl__net_inet_ip_fw_verbose
     ,&sysctl__net_inet_ip_fw_verbose_limit
     ,&sysctl__net_inet_ip_fw_one_pass
+    ,&sysctl__net_inet_ip_fw_autoinc_step
+    ,&sysctl__net_inet_ip_fw_dyn_buckets
+    ,&sysctl__net_inet_ip_fw_curr_dyn_buckets
+    ,&sysctl__net_inet_ip_fw_dyn_count
+    ,&sysctl__net_inet_ip_fw_dyn_max
+    ,&sysctl__net_inet_ip_fw_static_count
+    ,&sysctl__net_inet_ip_fw_dyn_ack_lifetime
+    ,&sysctl__net_inet_ip_fw_dyn_syn_lifetime
+    ,&sysctl__net_inet_ip_fw_dyn_fin_lifetime
+    ,&sysctl__net_inet_ip_fw_dyn_rst_lifetime
+    ,&sysctl__net_inet_ip_fw_dyn_udp_lifetime
+    ,&sysctl__net_inet_ip_fw_dyn_short_lifetime
+    ,&sysctl__net_inet_ip_fw_dyn_keepalive
     ,&sysctl__net_inet_ip_fw
 #endif
     ,&sysctl__net_inet_ip_linklocal
     ,&sysctl__net_inet_ip_linklocal_stat
     ,&sysctl__net_inet_ip_linklocal_in
     ,&sysctl__net_inet_ip_linklocal_in_allowbadttl
+    ,&sysctl__net_inet_ip_maxchainsent
     ,&sysctl__net_inet_raw_maxdgram
     ,&sysctl__net_inet_raw_recvspace
     ,&sysctl__net_inet_tcp_always_keepalive
@@ -440,14 +652,18 @@ struct sysctl_oid *newsysctl_list[] =
     ,&sysctl__net_inet_tcp_keepinit
     ,&sysctl__net_inet_tcp_keepintvl
     ,&sysctl__net_inet_tcp_mssdflt
+    ,&sysctl__net_inet_tcp_minmss
+    ,&sysctl__net_inet_tcp_minmssoverload
     ,&sysctl__net_inet_tcp_recvspace
     ,&sysctl__net_inet_tcp_sendspace
+    ,&sysctl__net_inet_tcp_slowlink_wsize
     ,&sysctl__net_inet_tcp_blackhole
     ,&sysctl__net_inet_tcp_tcp_lq_overflow
     ,&sysctl__net_inet_tcp_path_mtu_discovery
     ,&sysctl__net_inet_tcp_slowstart_flightsize
     ,&sysctl__net_inet_tcp_local_slowstart_flightsize
     ,&sysctl__net_inet_tcp_newreno
+    ,&sysctl__net_inet_tcp_packetchain
     ,&sysctl__net_inet_tcp_tcbhashsize
     ,&sysctl__net_inet_tcp_do_tcpdrain
     ,&sysctl__net_inet_tcp_icmp_may_rst
@@ -461,11 +677,18 @@ struct sysctl_oid *newsysctl_list[] =
 #if TCPDEBUG
     ,&sysctl__net_inet_tcp_tcpconsdebug
 #endif
+    ,&sysctl__net_inet_tcp_sockthreshold
+    ,&sysctl__net_inet_tcp_reass_maxsegments
+    ,&sysctl__net_inet_tcp_reass_cursegments
+    ,&sysctl__net_inet_tcp_reass_overflows
+    ,&sysctl__net_inet_tcp_reass
+
     ,&sysctl__net_inet_udp_log_in_vain 
     ,&sysctl__net_inet_udp_checksum
     ,&sysctl__net_inet_udp_maxdgram
     ,&sysctl__net_inet_udp_recvspace
     ,&sysctl__net_inet_udp_blackhole
+    ,&sysctl__net_inet_udp_pcbcount
 
 #if NETAT
     ,&sysctl__net_appletalk_debug
@@ -489,21 +712,24 @@ struct sysctl_oid *newsysctl_list[] =
     ,&sysctl__net_link_ether_inet_proxyall
     ,&sysctl__net_link_ether_inet_prune_intvl
     ,&sysctl__net_link_ether_inet_useloopback
-    ,&sysctl__net_link_ether_inet_log_arp_wrong_iface
+    ,&sysctl__net_link_ether_inet_log_arp_warnings
     ,&sysctl__net_link_ether_inet_apple_hwcksum_tx
     ,&sysctl__net_link_ether_inet_apple_hwcksum_rx
 #if NETMIBS
     ,&sysctl__net_link_generic_system_ifcount
     ,&sysctl__net_link_generic
     ,&sysctl__net_link_generic_ifdata
+    ,&sysctl__net_link_generic_ifalldata
     ,&sysctl__net_link_generic_system
 #endif
 
+#if 0
 #if VLAN
     ,&sysctl__net_link_vlan_link_proto
     ,&sysctl__net_link_vlan
     ,&sysctl__net_link_vlan_link
 #endif
+#endif 0
 
     ,&sysctl__net_local_inflight
     ,&sysctl__net_local_dgram_maxdgram
@@ -524,6 +750,16 @@ struct sysctl_oid *newsysctl_list[] =
     ,&sysctl__vfs_nfs_diskless_rootpath
     ,&sysctl__vfs_nfs_diskless_swappath
     ,&sysctl__vfs_nfs_nfsstats
+#endif
+    ,&sysctl__vfs_generic
+    ,&sysctl__vfs_generic_vfsidlist
+    ,&sysctl__vfs_generic_ctlbyfsid
+    ,&sysctl__vfs_generic_noremotehang
+#if NFSCLIENT
+    ,&sysctl__vfs_generic_nfs
+    ,&sysctl__vfs_generic_nfs_client
+    ,&sysctl__vfs_generic_nfs_client_initialdowndelay
+    ,&sysctl__vfs_generic_nfs_client_nextdowndelay
 #endif
     ,&sysctl__kern_ipc
     ,&sysctl__kern_sysv
@@ -578,6 +814,7 @@ struct sysctl_oid *newsysctl_list[] =
     ,&sysctl__net_inet6_ip6_redirect
     ,&sysctl__net_inet6_ip6_hlim
     ,&sysctl__net_inet6_ip6_maxfragpackets
+    ,&sysctl__net_inet6_ip6_maxfrags
     ,&sysctl__net_inet6_ip6_accept_rtadv
     ,&sysctl__net_inet6_ip6_keepfaith
     ,&sysctl__net_inet6_ip6_log_interval
@@ -593,12 +830,12 @@ struct sysctl_oid *newsysctl_list[] =
     ,&sysctl__net_inet6_ip6_v6only
     ,&sysctl__net_inet6_ip6_auto_linklocal
     ,&sysctl__net_inet6_ip6_rip6stats
+    ,&sysctl__net_inet6_ip6_mrt6stat
     ,&sysctl__net_inet6_ip6_rtexpire
     ,&sysctl__net_inet6_ip6_rtminexpire
     ,&sysctl__net_inet6_ip6_rtmaxcache
     ,&sysctl__net_inet6_ip6_temppltime
     ,&sysctl__net_inet6_ip6_tempvltime
-    ,&sysctl__net_inet6_ip6_auto_on
    ,&sysctl__net_inet6_icmp6_rediraccept
    ,&sysctl__net_inet6_icmp6_redirtimeout
    ,&sysctl__net_inet6_icmp6_nd6_prune
@@ -634,6 +871,7 @@ struct sysctl_oid *newsysctl_list[] =
 #if IPSEC
    ,&sysctl__net_key
    ,&sysctl__net_key_debug
+   ,&sysctl__net_key_prefered_oldsa
    ,&sysctl__net_key_spi_trycnt
    ,&sysctl__net_key_spi_minval
    ,&sysctl__net_key_spi_maxval
@@ -642,7 +880,10 @@ struct sysctl_oid *newsysctl_list[] =
    ,&sysctl__net_key_blockacq_count
    ,&sysctl__net_key_blockacq_lifetime
    ,&sysctl__net_key_esp_keymin
+   ,&sysctl__net_key_esp_auth
    ,&sysctl__net_key_ah_keymin
+   ,&sysctl__net_key_natt_keepalive_interval
+   ,&sysctl__net_key_pfkeystat
    ,&sysctl__net_inet_ipsec
    ,&sysctl__net_inet_ipsec_stats
    ,&sysctl__net_inet_ipsec_def_policy
@@ -657,6 +898,7 @@ struct sysctl_oid *newsysctl_list[] =
    ,&sysctl__net_inet_ipsec_debug
    ,&sysctl__net_inet_ipsec_esp_randpad
    ,&sysctl__net_inet_ipsec_bypass
+   ,&sysctl__net_inet_ipsec_esp_port
 #endif
     ,(struct sysctl_oid *) 0
 };