From Martin Mathieson:

packet-rtp.c packet_rtsp.cand packet-rtcp.c
------------------------------------------
Make sure that the RTP RTSP and RTCP dissectors show the setup frame
corresponding to the destination address


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11270 f5534014-38df-0310-8fa8-9805f1628bb7

3 files changed, 17 insertions, 12 deletions

diff --git a/packet-rtcp.c b/packet-rtcp.c
index de83ccbe75..780b85c2e3 100644
--- a/packet-rtcp.c
+++ b/packet-rtcp.c
@@ -1,6 +1,6 @@
 /* packet-rtcp.c
  *
- * $Id: packet-rtcp.c,v 1.44 2004/06/15 18:26:08 etxrab Exp $
+ * $Id: packet-rtcp.c,v 1.45 2004/06/29 20:29:56 etxrab Exp $
  *
  * Routines for RTCP dissection
  * RTCP = Real-time Transport Control Protocol
@@ -253,7 +253,9 @@ void rtcp_add_address( packet_info *pinfo,
 	 * again.
 	 */
 	if (pinfo->fd->flags.visited)
+	{
 		return;
+	}
 
 	src_addr.type = pinfo->net_src.type;
 	src_addr.len = pinfo->net_src.len;
@@ -294,7 +296,7 @@ void rtcp_add_address( packet_info *pinfo,
 
 		/* Create conversation with this data */
 		p_conv = conversation_new( &src_addr, &src_addr, PT_UDP,
-		                           (guint32)port, (guint32)port,
+		                           (guint32)port, (guint32)other_port,
 		                           NO_ADDR2 | (!other_port ? NO_PORT2 : 0));
 		conversation_add_proto_data(p_conv, proto_rtcp, p_conv_data);
 
@@ -831,9 +833,10 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (!pinfo->fd->flags.visited)
 	{
 		/* First time, get info from conversation */
-		p_conv = find_conversation(&pinfo->net_src, &pinfo->net_dst,
-		                           pinfo->ptype,
-		                           pinfo->srcport, pinfo->destport, 0);
+		p_conv = find_conversation(&pinfo->net_dst, &pinfo->net_src,
+                                   pinfo->ptype,
+                                   pinfo->destport, pinfo->srcport, NO_ADDR_B);
+
 		if (p_conv)
 		{
 			/* Create space for packet info */
diff --git a/packet-rtp.c b/packet-rtp.c
index d1ea504281..2873192e75 100644
--- a/packet-rtp.c
+++ b/packet-rtp.c
@@ -6,7 +6,7 @@
  * Copyright 2000, Philips Electronics N.V.
  * Written by Andreas Sikkema <h323@ramdyne.nl>
  *
- * $Id: packet-rtp.c,v 1.49 2004/06/15 18:26:08 etxrab Exp $
+ * $Id: packet-rtp.c,v 1.50 2004/06/29 20:29:56 etxrab Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -206,7 +206,9 @@ void rtp_add_address(packet_info *pinfo,
 	 * again.
 	 */
 	if (pinfo->fd->flags.visited)
+	{
 		return;
+	}
 
 	src_addr.type = pinfo->net_src.type;
 	src_addr.len = pinfo->net_src.len;
@@ -644,9 +646,9 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (!pinfo->fd->flags.visited)
 	{
 		/* First time, get info from conversation */
-		p_conv = find_conversation(&pinfo->net_src, &pinfo->net_dst,
-								   pinfo->ptype,
-								   pinfo->srcport, pinfo->destport, 0);
+		p_conv = find_conversation(&pinfo->net_dst, &pinfo->net_src,
+                                   pinfo->ptype,
+                                   pinfo->destport, pinfo->srcport, NO_ADDR_B);
 		if (p_conv)
 		{
 			/* Create space for packet info */
diff --git a/packet-rtsp.c b/packet-rtsp.c
index 06c9bc4013..8b824eaddb 100644
--- a/packet-rtsp.c
+++ b/packet-rtsp.c
@@ -4,7 +4,7 @@
  * Jason Lango <jal@netapp.com>
  * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-rtsp.c,v 1.65 2004/06/15 18:26:08 etxrab Exp $
+ * $Id: packet-rtsp.c,v 1.66 2004/06/29 20:29:57 etxrab Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -444,13 +444,13 @@ rtsp_create_conversation(packet_info *pinfo, const guchar *line_begin,
 	 */
 	SET_ADDRESS(&null_addr, pinfo->src.type, 0, NULL);
 
-	rtp_add_address(pinfo, (char *)&pinfo->dst, c_data_port, s_data_port,
+	rtp_add_address(pinfo, (char *)pinfo->dst.data, c_data_port, s_data_port,
                     "RTSP", pinfo->fd->num);
 
 	if (!c_mon_port)
 		return;
 
-	rtcp_add_address(pinfo, (char *)&pinfo->dst, c_mon_port, s_mon_port,
+	rtcp_add_address(pinfo, (char *)pinfo->dst.data, c_mon_port, s_mon_port,
                      "RTSP", pinfo->fd->num);
 }