diff options
| author | Taisuke Sasaki <taisasak@cisco.com> | 2021-06-29 19:17:30 +0900 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-10 20:54:18 +0000 |
| commit | fb2ed68545b76015b61594b9689af1195941da3a (patch) | |
| tree | 252143337d3a89317bd25f3492c2668a04556151 | |
| parent | 7799b0f5771239a33c1dc4c6dc43f93c056ab3b3 (diff) | |
OSPF: Fixed SRLB and SRMS Preference TLV types (rfc8665)
- Fixed TLV types of SRLB and SRMS Preference
- Added type/length for unknown Opaque RI TLV
(cherry picked from commit d8ee53e078ea8985db207e5d25b1a88913838f8a)
| -rw-r--r-- | epan/dissectors/packet-ospf.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 5403c4634d..fe1ec04da3 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -257,8 +257,8 @@ static const value_string grace_tlv_type_vals[] = { #define OPAQUE_TLV_NAT 10 #define OPAQUE_TLV_SBD 11 #define OPAQUE_TLV_NODE_MSD 12 -#define OPAQUE_TLV_SRLB 13 -#define OPAQUE_TLV_SRMS_PREF 14 +#define OPAQUE_TLV_SRLB 14 +#define OPAQUE_TLV_SRMS_PREF 15 /* The Opaque RI LSA TLV types definitions. */ static const value_string ri_tlv_type_vals[] = { @@ -270,7 +270,7 @@ static const value_string ri_tlv_type_vals[] = { {OPAQUE_TLV_PCED, "PCED" }, {OPAQUE_TLV_DH, "OSPF Dynamic Hostname" }, {OPAQUE_TLV_SA, "SR-Algorithm " }, - {OPAQUE_TLV_SLR, "SID/Label Range " }, + {OPAQUE_TLV_SLR, "SID/Label Range" }, {OPAQUE_TLV_NAT, "Node Admin Tag " }, {OPAQUE_TLV_SBD, "S-BFD Discriminator" }, {OPAQUE_TLV_NODE_MSD, "Node MSD" }, @@ -2848,7 +2848,9 @@ dissect_ospf_lsa_opaque_ri(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_ return; } tlv_tree = proto_tree_add_subtree_format(ri_tree, tvb, offset, tlv_length+4, - ett_ospf_lsa_unknown_tlv, NULL, "%s", val_to_str_const(tlv_type, ri_tlv_type_vals, "Unknown Opaque RI LSA TLV")); + ett_ospf_lsa_unknown_tlv, NULL, "%s (t=%u, l=%u)", + val_to_str_const(tlv_type, ri_tlv_type_vals, "Unknown Opaque RI LSA TLV"), + tlv_type, tlv_length); proto_tree_add_item(tlv_tree, hf_ospf_tlv_type_opaque, tvb, offset, 2, ENC_BIG_ENDIAN); |