diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-09-10 20:04:22 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-09-11 06:33:23 +0000 |
| commit | 29993d5266ff0a19d0d49a19a0473d7bb17cda43 (patch) | |
| tree | 0ccf0e41844fdeaf2d8c0fb5257659bcb157df54 /epan/dissectors/packet-aim-admin.c | |
| parent | d5940f576cc9b08b2fcbea71182ed0c7efb7f275 (diff) | |
Eliminate proto_tree_add_text from some dissectors.
Change-Id: Ie41ac30f8edaeee75b23717ef1d5147d804a65b3
Reviewed-on: https://code.wireshark.org/review/4074
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-aim-admin.c')
| -rw-r--r-- | epan/dissectors/packet-aim-admin.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/epan/dissectors/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c index 04743766cc..30c6a182c1 100644 --- a/epan/dissectors/packet-aim-admin.c +++ b/epan/dissectors/packet-aim-admin.c @@ -48,6 +48,7 @@ static const value_string confirm_statusses[] = { /* Initialize the protocol and registered fields */ static int proto_aim_admin = -1; static int hf_admin_acctinfo_code = -1; +static int hf_admin_acctinfo_unknown = -1; static int hf_admin_acctinfo_permissions = -1; static int hf_admin_confirm_status = -1; @@ -56,15 +57,16 @@ static gint ett_aim_admin = -1; static int dissect_aim_admin_accnt_info_req(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *admin_tree) { - proto_tree_add_item(admin_tree, hf_admin_acctinfo_code, tvb, 0, 2, tvb_get_ntohs(tvb, 0)); - proto_tree_add_text(admin_tree, tvb, 2, 2, "Unknown"); + proto_tree_add_item(admin_tree, hf_admin_acctinfo_code, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(admin_tree, hf_admin_acctinfo_unknown, tvb, 2, 2, ENC_BIG_ENDIAN); return 4; } static int dissect_aim_admin_accnt_info_repl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *admin_tree) { int offset = 0; - proto_tree_add_uint(admin_tree, hf_admin_acctinfo_permissions, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2; + proto_tree_add_item(admin_tree, hf_admin_acctinfo_permissions, tvb, offset, 2, ENC_BIG_ENDIAN); + offset+=2; return dissect_aim_tlv_list(tvb, pinfo, offset, admin_tree, aim_client_tlvs); } @@ -76,7 +78,8 @@ static int dissect_aim_admin_info_change_req(tvbuff_t *tvb, packet_info *pinfo, static int dissect_aim_admin_cfrm_repl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *admin_tree) { int offset = 0; - proto_tree_add_uint(admin_tree, hf_admin_confirm_status, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2; + proto_tree_add_item(admin_tree, hf_admin_confirm_status, tvb, offset, 2, ENC_BIG_ENDIAN); + offset+=2; return dissect_aim_tlv_sequence(tvb, pinfo, offset, admin_tree, aim_client_tlvs); } @@ -101,6 +104,9 @@ proto_register_aim_admin(void) { &hf_admin_acctinfo_code, { "Account Information Request Code", "aim_admin.acctinfo.code", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, + { &hf_admin_acctinfo_unknown, + { "Unknown", "aim_admin.acctinfo.unknown", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, + }, { &hf_admin_acctinfo_permissions, { "Account Permissions", "aim_admin.acctinfo.permissions", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, |