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-babel.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'epan/dissectors/packet-babel.c') diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c index a971a44292..2a01a1efc4 100644 --- a/epan/dissectors/packet-babel.c +++ b/epan/dissectors/packet-babel.c @@ -213,8 +213,8 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U ti = proto_tree_add_item(tree, proto_babel, tvb, 0, -1, ENC_NA); babel_tree = proto_item_add_subtree(ti, ett_babel); - proto_tree_add_item(babel_tree, hf_babel_magic, tvb, 0, 1, ENC_NA); - proto_tree_add_item(babel_tree, hf_babel_version, tvb, 1, 1, ENC_NA); + proto_tree_add_item(babel_tree, hf_babel_magic, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(babel_tree, hf_babel_version, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(babel_tree, hf_babel_bodylen, tvb, 2, 2, ENC_BIG_ENDIAN); } @@ -247,7 +247,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U if (tree) { message_tree = proto_item_add_subtree(ti, ett_message); proto_tree_add_item(message_tree, hf_babel_message_type, - tvb, message, 1, ENC_NA); + tvb, message, 1, ENC_BIG_ENDIAN); } if (type == MESSAGE_PAD1) { @@ -291,7 +291,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U format_address(rc < 0 ? NULL : addr_str)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 4, len - 2, ENC_NA); } else if (type == MESSAGE_ROUTER_ID) { @@ -311,7 +311,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U "NH: %s", format_address(rc < 0 ? NULL : nh)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 4, len - 2, ENC_NA); } else if (type == MESSAGE_UPDATE) { @@ -335,7 +335,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U } proto_tree_add_item(message_tree, hf_babel_message_flags, - tvb, message + 3, 1, ENC_NA); + tvb, message + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(message_tree, hf_babel_message_interval, tvb, message + 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(message_tree, hf_babel_message_seqno, @@ -349,11 +349,11 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U format_prefix(rc < 0 ? NULL : p, plen)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_plen, - tvb, message + 4, 1, ENC_NA); + tvb, message + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_omitted, - tvb, message + 5, 1, ENC_NA); + tvb, message + 5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 12, len - 10, ENC_NA); } else if (type == MESSAGE_REQUEST) { @@ -373,9 +373,9 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U format_prefix(rc < 0 ? NULL : p, plen)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_plen, - tvb, message + 3, 1, ENC_NA); + tvb, message + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 4, len - 2, ENC_NA); } else if (type == MESSAGE_MH_REQUEST) { @@ -391,7 +391,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U proto_tree_add_item(message_tree, hf_babel_message_seqno, tvb, message + 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(message_tree, hf_babel_message_hopcount, - tvb, message + 6, 1, ENC_NA); + tvb, message + 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(message_tree, hf_babel_message_routerid, tvb, message + 8, 8, ENC_NA); subtree = proto_tree_add_subtree_format(message_tree, @@ -401,9 +401,9 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U format_prefix(rc < 0 ? NULL : p, plen)); proto_tree_add_item(subtree, hf_babel_message_ae, - tvb, message + 2, 1, ENC_NA); + tvb, message + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_plen, - tvb, message + 3, 1, ENC_NA); + tvb, message + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_babel_message_prefix, tvb, message + 16, len - 14, ENC_NA); } -- cgit v1.2.3