Put names on some more options solves part of bug

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2284

svn path=/trunk/; revision=24444

2 files changed, 67 insertions, 17 deletions

diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index ccec90d70f..0ac368456e 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -181,16 +181,37 @@ static const value_string names_fmip6_naack_opt_status[] = {
 	{ 0,			NULL }
 };
 
+/* http://www.iana.org/assignments/icmpv6-parameters */
 static const value_string option_vals[] = {
-	{ ND_OPT_SOURCE_LINKADDR,	"Source link-layer address" },
-	{ ND_OPT_TARGET_LINKADDR,	"Target link-layer address" },
-	{ ND_OPT_PREFIX_INFORMATION,	"Prefix information" },
-	{ ND_OPT_REDIRECTED_HEADER,	"Redirected header" },
-	{ ND_OPT_MTU,			"MTU" },
-	{ ND_OPT_ADVINTERVAL,		"Advertisement Interval" },
-	{ ND_OPT_HOMEAGENT_INFO,	"Home Agent Information" },
-	{ ND_OPT_MAP,			"HMIPv6 MAP option" },
-	{ FMIP6_OPT_NEIGHBOR_ADV_ACK,	"Neighbor Advertisement Acknowledgment" },
+	{ ND_OPT_SOURCE_LINKADDR,			"Source link-layer address" },
+	{ ND_OPT_TARGET_LINKADDR,			"Target link-layer address" },
+	{ ND_OPT_PREFIX_INFORMATION,		"Prefix information" },
+	{ ND_OPT_REDIRECTED_HEADER,			"Redirected header" },
+	{ ND_OPT_MTU,						"MTU" },
+	{ ND_OPT_ADVINTERVAL,				"Advertisement Interval" },
+	{ ND_OPT_HOMEAGENT_INFO,			"Home Agent Information" },
+	{ ND_OPT_CGA,						"CGA" },								/* [RFC3971] */
+	{ ND_OPT_RSA,						"RSA Signature" },						/* [RFC3971] */
+	{ ND_OPT_TIMESTAMP,					"Timestamp" },							/* [RFC3971] */ 
+	{ 14,		"Nonce" },														/* [RFC3971] */
+	{ 15,		"Trust Anchor" },												/* [RFC3971] */
+	{ 16,		"Certificate" },												/* [RFC3971] */
+	{ FMIP6_OPT_IP_ADDRESS,				"IP Address Option" },						/* [RFC4068] */  
+	{ FMIP6_OPT_NEW_ROUTER_PREFIX_INFO,	"New Router Prefix Information" },			/* [RFC4068] */
+	{ FMIP6_OPT_LINK_LAYER_ADDRESS,		"Link-layer Address" },						/* [RFC4068] */
+	{ FMIP6_OPT_NEIGHBOR_ADV_ACK,		"Neighbor Advertisement Acknowledgment" },	/* [RFC4068] */  
+	{ 21,		"CARD Request" },                     /* [RFC4065] */
+	{ 22,		"CARD Reply" },                       /* [RFC4065] */
+	{ 23,		"MAP" },                              /* [RFC4140] */
+	{ 24,		"Route Information" },                /* [RFC4191] */
+	{ 25,		"Recursive DNS Server" },             /* [RFC5006] */
+	{ 26,		"RA Flags Extension" },               /* [RFC5075] */
+	{ 27,		"Handover Key Request" },             /* [RFC-ietf-mipshop-handover-key-03.txt] */
+	{ 28,		"Handover Key Reply" },               /* [RFC-ietf-mipshop-handover-key-03.txt] */
+	{ ND_OPT_MAP,						"HMIPv6 MAP option" },
+/*29-252  Unassigned */
+	{ 253,		"RFC3692-style Experiment 1" },          /* [RFC4727] */
+	{ 254,		"RFC3692-style Experiment 2" },          /* [RFC4727] */
 	{ 0,			NULL }
 };
 
@@ -357,7 +378,7 @@ again:
 	    "Advertisement Interval: %u",
 	    tvb_get_ntohl(tvb, offset + offsetof(struct nd_opt_adv_int, nd_opt_adv_int_advint)));
 	break;
-    case ND_OPT_HOMEAGENT_INFO:
+    case ND_OPT_HOMEAGENT_INFO: /* 8 */
       {
 	struct nd_opt_ha_info pibuf, *pi;
 
@@ -373,6 +394,8 @@ again:
 	    pntohs(&pi->nd_opt_ha_info_ha_life));
 	break;
       }
