summaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
authorGuillaume Rousse <guillomovitch@mageia.org>2012-03-15 18:46:27 +0000
committerGuillaume Rousse <guillomovitch@mageia.org>2012-03-15 18:46:27 +0000
commitd4dbc0a3e817b30ba80c8fe45ec25e7e7afded19 (patch)
tree374b567d932df3312fcaba25da3c36363298ef41 /protocols
parent7c6511ed3a51cf5943a25013425e60c67184133f (diff)
downloadsetup-d4dbc0a3e817b30ba80c8fe45ec25e7e7afded19.tar
setup-d4dbc0a3e817b30ba80c8fe45ec25e7e7afded19.tar.gz
setup-d4dbc0a3e817b30ba80c8fe45ec25e7e7afded19.tar.bz2
setup-d4dbc0a3e817b30ba80c8fe45ec25e7e7afded19.tar.xz
setup-d4dbc0a3e817b30ba80c8fe45ec25e7e7afded19.zip
update from debian
Diffstat (limited to 'protocols')
-rw-r--r--protocols13
1 files changed, 8 insertions, 5 deletions
diff --git a/protocols b/protocols
index 2d6a5af..dbe39c9 100644
--- a/protocols
+++ b/protocols
@@ -1,5 +1,3 @@
-# $Id: protocols 264343 2009-12-31 18:08:15Z guillomovitch $
-#
# Internet (IP) protocols
#
# Updated from http://www.iana.org/assignments/protocol-numbers and other
@@ -24,6 +22,7 @@ hmp 20 HMP # host monitoring protocol
xns-idp 22 XNS-IDP # Xerox NS IDP
rdp 27 RDP # "reliable datagram" protocol
iso-tp4 29 ISO-TP4 # ISO Transport Protocol class 4 [RFC905]
+dccp 33 DCCP # Datagram Congestion Control Prot. [RFC4340]
xtp 36 XTP # Xpress Transfer Protocol
ddp 37 DDP # Datagram Delivery Protocol
idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport
@@ -50,12 +49,16 @@ encap 98 ENCAP # Yet Another IP encapsulation [RFC1241]
# 99 # any private encryption scheme
pim 103 PIM # Protocol Independent Multicast
ipcomp 108 IPCOMP # IP Payload Compression Protocol
-vrrp 112 VRRP # Virtual Router Redundancy Protocol
+vrrp 112 VRRP # Virtual Router Redundancy Protocol [RFC5798]
l2tp 115 L2TP # Layer Two Tunneling Protocol [RFC2661]
isis 124 ISIS # IS-IS over IPv4
sctp 132 SCTP # Stream Control Transmission Protocol
fc 133 FC # Fibre Channel
-udplite 136 UDPLite # UDP-Lite
+mobility-header 135 Mobility-Header # Mobility Support for IPv6 [RFC3775]
+udplite 136 UDPLite # UDP-Lite [RFC3828]
mpls-in-ip 137 MPLS-in-IP # MPLS-in-IP [RFC4023]
-manet 138 # MANET Protocols
+manet 138 # MANET Protocols [RFC5498]
hip 139 HIP # Host Identity Protocol
+shim6 140 Shim6 # Shim6 Protocol [RFC5533]
+wesp 141 WESP # Wrapped Encapsulating Security Payload
+rohc 142 ROHC # Robust Header Compression