Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

MFC: 264174

Speed up the lookup of interfaces when there are a large number
of them, such in a system with a large number of VLANs.

Submitted by: Nick Rogers

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Fix coredump on 'arp -d'.

Submitted by: az
Approved by: re (kib)

Rate limit the number of remotely triggered ARP log messages
to 1 log message per second.

Retire struct sockaddr_inarp.

Since ARP and routing are separated, "proxy only" entries
don't have any meaning, thus we don't need additional field
in sockaddr to pass SIN_PROXY flag.

New kernel is binary compatible with old tools, since sizes
of sockaddr_inarp and sockaddr_in match, and sa_family are
filled with same value.

The structure declaration is left for compatibility with
third party software, but in tree code no longer use it.

Reviewed by: ru, andre, net@

Provide a sysctl switch that allows to install ARP entries
with multicast bit set. FreeBSD refuses to install such
entries since 9.0, and this broke installations running
Microsoft NLB, which are violating standards.

Tested by: Tarasov Oleg <oleg_tarasov sg-tea.com>

Explicitly document all variables in the net.link.ether.inet MIB.

Minor spelling fixes.

mdoc: add missing width argument to Bl -tag.

Historically arp(8) did a route lookup for the entry it is
about to add, and failed if it exist and had invalid data
link type.

Later on, in r201282, this check morphed to other code, but
message "proxy entry exists for non 802 device" still left,
and now it is printed in a case if route prefix found is
equal to current address being added. In other words, when
we are trying to add ARP entry for a network address. The
message is absolutely unrelated and disappointing in this
case.

I don't see anything bad with setting ARP entries for
network addresses. While useless in usual network,
in a /31 RFC3021 it may be necessary. This, remove this code.

mdoc: terminate quoted strings.

Reviewed by: brueffer

Do not hardcode (20*60), but use current ARP timeout value configured
in kernel.

That should belong to r216075. Pointy hat on me.

Use time_uptime instead of non-monotonic time_second to drive ARP
timeouts.

Suggested by: bde

Cache the last result from if_indextoname for printing. This speeds up
"arp -an" when using a lot of aliases (on a single interface).

A better fix would include a better interface for if_indextoname than
getting the whole address list from the kernel just to find the one
index->name mapping.

Reported & analyzed by: Nick Rogers
MFC after: 3 days

Show when an ARP entry expires.

MFC after: 1 week

The proxy arp entries could not be added into the system over the
IFF_POINTOPOINT link types. The reason was due to the routing
entry returned from the kernel covering the remote end is of an
interface type that does not support ARP. This patch fixes this
problem by providing a hint to the kernel routing code, which
indicates the prefix route instead of the PPP host route should
be returned to the caller. Since a host route to the local end
point is also added into the routing table, and there could be
multiple such instantiations due to multiple PPP links can be
created with the same local end IP address, this patch also fixes
the loopback route installation failure problem observed prior to
this patch. The reference count of loopback route to local end would
be either incremented or decremented. The first instantiation would
create the entry and the last removal would delete the route entry.

MFC after: 5 days

Use reallocf() to simplify some logic.

MFC after: 2 weeks

Remove bogus char cast.

PR: 118014
Submitted by: Gardner Bell <gbell72 at rogers dot com>
Approved by: re (rwatson), imp (mentor, implicit)
MFC after: immediate

Lower WARNS due to alignment issues on sparc64.

As of sam's r175206, arp builds cleanly at WARNS level 6, but the Makefile
was never updated. Also, clean up the macro that caused the warning in the
first place (no functional changes, just wrapped and reindented).

- xref ndp(8)

PR: docs/134053
Submitted by: Bob Van Zant <bob@veznat.com>
MFC after: 1 week

