aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-06-19 04:46:10 +0000
committerGuy Harris <guy@alum.mit.edu>2001-06-19 04:46:10 +0000
commit61c0c6c290e031527162b4b95853e3fb216e88e4 (patch)
tree7e6eabdbfeeef07f52da7031e1dd031ce1d3684d
parent61cb2338106205653eae2c7bf3d3e968d4b5b00a (diff)
Get rid of global references to "pi" - use "pinfo" instead.
svn path=/trunk/; revision=3572
-rw-r--r--packet-rtsp.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/packet-rtsp.c b/packet-rtsp.c
index 439156ef40..591f2ded3e 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.38 2001/06/18 02:17:51 guy Exp $
+ * $Id: packet-rtsp.c,v 1.39 2001/06/19 04:46:10 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -216,7 +216,8 @@ static const char rtsp_cps[] = "client_port=";
static const char rtsp_rtp[] = "rtp/avp";
static void
-rtsp_create_conversation(const u_char *line_begin, int line_len)
+rtsp_create_conversation(packet_info *pinfo, const u_char *line_begin,
+ int line_len)
{
conversation_t *conv;
u_char buf[256];
@@ -254,14 +255,14 @@ rtsp_create_conversation(const u_char *line_begin, int line_len)
if (!c_data_port || !s_data_port)
return;
- conv = conversation_new(&pi.src, &pi.dst, PT_UDP, s_data_port,
+ conv = conversation_new(&pinfo->src, &pinfo->dst, PT_UDP, s_data_port,
c_data_port, 0, 0);
conversation_set_dissector(conv, dissect_rtp);
if (!c_mon_port || !s_mon_port)
return;
- conv = conversation_new(&pi.src, &pi.dst, PT_UDP, s_mon_port,
+ conv = conversation_new(&pinfo->src, &pinfo->dst, PT_UDP, s_mon_port,
c_mon_port, 0, 0);
conversation_set_dissector(conv, dissect_rtcp);
}
@@ -481,7 +482,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo,
* a conversation that will be dissected
* with the appropriate dissector.
*/
- rtsp_create_conversation(line, linelen);
+ rtsp_create_conversation(pinfo, line, linelen);
} else if (MIME_HDR_MATCHES(rtsp_content_type)) {
/*
* If the Content-Type: header says this