diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-03-31 13:40:44 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-04-01 00:19:04 +0000 |
| commit | a859793b0de77b7f880cfd4bd251884164774187 (patch) | |
| tree | 0861b40d320a7c2baaa9ff8a32871959301543d7 | |
| parent | e2745d741ec11f395d41c0aafa24df9dec136399 (diff) | |
http: set conv dissector from when heuristics succeeded
When a conversation starts with SSL (Client Hello) but gets a HTTP
response back, then the first SSL request should be preserved.
Bug: 12132
Change-Id: I3f9b5c8828bc5c6680945d7cf71740584dd463ab
Reviewed-on: https://code.wireshark.org/review/14726
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 695d970a6e..77af766c98 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -3098,7 +3098,7 @@ dissect_http_heur_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* Check if the line start or ends with the HTTP token */ if((tvb_strncaseeql(tvb, linelen-8, "HTTP/1.1", 8) == 0)||(tvb_strncaseeql(tvb, 0, "HTTP/1.1", 8) == 0)){ conversation = find_or_create_conversation(pinfo); - conversation_set_dissector(conversation,http_handle); + conversation_set_dissector_from_frame_number(conversation, pinfo->num, http_handle); dissect_http(tvb, pinfo, tree, data); return TRUE; } |