This checkin addresses a couple of issues:
1. The "route" command allows route insertion through the interface-direct
option "-iface". During if_attach(), an sockaddr_dl{} entry is created
for the interface and is part of the interface address list. This
sockaddr_dl{} entry describes the interface in detail. The "route"
command selects this entry as the "gateway" object when the "-iface"
option is present. The "arp" and "ndp" commands also interact with the
kernel through the routing socket when adding and removing static L2
entries. The static L2 information is also provided through the
"gateway" object with an AF_LINK family type, similar to what is
provided by the "route" command. In order to differentiate between
these two types of operations, a RTF_LLDATA flag is introduced. This
flag is set by the "arp" and "ndp" commands when issuing the add and
delete commands. This flag is also set in each L2 entry returned by the
kernel. The "arp" and "ndp" command follows a convention where a RTM_GET
is issued first followed by a RTM_ADD/DELETE. This RTM_GET request fills
in the fields for a "rtm" object, which is reinjected into the kernel by
a subsequent RTM_ADD/DELETE command. The entry returend from RTM_GET
is a prefix route, so the RTF_LLDATA flag must be specified when issuing
the RTM_ADD/DELETE messages.

2. Enforce the convention that NET_RT_FLAGS with a 0 w_arg is the
specification for retrieving L2 information. Also optimized the
code logic.

Reviewed by: julian

Print a warning when blackhole and reject are used together.
Update arp.8 manual page syntax.

PR: 125896
Submitted by: Marc Olzheim <marcolz@stack.nl>
Approved by: sam

This main goals of this project are:
1. separating L2 tables (ARP, NDP) from the L3 routing tables
2. removing as much locking dependencies among these layers as
possible to allow for some parallelism in the search operations
3. simplify the logic in the routing code,

The most notable end result is the obsolescent of the route
cloning (RTF_CLONING) concept, which translated into code reduction
in both IPv4 ARP and IPv6 NDP related modules, and size reduction in
struct rtentry{}. The change in design obsoletes the semantics of
RTF_CLONING, RTF_WASCLONE and RTF_LLINFO routing flags. The userland
applications such as "arp" and "ndp" have been modified to reflect
those changes. The output from "netstat -r" shows only the routing
entries.

Quite a few developers have contributed to this project in the
past: Glebius Smirnoff, Luigi Rizzo, Alessandro Cerri, and
Andre Oppermann. And most recently:

- Kip Macy revised the locking code completely, thus completing
the last piece of the puzzle, Kip has also been conducting
active functional testing
- Sam Leffler has helped me improving/refactoring the code, and
provided valuable reviews
- Julian Elischer setup the perforce tree for me and has helped
me maintaining that branch before the svn conversion

Spell "blackhole" correctly and fix one grammar nit.

add reject+blackhole keywords to install entries with RTF_BLACKHOLE
and RTF_REJECT, respectively

PR: bin/79228
Submitted by: Dan Lukes <dan@obluda.cz>
MFC after: 2 weeks

quiet compiler complaint about comparing &v against NULL

Reduce the WARNS levels in a couple of places so that we can enable
-Werror at higher WARNS levels like we did before gcc4 was imported.

net.link.ether.inet.prune_intvl no longer exists.

Use sizeof() for calculating the buffer size instead of hard-coded values.

- Before doing ioctl(SIOCGIFNETMASK) put the proper IP address into the ifreq,
to obtain correct netmask in case of interface with multiple aliases.
- While here, remove a comment with a bad idea.

PR: bin/42120
Submitted by: Dmitry Frolov <frolov riss-telecom.ru>

Markup fixes.

Sync utility's usage() with manpage's SYNOPSIS.

Enumerate all cases where -i is applicable.

MFC after: 3 days

Refuse to install invalid ARP entries.

Submitted by: Vitaliy Ovsyannikov <V.Ovsyannikov kr.ru>

Update usage to reflect the fact that the -d -a now accepts -i <interface>.

Reminded by: ru
Pointy hat: brooks

Allow the -i <interface> option with -d -a to allow all arp entries for
a given interface to be removed.

Add a knob to suppress logging of attempts to modify
permanent ARP entries.

