From 077803300ed472847063dcd8339ccd34c1dfc7c8 Mon Sep 17 00:00:00 2001 From: Hasso Tepper Date: Thu, 21 Jun 2007 13:36:58 +0000 Subject: [PATCH] Add mpls-in-ip. Bring in some fixes from IANA and FreeBSD in progress. --- etc/protocols | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/etc/protocols b/etc/protocols index 4399da5169..eef0755de2 100644 --- a/etc/protocols +++ b/etc/protocols @@ -2,7 +2,7 @@ # Internet protocols # # $FreeBSD: src/etc/protocols,v 1.13.2.3 2002/02/27 03:39:00 dd Exp $ -# $DragonFly: src/etc/protocols,v 1.6 2007/05/13 18:33:55 swildner Exp $ +# $DragonFly: src/etc/protocols,v 1.7 2007/06/21 13:36:58 hasso Exp $ # from: @(#)protocols 5.1 (Berkeley) 4/17/89 # # See also http://www.iana.org/assignments/protocol-numbers @@ -13,7 +13,7 @@ icmp 1 ICMP # internet control message protocol igmp 2 IGMP # internet group management protocol ggp 3 GGP # gateway-gateway protocol ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'') -st2 5 ST2 # ST2 datagram mode (RFC 1819) +st2 5 ST2 # ST2 datagram mode (RFC 1819) (officially ``ST'') tcp 6 TCP # transmission control protocol cbt 7 CBT # CBT, Tony Ballardie egp 8 EGP # exterior gateway protocol @@ -41,7 +41,7 @@ iso-tp4 29 ISO-TP4 # ISO Transport Protocol Class 4 netblt 30 NETBLT # Bulk Data Transfer Protocol mfe-nsp 31 MFE-NSP # MFE Network Services Protocol merit-inp 32 MERIT-INP # MERIT Internodal Protocol -sep 33 SEP # Sequential Exchange Protocol +dccp 33 DCCP # Datagram Congestion Control Protocol 3pc 34 3PC # Third Party Connect Protocol idpr 35 IDPR # Inter-Domain Policy Routing Protocol xtp 36 XTP # Xpress Transfer Protocol @@ -56,7 +56,7 @@ ipv6-frag 44 IPV6-FRAG # fragment header for ipv6 idrp 45 IDRP # Inter-Domain Routing Protocol rsvp 46 RSVP # Resource ReSerVation Protocol gre 47 GRE # Generic Routing Encapsulation -mhrp 48 MHRP # Mobile Host Routing Protocol +dsr 48 DSR # Dynamic Source Routing Protocol bna 49 BNA # BNA esp 50 ESP # encapsulating security payload ah 51 AH # authentication header @@ -126,7 +126,7 @@ pgm 113 PGM # PGM Reliable Transport Protocol l2tp 115 L2TP # Layer Two Tunneling Protocol ddx 116 DDX # D-II Data Exchange iatp 117 IATP # Interactive Agent Transfer Protocol -st 118 ST # Schedule Transfer +stp 118 STP # Schedule Transfer Protocol srp 119 SRP # SpectraLink Radio Protocol uti 120 UTI # UTI smp 121 SMP # Simple Message Protocol @@ -142,10 +142,11 @@ sps 130 SPS # Secure Packet Shield pipe 131 PIPE # Private IP Encapsulation within IP sctp 132 SCTP # Stream Control Transmission Protocol fc 133 FC # Fibre Channel -rsvp-e2e-ignore 134 RSVP-E2E-IGNORE # RSVP for IPv4 and IPv6 Reservations -mobility 135 MOBILITY # Mobility support in IPv6 -udplite 136 UDPLITE # UDPLite -# 137-254 # Unassigned +rsvp-e2e-ignore 134 RSVP-E2E-IGNORE # Aggregation of RSVP for IP Reservations +mobility-header 135 Mobility-Header # Mobility support in IPv6 +udplite 136 UDPLite # The UDP-Lite Protocol +mpls-in-ip 137 MPLS-IN-IP # Encapsulating MPLS in IP +# 138-254 # Unassigned testing 253 TESTING # Use for experimentation and testing [RFC3692] #testing 254 TESTING # Use for experimentation and testing [RFC3692] divert 254 DIVERT # Divert pseudo-protocol [non IANA] -- 2.41.0