[src/netbsd-2]: src/etc Pull up following revision(s) (requested by martti in...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8ce30011511f
branches:  netbsd-2
changeset: 564568:8ce30011511f
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Dec 02 12:58:19 2006 +0000

description:
Pull up following revision(s) (requested by martti in ticket #10786):
        etc/protocols: revision 1.13
        etc/protocols: revision 1.14
        etc/protocols: revision 1.15
        etc/protocols: revision 1.16
Update with the iana.org URL, as has been done with services.
Add 4 new protocols: rsvp-e2e-ignore, mobility-header, udplite and mpls-in-ip.
Integrate Common Address Redundancy Procotol (CARP) from OpenBSD
'pseudo-device  carp'
Thanks to: joerg@ christos@ riz@ and others who tested
Ok: core@
Fix typo in xtp comment.

diffstat:

 etc/protocols |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 275a5203c0ea -r 8ce30011511f etc/protocols
--- a/etc/protocols     Sat Dec 02 12:45:02 2006 +0000
+++ b/etc/protocols     Sat Dec 02 12:58:19 2006 +0000
@@ -1,10 +1,9 @@
-#      $NetBSD: protocols,v 1.12 2003/09/08 21:02:55 itojun Exp $
+#      $NetBSD: protocols,v 1.12.4.1 2006/12/02 12:58:19 bouyer Exp $
 #
 # Internet (IP) protocols
 #
 #      originally from: @(#)protocols  8.1 (Berkeley) 6/9/93
-#      see http://www.isi.edu/in-notes/iana/assignments/protocol-numbers
-#      likely to move to http://www.iana.org/ one of these days
+#      see http://www.iana.org/assignments/protocol-numbers
 #
 ip     0       IP              # internet protocol, pseudo protocol number
 icmp   1       ICMP            # internet control message protocol
@@ -42,7 +41,7 @@
 sep    33      SEP             # Sequential Exchange Protocol
 3pc    34      3PC             # Third Party Connect Protocol
 idpr   35      IDPR            # Inter-Domain Policy Routing Protocol
-xtp    36      XTP             # Xpress Tranfer Protocol
+xtp    36      XTP             # Xpress Transfer Protocol
 ddp    37      DDP             # Datagram Delivery Protocol
 idpr-cmtp      38      IDPR-CMTP       # IDPR Control Message Transport
 tp++   39      TP++            # TP++ Transport Protocol
@@ -118,7 +117,7 @@
 snp    109     SNP             # Sitara Networks Protocol
 compaq-peer    110     Compaq-Peer     # Compaq Peer Protocol
 ipx-in-ip      111     IPX-in-IP       # IPX in IP
-vrrp   112     VRRP            # Virtual Router Redundancy Protocol
+carp   112     CARP    vrrp    # Virtual Router Redundancy Protocol
 pgm    113     PGM             # PGM Reliable Transport Protocol
 #      114                     # any 0-hop protocol
 l2tp   115     L2TP            # Layer Two Tunneling Protocol
@@ -140,5 +139,9 @@
 pipe   131     PIPE            # Private IP Encapsulation within IP
 sctp   132     SCTP            # Stream Control Transmission Protocol
 fc     133     FC              # Fibre Channel
-#      134-254                 # Unassigned
+rsvp-e2e-ignore        134     RSVP-E2E-IGNORE
+mobility-header        135     MOBILITY-HEADER # Mobility Header
+udplite                136     UDPLite
+mpls-in-ip     137     MPLS-in-IP      # MPLS in IP
+#      138-254                 # Unassigned
 #      255                     # Reserved