diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-09-26 05:52:58 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-09-26 05:52:58 +0000 |
commit | 60a08e7360409f8e06e97b1d65ec47156a6ce0b4 (patch) | |
tree | 8a9fc1879cbb0c4b9c4823078293dc5e8959b883 /epan/dissectors/packet-aruba-adp.c | |
parent | 292bb6e50a53c70f3c71e11d2524426ff89a98c3 (diff) |
Get rid of check_col() and use ENC_BIG_ENDIAN.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39144 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-aruba-adp.c')
-rw-r--r-- | epan/dissectors/packet-aruba-adp.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index 109472e4c9..cb47401f6c 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -68,38 +68,36 @@ dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_aruba_adp, tvb, 0, 0, FALSE); + ti = proto_tree_add_item(tree, proto_aruba_adp, tvb, 0, 0, ENC_BIG_ENDIAN); aruba_adp_tree = proto_item_add_subtree(ti, ett_aruba_adp); - proto_tree_add_item(aruba_adp_tree, hf_adp_version, tvb, 0, 2, FALSE); + proto_tree_add_item(aruba_adp_tree, hf_adp_version, tvb, 0, 2, ENC_BIG_ENDIAN); } type = tvb_get_ntohs(tvb, 2); if (tree) { - proto_tree_add_item(aruba_adp_tree, hf_adp_type, tvb, 2, 2, FALSE); + proto_tree_add_item(aruba_adp_tree, hf_adp_type, tvb, 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(aruba_adp_tree, hf_adp_id, tvb, 4, 2, FALSE); + proto_tree_add_item(aruba_adp_tree, hf_adp_id, tvb, 4, 2, ENC_BIG_ENDIAN); } switch(type){ case ADP_REQUEST: - proto_tree_add_item(aruba_adp_tree, hf_adp_mac, tvb, 6, 6, FALSE); + proto_tree_add_item(aruba_adp_tree, hf_adp_mac, tvb, 6, 6, ENC_BIG_ENDIAN); mac_str = tvb_ether_to_str(tvb, 6); - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Request Src MAC: %s", mac_str); + col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Request Src MAC: %s", mac_str); proto_item_append_text(ti, ", Request Src MAC: %s", mac_str); break; case ADP_RESPONSE: - proto_tree_add_item(aruba_adp_tree, hf_adp_switchip, tvb, 6, 4, FALSE); + proto_tree_add_item(aruba_adp_tree, hf_adp_switchip, tvb, 6, 4, ENC_BIG_ENDIAN); switchip = tvb_ip_to_str(tvb, 6); - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Response Switch IP: %s", switchip); + col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Response Switch IP: %s", switchip); proto_item_append_text(ti, ", Response Switch IP: %s", switchip); break; |