Submitted by: Andrew Alcheyev <buddy telenet.ru>

Improve the documentation of "proxyall" knob, somewhat: we do not
proxy for hosts that are reachable through the same interface the
request came in from. This feature is mainly for hosts reachable
through some P2P link, e.g. the gif(4) tunnel.

Some fixes for last commit.

Submitted by: ru

- Document last change to ARP behavior.
- Document several undocumented sysctl variables.
- Fix spelling of few diagnostics.

List IFT_BRIDGE as a valid type so that arp entries can be properly deleted.

Submitted by: Michal Mertl <mime^traveller.cz>

Commit some cosmetic fixes I developed some time ago, mostly style but
one functional change (fixed exit status from the "get" operation).

Fix exit status. In rev. 1.48 return logic of rtmsg() was confused. This
made arp(8) command exit status reversed for -s and -S.

Reported by: sem
MFC after: 2 weeks

o Reorganize the previous delta to make it more style(9) compliant.

Submitted by: ru

o Reduce an amount of memory we ask in advance.

o Try hard to guess a buffer size for a fast growing routing table.
An approach taken from killall/killall.c.

PR: bin/76075
Submitted by: Dmitrij Tejblum
MFC after: 3 weeks

For VLAN interfaces, print MAC addresses properly.
(Broken in rev. 1.52.)

PR: 75471
Submitted by: Jon Simola
MFC after: 3 days

Per letter dated July 22, 1999, delete clause 3 from code directly
from Berkeley.

Mechanically kill hard sentence breaks.

mdoc(7) police

Submitted by: ru

Document the behaviour of the net.link.ether.inet.proxyall sysctl MIB
variable.

PR: docs/21826
Reviewed by: ru
Requested by: Bernd Luevelsmeyer

Be smarter about printing non-ethernet link-level addresses.

Avoid assignments to cast expressions.

Reviewed by: md5
Approved by: das (mentor)

Massive cleanup of the code removing global variables to
pass function arguments and results.

Hopefully no functional changes except fixing a couple of
bugs which could cause endless loops if an ioctl() on an
interface would fail.

Back out previous commit, it was unintentional.
Keep WARNS at 3 though the code does compile with WARNS=5 at least on i386

Noticed by: ru

Replace ROUNDUP/ADVANCE with SA_SIZE

Make functions and variables static.
Remove global variables in favour of local ones.
Fix indentation of a couple of switch statements.

Overall, this program badly need cleaning up, as it relies
on information passed around through global variables.

- Change several errx() calls that should have been err() calls.
- Handle empty ARP tables properly.
- Remove register keyword.
- arp(8) is WARNS?=4 clean, so mark it as such to avoid regressions.

mdoc(7) cleanups (use .Va, not .Dv, for sysctls.)

Reviewed by: ru

mdoc(7) cleanup: Break up sentences so that they start on new lines.

Point out the existence of net.link.ether.inet.log_arp_movements.
Add sysctl(8) to the list of cross-referenced manual pages.

Update arp(4) to document the 'arp: foo is on if0 but got reply from
bar on if1' message.

PR: bin/48489
Requested by: ru

Implement a new option: -i, which will allow to limit
the scope of operation to the ARP entries on a particular
interface. It should be useful on machines with numerous
network interfaces, e.g., on inter-VLAN routers.

PR: bin/54151
Submitted by: Dmitry Morozovsky <marck at rinet.ru>
Discussed on: -net
MFC after: 2 weeks

Use __FBSDID over rcsid[]. Protect copyright[] where needed.

style.Makefile(5)

Further fix the syntax by ignoring empty and whitespace-only lines.

Prompted by: Eugene Grosbein <eugen@kuzbass.ru>

Don't hide global `s'.

