From 4e57694d4aa2a652077e01fd6867a8def7ffdb15 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Thu, 6 Oct 2011 03:35:44 +0000 Subject: Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39288 --- epan/dissectors/packet-linx.c | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'epan/dissectors/packet-linx.c') diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index aa0cd667b4..e87f02c61a 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -324,7 +324,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) | Next | R | Dest Coreid | Source Coreid | R | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - proto_tree_add_item(multicore_header_tree, hf_linx_nexthdr, tvb, 0, 4, FALSE); + proto_tree_add_item(multicore_header_tree, hf_linx_nexthdr, tvb, 0, 4, ENC_BIG_ENDIAN); proto_tree_add_item(multicore_header_tree, hf_linx_multicore_reserved, tvb, 0, 4, FALSE); proto_tree_add_item(multicore_header_tree, hf_linx_multicore_dcoreid, tvb, 0, 4, FALSE); proto_tree_add_item(multicore_header_tree, hf_linx_multicore_scoreid, tvb, 0, 4, FALSE); @@ -359,7 +359,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - proto_tree_add_item(main_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(main_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(main_header_tree, hf_linx_main_version , linx_tvb, offset, 4, FALSE); proto_tree_add_item(main_header_tree, hf_linx_main_reserved , linx_tvb, offset, 4, FALSE); proto_tree_add_item(main_header_tree, hf_linx_main_connection, linx_tvb, offset, 4, FALSE); @@ -403,7 +403,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) size = (dword >>21) & 0x7; item = proto_tree_add_text(linx_tree, linx_tvb, offset, (4+2*size), "Connection Header"); conn_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(conn_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(conn_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(conn_header_tree, hf_linx_conn_cmd , linx_tvb, offset, 4, FALSE); proto_tree_add_item(conn_header_tree, hf_linx_conn_size , linx_tvb, offset, 4, FALSE); proto_tree_add_item(conn_header_tree, hf_linx_conn_winsize , linx_tvb, offset, 4, FALSE); @@ -444,7 +444,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 4, "NACK Header"); nack_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(nack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(nack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(nack_header_tree, hf_linx_nack_reserv1, linx_tvb, offset, 4, FALSE); proto_tree_add_item(nack_header_tree, hf_linx_nack_count , linx_tvb, offset, 4, FALSE); proto_tree_add_item(nack_header_tree, hf_linx_nack_reserv2, linx_tvb, offset, 4, FALSE); @@ -489,7 +489,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 12, "Udata Header"); udata_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(udata_header_tree, hf_linx_nexthdr, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(udata_header_tree, hf_linx_nexthdr, linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(udata_header_tree, hf_linx_udata_reserved , linx_tvb, offset, 4, FALSE); proto_tree_add_item(udata_header_tree, hf_linx_udata_morefrags, linx_tvb, offset, 4, FALSE); proto_tree_add_item(udata_header_tree, hf_linx_udata_fragno , linx_tvb, offset, 4, FALSE); @@ -606,7 +606,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ item = proto_tree_add_text(linx_tree, linx_tvb, offset, 4, "Ack Header"); ack_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(ack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(ack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ack_header_tree, hf_linx_ack_request , linx_tvb, offset, 4, FALSE); proto_tree_add_item(ack_header_tree, hf_linx_ack_reserved, linx_tvb, offset, 4, FALSE); proto_tree_add_item(ack_header_tree, hf_linx_ack_ackno , linx_tvb, offset, 4, FALSE); @@ -627,7 +627,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 4, "Fragmentation Header"); frag_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(frag_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(frag_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(frag_header_tree, hf_linx_frag_reserved , linx_tvb, offset, 4, FALSE); proto_tree_add_item(frag_header_tree, hf_linx_frag_morefrags, linx_tvb, offset, 4, FALSE); proto_tree_add_item(frag_header_tree, hf_linx_frag_fragno , linx_tvb, offset, 4, FALSE); @@ -883,12 +883,12 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tcp_tree, linx_tcp_tvb, 0, 16, "TCP CM Header"); tcp_header_tree = proto_item_add_subtree(item, ett_linx_tcp); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_type, linx_tcp_tvb, 0, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_version, linx_tcp_tvb, 0, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_oob, linx_tcp_tvb, 0, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_src, linx_tcp_tvb, 4, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_dst, linx_tcp_tvb, 8, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_size, linx_tcp_tvb, 12, 4, FALSE); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_type, linx_tcp_tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_version, linx_tcp_tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_oob, linx_tcp_tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_src, linx_tcp_tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_dst, linx_tcp_tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_size, linx_tcp_tvb, 12, 4, ENC_BIG_ENDIAN); offset += 16; @@ -906,15 +906,15 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rlnh_header_tree = proto_item_add_subtree(item, ett_linx_tcp); if(version == 1) { - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_type32, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_type32, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else { /* * In version 2 of the rlnh protocol the length of the message type is * restricted to 8 bits. */ - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_reserved, linx_tcp_tvb, offset, 4, FALSE); - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_type8, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_reserved, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_type8, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -922,32 +922,32 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case RLNH_LINK_ADDR: break; case RLNH_QUERY_NAME: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, linx_tcp_tvb, offset, -1, FALSE); offset += tvb_strnlen(linx_tcp_tvb, offset, -1); break; case RLNH_PUBLISH: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, linx_tcp_tvb, offset, -1, FALSE); offset += tvb_strnlen(linx_tcp_tvb, offset, -1); break; case RLNH_UNPUBLISH: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case RLNH_UNPUBLISH_ACK: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case RLNH_INIT: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_version, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_version, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); rlnh_version = tvb_get_ntohl(linx_tcp_tvb, offset); offset += 4; break; case RLNH_INIT_REPLY: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_status, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_status, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if(rlnh_version > 1) { proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_feat_neg_str, linx_tcp_tvb, offset, -1, FALSE); @@ -955,9 +955,9 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } break; case RLNH_PUBLISH_PEER: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_peer_linkaddr, linx_tcp_tvb, offset, -1, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_peer_linkaddr, linx_tcp_tvb, offset, -1, ENC_BIG_ENDIAN); offset += tvb_strnlen(linx_tcp_tvb, offset, -1); break; default: -- cgit v1.2.3