+	case ND_OPT_TIMESTAMP:
+		break;
     case ND_OPT_MAP:
       {
 	struct nd_opt_map_info mapbuf, *map;
diff --git a/epan/dissectors/packet-ipv6.h b/epan/dissectors/packet-ipv6.h
index 60e4d67fb2..cd3fce5ac2 100644
--- a/epan/dissectors/packet-ipv6.h
+++ b/epan/dissectors/packet-ipv6.h
@@ -242,20 +242,20 @@ struct icmp6_hdr {
 #define ICMP6_TIME_EXCEEDED		3	/* time exceeded, code: */
 #define ICMP6_PARAM_PROB		4	/* ip6 header bad */
 
-#define ICMP6_ECHO_REQUEST		128	/* echo service */
-#define ICMP6_ECHO_REPLY		129	/* echo reply */
+#define ICMP6_ECHO_REQUEST			128	/* echo service */
+#define ICMP6_ECHO_REPLY			129	/* echo reply */
 #define ICMP6_MEMBERSHIP_QUERY		130	/* group membership query */
-#define MLD6_LISTENER_QUERY		130 	/* multicast listener query */
+#define MLD6_LISTENER_QUERY			130 	/* multicast listener query */
 #define ICMP6_MEMBERSHIP_REPORT		131	/* group membership report */
 #define MLD6_LISTENER_REPORT		131	/* multicast listener report */
 #define ICMP6_MEMBERSHIP_REDUCTION	132	/* group membership termination */
-#define MLD6_LISTENER_DONE		132	/* multicast listener done */
+#define MLD6_LISTENER_DONE			132	/* multicast listener done */
 
 #define ND_ROUTER_SOLICIT		133	/* router solicitation */
 #define ND_ROUTER_ADVERT		134	/* router advertisment */
 #define ND_NEIGHBOR_SOLICIT		135	/* neighbor solicitation */
 #define ND_NEIGHBOR_ADVERT		136	/* neighbor advertisment */
-#define ND_REDIRECT			137	/* redirect */
+#define ND_REDIRECT				137	/* redirect */
 
 #define ICMP6_ROUTER_RENUMBERING	138	/* router renumbering */
 
@@ -404,16 +404,43 @@ struct nd_opt_hdr {		/* Neighbor discovery option header */
 	/* followed by option specific data*/
 };
 
+/* http://www.iana.org/assignments/icmpv6-parameters */
 #define ND_OPT_SOURCE_LINKADDR		1
 #define ND_OPT_TARGET_LINKADDR		2
 #define ND_OPT_PREFIX_INFORMATION	3
 #define ND_OPT_REDIRECTED_HEADER	4
-#define ND_OPT_MTU			5
-#define ND_OPT_ADVINTERVAL		7
+#define ND_OPT_MTU					5
+#define ND_OPT_ADVINTERVAL			7
 #define ND_OPT_HOMEAGENT_INFO		8
 #define ND_OPT_SOURCE_ADDRLIST		9
 #define ND_OPT_TARGET_ADDRLIST		10
 
+#define ND_OPT_CGA					11
+#define ND_OPT_RSA					12
+#define ND_OPT_TIMESTAMP			14
+
+/*
+14      Nonce option                            [RFC3971]
+15      Trust Anchor option                     [RFC3971]
+16      Certificate option                      [RFC3971]
+17      IP Address Option                       [RFC4068]  
+18      New Router Prefix Information Option    [RFC4068]
+19      Link-layer Address Option               [RFC4068]
+20      Neighbor Advertisement Acknowledgment   [RFC4068]
+        Option
+21      CARD Request option                     [RFC4065]
+22      CARD Reply option                       [RFC4065]
+23      MAP Option                              [RFC4140]
+24      Route Information Option                [RFC4191]
+25      Recursive DNS Server Option             [RFC5006]
+26      RA Flags Extension Option               [RFC5075]
+27      Handover Key Request Option             [RFC-ietf-mipshop-handover-key-03.txt]
+28      Handover Key Reply Option               [RFC-ietf-mipshop-handover-key-03.txt]
+29-252  Unassigned
+253     RFC3692-style Experiment 1 (*)          [RFC4727]
+254     RFC3692-style Experiment 2 (*)          [RFC4727]
+*/
+
 /* draft-ietf-ipngwg-router-preference, not officially assigned yet */
 #define ND_OPT_ROUTE_INFO		200
 /* draft-ietf-mobileip-hmipv6, not officially assigned yet */