osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Martin Mathieson: Fix it so "setup frame" is shown even if no filter applied at loading of capture. 

svn path=/trunk/; revision=11287
This commit is contained in:
Anders Broman 2004-06-30 21:08:58 +00:00
parent 3c4e72e590
commit 0d1c590fa0
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packet-rtcp.c
View File

@ -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)

12
packet-rtp.c
View File

@ -6,7 +6,7 @@
* Copyright 2000, Philips Electronics N.V.
* Written by Andreas Sikkema <h323@ramdyne.nl>
*
* $Id: packet-rtp.c,v 1.50 2004/06/29 20:29:56 etxrab Exp $
* $Id: packet-rtp.c,v 1.51 2004/06/30 21:08:58 etxrab Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -643,7 +643,10 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
conversation_t *p_conv = NULL;
struct _rtp_conversation_info *p_conv_data = NULL;
if (!pinfo->fd->flags.visited)
/* Use existing packet info if available */
p_conv_data = p_get_proto_data(pinfo->fd, proto_rtp);
if (!p_conv_data)
{
/* First time, get info from conversation */
p_conv = find_conversation(&pinfo->net_dst, &pinfo->net_src,
@ -662,11 +665,6 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
p_add_proto_data(pinfo->fd, proto_rtp, p_conv_packet_data);
}
}
else
{
/* Otherwise, use stored packet data instead */
p_conv_data = p_get_proto_data(pinfo->fd, proto_rtp);
}
/* Create setup info subtree with summary info. */
if (p_conv_data)