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

LLDP : Fix bug in mdi_power_source hf. 

While it compiles fine, hits an assert in add_string :
failed assertion "hfinfo->type == FT_STRING || hfinfo->type == FT_STRINGZ || hfinfo->type == FT_STRINGZPAD"

Fix takes care of this issue, but seems like we're losing the bitmask info here, is there a better way to do this ?

Change-Id: I7156d734f4b058113730d5dfbf6498e801c36770
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1915
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Anish Bhatt 2014-06-01 19:13:55 -07:00 committed by Alexis La Goutte
parent fbf1873748
commit de9efa1cb9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2199,8 +2199,6 @@ dissect_ieee_802_3_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
}
case 0x02: /* MDI Power Support */
{
const char *strPtr;
/* Get MDI power support info */
if (tree)
{
@ -2238,14 +2236,18 @@ dissect_ieee_802_3_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
if (tree)
proto_tree_add_item(tree, hf_ieee_802_3_mdi_power_type, tvb, tempOffset, 1, ENC_BIG_ENDIAN);
/* Determine power source */
if (tree)
tf = proto_tree_add_item(tree, hf_ieee_802_3_mdi_power_source, tvb, tempOffset, 1, ENC_BIG_ENDIAN);
/* Determine power source subtype */
switch (subType)
{
case 0:
case 2:
{
subType = ((tempByte & 0x30) >> 4);
strPtr = val_to_str_const(subType, media_power_pse_device, "Reserved");
if (tree)
proto_item_append_text(tf, "%s", val_to_str_const(subType, media_power_pse_device, "Reserved"));
break;
}
@ -2253,18 +2255,18 @@ dissect_ieee_802_3_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
case 3:
{
subType = ((tempByte & 0x30) >> 4);
strPtr = val_to_str_const(subType, media_power_pd_device, "Reserved");
if (tree)
proto_item_append_text(tf, "%s", val_to_str_const(subType, media_power_pd_device, "Reserved"));
break;
}
default:
{
strPtr = "Unknown";
proto_item_append_text(tf, "%s", "Unknown");
break;
}
}
if (tree)
proto_tree_add_string(tree, hf_ieee_802_3_mdi_power_source, tvb, tempOffset, 1, strPtr);
/* Determine power priority */
if (tree)