Remove svn:mergeinfo carried over from stable/9.

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

Copy stable/9 to releng/9.3 as part of the 9.3-RELEASE cycle.

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

Merge r260524,r260540

r260524:
Add -4/-6 shorthand for -finet/-finet6 in route(8) and netstat(8).

r260540:
Bump dates in nestat(1) and route(8) man pages.
Fix several small errors introduced by r260524.

Suggested by: glebius

MFC 251581:

Fix a bug that the gateway address was not shown when a -gateway modifier
was used.

MFC 245168:

Fix -iface and -interface modifiers.

MFC 244325:

- Fix strtol() error handling.
- Add a range condition of given FIB number and the related error messages.
- Fix free() problem.

MFC 243185, 243188, 243212:

Add -fib modifier to specify FIB number. The FIB number can be in a
comma-separated list and/or range specification:

# route add -inet 192.0.2.0/24 198.51.100.1 -fib 1,3-5,6

Although all of the subcommands supports the modifier, "monitor" does not
support the list or range specification at this moment.

Merge r243860 from head:
Flush stdout after RTM_IFANNOUNCE message.

PR: bin/151600
Submitted by: Eric van Gyzen <eric vangyzen.net>

MFC r229766:
Handle the internal scope address representation of the KAME IPv6
stack for the node-local multicast address.

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by: re (implicit)

- Fix array bounds checking. [1]
- Add message length checking.

PR: 151664 [1]
Submitted by: Alexey Illarionov <littlesavage rambler.ru> [1]
Reviewed by: yar

Add RTM_IEEE80211 to array of route message descriptions.

PR: 151664
Submitted by: Alexey Illarionov <littlesavage rambler.ru>

route(8): make WARNS=3 clean

- add static and const where appropriate
- check pointers against NULL
- minor styling nits
- it is actually WARNS=6 clean for non-strict alignment platforms

This is shamelessly stolen from DragonflyBSD and reduces our diff.

PR: bin/140078
Approved by: ed (co-mentor)

remove stale references to RTF_CLONING and RTF_LLINFO

MFC after: 3 days

ANSIfy functions declarations, adjust prototypes. Rename local variable
to not conflict with err().

Extend route command:
- add show as alias for get
- add weights to allow mpath to do more than equal cost
- add sticky / nostick to disable / re-enable per-connection load balancing

This adds a field to rt_metrics_lite so network bits of world will need to be re-built.

Reviewed by: jeli & qingli

Fix broken case where caused by last patch where
a user uses 0.0.0.0/0 as an alias for default.
Obtained from: Mykola Dzham (freebsd@levsha.org.ua)

Ok, looking at the solution a bit closer, the level
calculation was too agressive. Instead we should only
look at each nibble. This makes it so we make
10.2.0.0 become 10.2/16 NOT 10.2/17.

Need to explore the non-cidr address issue. The two
may not be seperable..

MFC after: 1 week

Class based addressing went out in the early 90's. Basically
if a entry is not route add -net xxx/bits then we should use
the addr (xxx) to establish the number of bits by looking at
the first non-zero bit. So if we enter
route add -net 10.1.1.0 10.1.3.5
this is the same as doing
route add -net 10.1.1.0/24
Since the 8th bit (zero counting) is set to 1 we set bits
to 32-8.

Users can of course still use the /x to change this behavior
or in cases where the network is in the trailing part
of the address, a "netmask" argument can be supplied to
override what is established from the interpretation of the
address itself. e.g:

route add -net 10.1.1.8 -netmask 0xff00ffff

should overide and place the proper CIDR mask in place.

PR: 131365
MFC after: 1 week

Fix regression introduced in rev. 173124:
0.0.0.0/1 is not the same as 0.0.0.0/0.

MFC after: 1 month

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

Fix printing of sockaddr prefixes in verbose mode.

PR: bin/122403
Submitted by: az
MFC after: 3 days

In route.c in newroute() there's a call to exit(0) if the command was
'get'. Since rtmsg() always gets called and returns 0 on success and -1
on failure, it's possible to exit with a suitable exit code by calling
exit(ret != 0) instead, as is done at the end of newroute().

PR: bin/112303
Submitted by: bruce@cran.org.uk
MFC after: 1 week

Don't mask the address in inet_makenetandmask() according to what class
it appears to be in: there is also CIDR.

Noticed by: tegge

Document -t.

