diff options
| author | Richard Sharpe <richard.sharpe@primarydata.com> | 2017-06-12 13:59:22 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-06-13 03:54:12 +0000 |
| commit | 73bed8c209bc0ff44062039019ab91c8a8da8065 (patch) | |
| tree | 973e0aff82f7071d94301b4f32f289b1fd35ef8e /epan | |
| parent | 9dc4d271cd4f4a0454fe82860c03ee454ebae254 (diff) | |
Improve the HTTP2 dissector by not inserting empty padding, which looks ugly.
Change-Id: Ia01ae12fc9a22a7d0031c4580bbafe09f75881b5
Reviewed-on: https://code.wireshark.org/review/22104
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-http2.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index 87efbeefef..3cb85548ff 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -1055,8 +1055,10 @@ dissect_http2_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *http2_tree proto_tree_add_item(http2_tree, hf_http2_data_data, tvb, offset, datalen, ENC_NA); offset += datalen; - proto_tree_add_item(http2_tree, hf_http2_data_padding, tvb, offset, padding, ENC_NA); - offset += padding; + if (padding) { + proto_tree_add_item(http2_tree, hf_http2_data_padding, tvb, offset, padding, ENC_NA); + offset += padding; + } return offset; } @@ -1092,8 +1094,11 @@ dissect_http2_headers(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *http2_t offset += headlen; - proto_tree_add_item(http2_tree, hf_http2_headers_padding, tvb, offset, padding, ENC_NA); - offset += padding; + if (padding) { + proto_tree_add_item(http2_tree, hf_http2_headers_padding, tvb, offset, padding, ENC_NA); + offset += padding; + } + return offset; } @@ -1242,8 +1247,10 @@ dissect_http2_push_promise(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ht offset += headlen; - proto_tree_add_item(http2_tree, hf_http2_push_promise_padding, tvb, - offset, padding, ENC_NA); + if (padding) { + proto_tree_add_item(http2_tree, hf_http2_push_promise_padding, tvb, + offset, padding, ENC_NA); + } offset += tvb_reported_length_remaining(tvb, offset); @@ -1320,9 +1327,10 @@ dissect_http2_continuation(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ht offset += headlen; - proto_tree_add_item(http2_tree, hf_http2_continuation_padding, tvb, offset, padding, ENC_NA); - - offset += padding; + if (padding) { + proto_tree_add_item(http2_tree, hf_http2_continuation_padding, tvb, offset, padding, ENC_NA); + offset += padding; + } return offset; } |