forked from osmocom/wireshark
CFM: Add CSF PDU dissection
This commit is contained in:
Jaap Keuter
A Wireshark GitLab Utility
parent
8d960aaac4
commit
479175d044
|
|
@ -19,7 +19,7 @@
|
|||
* - ITU-T Y.1731 recommendation (05/2006,) which is not formally released
|
||||
* at the time of this dissector development.
|
||||
* Any updates to these documents may require additional modifications to this code.
|
||||
* ITU-T G.8013/Y.1731 (11/2013) is the current version (as of Sep 11, 2014)
|
||||
* ITU-T G.8013/Y.1731 (08/2015) is the current version (as of Jan 1, 2022)
|
||||
* ToDo: Update dissector to reflect this document.
|
||||
*/
|
||||
|
||||
|
|
@ -55,6 +55,8 @@
|
|||
#define EXR 0x30
|
||||
#define VSM 0x33
|
||||
#define VSR 0x32
|
||||
#define CSF 0x34
|
||||
#define OSL 0x35
|
||||
#define SLM 0x37
|
||||
#define SLR 0x36
|
||||
|
||||
|
|
@ -111,6 +113,8 @@ static const value_string opcodetypenames[] = {
|
|||
{ EXR, "Experimental OAM Reply (EXR)" },
|
||||
{ VSM, "Vendor Specific Message (VSM)" },
|
||||
{ VSR, "Vendor Specific Reply (VSR)" },
|
||||
{ CSF, "Client Signal Fail (CSF)" },
|
||||
{ OSL, "One Way Synthetic Loss Measurement (1SL)" },
|
||||
{ SLM, "Synthetic Loss Message (SLM)"},
|
||||
{ SLR, "Synthetic Loss Reply (SLR))"},
|
||||
{ 0, NULL }
|
||||
|
|
@ -289,6 +293,24 @@ static const value_string gnmsubopcodetypenames[] = {
|
|||
{ BNM, "Bandwidth Notification Message" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
static const value_string cfm_csf_flags_type_vals[] = {
|
||||
{ 0, "LOS" },
|
||||
{ 1, "FDI/AIS" },
|
||||
{ 2, "RDI" },
|
||||
{ 3, "DCI" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
static const value_string cfm_csf_flags_period_vals[] = {
|
||||
{ 0, "Invalid" },
|
||||
{ 1, "For further study" },
|
||||
{ 2, "For further study" },
|
||||
{ 3, "For further study" },
|
||||
{ 4, "1s" },
|
||||
{ 5, "For further study" },
|
||||
{ 6, "1 min" },
|
||||
{ 7, "For further study" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static int hf_cfm_md_level = -1;
|
||||
|
|
@ -405,6 +427,11 @@ static int hf_cfm_vsm_pdu = -1;
|
|||
static int hf_cfm_vsr_pdu = -1;
|
||||
static int hf_cfm_vsm_vsr_data = -1;
|
||||
|
||||
static int hf_cfm_csf_pdu = -1;
|
||||
static int hf_cfm_csf_flags_Reserved = -1;
|
||||
static int hf_cfm_csf_flags_Type =-1;
|
||||
static int hf_cfm_csf_flags_Period = -1;
|
||||
|
||||
static int hf_cfm_slm_pdu = -1;
|
||||
static int hf_cfm_slr_pdu = -1;
|
||||
static int hf_cfm_slm_src_mep = -1;
|
||||
|
|
@ -1206,6 +1233,31 @@ static int dissect_cfm_vsr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
return offset;
|
||||
}
|
||||
|
||||
static int dissect_cfm_csf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset)
|
||||
{
|
||||
proto_item *ti;
|
||||
proto_item *fi;
|
||||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_csf_pdu, tvb, offset, -1, ENC_NA);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_csf_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_csf_flags_Type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_csf_flags_Period, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int dissect_cfm_slm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset)
|
||||
{
|
||||
proto_item *ti;
|
||||
|
|
@ -1374,6 +1426,9 @@ static int dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
|
|||
case VSR:
|
||||
offset = dissect_cfm_vsr(tvb, pinfo, tree, offset);
|
||||
break;
|
||||
case CSF:
|
||||
offset = dissect_cfm_csf(tvb, pinfo, tree, offset);
|
||||
break;
|
||||
case SLM:
|
||||
offset = dissect_cfm_slm(tvb, pinfo, tree, offset);
|
||||
break;
|
||||
|
|
@ -2046,6 +2101,24 @@ void proto_register_cfm(void)
|
|||
BASE_NONE, NULL, 0x0, NULL, HFILL }
|
||||
},
|
||||
|
||||
/* CFM CSF */
|
||||
{ &hf_cfm_csf_pdu,
|
||||
{ "CFM CSF PDU", "cfm.csf.pdu", FT_NONE,
|
||||
BASE_NONE, NULL, 0x0, NULL, HFILL }
|
||||
},
|
||||
{ &hf_cfm_csf_flags_Reserved,
|
||||
{ "Reserved", "cfm.csf.flags.Reserved", FT_UINT8,
|
||||
BASE_HEX, NULL, 0xC0, NULL, HFILL }
|
||||
},
|
||||
{ &hf_cfm_csf_flags_Type,
|
||||
{ "Type", "cfm.csf.flags.Type", FT_UINT8,
|
||||
BASE_DEC, VALS(cfm_csf_flags_type_vals), 0x38, NULL, HFILL }
|
||||
},
|
||||
{ &hf_cfm_csf_flags_Period,
|
||||
{ "Type", "cfm.csf.flags.Period", FT_UINT8,
|
||||
BASE_DEC, VALS(cfm_csf_flags_period_vals), 0x07, NULL, HFILL }
|
||||
},
|
||||
|
||||
/* Synthetic Loss values */
|
||||
{ &hf_cfm_slm_pdu,
|
||||
{ "CFM SLM PDU", "cfm.slm.pdu", FT_NONE,
|
||||
|
|
|
|||
Loading…
Reference in New Issue