From bboissin:

fix RFC4191 handling
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2498

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

diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 85b3c24ff91da11900c5eddf87c6a3911bcdb39a..ba13b73755830cdfc61384a0bd6ae5e844e71492 100644 (file)
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -224,7 +224,7 @@ static const value_string option_vals[] = {
        { 21,           "CARD Request" },                     /* [RFC4065] */
        { 22,           "CARD Reply" },                       /* [RFC4065] */
        { 23,           "MAP" },                              /* [RFC4140] */
-       { 24,           "Route Information" },                /* [RFC4191] */
+       { ND_OPT_ROUTE_INFO,                            "Route Information" },                /* [RFC4191] */
        { ND_OPT_RECURSIVE_DNS_SERVER,          "Recursive DNS Server" },             /* [RFC5006] */
        { 26,           "RA Flags Extension" },               /* [RFC5075] */
        { 27,           "Handover Key Request" },             /* [RFC-ietf-mipshop-handover-key-03.txt] */

diff --git a/epan/dissectors/packet-ipv6.h b/epan/dissectors/packet-ipv6.h
index f0d6875956bc78e7feba7faa1e1db35ca87c9ba5..438b9142f42e590c05e89bcf4cf5574af7a79d54 100644 (file)
--- a/epan/dissectors/packet-ipv6.h
+++ b/epan/dissectors/packet-ipv6.h
@@ -432,8 +432,8 @@ struct nd_opt_hdr {         /* Neighbor discovery option header */
 21      CARD Request option                     [RFC4065]
 22      CARD Reply option                       [RFC4065]
 23      MAP Option                              [RFC4140]
-24      Route Information Option                [RFC4191]
 */
+#define ND_OPT_ROUTE_INFO                      24  /* Route Information Option                [RFC4191] */
 #define ND_OPT_RECURSIVE_DNS_SERVER    25      /* Recursive DNS Server Option             [RFC5006] */
 /*
 26      RA Flags Extension Option               [RFC5075]
@@ -444,8 +444,6 @@ struct nd_opt_hdr {         /* Neighbor discovery option header */
 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 */
 #define ND_OPT_MAP                     201