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 <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
parent
0acd5034ac
commit
2d8615948e
|
@ -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");
|
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);
|
ench.spi = tvb_get_ntohl(tvb, 4);
|
||||||
|
|
||||||
if (tree) {
|
if (tree) {
|
||||||
|
@ -113,9 +113,9 @@ dissect_enc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
||||||
ench.spi);
|
ench.spi);
|
||||||
enc_tree = proto_item_add_subtree(ti, ett_enc);
|
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_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 */
|
/* Set the tvbuff for the payload after the header */
|
||||||
|
|
Loading…
Reference in New Issue