diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-03-02 21:01:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-03-02 21:01:08 +0000 |
| commit | 47b4b15d800187084439a0cf220d7b0e12a422d2 (patch) | |
| tree | e5533477122cfb6a649d685ac58823b392fc2730 /epan/dissectors/packet-atm.c | |
| parent | 41d6d1249710b3ad5fa018a8048f7cf9a6e0ee53 (diff) | |
| download | wireshark-47b4b15d800187084439a0cf220d7b0e12a422d2.tar.gz | |
Move the setting of pt to where it was before the changes, so it's
before the point at which it's added to the protocol tree.
Put the ATM channel in the ATM tree rather than the top-level tree.
Fix the name for the CPI field (copy-and-pasteo).
svn path=/trunk/; revision=48015
Diffstat (limited to 'epan/dissectors/packet-atm.c')
| -rw-r--r-- | epan/dissectors/packet-atm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 4edd852f97..715571549c 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -1639,8 +1639,8 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vci |= octet << 4; octet = tvb_get_guint8(tvb, 3); vci |= octet >> 4; - pt = (octet >> 1) & 0x7; proto_tree_add_uint(atm_tree, hf_atm_vci, tvb, 1, 3, vci); + pt = (octet >> 1) & 0x7; proto_tree_add_item(atm_tree, hf_atm_payload_type, tvb, 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(atm_tree, hf_atm_cell_loss_priority, tvb, 3, 1, ENC_BIG_ENDIAN); @@ -1838,7 +1838,7 @@ dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, atm_tree = proto_item_add_subtree(atm_ti, ett_atm); if (!pseudowire_mode) { - proto_tree_add_uint(tree, hf_atm_channel, tvb, 0, 0, pinfo->pseudo_header->atm.channel); + proto_tree_add_uint(atm_tree, hf_atm_channel, tvb, 0, 0, pinfo->pseudo_header->atm.channel); } proto_tree_add_uint_format_value(atm_tree, hf_atm_aal, tvb, 0, 0, @@ -2033,7 +2033,7 @@ proto_register_atm(void) { "AAL5 UU", "atm.hf_atm.aal5t_uu", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_atm_aal5_cpi, - { "AAL5 UU", "atm.hf_atm.aal5t_cpi", FT_UINT8, BASE_HEX, NULL, 0x0, + { "AAL5 CPI", "atm.hf_atm.aal5t_cpi", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_atm_aal5_len, { "AAL5 len", "atm.aal5t_len", FT_UINT16, BASE_DEC, NULL, 0x0, |