diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-10-24 14:15:04 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-10-24 14:15:04 +0000 |
| commit | 525f7e0552ea7e31ef2ff095a53cf6013e252709 (patch) | |
| tree | 7240310398eed566b6978745412389c7a17d78a2 /epan/dissectors/packet-zbee-aps.c | |
| parent | bfcc79bd234dff1a4fb1a42c73806e2114fb543e (diff) | |
Clean up a few proto_add_bytes calls.
svn path=/trunk/; revision=34630
Diffstat (limited to 'epan/dissectors/packet-zbee-aps.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-aps.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 27e78d549f..9e468b3c23 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -1073,9 +1073,8 @@ dissect_zbee_aps_skke_challenge(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre offset += sizeof(guint64); /* Get and display the SKKE data. */ - tvb_ensure_bytes_exist(tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH); if (tree) { - proto_tree_add_bytes(tree, hf_zbee_aps_cmd_challenge, tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH, ep_tvb_memdup(tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH)); + proto_tree_add_item(tree, hf_zbee_aps_cmd_challenge, tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH, ENC_BIG_ENDIAN); } offset += ZBEE_APS_CMD_SKKE_DATA_LENGTH; @@ -1119,9 +1118,8 @@ dissect_zbee_aps_skke_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr offset += sizeof(guint64); /* Get and display the SKKE data. */ - tvb_ensure_bytes_exist(tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH); if (tree) { - proto_tree_add_bytes(tree, hf_zbee_aps_cmd_mac, tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH, ep_tvb_memdup(tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH)); + proto_tree_add_item(tree, hf_zbee_aps_cmd_mac, tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH, ENC_BIG_ENDIAN); } offset += ZBEE_APS_CMD_SKKE_DATA_LENGTH; @@ -1167,7 +1165,7 @@ dissect_zbee_aps_transport_key(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree key[i] = tvb_get_guint8(tvb, offset+i); } /* for */ if (tree) { - proto_tree_add_bytes(tree, hf_zbee_aps_cmd_key, tvb, offset, ZBEE_APS_CMD_KEY_LENGTH, key); + proto_tree_add_item(tree, hf_zbee_aps_cmd_key, tvb, offset, ZBEE_APS_CMD_KEY_LENGTH, ENC_BIG_ENDIAN); } offset += ZBEE_APS_CMD_KEY_LENGTH; @@ -1485,10 +1483,8 @@ dissect_zbee_aps_auth_challenge(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre offset += sizeof(guint64); /* Get and display the challenge. */ - tvb_ensure_bytes_exist(tvb, offset, ZBEE_APS_CMD_EA_CHALLENGE_LENGTH); if (tree) { - proto_tree_add_bytes(tree, hf_zbee_aps_cmd_challenge, tvb, offset, ZBEE_APS_CMD_EA_CHALLENGE_LENGTH, - ep_tvb_memdup(tvb, offset, ZBEE_APS_CMD_EA_CHALLENGE_LENGTH)); + proto_tree_add_item(tree, hf_zbee_aps_cmd_challenge, tvb, offset, ZBEE_APS_CMD_EA_CHALLENGE_LENGTH, ENC_BIG_ENDIAN); } offset += ZBEE_APS_CMD_EA_CHALLENGE_LENGTH; @@ -1517,10 +1513,8 @@ dissect_zbee_aps_auth_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr guint8 data_type; /* Get and display the MAC. */ - tvb_ensure_bytes_exist(tvb, offset, ZBEE_APS_CMD_EA_MAC_LENGTH); if (tree) { - proto_tree_add_bytes(tree, hf_zbee_aps_cmd_mac, tvb, offset, ZBEE_APS_CMD_EA_MAC_LENGTH, - ep_tvb_memdup(tvb, offset, ZBEE_APS_CMD_EA_MAC_LENGTH)); + proto_tree_add_item(tree, hf_zbee_aps_cmd_mac, tvb, offset, ZBEE_APS_CMD_EA_MAC_LENGTH, ENC_BIG_ENDIAN); } offset += ZBEE_APS_CMD_EA_MAC_LENGTH; @@ -1538,10 +1532,8 @@ dissect_zbee_aps_auth_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr offset += sizeof(guint8); /* Get and display the data field. */ - tvb_ensure_bytes_exist(tvb, offset, ZBEE_APS_CMD_EA_DATA_LENGTH); if (tree) { - proto_tree_add_bytes(tree, hf_zbee_aps_cmd_ea_data, tvb, offset, ZBEE_APS_CMD_EA_DATA_LENGTH, - ep_tvb_memdup(tvb, offset, ZBEE_APS_CMD_EA_DATA_LENGTH)); + proto_tree_add_item(tree, hf_zbee_aps_cmd_ea_data, tvb, offset, ZBEE_APS_CMD_EA_DATA_LENGTH, ENC_BIG_ENDIAN); } offset += ZBEE_APS_CMD_EA_DATA_LENGTH; |