Fix an error in bit shifting logic for network addresses. The route
command would add incorrect routing entries if network numbers weren't
fully "spelled" out according to their class. For example:
# route add 128.0/16 (works)
# route add 128/16 (doesn't work)
# route add 193.0.0/24 (works)
# route add 193/24 (doesn't work)

Also, rework the way a netmask is deduced from network number if
it [netmask] is not specified.

Submitted by: Nuno Antunes <nuno.antunes@gmail.com> (mostly)
MFC after: 1 week

Obey MK_INET6_SUPPORT.
This is also a good chance to apply style.Makefile(5) in some cases.

Document that -q option is also applicable to the "change" command.

PR: docs/85095
Submitted by: Rostislav Krasny

Introduce "route del" as an alias to "route delete".

Reviewed by: arch

- Understand EADDRINUSE, and forget EDQUOT. [1]
- Add description for EEXIST.
- Change description for ENOBUFS. Routing socket can return
this error for many different reasons, including general
memory shortage, mbuf memory shortage and rtentry zone.

PR: kern/64090 [1]

- do DNS lookup for symbolic names specified for a destination
or gateway.
- improves error reporting using gai_strerror(3) instead of
printing "bad value".
- remove "0" for servname argument for getaddrinfo(3).

Submitted by: Andreas Kohn <andreas __at__ syndrom23.de>
MFC after: 1 week

NI_WITHSCOPEID cleanup. Neither RFC 2553 nor RFC 3493 defines
NI_WITHSCOPEID, and our getaddrinfo(3) does nothing special
for it, now.

shutdown(2)'s how argument as 0 is nowhere near as cool as SHUT_RD

Expand *n't contractions.

Sort sections.

Added the EXIT STATUS section where appropriate.

Scheduled mdoc(7) sweep.

Fix markup: .Dv -> .Va
Update document dates.

Prodded by: ru

Document the fact that blackhole routes normally need to be bound
to lo(4) interfaces to have an effect, and that this is not needed
when using IP fast forwarding.

Sponsored by: eXtensible Open Router Project <URL:http://www.xorp.org/>
MFC after: 3 weeks

Mechanically kill hard sentence breaks.

When parsing an argument as an address in getaddr(), heed the -host option
in all cases. The failure mode in the PR is easily reproducible without
this patch.

PR: bin/43139

Assorted markup, grammar, and spelling fixes.

Teach route(8) how to deal with root being in a prison. If prison
root is allowed to create raw sockets, then they will be able to create
routing sockets, too. However prison-root is not able to manipulate
routing tables. So when route(8) attempts to write to a routing
socket and recieves EPERM from the kernel, exit rather than moving
on with execution.

Approved by: bmilekic (mentor)

Link state change notification of ethernet media to the routing socket.

o Print the link state for interface messages in monitor mode.

No objections by: sam, wpaul, ru, bms
Brucification by: bde

For both ifconfig and route if we didn't get enough memory from the
prior sysctl due to the structure growing between calls try again.

Also try again for deleting routes if things fail. We've seen
route -f fail this way which does not actually flush all routes.
This fixes it. It will whine but it will do the work.

PR: 56732
Obtained from: IronPort

Replace ROUNDUP/ADVANCE with SA_SIZE

Remove advertising clause from University of California Regent's license,
per letter dated July 22, 1999.

Approved by: core, imp

style.Makefile(5):
Use WARNS?= instead of WARNS=.

link-local multicast address must be converted to KAME specific
embeded scopeid form.

Reported by: dwmalone
MFC after: 3 days

Add a describtion for the '-d' flag

While I'm here, add a missing comma

PR: 41787
Obtained from: OpenBSD
MFC after: 5 days

Add the -xresolve flag to the route(8) man page.

Reviewed by: ru

LANG->LC_ALL

Pointed by: ru

Fix problem differently, use 
LANG=C tr 'a-z' 'A-Z' 
for hypotetical case that script may generate non-ascii characters

Use tr '[:lower:]' '[:upper:]' to work with any locale

There is an undocument feature that ``route -vnd flush'' prints
a nice dump of the entire routing table. Allow non-root users
to see it too.

Kill #ifdef NS code

Since route(8) itself is no longer setuid, we can get a meaningful
answer for the euid. As a result, fix it such that setuid scripts or
programs may call route(8) to do work on their behalf.

Reviewed by: ru
MFC after: 3 days

The .Nm utility.

Don't have -prefixlen 128 on host routes.

Obtained from: KAME

Avoid construction which results in label at end of block.

Respect -q with "add" and "delete". Document who respects -q.

