diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-06-21 23:32:38 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-22 14:22:02 +0000 |
| commit | 123d170767f6e51ce6b216d633fb03a3cf311109 (patch) | |
| tree | 344095980cd7cf0784e57acfb16587d4608178a5 | |
| parent | 0510954a8b2388dab356f161133ac3b8a573aa82 (diff) | |
OSPF: Opaque ID is not longer be zero
With RFC7770 the Opaque ID for Router Information is not longer be zero
Change-Id: I22f9917ac5b5b0261e36b1097765dab6ce216a46
Ping-Bug: 13823
Reviewed-on: https://code.wireshark.org/review/22329
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-ospf.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 35e5da5a03..e4e9e0bed4 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -589,7 +589,6 @@ static int hf_ospf_ri_options_p2plan = -1; static int hf_ospf_ri_options_ete = -1; /* OSPF Dynamic Hostname support (RFC5642) */ -static int hf_ospf_opaque_lsa_mbz = -1; static int hf_ospf_v3_options = -1; static int hf_ospf_v3_options_v6 = -1; static int hf_ospf_v3_options_e = -1; @@ -2526,7 +2525,6 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t /* opaque LSA */ guint8 ls_id_type; - guint8 ls_ri_opaque_field; guint8 ls_length_constraints[] = { 0, 24, 28, 28, 28, 36, 20, 36, 20, 20, 20, 20 }; @@ -2577,14 +2575,6 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t break; case OSPF_LSA_OPAQUE_RI: - ls_ri_opaque_field = tvb_get_guint8(tvb, offset + 5); - if ( ls_ri_opaque_field != 0 ) - ls_id_type = OSPF_LSA_UNKNOWN; - else - proto_tree_add_item(ospf_lsa_tree, hf_ospf_opaque_lsa_mbz, - tvb, offset + 5, 3, ENC_BIG_ENDIAN); - break; - default: proto_tree_add_item(ospf_lsa_tree, hf_ospf_ls_id_opaque_id, tvb, offset + 5, 3, ENC_BIG_ENDIAN); break; @@ -3549,11 +3539,6 @@ proto_register_ospf(void) { "TLV Type", "ospf.tlv_type.opaque", FT_UINT16, BASE_DEC, VALS(ri_tlv_type_vals), 0x0, NULL, HFILL }}, - /* An MBZ field for the 24-bits of type field of Opaque RI LSA */ - {&hf_ospf_opaque_lsa_mbz, - { "MBZ", "ospf.ri.mbz", FT_UINT16, BASE_HEX, - NULL, 0x0, "OSPF Opaque RI LSA - 24 bits of Type Field Must be Zero", HFILL }}, - {&hf_ospf_v3_options, { "Options", "ospf.v3.options", FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL }}, |