POLA dictates that in the file designated with the -f option
argument, leading whitespace and empty lines be ignored, and
the `#' character marks the rest of the line as a comment.

PR: bin/45958
MFC after: 3 days

s/pseudo-device/device/

Change 'int pid' to 'pid_t pid'

Submitted by: Bruce "Allah" Dang <bruce@research.teamxor.org>

The .Nm utility

Unbreak this file after the last drive-by committing. We have to
#include route.h before iso88025.h, and we have to dereference
the trld_route array correctly. (NOTE: I'm not altogether sure
that this is really the correct way to traverse this array. This
just eliminates the build warning/error. It may not work right at
runtime, and I have no way to test it since I lack the necessary
hardware.)

Broken by: kbyanc, who gets to wear the pointy hat

Update ARP to access token-ring source routing information at it's new
location.

Not tested by: me (sorry!)
Sponsored by: NTT Multimedia Communications Labs

GCC 3.1 cleanup - add a break after default: at the end of a switch
statement.

Don't reinvent the wheel now that ether_ntoa(3) has been fixed
to print leading zeros in libc_net/ether_addr.c,v 1.13.

MFC after: 3 days

Correct old wording of the arp functionality.
We are long past the stage where we only had ARP working for 10 Mb/s.

PR: 35604
Submitted by: Gary W. Swearingen <swear@blarg.net>
Additional comments by: Mike DeGraw-Bertsch <mbertsch@radioactivedata.org>

Include <string.h> for some prototypes, rather than depending on
pollution from <strings.h>.

Fix bugs from previous commit: initialize the correct field and use
the correct local variable.

Caught by: Joachim Isaksson <Joachim.Isaksson@algitech.com>
Pointy hat to: mikeh

Fix a typo.

- Misc grammar fixes.
- Add `Ar filename' to the description of the -f option.

Reorder WARNS line for style.

Pointed out by: bde

WARNS=2 cleanup.

Submitted by: Maxime Henrion <mux@qualys.com>
MFC after: 2 weeks

Print [fddi] or [atm] tags for ARP addresses on interfaces of that type.

Print interface name for each ARP entry.

Prodded by: Igor Podlesny <poige@morning.ru>
MFC after: 1 week

Remove GCC'isms in CFLAGS.

Remove whitespace at EOL.

mdoc(7) police: removed HISTORY info from the .Os call.

- Renamed the ``proxy'' modifier of the -d flag to ``pub'',
to be consistent with the -s flag. Updated documentation
on what this modifier does.

- Added the ``only'' keyword to the -s and -S flags, that
could be used to created "proxy-only" published entries.
Previously, arp(8) created an entry of this type only
in the absence of the route to a destination.

PR: bin/12357
MFC after: 1 week

Add a missing free(3).

PR: bin/27001
Submitted by: alex <ml-freebsd-net@phobgate.de>,
Matthew Emmerton <matt@gsicomp.on.ca>

Add the VLAN interface type to the list of ARP-capable interface types.

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

zeropad mac address ouput

PR: bin/25584
Submitted by: David Xu <davidx@viasoft.com.cn>
Reviewed by: wollman, billf

h_errno is declared in netdb.h.

Print a diagnostic message if no interface could be determined
when attempting to create a published ARP entry. For example:

# arp -s 1.1.1.1 auto pub

PR: bin/7753
Submitted by: Jonathan Hanna <pangolin@home.com>

mdoc(7) police: Change -filled displays (which just happen
to be the same as -ragged in the current implementation) to
-ragged. With mdocNG, -filled displays produce the correct
output, formatted and justified to both margins.

mdoc(7) police: modifiers should be marked with .Cm, not .Ar.

Make the ``arp -d hostname proxy'' really do something useful.

Specifically, ``proxy'' modifier tells the code to delete only
Proxy ARP entry for the ``hostname''; the usual ARP entry will
be unaffected by this operation.

Revert previous checkin ("proxy" is required in some instances).
Add a note to that effect to the man page.

Fix documentation: "proxy" is not a keyword for the arp(8) command line.

mdoc(7) police: Er macro usage cleanup.

mdoc(7) police: use the new features of the Nm macro.

Avoid use of direct troff requests in mdoc(7) manual pages.

