* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quake.c,v 1.18 2001/09/03 10:33:06 guy Exp $
+ * $Id: packet-quake.c,v 1.19 2001/11/25 22:19:24 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
static gint ett_quake_control_colors = -1;
static gint ett_quake_flags = -1;
+static dissector_handle_t data_handle;
/* I took these names directly out of the Q1 source. */
#define NETFLAG_LENGTH_MASK 0x0000ffff
(next_tvb, pinfo, control_tree);
break;
default:
- dissect_data(next_tvb, 0, pinfo, control_tree);
+ call_dissector(data_handle,next_tvb, pinfo, control_tree);
break;
}
}
rest_length = tvb_reported_length(tvb) - 8;
next_tvb = tvb_new_subset(tvb, 8, rest_length , rest_length);
- dissect_data(next_tvb, 0, pinfo, quake_tree);
+ call_dissector(data_handle,next_tvb, pinfo, quake_tree);
}
dissector_add("udp.port", gbl_quakeServerPort,
dissect_quake, proto_quake);
+ data_handle = find_dissector("data");
}
* http://www.dgs.monash.edu.au/~timf/bottim/
* http://www.opt-sci.Arizona.EDU/Pandora/default.asp
*
- * $Id: packet-quake2.c,v 1.2 2001/07/22 18:52:38 girlich Exp $
+ * $Id: packet-quake2.c,v 1.3 2001/11/25 22:19:24 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_quake2_game_clc = -1;
static gint ett_quake2_game_svc = -1;
+static dissector_handle_t data_handle;
#define PORT_MASTER 27910
static unsigned int gbl_quake2ServerPort=PORT_MASTER;
the information from my DM2 specs:
http://www.planetquake.com/demospecs/dm2/
*/
- dissect_data(tvb, 0, pinfo, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
}
the information from my DM2 specs:
http://www.planetquake.com/demospecs/dm2/
*/
- dissect_data(tvb, 0, pinfo, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
}
dissector_add("udp.port", gbl_quake2ServerPort,
dissect_quake2, proto_quake2);
+ data_handle = find_dissector("data");
}
*
* Uwe Girlich <uwe@planetquake.com>
*
- * $Id: packet-quake3.c,v 1.4 2001/10/13 07:43:25 guy Exp $
+ * $Id: packet-quake3.c,v 1.5 2001/11/25 22:19:24 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
static gint ett_quake3_game_clc = -1;
static gint ett_quake3_game_svc = -1;
+static dissector_handle_t data_handle;
#define QUAKE3_SERVER_PORT 27960
#define QUAKE3_MASTER_PORT 27950
proto_tree *tree)
{
/* this shouldn't be too difficult */
- dissect_data(tvb, 0, pinfo, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
}
{
/* It is totally forbidden to decode this any further,
I wont do it. */
- dissect_data(tvb, 0, pinfo, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
}
for (i=0;i<4;i++)
dissector_add("udp.port", gbl_quake3_master_port + i,
dissect_quake3, proto_quake3);
+ data_handle = find_dissector("data");
}
* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quakeworld.c,v 1.4 2001/07/22 18:51:51 girlich Exp $
+ * $Id: packet-quakeworld.c,v 1.5 2001/11/25 22:19:24 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_quakeworld_game_clc = -1;
static gint ett_quakeworld_game_svc = -1;
-
+static dissector_handle_t data_handle;
/*
helper functions, they may ave to go somewhere else
the information from my QWD specs:
http://www.planetquake.com/demospecs/qwd/
*/
- dissect_data(tvb, 0, pinfo, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
}
the information from my QWD specs:
http://www.planetquake.com/demospecs/qwd/
*/
- dissect_data(tvb, 0, pinfo, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
}
dissector_add("udp.port", gbl_quakeworldServerPort,
dissect_quakeworld, proto_quakeworld);
+ data_handle = find_dissector("data");
}
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
* Copyright 2001, Jean-Francois Mule <jfm@clarent.com>
*
- * $Id: packet-sip.c,v 1.17 2001/10/26 18:28:16 gram Exp $
+ * $Id: packet-sip.c,v 1.18 2001/11/25 22:19:24 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
static gint sip_get_msg_offset(tvbuff_t *tvb, guint32 offset);
static dissector_handle_t sdp_handle;
+static dissector_handle_t data_handle;
#define SIP2_HDR "SIP/2.0 "
#define SIP2_HDR_LEN (strlen (SIP2_HDR))
bad:
next_tvb = tvb_new_subset(tvb, offset, -1, -1);
- dissect_data(next_tvb, 0, pinfo, tree);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
return;
}
* Get a handle for the SDP dissector.
*/
sdp_handle = find_dissector("sdp");
+ data_handle = find_dissector("data");
}
* This file is based on packet-aim.c, which is
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-skinny.c,v 1.4 2001/10/20 18:42:01 guy Exp $
+ * $Id: packet-skinny.c,v 1.5 2001/11/25 22:19:25 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
/* Initialize the subtree pointers */
static gint ett_skinny = -1;
+static dissector_handle_t data_handle;
+
/* Code to actually dissect the packets */
static void dissect_skinny(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
/* hdr_data_length > 1024 is just a heuristic. Better values/checks welcome */
if (hdr_data_length < 4 || hdr_data_length > 1024 || hdr_reserved != 0) {
/* Not an SKINNY packet, just happened to use the same port */
- dissect_data(tvb, 0, pinfo, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
return;
}
void
proto_reg_handoff_skinny(void)
{
+ data_handle = find_dissector("data");
dissector_add("tcp.port", TCP_PORT_SKINNY, &dissect_skinny, proto_skinny);
}
/* packet-sll.c
* Routines for disassembly of packets from Linux "cooked mode" captures
*
- * $Id: packet-sll.c,v 1.12 2001/11/20 21:59:13 guy Exp $
+ * $Id: packet-sll.c,v 1.13 2001/11/25 22:19:25 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
static dissector_handle_t ipx_handle;
static dissector_handle_t llc_handle;
+static dissector_handle_t data_handle;
void
capture_sll(const u_char *pd, int len, packet_counts *ld)
break;
default:
- dissect_data(next_tvb, 0, pinfo, tree);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
break;
}
} else {
*/
llc_handle = find_dissector("llc");
ipx_handle = find_dissector("ipx");
+ data_handle = find_dissector("data");
dissector_add("wtap_encap", WTAP_ENCAP_SLL, dissect_sll, proto_sll);
}
* Routines for SSCOP (Q.2110, Q.SAAL) frame disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-sscop.c,v 1.15 2001/05/27 07:15:26 guy Exp $
+ * $Id: packet-sscop.c,v 1.16 2001/11/25 22:19:25 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
static gint ett_sscop = -1;
static dissector_handle_t q2931_handle;
+static dissector_handle_t data_handle;
/*
* See
if (pdu_type == SSCOP_SD)
call_dissector(q2931_handle, next_tvb, pinfo, tree);
else
- dissect_data(next_tvb, 0, pinfo, tree);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
}
break;
}
* Get handle for the Q.2931 dissector.
*/
q2931_handle = find_dissector("q2931");
+ data_handle = find_dissector("data");
}
* Routines for v120 frame disassembly
* Bert Driehuis <driehuis@playbeing.org>
*
- * $Id: packet-v120.c,v 1.19 2001/06/18 02:17:53 guy Exp $
+ * $Id: packet-v120.c,v 1.20 2001/11/25 22:19:25 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_v120_control = -1;
static gint ett_v120_header = -1;
+static dissector_handle_t data_handle;
+
static int dissect_v120_header(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
static void
v120len += dissect_v120_header(tvb, v120len, pinfo, v120_tree);
proto_item_set_len(ti, v120len);
next_tvb = tvb_new_subset(tvb, v120len, -1, -1);
- dissect_data(next_tvb, 0, pinfo, v120_tree);
+ call_dissector(data_handle,next_tvb, pinfo, v120_tree);
}
}
void
proto_reg_handoff_v120(void)
{
+ data_handle = find_dissector("data");
dissector_add("wtap_encap", WTAP_ENCAP_V120, dissect_v120,
proto_v120);
}
* Routines for x25 packet disassembly
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-x25.c,v 1.54 2001/11/15 21:11:01 gram Exp $
+ * $Id: packet-x25.c,v 1.55 2001/11/25 22:19:25 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static dissector_handle_t ositp_handle;
static dissector_handle_t sna_handle;
static dissector_handle_t qllc_handle;
+static dissector_handle_t data_handle;
/* Preferences */
static gboolean non_q_bit_is_sna = FALSE;
call_dissector(ip_handle, next_tvb, pinfo, tree);
}
else {
- dissect_data(next_tvb, 0, pinfo, tree);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
}
}
}
ositp_handle = find_dissector("ositp");
sna_handle = find_dissector("sna");
qllc_handle = find_dissector("qllc");
+ data_handle = find_dissector("data");
dissector_add("llc.dsap", SAP_X25, dissect_x25, proto_x25);
}