PR: bin/38531

Allow prefix/prefixlen syntax for IPv6 to have consistency
with IPv4.

Have RTF_HOST for /128 destionation.

Try to guess prefixlen for guessable cases.
- /0 if matches ::/128
- /64 if matches 2000::/3 and lowermost 64 bit is all 0
- /128 if matches 2000::/3 and lowermost 64 bit is non-zero 0

Obtained from: KAME/NetBSD

Removed the cruft that became cruft after rev. 1.4.
Fixed CLEANFILES.

o remove __P
o remove main prototype

Remove 'register' keyword.
It does not help modern compilers, and some may take some hit from it.
(I also found several functions that listed *every* of its 10 local vars with
"register" -- just how many free registers do people think machines have?)

Introduce an interface announcement message for the routing
socket so that routing daemons and other interested parties
know when an interface is attached/detached.

PR: kern/33747
Obtained from: NetBSD
MFC after: 2 weeks

Default to WARNS=2.
Binary builds that cannot handle this must explicitly set WARNS=0.

Reviewed by: mike

Bring in latest CSRG revisions to this file.

Synch with NetBSD and OpenBSD.

Allow non-superuser to open, listen to, and send safe commands on the
routing socket. Superuser priviledge is required for all commands
but RTM_GET.

Lose `setuid root' bit of route(8).

Reviewed by: wollman, dd

Handle snprintf() returning < 0 (not just -1)

MFC after: 2 weeks

Handle snprintf() returning -1.

MFC after: 2 weeks

mdoc(7) police: utilize the new .Ex macro.

mdoc(7) police:

Avoid using parenthesis enclosure macros (.Pq and .Po/.Pc) with plain text.
Not only this slows down the mdoc(7) processing significantly, but it also
has an undesired (in this case) effect of disabling hyphenation within the
entire enclosed block.

Remove whitespace at EOL.

Due to the documented bug in inet_aton(3), it wasn't possible
to use 0xffffffff (INADDR_NONE) as a netmask value. The fix
is to use inet_addr(3) which doesn't suffer from this problem.

PR: bin/28873

Also, while here, fixed the bug when netmask value was ignored
(RTF_HOST flag was set) if the "destination gateway netmask"
syntax is used, e.g. ``route add 1.2.3.4 127.1 255.255.255.255''.

mdoc(7) police: sort SEE ALSO xrefs (sort -b -f +2 -3 +1 -2).

Allow route(8) to create "proxy only" published ARP entries.

PR: bin/12357
Submitted by: Craig Leres <leres@ee.lbl.gov>

Fixed the -iface breakage introduced with the latest KAME merge
in revision 1.48. It is pretty valid and often feasible to use
a non-point-to-point interface as the gateway. One might, for
example, use this to route some hosts through an ARP on a local
interface, without having to assign an additional IP address:

Script started on Tue Jun 12 16:16:09 2001
# ifconfig rl0 inet
rl0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
inet 192.168.4.115 netmask 0xffffff00 broadcast 192.168.4.255
# netstat -arn -finet | grep -w rl0
192.168.4 link#1 UC 3 0 rl0 =>
192.168.4.65 0:d0:b7:16:9c:c6 UHLW 1 0 rl0 1197
# route add -net 192.168.100 -iface rl0
add net 192.168.100: gateway rl0
# ping 192.168.100.1
PING 192.168.100.1 (192.168.100.1): 56 data bytes
64 bytes from 192.168.100.1: icmp_seq=0 ttl=255 time=0.551 ms
64 bytes from 192.168.100.1: icmp_seq=1 ttl=255 time=0.268 ms
^C
--- 192.168.100.1 ping statistics ---
2 packets transmitted, 2 packets received, 0% packet loss
round-trip min/avg/max/stddev = 0.268/0.410/0.551/0.142 ms
# netstat -arn -finet | grep -w rl0
192.168.4 link#1 UC 3 0 rl0 =>
192.168.4.65 0:d0:b7:16:9c:c6 UHLW 1 0 rl0 1165
192.168.100 link#1 UCSc 1 0 rl0 =>
192.168.100.1 0:d0:b7:16:9c:c6 UHLW 1 4 rl0 1192

Script done on Tue Jun 12 16:17:12 2001

Sync with recent KAME.
This work was based on kame-20010528-freebsd43-snap.tgz and some
critical problem after the snap was out were fixed.
There are many many changes since last KAME merge.

TODO:
- The definitions of SADB_* in sys/net/pfkeyv2.h are still different
from RFC2407/IANA assignment because of binary compatibility
issue. It should be fixed under 5-CURRENT.
- ip6po_m member of struct ip6_pktopts is no longer used. But, it
is still there because of binary compatibility issue. It should
be removed under 5-CURRENT.

Reviewed by: itojun
Obtained from: KAME
MFC after: 3 weeks

When changing an indirect route, kernel routing code allocates
a route to the gateway and caches it in the route structure.
It may happen (if the routing table is screwed) that the gateway
route is the same route as the one being modified, in which case
a kernel reports EDQUOT. Be more verbose about this:

# route add -net 10 192.168.4.65
add net 10: gateway 192.168.4.65
# netstat -rn -finet
Routing tables

Internet:
Destination Gateway Flags Refs Use Netif Expire
default 192.168.4.65 UGSc 1 7 rl0
10 192.168.4.65 UGSc 0 0 rl0
127.0.0.1 127.0.0.1 UH 0 178 lo0
192.168.4 link#1 UC 2 0 rl0 =>
192.168.4.65 0:d0:b7:16:9c:c6 UHLW 2 0 rl0 1123

Before:

# route change -net 10 10.0.0.1
route: writing to routing socket: Disc quota exceeded
change net 10: gateway 10.0.0.1: Disc quota exceeded

After:

# ./route change -net 10 10.0.0.1
route: writing to routing socket: Disc quota exceeded
change net 10: gateway 10.0.0.1: gateway uses the same route

PR: bin/1093, misc/26833

Change the host/bits syntax introduced in route.c,v 1.24 to the
net/bits syntax, for consistency with netstat(1) in particular.

OK'ed by: phk
MFC after: 1 week

- Exit 1 if "add", "change", or "delete" operation fails.

PR: bin/12489

- Use inet_ntoa(3) where it should have been used. This
part of code simply wasn't converted to the "new" style
after the routename() function was converted from the
protocol-generic version to protocol-specific version
in CSRG revision 5.6.

MFC after: 1 week

mdoc(7) police: properly use a -diag list in the DIAGNOSTICS section.

Reviewed by: ru

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

Set the default manual section for sbin/ to 8.

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.

Add a couple of newlines in the output from route monitor

Add `_PATH_DEVZERO'.
Use _PATH_* where where possible.

