osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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 d8ee53e078)
This commit is contained in:
Taisuke Sasaki 2021-06-29 19:17:30 +09:00 committed by Wireshark GitLab Utility
parent 7799b0f577
commit fb2ed68545
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/packet-ospf.c
View File

@ -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);