Change type of vars which hold in_addr.s_addr from u_long to u_int32_t,
for more safety on alpha.

Approved by: jkh

Fix syntax error in previous commit.

Don't overflow buffers.

Reviewed by: audit@freebsd.org

Yet another align.
It will be required if sizeof(struct sockaddr_in) changes in the future.

Not objected to by: wollman

Align sockaddrs passed to/from the routing socket as supposed by kernel.

PR: 12847
Spotted by: Key Teck Sin <ktsin@acm.org>
Reviewed by: wollman

$Id$ -> $FreeBSD$

Add $Id$, to make it simpler for members of the translation teams to
track.

The Id line is normally at the bottom of the main comment block in the
man page, separated from the rest of the manpage by an empty comment,
like so;

.\" $Id$
.\"

If the immediately preceding comment is a @(#) format ID marker than the
the $Id$ will line up underneath it with no intervening blank lines.
Otherwise, an additional blank line is inserted.

Approved by: bde

When incrementing through a SIOCGIFCONF list, enforce a lower limit of
sizeof(ifr->ifr_addr) for the variable length field ifr->ifr_addr.sa_len.
Otherwise the increment will be wrong in certain cases.

Obtained from: Whistle source tree
For the record: Garrett Wollman <wollman@khavrinen.lcs.mit.edu> suggests
SIOCGIFCONF should be dropped in favor of a sysctl mechanism.

Use Cd macro instead of Em for SYNOPSIS, as do other section 4 pages.
Added $Id$.

PR: docs/10494

Submitted by: Larry Lile
Move the Olicom token ring driver to the officially sanctionned location of
/sys/contrib. Also fix some brokenness in the generic token ring support.

Be warned that if_dl.h has been changed and SOME programs might
like recompilation.

Removed most unused includes of <net/if_var.h> outside the kernel.

Submitted by: Archie@Whistle.com (Archie Cobbs)

allow teh -a option to work with the -d option
thus:
arp -d -a now flushes your arp cache.
also fix the -n option so that -an now works correctly.

Use err(3). Document -n flag from OpenBSD.
Obtained from: OpenBSD.

Balance single quotes.

PR: docs/4161
Submitted by: Kazuo Horikawa <k-horik@yk.rim.or.jp>

Removed inconsistent declaration of malloc(). `make world' with DESTDIR
set to something other than "/" now actually works.

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Update to match changes in <net/if.h>.

Renamed private copy of ether_aton to my_ether_aton so as to not
conflict with the version in <net/ethernet.h>

Fix up programs which expect <net/if.h> to include <sys/time.h> to instead
do it themselves. (Some of these programs actually depended on this
beyond compiling the definition of struct ifinfo!) Also fix up some
other #include messes while we're at it.

Update wording of the one message that was in the DIAGNOSTICS section.
Add three other common messages.

This should be in 2.2 to go with the netinet/if_ether.c rewording.

Clean up warnings.
fix return/exit codes in some cases.
Add -S which will delete any old entry first.
Add "auto" in proxy case, so it finds the right interface automatically.

This commit was generated by cvs2svn to compensate for changes in r13122,
which included commits to RCS files with non-trunk default branches.

Make arp command actually behave as documented with the addition of a -f
flag. The getopt handling in here is actually pretty bogus (not Phil's
fault - it's original sin) but the general approach is working so I'm not
going to break it. Some small tweaks of my own to add error checking to what
was originally submitted. Strange how nobody noticed that the flag was
documented but completely missing from the code before! [jkh].
Submitted by: Phil Taylor <phil@zipmail.co.uk>

Remove trailing whitespace.

Remove talk about trailers from arp(8) manual page
Obtained from: NetBSD bin/487

Get rid of update. Make man page installation work with our scheme
(and rename a few in the process).

Remove stuff for building manual pages the old way.

This commit was generated by cvs2svn to compensate for changes in r1553,
which included commits to RCS files with non-trunk default branches.