reapply 1.25 to fix upstream inconsistencies

This commit is contained in:
christos 2015-11-18 16:16:36 +00:00
parent 9d449a8fd8
commit be39cd8f18
1 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: protocols,v 1.27 2015/11/14 16:25:48 christos Exp $
# $NetBSD: protocols,v 1.28 2015/11/18 16:16:36 christos Exp $
# See also: protocols(5), http://www.sethwklein.net/projects/iana-etc/
#
# Last Updated
@ -160,9 +160,9 @@ iso-ip 80 ISO-IP # ISO Internet Protocol [Mar
vmtp 81 VMTP # VMTP [Dave_Cheriton]
secure-vmtp 82 SECURE-VMTP # SECURE-VMTP [Dave_Cheriton]
vines 83 VINES # VINES [Brian Horn]
ttp 84 TTP # Transaction Transport [Jim_Stevens]
ttp 84 TTP iptm IPTM # Transaction Transport [Jim_Stevens]
# Protocol
iptm 84 IPTM # Internet Protocol Traffic [Jim_Stevens]
#iptm 84 IPTM # Internet Protocol Traffic [Jim_Stevens]
# Manager
nsfnet-igp 85 NSFNET-IGP # NSFNET-IGP [Hans_Werner_Braun]
dgp 86 DGP # Dissimilar Gateway Protocol [M/A-COM Government Systems, "Dissimilar Gateway Protocol Specification,
@ -237,7 +237,7 @@ rsvp-e2e-ignore 134 RSVP-E2E-IGNORE # [RFC3175]
mobility 135 Mobility # Header Y [RFC6275]
udplite 136 UDPLite # [RFC3828]
mpls-in-ip 137 MPLS-in-IP # [RFC4023]
manet 138 manet # MANET Protocols [RFC5498]
manet 138 MANET # MANET Protocols [RFC5498]
hip 139 HIP # Host Identity Protocol Y [RFC7401]
shim6 140 Shim6 # Shim6 Protocol Y [RFC5533]
wesp 141 WESP # Wrapped Encapsulating [RFC5840]