diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-04 22:44:31 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-04 22:44:31 +0000 |
| commit | 94f36ca4ff177617fcc4e4ca8a171e374f8aeff6 (patch) | |
| tree | 060bfcfb238455d21752efec8612998f2ab1db6f /epan/dissectors/packet-wifi-p2p.c | |
| parent | 039fc59cb110aa485e910583d1edd5ff81ca2168 (diff) | |
Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
FT_BYTES
FT_IPV6
FT_IPXNET
FT_OID
Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
svn path=/trunk/; revision=39260
Diffstat (limited to 'epan/dissectors/packet-wifi-p2p.c')
| -rw-r--r-- | epan/dissectors/packet-wifi-p2p.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 027d2e9497..48d2096a18 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -500,7 +500,7 @@ static void dissect_channel_list(proto_item *tlv_root, tvbuff_t *tvb, s_offset++; proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_chan, tvb, - s_offset, num_chan, FALSE); + s_offset, num_chan, ENC_NA); s_offset += num_chan; } } @@ -553,11 +553,11 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo, s_offset += 2; proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type, tvb, - s_offset, 8, FALSE); + s_offset, 8, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_category, tvb, s_offset, 2, FALSE); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_oui, - tvb, s_offset + 2, 4, FALSE); + tvb, s_offset + 2, 4, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_subcategory, tvb, s_offset + 6, 2, FALSE); s_offset += 8; @@ -569,7 +569,7 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo, while (num_sec > 0) { proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_sec_dev_type, - tvb, s_offset, 8, FALSE); + tvb, s_offset, 8, ENC_NA); s_offset += 8; num_sec--; } @@ -780,11 +780,11 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, s_offset += 2; proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type, tvb, - s_offset, 8, FALSE); + s_offset, 8, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type_category, tvb, s_offset, 2, FALSE); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type_oui, - tvb, s_offset + 2, 4, FALSE); + tvb, s_offset + 2, 4, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type_subcategory, tvb, s_offset + 6, 2, FALSE); s_offset += 8; @@ -801,7 +801,7 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, } while (num_sec > 0) { proto_tree_add_item(tlv_root, hf_p2p_attr_gi_sec_dev_type, - tvb, s_offset, 8, FALSE); + tvb, s_offset, 8, ENC_NA); s_offset += 8; num_sec--; } @@ -1032,12 +1032,12 @@ void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, offset + 1, 1, FALSE); if (request) { proto_tree_add_item(tlv, hf_p2p_anqp_query_data, tvb, - offset + 2, len - 2, FALSE); + offset + 2, len - 2, ENC_NA); } else { proto_tree_add_item(tlv, hf_p2p_anqp_status_code, tvb, offset + 2, 1, FALSE); proto_tree_add_item(tlv, hf_p2p_anqp_response_data, tvb, - offset + 3, len - 3, FALSE); + offset + 3, len - 3, ENC_NA); } offset += len; } |