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

From Wido Kelling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9176 : 

Fix decoding of the Auto-Negotiation bits in LLDP (they were off by one).

svn path=/trunk/; revision=52199
This commit is contained in:
Jeff Morriss 2013-09-24 01:12:44 +00:00
parent 221f85fd67
commit 31267e5a21
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-lldp.c
View File

@ -2651,7 +2651,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tempShort = tvb_get_ntohs(tvb, offset);
tempType = TLV_TYPE(tempShort);
/* pass only TLV to dissectors, Zero offset (point to front of tlv) */
new_tvb = tvb_new_subset(tvb, offset, TLV_INFO_LEN(tempShort)+2, TLV_INFO_LEN(tempShort)+2);
new_tvb = tvb_new_subset(tvb, offset, TLV_INFO_LEN(tempShort)+2, TLV_INFO_LEN(tempShort)+2);
switch (tempType)
{
case CHASSIS_ID_TLV_TYPE:
@ -2877,11 +2877,11 @@ proto_register_lldp(void)
},
{ &hf_ieee_802_3_mac_phy_auto_neg_status_supported,
{ "Auto-Negotiation", "lldp.ieee.802_3.mac_phy_auto_neg_status.supported", FT_BOOLEAN, 8,
TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL }
TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL }
},
{ &hf_ieee_802_3_mac_phy_auto_neg_status_enabled,
{ "Auto-Negotiation", "lldp.ieee.802_3.mac_phy_auto_neg_status.enabled", FT_BOOLEAN, 8,
TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL }
TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }
},
{ &hf_ieee_802_3_pmd_auto_neg_advertised_caps,
{ "PMD Auto-Negotiation Advertised Capability", "lldp.ieee.802_3.pmd_auto_neg_advertised_caps", FT_UINT16, BASE_HEX,