diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-12-17 07:23:31 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-12-17 07:41:52 +0000 |
| commit | e520d79c8af96e2ca7fa5024f595c4b36101c6cf (patch) | |
| tree | c6379394da2c156de98dc4ccd7d310f7841d2421 /epan/dissectors/packet-ipsec.c | |
| parent | da5cad4d68c72996d97a9923df9205cbf633e55e (diff) | |
IPsec: Revert g232cb9a2dd
Change-Id: I9e353215c17c9a868b1cbbcd18a5707e023d86bb
Reviewed-on: https://code.wireshark.org/review/19310
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/dissectors/packet-ipsec.c')
| -rw-r--r-- | epan/dissectors/packet-ipsec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 571c15a8f0..0d13dc9476 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -1120,7 +1120,7 @@ static int dissect_ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { proto_tree *ah_tree, *root_tree; - proto_item *pi; + proto_item *pi, *ti; guint ah_nxt; /* Next header */ guint8 ah_len; /* Length of header in 32bit words minus 2 */ guint ah_hdr_len; /* Length of header in octets */ @@ -1153,7 +1153,8 @@ dissect_ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) ah_tree = proto_item_add_subtree(pi, ett_ah); proto_tree_add_item(ah_tree, hf_ah_next_header, tvb, 0, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ah_tree, hf_ah_length, tvb, 1, 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(ah_tree, hf_ah_length, tvb, 1, 1, ENC_BIG_ENDIAN); + proto_item_append_text(ti, " (%u bytes)", ah_hdr_len); proto_tree_add_item(ah_tree, hf_ah_reserved, tvb, 2, 2, ENC_NA); proto_tree_add_item_ret_uint(ah_tree, hf_ah_spi, tvb, 4, 4, ENC_BIG_ENDIAN, &ah_spi); @@ -2267,7 +2268,7 @@ proto_register_ipsec(void) { "Next header", "ah.next_header", FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0, NULL, HFILL }}, { &hf_ah_length, - { "Length", "ah.length", FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &units_byte_bytes, 0x0, + { "Length", "ah.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ah_reserved, { "Reserved", "ah.reserved", FT_BYTES, BASE_NONE, NULL, 0x0, |