Typo fix: forgot -> forget.

PR: 23113
Submitted by: Jimmy Olgeni <olgeni@uli.it>

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

- Documented the host/bits syntax for destination argument.
- Documented that netmask could be specified with third argument.

Interpret the address argument as network-type address for `destination'
argument only. Before that, the `route add default gateway' first tried
the `gateway' as network address and passed its name to getnetbyname(3),
which in the BIND resolution case does the T_PTR lookup on that name.

Fixed the case where argument of 0.0.0.0/8 would match the default route.

Clear sin6_scope_id before passing routes into kernel, becaues kernel
don't support routes with sin6_scope_id set.
Without this fix, routes with IPv6 scoped addr won't work when it is
assigned by "route" command.

Approved by: jkh

Reviewed by: ume

Add an scope index embedded IPv6 link local addr creation support, by route
command.
This is a workaround for some kernel interface which can't treat sin6_scope_id,
yet.

Support IPv6 scoped addr in ifconfig and route

IPv6 scoped addr display is not yet supported by ifconfig
and route. Now almost of IPv6 apps support it, so its support
in ifconfig and route is important to keep consisetncy, and
to avoid user confusion.

Approved by: jkh

Fix return value check for inet_pton().

Obtained from: KAME Project

Merge bug fix from KAME repository.
This fix enables inet6 default route addition.

Suggested by: itojun

Enable INET6 by default.
This should be OK on non INET6 enabled kernel.

udp IPv6 support, IPv6/IPv4 tunneling support in kernel,
packet divert at kernel for IPv6/IPv4 translater daemon

This includes queue related patch submitted by jburkhol@home.com.

Submitted by: queue related patch from jburkhol@home.com
Reviewed by: freebsd-arch, cvs-committers
Obtained from: KAME project

MFS: forego->forgo

spell check != grammar check. :-)

Remove two more unnecessary function declarations/prototypes.

Include the proper headers, remove the unnecessary function declarations.

$Id$ -> $FreeBSD$

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.

Get rid of segfaults in a set-uid program.
PR: 11823
Reviewed by: des

Mention the special destination "default" for default routes. Fix a
couple of formatting bugs.

PR: docs/9960

Remove useless `BINOWN=root' now that it is the default.

