From 293049dfbac0ea7db5651f4f4a0820465421550e Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Sun, 16 Oct 2011 23:38:49 +0000 Subject: Do some conversions of proto_tree_add_item() 'encoding' arg. (previously missed). 57 FT_BOOLEAN: FALSE-->ENC_BIG_ENDIAN 31 FT_BOOLEAN: TRUE-->ENC_LITTLE_ENDIAN 10 FT_BYTES: ENC_BIG_ENDIAN-->ENC_NA 1 FT_BYTES: ENC_LITTLE_ENDIAN-->ENC_NA 21 FT_BYTES: FALSE-->ENC_NA 2 FT_BYTES: TRUE-->ENC_NA 2 FT_IPXNET: ENC_BIG_ENDIAN-->ENC_NA 6 FT_IPv6: ENC_BIG_ENDIAN-->ENC_NA 1 FT_IPv6: FALSE-->ENC_NA 6 FT_NONE: ENC_BIG_ENDIAN-->ENC_NA 19 FT_NONE: FALSE-->ENC_NA 3 FT_NONE: TRUE-->ENC_NA 1 FT_STRING: ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA 1 FT_STRING: ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA 5 FT_STRING: FALSE-->ENC_ASCII|ENC_NA 1 FT_STRING: TRUE-->ENC_ASCII|ENC_NA 4 FT_STRINGZ: ENC_NA-->ENC_ASCII|ENC_NA 8 FT_STRINGZ: FALSE-->ENC_ASCII|ENC_NA 1 FT_INT32: FALSE-->ENC_BIG_ENDIAN 1 FT_INT32: TRUE-->ENC_LITTLE_ENDIAN 11 FT_UINT8: 0-->ENC_BIG_ENDIAN 111 FT_UINT8: FALSE-->ENC_BIG_ENDIAN 17 FT_UINT8: TRUE-->ENC_LITTLE_ENDIAN 1 FT_UINT16: 0-->ENC_BIG_ENDIAN 68 FT_UINT16: FALSE-->ENC_BIG_ENDIAN 18 FT_UINT16: TRUE-->ENC_LITTLE_ENDIAN 4 FT_UINT24: FALSE-->ENC_BIG_ENDIAN 70 FT_UINT32: FALSE-->ENC_BIG_ENDIAN 1 FT_UINT32: TRUE-->ENC_LITTLE_ENDIAN 4 FT_UINT64: FALSE-->ENC_BIG_ENDIAN 1 FT_UINT64: TRUE-->ENC_LITTLE_ENDIAN 1 FT_UINT_STRING: FALSE-->ENC_ASCII|ENC_BIG_ENDIAN svn path=/trunk/; revision=39442 --- epan/dissectors/packet-pw-atm.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'epan/dissectors/packet-pw-atm.c') diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index 4d17121545..7268e36e0b 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -1239,10 +1239,10 @@ void dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree } if (pd->mode == PWATM_MODE_AAL5_SDU) { - proto_tree_add_item(tree2, hf_pref_cw_a5s_t, tvb, 0, 1, FALSE); - proto_tree_add_item(tree2, hf_pref_cw_a5s_e, tvb, 0, 1, FALSE); - proto_tree_add_item(tree2, hf_pref_cw_a5s_c, tvb, 0, 1, FALSE); - proto_tree_add_item(tree2, hf_pref_cw_a5s_u, tvb, 0, 1, FALSE); + proto_tree_add_item(tree2, hf_pref_cw_a5s_t, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree2, hf_pref_cw_a5s_e, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree2, hf_pref_cw_a5s_c, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree2, hf_pref_cw_a5s_u, tvb, 0, 1, ENC_BIG_ENDIAN); /* * rfc4717: [When FRF.8.1 Frame Relay/ATM PVC Service Interworking [RFC3916] * traffic is being transported, the CPCS-UU Least Significant Bit @@ -1521,7 +1521,7 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_uint(tree2, hf_cell_h_vpi, tvb, 0, 2, (unsigned)pd->vpi); proto_tree_add_uint(tree2, hf_cell_h_vci, tvb, 1, 3, (unsigned)pd->vci); - item2 = proto_tree_add_item(tree2, hf_cell_h_pti, tvb, 3, 1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cell_h_pti, tvb, 3, 1, ENC_BIG_ENDIAN); if (NULL == match_strval(pd->pti,atm_pt_vals)) { expert_add_info_format(pinfo, item2, PI_UNDECODED, PI_WARN, @@ -1536,11 +1536,11 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) pd->pti); } - proto_tree_add_item(tree2, hf_cell_h_clp, tvb, 3, 1, FALSE); + proto_tree_add_item(tree2, hf_cell_h_clp, tvb, 3, 1, ENC_BIG_ENDIAN); } else if (MODE_11_OR_AAL5_PDU(pd->mode)) { - item2 = proto_tree_add_item(tree2, hf_cell_h_m , tvb, 0, 1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cell_h_m , tvb, 0, 1, ENC_BIG_ENDIAN); if ((0 != pd->cwb3.m) && MODE_11(pd->mode)) { expert_add_info_format(pinfo, item2, PI_MALFORMED, PI_ERROR @@ -1548,7 +1548,7 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) " M bit must be 0 to distinguish from AAL5 PDU mode"); } - item2 = proto_tree_add_item(tree2, hf_cell_h_v , tvb, 0, 1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cell_h_v , tvb, 0, 1, ENC_BIG_ENDIAN); if ((0 == pd->cwb3.v) && (PWATM_MODE_11_VPC == pd->mode)) { expert_add_info_format(pinfo, item2, PI_MALFORMED, PI_ERROR @@ -1585,7 +1585,7 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (MODE_11(pd->mode)) { - item2 = proto_tree_add_item(tree2, hf_cell_h_pti, tvb, 0, 1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cell_h_pti, tvb, 0, 1, ENC_BIG_ENDIAN); if (NULL == match_strval(pd->pti,atm_pt_vals)) { expert_add_info_format(pinfo, item2, PI_UNDECODED, PI_WARN, @@ -1595,11 +1595,11 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } else { - proto_tree_add_item(tree2, hf_aal5_pdu_u, tvb, 0, 1, FALSE); - proto_tree_add_item(tree2, hf_aal5_pdu_e, tvb, 0, 1, FALSE); + proto_tree_add_item(tree2, hf_aal5_pdu_u, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree2, hf_aal5_pdu_e, tvb, 0, 1, ENC_BIG_ENDIAN); } - proto_tree_add_item(tree2, hf_cell_h_clp, tvb, 0, 1, FALSE); + proto_tree_add_item(tree2, hf_cell_h_clp, tvb, 0, 1, ENC_BIG_ENDIAN); if (PWATM_MODE_11_VPC == pd->mode) { -- cgit v1.2.3