diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-06-30 21:08:58 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-06-30 21:08:58 +0000 |
| commit | 194fc7f5ad52dd09081ba90e5118a30f71a5066c (patch) | |
| tree | 052779f970a07d4841c80e31d33a175a5b28cc92 /packet-rtcp.c | |
| parent | 3322ae5fdfe492f50e48d9d8503f93fc72d98abe (diff) | |
From Martin Mathieson: Fix it so "setup frame" is shown even if no filter applied at loading of capture.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11287 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-rtcp.c')
| -rw-r--r-- | packet-rtcp.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/packet-rtcp.c b/packet-rtcp.c index 780b85c2e3..ed63a09690 100644 --- a/packet-rtcp.c +++ b/packet-rtcp.c @@ -1,6 +1,6 @@ /* packet-rtcp.c * - * $Id: packet-rtcp.c,v 1.45 2004/06/29 20:29:56 etxrab Exp $ + * $Id: packet-rtcp.c,v 1.46 2004/06/30 21:08:58 etxrab Exp $ * * Routines for RTCP dissection * RTCP = Real-time Transport Control Protocol @@ -830,7 +830,10 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation_t *p_conv = NULL; struct _rtcp_conversation_info *p_conv_data = NULL; - if (!pinfo->fd->flags.visited) + /* Use existing packet data if available */ + p_conv_data = p_get_proto_data(pinfo->fd, proto_rtcp); + + if (!p_conv_data) { /* First time, get info from conversation */ p_conv = find_conversation(&pinfo->net_dst, &pinfo->net_src, @@ -850,11 +853,6 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) p_add_proto_data(pinfo->fd, proto_rtcp, p_conv_packet_data); } } - else - { - /* Otherwise, use stored packet data instead */ - p_conv_data = p_get_proto_data(pinfo->fd, proto_rtcp); - } /* Create setup info subtree with summary info. */ if (p_conv_data) |