Comment is .\" not .|'. Add -d and -t flags to SYNOPSIS and usage(). Getopt
returns -1. Correct use of .Nm. Spelling. Add rcsid and remove unused
#include.

style(9) corrections
Submitted by: bde

Two fixes:
1) Correct strncpy usage
2) gethostbyaddr paranoia from Julian Assange

fix what appears to me to be absolutle bogus code
to do with netmasks.. we fed totally bogus data into the kernel
to do with default routes and it just believed us. this led to:
1/ kernel panics
2/ the default route refusing to be deleted or added
(depending on a number of factors, usually it worked ok.)

Sync beetween man page and usage string.

Allow "modern" syntax:
route add -net 192.168.64.0/20 bla bla bla

unifdef CCITT, ISO & CRUFT.

Revert $FreeBSD$ to $Id$

Security patch from OpenBSD: fixes potential buffer overflow in a static
buffer (so more difficult to exploit but better safe than sorry). Found
by comparing FreeBSD & OpenBSD sources/logs for the auditing process.

Reviewed by: Warner Losh
Obtained from: OpenBSD

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.

Sort cross references.

If the RTM_NEWMADDR and RTM_DELMADDR messages are defined
(in <net/route.h>), then interpret them appropriately. This has
no effect until I commit the changes to multicast group
management (awaiting review).

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.

Delete another unnecessary #include <sys/mbuf.h>.

setuid back to the original caller immediately after opening the route socket.
Opening the socket is the only privileged operation route requires.

Make a couple of static buffers bigger, and use strncpy() and snprintf() where
there's a chance of overflow.

Fixes PR bin/1903

Partially Submitted by: Ollivier Robert <roberto@keltia.freenix.fr>

Don't look up the network number if we're being asked to add a host route.

Fixes PR bin/1900

Submitted by: Bruce A. Mah <bmah@cs.berkeley.edu> (pr bin/1900)

Bring back NS support for this utility - we need it for the commercial Novell
server software.

Don't use __dead or __pure in user code. They were obfuscations
for gcc >= 2.5 and no-ops for gcc >= 2.6. Converted to use __dead2
or __pure2 where it wasn't already done, except in math.h where use
of __pure was mostly wrong.

back out a part of the previous patch that garrett objected to..

Submitted by: Archie@whistle.com
if making a interface route, and it's a P2P link,
then also automatically lable it as an llinfo entry so that
gated and friends don't clobber it..

Reviewed by: julian
Submitted by: archie@whistle.com

This patch allows true interface routing to be controlled
from the command line..
you can now do:
route add default -interface ppp0
even if you have no clue what the address at the other end is..

this is part of a set of changes that allow true "unnumbered links"
such as netcom run between their sites..
In practice you should assign the address from one of your ethernet
interfaces to the local side of the P2P link so that IP doesn't
say that the packet comes from 255.255.255.255, but
there is no need whatsoever to assign an address of any kind
to the remote end of the link.. useful for frame relay links etc also.

Submitted by: archie@whistle.com

slight cleanups on yesterday's patches

Submitted by: archie@whistle.com

appletalk cleanups

changes to allow route to manipulate appletalk routes.

Update route(8) to print out current meanings of rt_flags RTF_* bits.

Do not install the now unsupported netns and netiso
related man pages. Comment out cross references to those man
pages from other man pages.

Fix route to check if inet_addr and inet_network return INADDR_NONE,
instead of -1 which is never returned by those routines.

XNS sort-of-support is no more.

Another round of man page cleanups.

Down to only about 100 items left to cleanup! :-)

Remove support for OSI networking in user-land (#ifdef OSI aor CCITT)
in preparation for its removal from the kernel source tree. NB: because
a function was deleted, libc is now at version 3.0 (was 2.2 previously).

Route calls the errx routine with the wrong number of arguments
when printing "route: bad address: ...".

Clean up GCC warnings, condition out some compatibility cruft, add $Id$.

Pointed-out-by: jmb

Missing 'break' after setting interface route flag was causing interface
routes to not be properly marked as static.

Make keywords.h get properly built.
Submitted by: jkh

Convert to our man installation style. Also fixed long-standing bug
in `fastboot'/`fasthalt' in which the interpreter would hang around
after `reboot' or `halt' is run, causing an irritating ``Killed'' message.

Remove old style manual page depends so make install with NOMAN set
can run.

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