Document ip.arpq and remove ip, ip6 and mpls ifq.

ok deraadt@

1 files changed, 27 insertions, 45 deletions

diff --git a/lib/libc/sys/sysctl.2 b/lib/libc/sys/sysctl.2
index 29cd3ac306c..e12b8a3334a 100644
--- a/lib/libc/sys/sysctl.2
+++ b/lib/libc/sys/sysctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.2,v 1.28 2019/08/11 15:48:08 deraadt Exp $
+.\"	$OpenBSD: sysctl.2,v 1.29 2019/08/11 16:04:23 denis Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -1240,12 +1240,13 @@ The currently defined protocols and names are:
 .It icmp Ta redirtimeout Ta integer Ta yes
 .It icmp Ta stats Ta structure Ta no
 .It icmp Ta tstamprepl Ta integer Ta yes
+.It ip Ta arpqueued Ta integer Ta no
 .It ip Ta arpdown Ta integer Ta yes
 .It ip Ta arptimeout Ta integer Ta yes
+.It ip Ta arpq Ta node Ta "N/A"
 .It ip Ta directed-broadcast Ta integer Ta yes
 .It ip Ta encdebug Ta integer Ta yes
 .It ip Ta forwarding Ta integer Ta yes
-.It ip Ta ifq Ta node Ta "N/A"
 .It ip Ta ipsec-allocs Ta integer Ta yes
 .It ip Ta ipsec-auth-alg Ta string Ta yes
 .It ip Ta ipsec-bytes Ta integer Ta yes
@@ -1402,28 +1403,17 @@ Returns the ICMP statistics in a struct icmpstat.
 .It Li icmp.tstamprepl Pq Va net.inet.icmp.tstamprepl
 If set to 1, reply to ICMP timestamp requests.
 If set to 0, ignore timestamp requests.
+.It Li ip.arpqueued Pq Va net.inet.ip.arpqueued
+Number of packets ARP resolution is holding onto until it gets a MAC
+address for an IP.
 .It Li ip.arpdown Pq Va net.inet.ip.arpdown
 Lifetime of unresolved ARP entries, in seconds.
 .It Li ip.arptimeout Pq Va net.inet.ip.arptimeout
 Lifetime of resolved ARP entries, in seconds.
-.It Li ip.directed-broadcast Pq Va net.inet.ip.directed-broadcast
-Returns 1 if directed broadcast behavior is enabled for the host.
-.It Li ip.encdebug Pq Va net.inet.ip.encdebug
-Returns 1 when error message reporting is enabled for the host.
-If the kernel has been compiled with the
-.Dv ENCDEBUG
-option,
-then debugging information will also be reported when this variable is set.
-.It Li ip.forwarding Pq Va net.inet.ip.forwarding
-If set to 1, then IP forwarding is enabled for the host,
-indicating the host is acting as a router.
-If set to 2, then IP forwarding is restricted to traffic that has been
-IPsec encapsulated or decapsulated by the host.
-The default value is 0.
-.It Li ip.ifq
+.It Li ip.arpq
 Fifth level comprises an array of
 .Vt struct ifqueue
-structures containing information about IP packet input queue.
+structures containing information about ARP queue.
 The fifth level names for the elements of
 .Vt struct ifqueue
 are detailed below.
@@ -1437,13 +1427,27 @@ are detailed below.
 The variables are as follows:
 .Pp
 .Bl -tag -width Ds -compact
-.It Dv IFQCTL_DROPS Pq Va net.inet.ip.ifq.drops
+.It Dv IFQCTL_DROPS Pq Va net.inet.ip.arpq.drops
 Returns number of packet dropped.
-.It Dv IFQCTL_LEN Pq Va net.inet.ip.ifq.len
+.It Dv IFQCTL_LEN Pq Va net.inet.ip.arpq.len
 Returns the current queue length.
-.It Dv IFQCTL_MAXLEN Pq Va net.inet.ip.ifq.maxlen
+.It Dv IFQCTL_MAXLEN Pq Va net.inet.ip.arpq.maxlen
 Get or set the maximum number of queue length.
 .El
