From 2d8615948e06e70eef915085258660c23a5bd771 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Fri, 30 Dec 2016 16:01:16 +0100 Subject: [PATCH] ENC: fix parsing of header broken by gee242bd From the code before change, it appears that only SPI field is in network byte order. Bug: 13279 Change-Id: Ia157b43a9da30d61dc9cb7607c66d44c8f607498 Reviewed-on: https://code.wireshark.org/review/19477 Petri-Dish: Pascal Quantin Reviewed-by: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/dissectors/packet-enc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index 9cbde0e42d..d3574548e4 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -102,7 +102,7 @@ dissect_enc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) col_set_str(pinfo->cinfo, COL_PROTOCOL, "ENC"); - ench.af = tvb_get_ntohl(tvb, 0); + ench.af = tvb_get_h_guint32(tvb, 0); ench.spi = tvb_get_ntohl(tvb, 4); if (tree) { @@ -113,9 +113,9 @@ dissect_enc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) ench.spi); enc_tree = proto_item_add_subtree(ti, ett_enc); - proto_tree_add_item(enc_tree, hf_enc_af, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(enc_tree, hf_enc_af, tvb, 0, 4, ENC_HOST_ENDIAN); proto_tree_add_item(enc_tree, hf_enc_spi, tvb, 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_bitmask(enc_tree, tvb, 8, hf_enc_flags, ett_enc_flag, flags, ENC_BIG_ENDIAN); + proto_tree_add_bitmask(enc_tree, tvb, 8, hf_enc_flags, ett_enc_flag, flags, ENC_HOST_ENDIAN); } /* Set the tvbuff for the payload after the header */