aboutsummaryrefslogtreecommitdiffstats
path: root/packet-rtsp.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-11-27 07:13:32 +0000
committerGuy Harris <guy@alum.mit.edu>2001-11-27 07:13:32 +0000
commit07b2709f8a32951cc2503d2e048d662a01cb472c (patch)
tree21d265bf7402a2739905bd87227383ae0a9f78ab /packet-rtsp.c
parentfd456eaf0b5af46449882983b95529e073fd989f (diff)
Change "conversation_set_dissector()" to take a dissector handle, rather
than a pointer to a dissector function, as an argument. This means that the conversation dissector is called through "call_dissector()", so the dissector itself doesn't have to worry about checking whether the protocol is enabled or setting "pinfo->current_proto", so get rid of the code that does that in conversation dissectors. Also, make the conversation dissectors static. Get rid of some direct calls to dissectors; replace them with calls through handles, and, again, get rid of code to check whether a protocol is enabled and set "pinfo->current_proto" where that code isn't needed. Make those dissectors static if they aren't already static. Add a routine "create_dissector_handle()" to create a dissector handle without registering it by name, if the dissector isn't used outside the module in which it's defined. svn path=/trunk/; revision=4281
Diffstat (limited to 'packet-rtsp.c')
-rw-r--r--packet-rtsp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-rtsp.c b/packet-rtsp.c
index 4b3183efca..3cd944f8de 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.42 2001/09/08 00:43:51 guy Exp $
+ * $Id: packet-rtsp.c,v 1.43 2001/11/27 07:13:26 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -352,14 +352,14 @@ rtsp_create_conversation(packet_info *pinfo, const u_char *line_begin,
conv = conversation_new(&pinfo->dst, &null_addr, PT_UDP, c_data_port,
s_data_port, NO_ADDR2 | (!s_data_port ? NO_PORT2 : 0));
- conversation_set_dissector(conv, dissect_rtp);
+ conversation_set_dissector(conv, rtp_handle);
if (!c_mon_port)
return;
conv = conversation_new(&pinfo->dst, &null_addr, PT_UDP, c_mon_port,
s_mon_port, NO_ADDR2 | (!s_mon_port ? NO_PORT2 : 0));
- conversation_set_dissector(conv, dissect_rtcp);
+ conversation_set_dissector(conv, rtcp_handle);
}
static const char rtsp_content_length[] = "Content-Length:";