+.It Li ip.directed-broadcast Pq Va net.inet.ip.directed-broadcast
+Returns 1 if directed broadcast behavior is enabled for the host.
+.It Li ip.encdebug Pq Va net.inet.ip.encdebug
+Returns 1 when error message reporting is enabled for the host.
+If the kernel has been compiled with the
+.Dv ENCDEBUG
+option,
+then debugging information will also be reported when this variable is set.
+.It Li ip.forwarding Pq Va net.inet.ip.forwarding
+If set to 1, then IP forwarding is enabled for the host,
+indicating the host is acting as a router.
+If set to 2, then IP forwarding is restricted to traffic that has been
+IPsec encapsulated or decapsulated by the host.
+The default value is 0.
 .It Li ip.ipsec-allocs Pq Va net.inet.ip.ipsec-allocs
 The number of IPsec flows that can use a security association before
 it expires.
@@ -1753,7 +1757,6 @@ The currently defined protocols and names are:
 .It ip6 Ta forwarding Ta integer Ta yes
 .It ip6 Ta hdrnestlimit Ta integer Ta yes
 .It ip6 Ta hlim Ta integer Ta yes
-.It ip6 Ta ifq Ta node Ta "N/A"
 .It ip6 Ta log_interval Ta integer Ta yes
 .It ip6 Ta maxdynroutes Ta integer Ta yes
 .It ip6 Ta maxfragpackets Ta integer Ta yes
@@ -1881,15 +1884,6 @@ This value applies to all the transport protocols on top of IPv6.
 Methods for overriding this value are documented in
 .Xr ip6 4 .
 .Pp
-.It Li ip6.ifq Pq Va net.inet6.ip6.ifq
-Fifth level comprises an array of
-.Vt struct ifqueue
-structures containing information about IPv6 packet input queue.
-The fifth level names for the elements of
-.Vt struct ifqueue
-are detailed above in
-.Li ip.ifq .
-.Pp
 .It Li ip6.log_interval Pq Va net.inet6.ip6.log_interval
 This variable permits adjusting the amount of logs generated by the
 IPv6 packet forwarding engine.
@@ -1979,7 +1973,6 @@ Get or set global information about MPLS (Multiprotocol Label Switching).
 .Bl -column "MPLSCTL_MAXINKLOOP " "integer" "not applicable" -offset indent
 .It Sy "Third level name" Ta Sy "Type" Ta Sy "Changeable"
 .It Dv MPLSCTL_DEFTTL Ta integer Ta yes
-.It Dv MPLSCTL_IFQUEUE Ta node Ta "not applicable"
 .It Dv MPLSCTL_MAPTTL_IP Ta integer Ta yes
 .It Dv MPLSCTL_MAPTTL_IP6 Ta integer Ta yes
 .It Dv MPLSCTL_MAXINKLOOP Ta integer Ta yes
@@ -1988,17 +1981,6 @@ Get or set global information about MPLS (Multiprotocol Label Switching).
 .It Dv MPLSCTL_DEFTTL Pq Va net.mpls.ttl
 Set or get the default TTL value which is used for MPLS (Shim) Header.
 The default is 255.
-.It Dv MPLSCTL_IFQUEUE Pq Va net.mpls.ifq
-Fourth level comprises an array of
-.Vt struct ifqueue
-structures containing information about MPLS packet input queue.
-The forth level names for the elements of
-.Vt struct ifqueue
-are the same as described in
-.Li ip.ifq
-in the
-.Dv PF_INET
-section.
 .It Dv MPLSCTL_MAPTTL_IP Pq Va net.mpls.mapttl_ip
 If set to 1 the TTL field is synchronized between the IP header and the
 MPLS label stack.
@@ -2039,7 +2021,7 @@ structures containing information about the PIPEX packet input queue.
 The forth level names for the elements of
 .Vt struct ifqueue
 are the same as described in
-.Li ip.ifq
+.Li ip.arpq
 in the
 .Dv PF_INET
 section.
@@ -2050,7 +2032,7 @@ structures containing information about PIPEX packet output queue.
 The forth level names for the elements of
 .Vt struct ifqueue
 are the same as described in
-.Li ip.ifq
+.Li ip.arpq
 in the
 .Dv PF_INET
 section.