From e96768f65861b1004ebd8c94b915957088d0fbb7 Mon Sep 17 00:00:00 2001
From: glebius <glebius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 24 Oct 2012 09:46:52 +0000
Subject: [PATCH] Merge r240072 from head:   Explicitly document all variables
 in the net.link.ether.inet MIB.

git-svn-id: svn://svn.freebsd.org/base/stable/9@241991 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/arp/arp.4 | 43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 335a52124..5d4685040 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -28,7 +28,7 @@
 .\"	@(#)arp4.4	6.5 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd March 28, 2007
+.Dd September 3, 2012
 .Dt ARP 4
 .Os
 .Sh NAME
@@ -119,20 +119,53 @@ branch
 of the
 .Xr sysctl 3
 MIB.
-.Bl -tag
+.Bl -tag -width "log_arp_permanent_modify"
+.It Va log_arp_movements
+Should the kernel log movements of IP addresses from one hardware
+address to an other.
+See
+.Sx DIAGNOSTICS
+below.
+Turned on by default.
+.It Va log_arp_permanent_modify
+Should the kernel log attempts of remote host on network to modify a
+permanent ARP entry.
+See
+.Sx DIAGNOSTICS
+below.
+Turned on by default.
+.It Va log_arp_wrong_iface
+Should the kernel log attempts to insert an ARP entry on an interface
+when the IP network the address belongs to is connected to an other
+interface.
+See
+.Sx DIAGNOSTICS
+below.
+Turned on by default.
 .It Va max_age
 How long an ARP entry is held in the cache until it needs to be refreshed.
+Default is 1200 seconds.
+.It Va maxhold
+How many packets hold in the per-entry output queue while the entry
+is being resolved.
+Default is one packet.
 .It Va maxtries
 Number of retransmits before host is considered down and error is returned.
+Default is 5 tries.
+.It Va proxyall
+Enables ARP proxying for all hosts on net.
+Turned off by default.
 .It Va useloopback
 If an ARP entry is added for local address, force the traffic to go through
 the loopback interface.
-.It Va proxyall
-Enables ARP proxying for all hosts on net.
+Turned on by default.
+.It Va wait
+Lifetime of an incomplete ARP entry.
+Default is 20 seconds.
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "arp: %x:%x:%x:%x:%x:%x is using my IP address %d.%d.%d.%d!"
+.It "arp: %x:%x:%x:%x:%x:%x is using my IP address %d.%d.%d.%d on %s!"
 ARP has discovered another host on the local network which responds to
 mapping requests for its own Internet address with a different Ethernet
 address, generally indicating that two hosts are attempting to use the
-- 
2.45.0