diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-03-17 12:55:30 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-03-17 17:04:52 +0000 |
| commit | b7492919abd59b5e3350de73d47cbdeb2ed2064a (patch) | |
| tree | e737c68b37d003b41b115dc2c643343bd6e78448 /epan/dissectors/packet-reload-framing.c | |
| parent | 386ebf50fef43a75d70d4c0085948c13cdd4e930 (diff) | |
Revert "Try to make the heuristic a bit more efficient."
(based upon an OK from Anders).
(The commit caused 'reload_framing_info' to be referenced before being set).
This reverts commit b3ce4ecc1460fc0171d65e69549e155b447d851a.
svn path=/trunk/; revision=52004
Change-Id: If715e1cad041fd832f460411cc652d9b5764d069
Reviewed-on: https://code.wireshark.org/review/718
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-reload-framing.c')
| -rw-r--r-- | epan/dissectors/packet-reload-framing.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index fbf4396e8f..c60378bd66 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -135,6 +135,11 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (effective_length < MIN_HDR_LENGTH) return 0; + conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + if (conversation) + reload_framing_info = (reload_conv_info_t *)conversation_get_proto_data(conversation, proto_reload_framing); + /* Get the type * http://tools.ietf.org/html/draft-ietf-p2psip-base-12 * 5.6.2. Framing Header @@ -168,11 +173,6 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr return 0; } - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - if (conversation) - reload_framing_info = (reload_conv_info_t *)conversation_get_proto_data(conversation, proto_reload_framing); - if (from_dtls && have_tap_listener(exported_pdu_tap)) { exp_pdu_data_t *exp_pdu_data; |