From f412c9a01aa031ef9f024ee1b8ec60bf4a73edb8 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Sat, 13 Dec 2014 12:52:20 -0500 Subject: Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ... (for some dissectors which fetch all other integral fields using ENC_BIG_ENDIAN). Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56 Reviewed-on: https://code.wireshark.org/review/5748 Reviewed-by: Bill Meier --- epan/dissectors/packet-lon.c | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'epan/dissectors/packet-lon.c') diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index ef3bad3c1c..a4e28cf751 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.c @@ -252,43 +252,43 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { case 0: /* Broadcast */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 3, ett_address, NULL, "Address type 0 (broadcast)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_BIG_ENDIAN); offset += 3; break; case 1: /* Multicast */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 3, ett_address, NULL, "Address type 1 (multicast)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstgrp, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstgrp, tvb, offset+2, 1, ENC_BIG_ENDIAN); offset += 3; break; case 2: /* Unicast/Multicast */ addr_a = tvb_get_guint8(tvb, offset+1) >> 7; if (addr_a) { /* Type 2a */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 4, ett_address, NULL, "Address type 2a (unicast)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstnode, tvb, offset+3, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstnode, tvb, offset+3, 1, ENC_BIG_ENDIAN); offset += 4; } else { /* Type 2b */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 6, ett_address, NULL, "Address type 2b (multicast)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstgrp, tvb, offset+2, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstnode, tvb, offset+3, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_grp, tvb, offset+4, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_grpmem, tvb, offset+5, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstgrp, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstnode, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_grp, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_grpmem, tvb, offset+5, 1, ENC_BIG_ENDIAN); offset += 6; } break; case 3: /* UID */ ti = proto_tree_add_subtree(lon_tree, tvb, offset, 9, ett_address, NULL, "Address type 3 (UID)"); - proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_NA); - proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_NA); + proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_srcnode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_lon_addr_dstsub, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ti, hf_lon_addr_uid, tvb, offset+3, 6, ENC_NA); offset += 9; break; @@ -340,17 +340,17 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) break; case 4: /* REMINDER */ length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; break; case 5: /* REM/MSG */ length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (length > 0) - proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; offset += dissect_apdu(lon_tree, pinfo, tvb, offset); break; @@ -382,17 +382,17 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) break; case 4: /* REMINDER */ length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; break; case 5: /* REM/MSG */ length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (length > 0) - proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_NA); + proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; offset += dissect_apdu(lon_tree, pinfo, tvb, offset); break; -- cgit v1.2.3