From edwin@mavetju.org  Wed May 16 22:55:57 2007
Return-Path: <edwin@mavetju.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BFF6E16A401
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 16 May 2007 22:55:57 +0000 (UTC)
	(envelope-from edwin@mavetju.org)
Received: from mail4out.barnet.com.au (mail4.barnet.com.au [202.83.178.125])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A0FA13C44B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 16 May 2007 22:55:57 +0000 (UTC)
	(envelope-from edwin@mavetju.org)
Received: by mail4out.barnet.com.au (Postfix, from userid 1001)
	id 725B637D36B; Thu, 17 May 2007 08:55:54 +1000 (EST)
Received: from mail4auth.barnet.com.au (mail4.barnet.com.au [202.83.178.125])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mail4.barnet.com.au (Postfix) with ESMTP id 266D042214B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 May 2007 08:55:54 +1000 (EST)
Received: from k7.mavetju (k7.mavetju.org [10.251.1.18])
	by mail4auth.barnet.com.au (Postfix) with ESMTP id CEC6D37D6F7
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 May 2007 08:55:53 +1000 (EST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id B335D1BB; Thu, 17 May 2007 08:55:52 +1000 (EST)
Message-Id: <20070516225552.B335D1BB@k7.mavetju>
Date: Thu, 17 May 2007 08:55:52 +1000 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] bring /etc/protocols up to date
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         112723
>Category:       conf
>Synopsis:       [patch] bring /etc/protocols up to date
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    grog
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 16 23:00:10 GMT 2007
>Closed-Date:    Sun May 20 03:56:20 GMT 2007
>Last-Modified:  Sun May 20 03:56:20 GMT 2007
>Originator:     Edwin Groothuis
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:42:56 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386



>Description:

Update /etc/protocols with IANA list updated 2007-02-12

Gotcha:  Number 48 (mhrp) is replaced with dsr.

>How-To-Repeat:
>Fix:


Index: protocols
===================================================================
RCS file: /home/ncvs/src/etc/protocols,v
retrieving revision 1.20
diff -u -r1.20 protocols
--- protocols	22 Feb 2005 13:04:02 -0000	1.20
+++ protocols	16 May 2007 22:54:25 -0000
@@ -12,7 +12,7 @@
 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 <A.Ballardie@cs.ucl.ac.uk>
 egp	8	EGP		# exterior gateway protocol
@@ -40,7 +40,7 @@
 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 Tranfer Protocol
@@ -55,7 +55,7 @@
 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
@@ -125,7 +125,7 @@
 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
@@ -141,7 +141,11 @@
 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	# 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
 pfsync	240	PFSYNC		# PF Synchronization
 #	255			# Reserved
 divert	258	DIVERT		# Divert pseudo-protocol [non IANA]
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: grog 
State-Changed-When: Sun May 20 03:55:39 UTC 2007 
State-Changed-Why:  
grog handled this PR 


Responsible-Changed-From-To: freebsd-bugs->grog 
Responsible-Changed-By: grog 
Responsible-Changed-When: Sun May 20 03:55:39 UTC 2007 
Responsible-Changed-Why:  
Patch commited, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112723 
>Unformatted:
