diff options
| author | Evan Huus <eapache@gmail.com> | 2014-04-23 12:46:51 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-04-23 12:59:14 +0000 |
| commit | cb8386c4de31978e0988ea10de25aa9c40e58834 (patch) | |
| tree | 86f5a476c6879e39a6acf8540553a4070c24fd20 /epan/dissectors/packet-http.c | |
| parent | f0e77aa3667a542a2904da26c29d9f8c0af1d27f (diff) | |
Revert "Create the HTTP tree after we're assured it's HTTP. Otherwise a bogus tree is created when HTTP2 traffic is found."
It causes the DTLS decryption test suite to fail for some reason, and I don't have time/energy to investigate further, so we should probably revert it until that gets resolved.
This reverts commit fc5d8db74dc473610b9fc6c0c4b571d4aa65264a.
Change-Id: Iac9a7592047d2e080e380a70752efa076303e442
Reviewed-on: https://code.wireshark.org/review/1297
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-http.c')
| -rw-r--r-- | epan/dissectors/packet-http.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 8fd0afceda..5463d22bac 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -796,6 +796,11 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, col_set_str(pinfo->cinfo, COL_INFO, "Continuation or non-HTTP traffic"); orig_offset = offset; + if (tree) { + ti = proto_tree_add_item(tree, proto_http, tvb, offset, -1, + ENC_NA); + http_tree = proto_item_add_subtree(ti, ett_http); + } /* * Process the packet data, a line at a time. @@ -954,15 +959,9 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, break; is_http: - if ((tree) && (http_tree == NULL)) { - ti = proto_tree_add_item(tree, proto_http, tvb, orig_offset, -1, ENC_NA); - http_tree = proto_item_add_subtree(ti, ett_http); - } - /* * Process this line. */ - if (linelen == 0) { /* * This is a blank line, which means that |