osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Aditya Ambadkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7046 : 

Fix CID 703472 and (external) fuzz failure 7567:

The dissect_subtlv_interface_parameters is missing the handling of BFD 2..4.
For the crash patch, we decided to add the bfd2..4 in dissect_tlc function(in
the diff). We plan to open a separate bug to fix
dissect_subtlv_interface_parameters to make it handle BFD2..4. (Thanks to Arun
Arunachalam for this analysis)


From me: fix up some indentation and replace tabs with spaces (for consistency).

svn path=/trunk/; revision=44801
This commit is contained in:
Jeff Morriss 2012-09-07 01:35:16 +00:00
parent 621120248d
commit 8ba24b5530
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
epan/dissectors/packet-ldp.c
View File

@ -2459,7 +2459,13 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem)
&hf_ldp_tlv_intparam_vccv_cctype_ttl1 ,
&hf_ldp_tlv_intparam_vccv_cvtype_icmpping ,
&hf_ldp_tlv_intparam_vccv_cvtype_lspping ,
&hf_ldp_tlv_intparam_vccv_cvtype_bfd
&hf_ldp_tlv_intparam_vccv_cvtype_bfd,
&hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd2,
&hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd3,
&hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd4,
&hf_ldp_tlv_fec_vc_intparam_flowlabel_t,
&hf_ldp_tlv_fec_vc_intparam_flowlabel_r,
&hf_ldp_tlv_fec_vc_intparam_flowlabel_res
};
int vc_len = length;
offset += 4;
@ -3568,25 +3574,25 @@ proto_register_ldp(void)
{ "BFD IP/UDP-encapsulated, for PW Fault Detection only", "ldp.msg.tlv.fec.vc.intparam.vccv.cvtype_bfd1", FT_BOOLEAN, 8,
NULL, 0x04, "VC FEC Interface Param VCCV CV Type BFD IP/UDP-encapsulated, for PW Fault Detection only", HFILL }},
{ &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd2,
{ &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd2,
{ "BFD IP/UDP-encapsulated, for PW Fault Detection and AC/PW Fault Status Signaling", "ldp.msg.tlv.fec.vc.intparam.vccv.cvtype_bfd2", FT_BOOLEAN, 8,
NULL, 0x08, "VC FEC Interface Param VCCV CV Type BFD IP/UDP-encapsulated, for PW Fault Detection and AC/PW Fault Status Signaling", HFILL }},
{ &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd3,
{ &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd3,
{ "BFD BFD PW-ACH-encapsulated, for PW Fault Detection only", "ldp.msg.tlv.fec.vc.intparam.vccv.cvtype_bfd3", FT_BOOLEAN, 8,
NULL, 0x10, "VC FEC Interface Param VCCV CV Type BFD PW-ACH-encapsulated, for PW Fault Detection only", HFILL }},
{ &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd4,
{ &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd4,
{ "BFD BFD PW-ACH-encapsulated, for PW Fault Detection and AC/PW Fault Status Signaling", "ldp.msg.tlv.fec.vc.intparam.vccv.cvtype_bfd4", FT_BOOLEAN, 8,
NULL, 0x20, "VC FEC Interface Param VCCV CV Type BFD PW-ACH-encapsulated, for PW Fault Detection and AC/PW Fault Status Signaling", HFILL }},
{ &hf_ldp_tlv_fec_vc_intparam_flowlabel_t,
{ &hf_ldp_tlv_fec_vc_intparam_flowlabel_t,
{ "Flow Label Transmit bit", "ldp.msg.tlv.fec.vc.intparam.flowlabel.t", FT_UINT8, BASE_DEC, NULL, 0x80, NULL, HFILL}},
{ &hf_ldp_tlv_fec_vc_intparam_flowlabel_r,
{ &hf_ldp_tlv_fec_vc_intparam_flowlabel_r,
{ "Flow Label Receive bit", "ldp.msg.tlv.fec.vc.intparam.flowlabel.r", FT_UINT8, BASE_DEC, NULL, 0x40, NULL, HFILL}},
{ &hf_ldp_tlv_fec_vc_intparam_flowlabel_res,
{ &hf_ldp_tlv_fec_vc_intparam_flowlabel_res,
{ "Flow Label Reserved", "ldp.msg.tlv.fec.vc.intparam.flowlabel.res", FT_UINT16, BASE_HEX, NULL, 0x3FFF, NULL, HFILL}},
{ &hf_ldp_tlv_lspid_act_flg,