Preserve 62 as an (old) IP protocol type for mobility headers.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9074 f5534014-38df-0310-8fa8-9805f1628bb7

3 files changed, 17 insertions, 4 deletions

diff --git a/ipproto.c b/ipproto.c
index 2f87bb3e06..a6f145a798 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,7 +1,7 @@
 /* ipproto.c
  * Routines for converting IPv4 protocol/v6 nxthdr field into string
  *
- * $Id: ipproto.c,v 1.23 2003/11/02 22:12:35 gerald Exp $
+ * $Id: ipproto.c,v 1.24 2003/11/24 21:42:13 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -108,7 +108,7 @@ static const value_string ipproto_val[] = {
     { IP_PROTO_ICMPV6,	"ICMPv6" },
     { IP_PROTO_NONE,	"IPv6 no next header" },
     { IP_PROTO_DSTOPTS,	"IPv6 destination option" },
-    { IP_PROTO_MIPV6,	"Mobile IPv6" },
+    { IP_PROTO_MIPV6_OLD, "Mobile IPv6 (old)" },
     { IP_PROTO_SATEXPAK,"SATNET EXPAK" },
     { IP_PROTO_KRYPTOLAN, "Kryptolan" },
     { IP_PROTO_RVD,     "Remote Virtual Disk" },
@@ -177,6 +177,7 @@ static const value_string ipproto_val[] = {
     { IP_PROTO_SCTP,    "SCTP" },
     { IP_PROTO_FC,      "Fibre Channel" },
     { IP_PROTO_RSVPE2EI,"RSVP E2EI" },
+    { IP_PROTO_MIPV6,	"Mobile IPv6" },
     { IP_PROTO_NCS_HEARTBEAT,"Novell NCS Heartbeat" },
     { 0,		NULL },
 };
diff --git a/ipproto.h b/ipproto.h
index 927c6639cb..cb980e3997 100644
--- a/ipproto.h
+++ b/ipproto.h
@@ -2,7 +2,7 @@
  * Declarations of IP protocol numbers, and of routines for converting
  * IP protocol numbers into strings.
  *
- * $Id: ipproto.h,v 1.11 2003/11/22 08:35:45 guy Exp $
+ * $Id: ipproto.h,v 1.12 2003/11/24 21:42:13 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -95,6 +95,17 @@
 #define IP_PROTO_NONE		59		/* IP6 no next header - RFC1883 */
 #define IP_PROTO_DSTOPTS	60		/* IP6 destination options - RFC1883 */
 /* 61 is reserved by IANA for any host internal protocol */
+/*
+ * The current Protocol Numbers list says that the IP protocol number for
+ * mobility headers is 135; it cites draft-ietf-mobileip-ipv6-24, but
+ * that draft doesn't actually give a number.
+ *
+ * It appears that 62 used to be used, even though that's assigned to
+ * a protocol called CFTP; however, the only reference for CFTP is a
+ * Network Message from BBN back in 1982, so, for now, we support 62,
+ * aas well as 135, as a protocol number for mobility headers.
+ */
+#define IP_PROTO_MIPV6_OLD	62		/* Mobile IPv6  */
 /* 63 is reserved by IANA for any local network */
 #define IP_PROTO_SATEXPAK       64
 #define IP_PROTO_KRYPTOLAN      65
diff --git a/packet-mip6.c b/packet-mip6.c
index 26740c411d..59544911bb 100644
--- a/packet-mip6.c
+++ b/packet-mip6.c
@@ -1,6 +1,6 @@
 /* packet-mip6.c
  *
- * $Id: packet-mip6.c,v 1.4 2003/07/11 21:03:13 guy Exp $
+ * $Id: packet-mip6.c,v 1.5 2003/11/24 21:42:13 guy Exp $
  *
  * Routines for Mobile IPv6 dissection (draft-ietf-mobileip-ipv6-20.txt)
  * Copyright 2003 Oy L M Ericsson Ab <teemu.rinta-aho@ericsson.fi>
@@ -687,5 +687,6 @@ proto_reg_handoff_mip6(void)
     
     /* mip6_handle = find_dissector("mipv6"); */
     mip6_handle = create_dissector_handle(dissect_mip6, proto_mip6);
+    dissector_add("ip.proto", IP_PROTO_MIPV6_OLD, mip6_handle);
     dissector_add("ip.proto", IP_PROTO_MIPV6, mip6_handle);
 }