aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/packet.c33
-rw-r--r--epan/packet.h22
-rw-r--r--packet-aarp.c4
-rw-r--r--packet-aim.c4
-rw-r--r--packet-arp.c6
-rw-r--r--packet-ascend.c4
-rw-r--r--packet-atalk.c14
-rw-r--r--packet-atm.c5
-rw-r--r--packet-auto_rp.c5
-rw-r--r--packet-bgp.c4
-rw-r--r--packet-bootp.c4
-rw-r--r--packet-bpdu.c6
-rw-r--r--packet-bxxp.c4
-rw-r--r--packet-cdp.c4
-rw-r--r--packet-cgmp.c4
-rw-r--r--packet-clip.c5
-rw-r--r--packet-clnp.c11
-rw-r--r--packet-cops.c4
-rw-r--r--packet-ddtp.c4
-rw-r--r--packet-dec-bpdu.c5
-rw-r--r--packet-diameter.c14
-rw-r--r--packet-dns.c6
-rw-r--r--packet-eigrp.c8
-rw-r--r--packet-esis.c4
-rw-r--r--packet-eth.c7
-rw-r--r--packet-fddi.c8
-rw-r--r--packet-fr.c6
-rw-r--r--packet-ftp.c6
-rw-r--r--packet-giop.c4
-rw-r--r--packet-gre.c4
-rw-r--r--packet-h1.c4
-rw-r--r--packet-hsrp.c4
-rw-r--r--packet-http.c17
-rw-r--r--packet-icmpv6.c4
-rw-r--r--packet-icp.c4
-rw-r--r--packet-icq.c4
-rw-r--r--packet-ieee80211.c5
-rw-r--r--packet-igrp.c4
-rw-r--r--packet-imap.c4
-rw-r--r--packet-ip.c22
-rw-r--r--packet-ipp.c6
-rw-r--r--packet-ipsec.c9
-rw-r--r--packet-ipv6.c20
-rw-r--r--packet-ipx.c24
-rw-r--r--packet-irc.c4
-rw-r--r--packet-isakmp.c5
-rw-r--r--packet-isis.c4
-rw-r--r--packet-isl.c4
-rw-r--r--packet-kerberos.c8
-rw-r--r--packet-l2tp.c5
-rw-r--r--packet-lapb.c6
-rw-r--r--packet-lapbether.c4
-rw-r--r--packet-lapd.c4
-rw-r--r--packet-ldap.c4
-rw-r--r--packet-ldp.c6
-rw-r--r--packet-llc.c7
-rw-r--r--packet-lpd.c4
-rw-r--r--packet-mapi.c4
-rw-r--r--packet-mip.c4
-rw-r--r--packet-mpls.c6
-rw-r--r--packet-msproxy.c5
-rw-r--r--packet-nbipx.c7
-rw-r--r--packet-nbns.c10
-rw-r--r--packet-ncp.c11
-rw-r--r--packet-netbios.c4
-rw-r--r--packet-nntp.c4
-rw-r--r--packet-ntp.c6
-rw-r--r--packet-null.c4
-rw-r--r--packet-osi.c6
-rw-r--r--packet-ospf.c4
-rw-r--r--packet-pim.c4
-rw-r--r--packet-pop.c4
-rw-r--r--packet-ppp.c10
-rw-r--r--packet-pppoe.c8
-rw-r--r--packet-pptp.c4
-rw-r--r--packet-quake.c4
-rw-r--r--packet-radius.c14
-rw-r--r--packet-raw.c4
-rw-r--r--packet-rip.c4
-rw-r--r--packet-ripng.c4
-rw-r--r--packet-rlogin.c5
-rw-r--r--packet-rpc.c6
-rw-r--r--packet-rsh.c4
-rw-r--r--packet-rsvp.c5
-rw-r--r--packet-rtcp.c4
-rw-r--r--packet-rtp.c4
-rw-r--r--packet-rtsp.c4
-rw-r--r--packet-rx.c7
-rw-r--r--packet-sap.c4
-rw-r--r--packet-sctp.c4
-rw-r--r--packet-sdp.c4
-rw-r--r--packet-sip.c6
-rw-r--r--packet-sll.c4
-rw-r--r--packet-smtp.c4
-rw-r--r--packet-sna.c5
-rw-r--r--packet-snmp.c20
-rw-r--r--packet-socks.c5
-rw-r--r--packet-srvloc.c18
-rw-r--r--packet-syslog.c4
-rw-r--r--packet-tacacs.c8
-rw-r--r--packet-tcp.c4
-rw-r--r--packet-telnet.c5
-rw-r--r--packet-tftp.c4
-rw-r--r--packet-time.c4
-rw-r--r--packet-tns.c4
-rw-r--r--packet-tr.c5
-rw-r--r--packet-trmac.c4
-rw-r--r--packet-udp.c4
-rw-r--r--packet-v120.c5
-rw-r--r--packet-vines.c12
-rw-r--r--packet-vlan.c4
-rw-r--r--packet-vrrp.c4
-rw-r--r--packet-vtp.c4
-rw-r--r--packet-wccp.c4
-rw-r--r--packet-who.c4
-rw-r--r--packet-wsp.c12
-rw-r--r--packet-wtp.c6
-rw-r--r--packet-x11.c8
-rw-r--r--packet-x25.c11
-rw-r--r--packet-xot.c4
-rw-r--r--packet-yhoo.c4
-rw-r--r--packet-zebra.c4
-rw-r--r--plugins/gryphon/packet-gryphon.c4
-rw-r--r--plugins/mgcp/packet-mgcp.c14
-rw-r--r--plugins/plugin_table.h11
125 files changed, 460 insertions, 364 deletions
diff --git a/epan/packet.c b/epan/packet.c
index d29708d2dc..3546579c76 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
- * $Id: packet.c,v 1.12 2001/01/09 05:53:21 guy Exp $
+ * $Id: packet.c,v 1.13 2001/01/09 06:32:06 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1160,6 +1160,7 @@ typedef struct {
old_dissector_t old;
dissector_t new;
} dissector;
+ int proto_index;
} dtbl_entry_t;
/* Finds a dissector table by field name. */
@@ -1173,7 +1174,8 @@ find_dissector_table(const char *name)
/* add an entry, lookup the dissector table for the specified field name, */
/* if a valid table found, add the subdissector */
void
-old_dissector_add(const char *name, guint32 pattern, old_dissector_t dissector)
+old_dissector_add(const char *name, guint32 pattern, old_dissector_t dissector,
+ int proto)
{
dissector_table_t sub_dissectors = find_dissector_table( name);
dtbl_entry_t *dtbl_entry;
@@ -1184,6 +1186,7 @@ old_dissector_add(const char *name, guint32 pattern, old_dissector_t dissector)
dtbl_entry = g_malloc(sizeof (dtbl_entry_t));
dtbl_entry->is_old_dissector = TRUE;
dtbl_entry->dissector.old = dissector;
+ dtbl_entry->proto_index = proto;
/* do the table insertion */
g_hash_table_insert( sub_dissectors, GUINT_TO_POINTER( pattern),
@@ -1191,7 +1194,8 @@ old_dissector_add(const char *name, guint32 pattern, old_dissector_t dissector)
}
void
-dissector_add(const char *name, guint32 pattern, dissector_t dissector)
+dissector_add(const char *name, guint32 pattern, dissector_t dissector,
+ int proto)
{
dissector_table_t sub_dissectors = find_dissector_table( name);
dtbl_entry_t *dtbl_entry;
@@ -1202,6 +1206,7 @@ dissector_add(const char *name, guint32 pattern, dissector_t dissector)
dtbl_entry = g_malloc(sizeof (dtbl_entry_t));
dtbl_entry->is_old_dissector = FALSE;
dtbl_entry->dissector.new = dissector;
+ dtbl_entry->proto_index = proto;
/* do the table insertion */
g_hash_table_insert( sub_dissectors, GUINT_TO_POINTER( pattern),
@@ -1319,7 +1324,7 @@ dissector_try_port(dissector_table_t sub_dissectors, guint32 port,
dtbl_entry = g_hash_table_lookup(sub_dissectors,
GUINT_TO_POINTER(port));
if (dtbl_entry != NULL) {
- pi.match_port = port;
+ pinfo->match_port = port;
if (dtbl_entry->is_old_dissector) {
/*
* New dissector calling old dissector; use
@@ -1373,6 +1378,7 @@ typedef struct {
old_heur_dissector_t old;
heur_dissector_t new;
} dissector;
+ int proto_index;
} heur_dtbl_entry_t;
/* Finds a heuristic dissector table by field name. */
@@ -1384,7 +1390,8 @@ find_heur_dissector_list(const char *name)
}
void
-old_heur_dissector_add(const char *name, old_heur_dissector_t dissector)
+old_heur_dissector_add(const char *name, old_heur_dissector_t dissector,
+ int proto)
{
heur_dissector_list_t *sub_dissectors = find_heur_dissector_list(name);
heur_dtbl_entry_t *dtbl_entry;
@@ -1395,13 +1402,14 @@ old_heur_dissector_add(const char *name, old_heur_dissector_t dissector)
dtbl_entry = g_malloc(sizeof (heur_dtbl_entry_t));
dtbl_entry->is_old_dissector = TRUE;
dtbl_entry->dissector.old = dissector;
+ dtbl_entry->proto_index = proto;
/* do the table insertion */
*sub_dissectors = g_slist_append(*sub_dissectors, (gpointer)dtbl_entry);
}
void
-heur_dissector_add(const char *name, heur_dissector_t dissector)
+heur_dissector_add(const char *name, heur_dissector_t dissector, int proto)
{
heur_dissector_list_t *sub_dissectors = find_heur_dissector_list(name);
heur_dtbl_entry_t *dtbl_entry;
@@ -1412,6 +1420,7 @@ heur_dissector_add(const char *name, heur_dissector_t dissector)
dtbl_entry = g_malloc(sizeof (heur_dtbl_entry_t));
dtbl_entry->is_old_dissector = FALSE;
dtbl_entry->dissector.new = dissector;
+ dtbl_entry->proto_index = proto;
/* do the table insertion */
*sub_dissectors = g_slist_append(*sub_dissectors, (gpointer)dtbl_entry);
@@ -1480,6 +1489,7 @@ typedef struct {
old_dissector_t old;
dissector_t new;
} dissector;
+ int proto_index;
} conv_dtbl_entry_t;
/* Finds a conversation dissector table by table name. */
@@ -1491,7 +1501,8 @@ find_conv_dissector_list(const char *name)
}
void
-old_conv_dissector_add(const char *name, old_dissector_t dissector)
+old_conv_dissector_add(const char *name, old_dissector_t dissector,
+ int proto)
{
conv_dissector_list_t *sub_dissectors = find_conv_dissector_list(name);
conv_dtbl_entry_t *dtbl_entry;
@@ -1502,13 +1513,14 @@ old_conv_dissector_add(const char *name, old_dissector_t dissector)
dtbl_entry = g_malloc(sizeof (conv_dtbl_entry_t));
dtbl_entry->is_old_dissector = TRUE;
dtbl_entry->dissector.old = dissector;
+ dtbl_entry->proto_index = proto;
/* do the table insertion */
*sub_dissectors = g_slist_append(*sub_dissectors, (gpointer)dtbl_entry);
}
void
-conv_dissector_add(const char *name, dissector_t dissector)
+conv_dissector_add(const char *name, dissector_t dissector, int proto)
{
conv_dissector_list_t *sub_dissectors = find_conv_dissector_list(name);
conv_dtbl_entry_t *dtbl_entry;
@@ -1519,6 +1531,7 @@ conv_dissector_add(const char *name, dissector_t dissector)
dtbl_entry = g_malloc(sizeof (conv_dtbl_entry_t));
dtbl_entry->is_old_dissector = FALSE;
dtbl_entry->dissector.new = dissector;
+ dtbl_entry->proto_index = proto;
/* do the table insertion */
*sub_dissectors = g_slist_append(*sub_dissectors, (gpointer)dtbl_entry);
@@ -1559,6 +1572,7 @@ static GHashTable *registered_dissectors = NULL;
struct dissector_handle {
const char *name; /* dissector name */
dissector_t dissector;
+ int proto_index;
};
/* Find a registered dissector by name. */
@@ -1571,7 +1585,7 @@ find_dissector(const char *name)
/* Register a dissector by name. */
void
-register_dissector(const char *name, dissector_t dissector)
+register_dissector(const char *name, dissector_t dissector, int proto)
{
struct dissector_handle *handle;
@@ -1587,6 +1601,7 @@ register_dissector(const char *name, dissector_t dissector)
handle = g_malloc(sizeof (struct dissector_handle));
handle->name = name;
handle->dissector = dissector;
+ handle->proto_index = proto;
g_hash_table_insert(registered_dissectors, (gpointer)name,
(gpointer) handle);
diff --git a/epan/packet.h b/epan/packet.h
index 0f1ebdfcaf..ea634a8c6c 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet.h,v 1.16 2001/01/09 05:53:21 guy Exp $
+ * $Id: packet.h,v 1.17 2001/01/09 06:32:06 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -211,8 +211,10 @@ dissector_table_t register_dissector_table(const char *name);
/* Add a sub-dissector to a dissector table. Called by the protocol routine */
/* that wants to register a sub-dissector. */
-void old_dissector_add(const char *abbrev, guint32 pattern, old_dissector_t dissector);
-void dissector_add(const char *abbrev, guint32 pattern, dissector_t dissector);
+void old_dissector_add(const char *abbrev, guint32 pattern,
+ old_dissector_t dissector, int proto);
+void dissector_add(const char *abbrev, guint32 pattern,
+ dissector_t dissector, int proto);
/* Add a sub-dissector to a dissector table. Called by the protocol routine */
/* that wants to de-register a sub-dissector. */
@@ -244,8 +246,10 @@ void register_heur_dissector_list(const char *name, heur_dissector_list_t *list)
/* Add a sub-dissector to a heuristic dissector list. Called by the
protocol routine that wants to register a sub-dissector. */
-void old_heur_dissector_add(const char *name, old_heur_dissector_t dissector);
-void heur_dissector_add(const char *name, heur_dissector_t dissector);
+void old_heur_dissector_add(const char *name, old_heur_dissector_t dissector,
+ int proto);
+void heur_dissector_add(const char *name, heur_dissector_t dissector,
+ int proto);
/* Try all the dissectors in a given heuristic dissector list until
we find one that recognizes the protocol, in which case we return
@@ -272,8 +276,10 @@ void register_conv_dissector_list(const char *name, conv_dissector_list_t *list)
/* Add a sub-dissector to a conversation dissector list. Called by the
protocol routine that wants to register a sub-dissector. */
-void old_conv_dissector_add(const char *name, old_dissector_t dissector);
-void conv_dissector_add(const char *name, dissector_t dissector);
+void old_conv_dissector_add(const char *name, old_dissector_t dissector,
+ int proto);
+void conv_dissector_add(const char *name, dissector_t dissector,
+ int proto);
/* Handle for dissectors you call directly.
This handle is opaque outside of "packet.c". */
@@ -281,7 +287,7 @@ struct dissector_handle;
typedef struct dissector_handle *dissector_handle_t;
/* Register a dissector. */
-void register_dissector(const char *name, dissector_t dissector);
+void register_dissector(const char *name, dissector_t dissector, int proto);
/* Find a dissector by name. */
dissector_handle_t find_dissector(const char *name);
diff --git a/packet-aarp.c b/packet-aarp.c
index 7fc807c345..abd9b007ad 100644
--- a/packet-aarp.c
+++ b/packet-aarp.c
@@ -1,7 +1,7 @@
/* packet-aarp.c
* Routines for Appletalk ARP packet disassembly
*
- * $Id: packet-aarp.c,v 1.26 2001/01/03 06:55:26 guy Exp $
+ * $Id: packet-aarp.c,v 1.27 2001/01/09 06:31:33 guy Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@@ -290,5 +290,5 @@ proto_register_aarp(void)
void
proto_reg_handoff_aarp(void)
{
- dissector_add("ethertype", ETHERTYPE_AARP, dissect_aarp);
+ dissector_add("ethertype", ETHERTYPE_AARP, dissect_aarp, proto_aarp);
}
diff --git a/packet-aim.c b/packet-aim.c
index f4499d8e41..7954e552ae 100644
--- a/packet-aim.c
+++ b/packet-aim.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-aim.c,v 1.5 2001/01/03 06:55:26 guy Exp $
+ * $Id: packet-aim.c,v 1.6 2001/01/09 06:31:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -620,5 +620,5 @@ proto_register_aim(void)
void
proto_reg_handoff_aim(void)
{
- dissector_add("tcp.port", TCP_PORT_AIM, &dissect_aim);
+ dissector_add("tcp.port", TCP_PORT_AIM, &dissect_aim, proto_aim);
}
diff --git a/packet-arp.c b/packet-arp.c
index 5f00ab60e5..2d975c19b0 100644
--- a/packet-arp.c
+++ b/packet-arp.c
@@ -1,7 +1,7 @@
/* packet-arp.c
* Routines for ARP packet disassembly
*
- * $Id: packet-arp.c,v 1.41 2001/01/09 01:02:34 guy Exp $
+ * $Id: packet-arp.c,v 1.42 2001/01/09 06:31:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -943,6 +943,6 @@ proto_register_arp(void)
void
proto_reg_handoff_arp(void)
{
- dissector_add("ethertype", ETHERTYPE_ARP, dissect_arp);
- dissector_add("ethertype", ETHERTYPE_REVARP, dissect_arp);
+ dissector_add("ethertype", ETHERTYPE_ARP, dissect_arp, proto_arp);
+ dissector_add("ethertype", ETHERTYPE_REVARP, dissect_arp, proto_arp);
}
diff --git a/packet-ascend.c b/packet-ascend.c
index c53239de21..0f14be87a4 100644
--- a/packet-ascend.c
+++ b/packet-ascend.c
@@ -1,7 +1,7 @@
/* packet-ascend.c
* Routines for decoding Lucent/Ascend packet traces
*
- * $Id: packet-ascend.c,v 1.22 2001/01/03 06:55:27 guy Exp $
+ * $Id: packet-ascend.c,v 1.23 2001/01/09 06:31:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -157,5 +157,5 @@ proto_reg_handoff_ascend(void)
*/
eth_handle = find_dissector("eth");
ppp_handle = find_dissector("ppp");
- dissector_add("wtap_encap", WTAP_ENCAP_ASCEND, dissect_ascend);
+ dissector_add("wtap_encap", WTAP_ENCAP_ASCEND, dissect_ascend, proto_ascend);
}
diff --git a/packet-atalk.c b/packet-atalk.c
index 4c090d9608..2ca0c3b51b 100644
--- a/packet-atalk.c
+++ b/packet-atalk.c
@@ -1,7 +1,7 @@
/* packet-atalk.c
* Routines for Appletalk packet disassembly (DDP, currently).
*
- * $Id: packet-atalk.c,v 1.48 2001/01/03 06:55:27 guy Exp $
+ * $Id: packet-atalk.c,v 1.49 2001/01/09 06:31:33 guy Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@@ -582,10 +582,10 @@ proto_register_atalk(void)
void
proto_reg_handoff_atalk(void)
{
- dissector_add("ethertype", ETHERTYPE_ATALK, dissect_ddp);
- dissector_add("ppp.protocol", PPP_AT, dissect_ddp);
- dissector_add("null.type", BSD_AF_APPLETALK, dissect_ddp);
- dissector_add("ddp.type", DDP_NBP, dissect_nbp);
- dissector_add("ddp.type", DDP_RTMPREQ, dissect_rtmp_request);
- dissector_add("ddp.type", DDP_RTMPDATA, dissect_rtmp_data);
+ dissector_add("ethertype", ETHERTYPE_ATALK, dissect_ddp, proto_ddp);
+ dissector_add("ppp.protocol", PPP_AT, dissect_ddp, proto_ddp);
+ dissector_add("null.type", BSD_AF_APPLETALK, dissect_ddp, proto_ddp);
+ dissector_add("ddp.type", DDP_NBP, dissect_nbp, proto_nbp);
+ dissector_add("ddp.type", DDP_RTMPREQ, dissect_rtmp_request, proto_rtmp);
+ dissector_add("ddp.type", DDP_RTMPDATA, dissect_rtmp_data, proto_rtmp);
}
diff --git a/packet-atm.c b/packet-atm.c
index ab070798e1..fe7dec01bb 100644
--- a/packet-atm.c
+++ b/packet-atm.c
@@ -1,7 +1,7 @@
/* packet-atm.c
* Routines for ATM packet disassembly
*
- * $Id: packet-atm.c,v 1.30 2001/01/03 10:34:41 guy Exp $
+ * $Id: packet-atm.c,v 1.31 2001/01/09 06:31:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -801,5 +801,6 @@ proto_reg_handoff_atm(void)
*/
llc_handle = find_dissector("llc");
- dissector_add("wtap_encap", WTAP_ENCAP_ATM_SNIFFER, dissect_atm);
+ dissector_add("wtap_encap", WTAP_ENCAP_ATM_SNIFFER, dissect_atm,
+ proto_atm);
}
diff --git a/packet-auto_rp.c b/packet-auto_rp.c
index 80ccb3ecfa..5fe5d79b67 100644
--- a/packet-auto_rp.c
+++ b/packet-auto_rp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-auto_rp.c,v 1.11 2001/01/03 06:55:27 guy Exp $
+ * $Id: packet-auto_rp.c,v 1.12 2001/01/09 06:31:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -245,7 +245,8 @@ void proto_register_auto_rp(void)
void
proto_reg_handoff_auto_rp(void)
{
- dissector_add("udp.port", UDP_PORT_PIM_RP_DISC, dissect_auto_rp);
+ dissector_add("udp.port", UDP_PORT_PIM_RP_DISC, dissect_auto_rp,
+ proto_auto_rp);
}
/*
diff --git a/packet-bgp.c b/packet-bgp.c
index 06a0463e48..eadae77ec3 100644
--- a/packet-bgp.c
+++ b/packet-bgp.c
@@ -2,7 +2,7 @@
* Routines for BGP packet dissection.
* Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-bgp.c,v 1.31 2001/01/03 06:55:27 guy Exp $
+ * $Id: packet-bgp.c,v 1.32 2001/01/09 06:31:34 guy Exp $
*
* Supports:
* RFC1771 A Border Gateway Protocol 4 (BGP-4)
@@ -1516,5 +1516,5 @@ proto_register_bgp(void)
void
proto_reg_handoff_bgp(void)
{
- old_dissector_add("tcp.port", BGP_TCP_PORT, dissect_bgp);
+ old_dissector_add("tcp.port", BGP_TCP_PORT, dissect_bgp, proto_bgp);
}
diff --git a/packet-bootp.c b/packet-bootp.c
index 7adb16c379..3ce1823193 100644
--- a/packet-bootp.c
+++ b/packet-bootp.c
@@ -2,7 +2,7 @@
* Routines for BOOTP/DHCP packet disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-bootp.c,v 1.44 2001/01/03 22:49:06 guy Exp $
+ * $Id: packet-bootp.c,v 1.45 2001/01/09 06:31:34 guy Exp $
*
* The information used comes from:
* RFC 951: Bootstrap Protocol
@@ -899,5 +899,5 @@ proto_register_bootp(void)
void
proto_reg_handoff_bootp(void)
{
- dissector_add("udp.port", UDP_PORT_BOOTPS, dissect_bootp);
+ dissector_add("udp.port", UDP_PORT_BOOTPS, dissect_bootp, proto_bootp);
}
diff --git a/packet-bpdu.c b/packet-bpdu.c
index 31aa099c8b..db992d9a86 100644
--- a/packet-bpdu.c
+++ b/packet-bpdu.c
@@ -1,7 +1,7 @@
/* packet-bpdu.c
* Routines for BPDU (Spanning Tree Protocol) disassembly
*
- * $Id: packet-bpdu.c,v 1.18 2001/01/03 06:55:27 guy Exp $
+ * $Id: packet-bpdu.c,v 1.19 2001/01/09 06:31:34 guy Exp $
*
* Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
*
@@ -319,11 +319,11 @@ proto_register_bpdu(void)
proto_register_field_array(proto_bpdu, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("bpdu", dissect_bpdu);
+ register_dissector("bpdu", dissect_bpdu, proto_bpdu);
}
void
proto_reg_handoff_bpdu(void)
{
- dissector_add("llc.dsap", SAP_BPDU, dissect_bpdu);
+ dissector_add("llc.dsap", SAP_BPDU, dissect_bpdu, proto_bpdu);
}
diff --git a/packet-bxxp.c b/packet-bxxp.c
index 37e22f4cd6..7d3e012673 100644
--- a/packet-bxxp.c
+++ b/packet-bxxp.c
@@ -1,7 +1,7 @@
/* packet-bxxp.c
* Routines for BXXP packet disassembly
*
- * $Id: packet-bxxp.c,v 1.14 2001/01/03 07:53:43 guy Exp $
+ * $Id: packet-bxxp.c,v 1.15 2001/01/09 06:31:34 guy Exp $
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
@@ -1257,6 +1257,6 @@ proto_reg_handoff_bxxp(void)
tcp_port = global_bxxp_tcp_port;
- dissector_add("tcp.port", global_bxxp_tcp_port, dissect_bxxp);
+ dissector_add("tcp.port", global_bxxp_tcp_port, dissect_bxxp, proto_bxxp);
}
diff --git a/packet-cdp.c b/packet-cdp.c
index 899513d903..f6b7e5902b 100644
--- a/packet-cdp.c
+++ b/packet-cdp.c
@@ -2,7 +2,7 @@
* Routines for the disassembly of the "Cisco Discovery Protocol"
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-cdp.c,v 1.30 2001/01/05 19:14:05 guy Exp $
+ * $Id: packet-cdp.c,v 1.31 2001/01/09 06:31:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -524,5 +524,5 @@ proto_register_cdp(void)
void
proto_reg_handoff_cdp(void)
{
- dissector_add("llc.cisco_pid", 0x2000, dissect_cdp);
+ dissector_add("llc.cisco_pid", 0x2000, dissect_cdp, proto_cdp);
}
diff --git a/packet-cgmp.c b/packet-cgmp.c
index f0212de700..5d53e01e62 100644
--- a/packet-cgmp.c
+++ b/packet-cgmp.c
@@ -1,7 +1,7 @@
/* packet-cgmp.c
* Routines for the disassembly of the Cisco Group Management Protocol
*
- * $Id: packet-cgmp.c,v 1.7 2001/01/03 06:55:27 guy Exp $
+ * $Id: packet-cgmp.c,v 1.8 2001/01/09 06:31:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -144,5 +144,5 @@ proto_register_cgmp(void)
void
proto_reg_handoff_cgmp(void)
{
- dissector_add("llc.cisco_pid", 0x2001, dissect_cgmp);
+ dissector_add("llc.cisco_pid", 0x2001, dissect_cgmp, proto_cgmp);
}
diff --git a/packet-clip.c b/packet-clip.c
index 750bd576b3..0e37a7b23a 100644
--- a/packet-clip.c
+++ b/packet-clip.c
@@ -1,7 +1,7 @@
/* packet-clip.c
* Routines for clip packet disassembly
*
- * $Id: packet-clip.c,v 1.13 2000/11/29 05:16:15 gram Exp $
+ * $Id: packet-clip.c,v 1.14 2001/01/09 06:31:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -102,5 +102,6 @@ proto_reg_handoff_clip(void)
* Get a handle for the IP dissector.
*/
ip_handle = find_dissector("ip");
- dissector_add("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, dissect_clip);
+ dissector_add("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, dissect_clip,
+ -1); /* XXX */
}
diff --git a/packet-clnp.c b/packet-clnp.c
index 62a58f5189..5bd4e90ff9 100644
--- a/packet-clnp.c
+++ b/packet-clnp.c
@@ -1,7 +1,7 @@
/* packet-clnp.c
* Routines for ISO/OSI network and transport protocol packet disassembly
*
- * $Id: packet-clnp.c,v 1.21 2001/01/03 07:53:43 guy Exp $
+ * $Id: packet-clnp.c,v 1.22 2001/01/09 06:31:34 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -1906,7 +1906,8 @@ void proto_register_cotp(void)
/* subdissector code */
register_heur_dissector_list("cotp_is", &cotp_is_heur_subdissector_list);
- register_dissector("ositp", dissect_ositp);
+ /* XXX - what about CLTP? */
+ register_dissector("ositp", dissect_ositp, proto_cotp);
}
void proto_register_cltp(void)
@@ -1927,6 +1928,8 @@ void proto_register_cltp(void)
void
proto_reg_handoff_clnp(void)
{
- dissector_add("osinl", NLPID_ISO8473_CLNP, dissect_clnp);
- dissector_add("osinl", NLPID_NULL, dissect_clnp); /* Inactive subset */
+ dissector_add("osinl", NLPID_ISO8473_CLNP, dissect_clnp,
+ proto_clnp);
+ dissector_add("osinl", NLPID_NULL, dissect_clnp,
+ proto_clnp); /* Inactive subset */
}
diff --git a/packet-cops.c b/packet-cops.c
index 93500682dc..675e3f2897 100644
--- a/packet-cops.c
+++ b/packet-cops.c
@@ -4,7 +4,7 @@
*
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-cops.c,v 1.9 2001/01/03 16:41:06 gram Exp $
+ * $Id: packet-cops.c,v 1.10 2001/01/09 06:31:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -828,5 +828,5 @@ void proto_register_cops(void)
void
proto_reg_handoff_cops(void)
{
- dissector_add("tcp.port", TCP_PORT_COPS, dissect_cops);
+ dissector_add("tcp.port", TCP_PORT_COPS, dissect_cops, proto_cops);
}
diff --git a/packet-ddtp.c b/packet-ddtp.c
index 3f6b7dafe1..aea730cfa9 100644
--- a/packet-ddtp.c
+++ b/packet-ddtp.c
@@ -3,7 +3,7 @@
* see http://ddt.sourceforge.net/
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-ddtp.c,v 1.13 2001/01/04 04:44:02 gram Exp $
+ * $Id: packet-ddtp.c,v 1.14 2001/01/09 06:31:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -198,5 +198,5 @@ proto_register_ddtp(void)
void
proto_reg_handoff_ddtp(void)
{
- dissector_add("udp.port", UDP_PORT_DDTP, dissect_ddtp);
+ dissector_add("udp.port", UDP_PORT_DDTP, dissect_ddtp, proto_ddtp);
}
diff --git a/packet-dec-bpdu.c b/packet-dec-bpdu.c
index 27ec5fac52..a41bd9ff47 100644
--- a/packet-dec-bpdu.c
+++ b/packet-dec-bpdu.c
@@ -1,7 +1,7 @@
/* packet-dec-bpdu.c
* Routines for DEC BPDU (DEC Spanning Tree Protocol) disassembly
*
- * $Id: packet-dec-bpdu.c,v 1.3 2001/01/07 00:23:03 guy Exp $
+ * $Id: packet-dec-bpdu.c,v 1.4 2001/01/09 06:31:35 guy Exp $
*
* Copyright 2001 Paul Ionescu <paul@acorp.ro>
*
@@ -164,5 +164,6 @@ proto_register_dec_bpdu(void)
void
proto_reg_handoff_dec_bpdu(void)
{
- dissector_add("ethertype", ETHERTYPE_DEC_LB, dissect_dec_bpdu);
+ dissector_add("ethertype", ETHERTYPE_DEC_LB, dissect_dec_bpdu,
+ proto_dec_bpdu);
}
diff --git a/packet-diameter.c b/packet-diameter.c
index 9e2348a0c6..cab0e95207 100644
--- a/packet-diameter.c
+++ b/packet-diameter.c
@@ -1,7 +1,7 @@
/* packet-diameter.c
* Routines for DIAMETER packet disassembly
*
- * $Id: packet-diameter.c,v 1.10 2001/01/03 07:53:43 guy Exp $
+ * $Id: packet-diameter.c,v 1.11 2001/01/09 06:31:35 guy Exp $
*
* Copyright (c) 2000 by David Frascone <chaos@mindspring.com>
*
@@ -761,10 +761,14 @@ proto_reg_handoff_diameter(void)
/* g_warning ("Diameter: Adding tcp dissector to port %d",
gbl_diameterTcpPort); */
- old_dissector_add("tcp.port", gbl_diameterTcpPort, dissect_diameter);
- old_dissector_add("udp.port", gbl_diameterUdpPort, dissect_diameter);
+ old_dissector_add("tcp.port", gbl_diameterTcpPort, dissect_diameter,
+ proto_diameter);
+ old_dissector_add("udp.port", gbl_diameterUdpPort, dissect_diameter,
+ proto_diameter);
#ifdef SCTP_DISSECTORS_ENABLED
- old_dissector_add("sctp.srcport", gbl_diameterSctpPort, dissect_diameter);
- old_dissector_add("sctp.destport", gbl_diameterSctpPort, dissect_diameter);
+ old_dissector_add("sctp.srcport", gbl_diameterSctpPort,
+ dissect_diameter, proto_diameter);
+ old_dissector_add("sctp.destport", gbl_diameterSctpPort,
+ dissect_diameter, proto_diameter);
#endif
}
diff --git a/packet-dns.c b/packet-dns.c
index 4773884f2a..ec0667e2f4 100644
--- a/packet-dns.c
+++ b/packet-dns.c
@@ -1,7 +1,7 @@
/* packet-dns.c
* Routines for DNS packet disassembly
*
- * $Id: packet-dns.c,v 1.60 2001/01/03 06:55:27 guy Exp $
+ * $Id: packet-dns.c,v 1.61 2001/01/09 06:31:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -2482,6 +2482,6 @@ proto_register_dns(void)
void
proto_reg_handoff_dns(void)
{
- old_dissector_add("udp.port", UDP_PORT_DNS, dissect_dns);
- old_dissector_add("tcp.port", TCP_PORT_DNS, dissect_dns_tcp);
+ old_dissector_add("udp.port", UDP_PORT_DNS, dissect_dns, proto_dns);
+ old_dissector_add("tcp.port", TCP_PORT_DNS, dissect_dns_tcp, proto_dns);
}
diff --git a/packet-eigrp.c b/packet-eigrp.c
index be25b95244..f728a394a5 100644
--- a/packet-eigrp.c
+++ b/packet-eigrp.c
@@ -2,7 +2,7 @@
* Routines for EIGRP dissection
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-eigrp.c,v 1.10 2001/01/03 06:55:27 guy Exp $
+ * $Id: packet-eigrp.c,v 1.11 2001/01/09 06:31:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -466,7 +466,7 @@ proto_register_eigrp(void)
void
proto_reg_handoff_eigrp(void)
{
- dissector_add("ip.proto", IP_PROTO_EIGRP, dissect_eigrp);
- dissector_add("ddp.type", DDP_EIGRP, dissect_eigrp);
- dissector_add("ipx.socket", IPX_SOCKET_EIGRP, dissect_eigrp);
+ dissector_add("ip.proto", IP_PROTO_EIGRP, dissect_eigrp, proto_eigrp);
+ dissector_add("ddp.type", DDP_EIGRP, dissect_eigrp, proto_eigrp);
+ dissector_add("ipx.socket", IPX_SOCKET_EIGRP, dissect_eigrp, proto_eigrp);
}
diff --git a/packet-esis.c b/packet-esis.c
index a661df9039..2f05363fd3 100644
--- a/packet-esis.c
+++ b/packet-esis.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI End System to Intermediate System
* Routeing Exchange Protocol ISO 9542.
*
- * $Id: packet-esis.c,v 1.10 2001/01/03 06:55:28 guy Exp $
+ * $Id: packet-esis.c,v 1.11 2001/01/09 06:31:35 guy Exp $
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
@@ -432,5 +432,5 @@ proto_register_esis(void) {
void
proto_reg_handoff_esis(void)
{
- dissector_add("osinl", NLPID_ISO9542_ESIS, dissect_esis);
+ dissector_add("osinl", NLPID_ISO9542_ESIS, dissect_esis, proto_esis);
}
diff --git a/packet-eth.c b/packet-eth.c
index 1404102c16..653b55ef69 100644
--- a/packet-eth.c
+++ b/packet-eth.c
@@ -1,7 +1,7 @@
/* packet-eth.c
* Routines for ethernet packet disassembly
*
- * $Id: packet-eth.c,v 1.53 2001/01/03 10:34:41 guy Exp $
+ * $Id: packet-eth.c,v 1.54 2001/01/09 06:31:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -380,7 +380,7 @@ proto_register_eth(void)
proto_register_field_array(proto_eth, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("eth", dissect_eth);
+ register_dissector("eth", dissect_eth, proto_eth);
}
void
@@ -392,5 +392,6 @@ proto_reg_handoff_eth(void)
isl_handle = find_dissector("isl");
llc_handle = find_dissector("llc");
- dissector_add("wtap_encap", WTAP_ENCAP_ETHERNET, dissect_eth);
+ dissector_add("wtap_encap", WTAP_ENCAP_ETHERNET, dissect_eth,
+ proto_eth);
}
diff --git a/packet-fddi.c b/packet-fddi.c
index 701edcfd33..0bbe7c87ef 100644
--- a/packet-fddi.c
+++ b/packet-fddi.c
@@ -3,7 +3,7 @@
*
* Laurent Deniel <deniel@worldnet.fr>
*
- * $Id: packet-fddi.c,v 1.45 2001/01/03 10:34:41 guy Exp $
+ * $Id: packet-fddi.c,v 1.46 2001/01/09 06:31:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -385,6 +385,8 @@ proto_reg_handoff_fddi(void)
*/
llc_handle = find_dissector("llc");
- dissector_add("wtap_encap", WTAP_ENCAP_FDDI, dissect_fddi_not_bitswapped);
- dissector_add("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED, dissect_fddi_bitswapped);
+ dissector_add("wtap_encap", WTAP_ENCAP_FDDI,
+ dissect_fddi_not_bitswapped, proto_fddi);
+ dissector_add("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED,
+ dissect_fddi_bitswapped, proto_fddi);
}
diff --git a/packet-fr.c b/packet-fr.c
index d51c51b7cb..4ef1c96b5e 100644
--- a/packet-fr.c
+++ b/packet-fr.c
@@ -3,7 +3,7 @@
*
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-fr.c,v 1.3 2001/01/08 22:18:21 guy Exp $
+ * $Id: packet-fr.c,v 1.4 2001/01/09 06:31:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -141,10 +141,10 @@ void proto_register_fr(void)
proto_register_field_array(proto_fr, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("fr", dissect_fr);
+ register_dissector("fr", dissect_fr, proto_fr);
};
void proto_reg_handoff_fr(void)
{
- dissector_add("wtap_encap", WTAP_ENCAP_FRELAY, dissect_fr);
+ dissector_add("wtap_encap", WTAP_ENCAP_FRELAY, dissect_fr, proto_fr);
}
diff --git a/packet-ftp.c b/packet-ftp.c
index 534ba1b06f..d583d1679d 100644
--- a/packet-ftp.c
+++ b/packet-ftp.c
@@ -2,7 +2,7 @@
* Routines for ftp packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-ftp.c,v 1.25 2001/01/03 06:55:28 guy Exp $
+ * $Id: packet-ftp.c,v 1.26 2001/01/09 06:31:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -264,6 +264,6 @@ proto_register_ftp(void)
void
proto_reg_handoff_ftp(void)
{
- dissector_add("tcp.port", TCP_PORT_FTPDATA, &dissect_ftpdata);
- dissector_add("tcp.port", TCP_PORT_FTP, &dissect_ftp);
+ dissector_add("tcp.port", TCP_PORT_FTPDATA, &dissect_ftpdata, proto_ftp);
+ dissector_add("tcp.port", TCP_PORT_FTP, &dissect_ftp, proto_ftp_data);
}
diff --git a/packet-giop.c b/packet-giop.c
index 297056569d..3eceaaa6c4 100644
--- a/packet-giop.c
+++ b/packet-giop.c
@@ -4,7 +4,7 @@
* Laurent Deniel <deniel@worldnet.fr>
* Craig Rodrigues <rodrigc@mediaone.net>
*
- * $Id: packet-giop.c,v 1.27 2001/01/03 06:55:28 guy Exp $
+ * $Id: packet-giop.c,v 1.28 2001/01/09 06:31:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1435,5 +1435,5 @@ proto_register_giop (void)
void
proto_reg_handoff_giop (void)
{
- heur_dissector_add ("tcp", dissect_giop);
+ heur_dissector_add ("tcp", dissect_giop, proto_giop);
}
diff --git a/packet-gre.c b/packet-gre.c
index 95ecca0ddb..3162db06c9 100644
--- a/packet-gre.c
+++ b/packet-gre.c
@@ -2,7 +2,7 @@
* Routines for the Generic Routing Encapsulation (GRE) protocol
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-gre.c,v 1.35 2001/01/07 22:35:21 guy Exp $
+ * $Id: packet-gre.c,v 1.36 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -384,7 +384,7 @@ proto_register_gre(void)
void
proto_reg_handoff_gre(void)
{
- dissector_add("ip.proto", IP_PROTO_GRE, dissect_gre);
+ dissector_add("ip.proto", IP_PROTO_GRE, dissect_gre, proto_gre);
/*
* Get handles for the IP, PPP, and Frame Relay dissectors.
diff --git a/packet-h1.c b/packet-h1.c
index 6a43de172d..c4c5c9846d 100644
--- a/packet-h1.c
+++ b/packet-h1.c
@@ -2,7 +2,7 @@
* Routines for Sinec H1 packet disassembly
* Gerrit Gehnen <G.Gehnen@atrie.de>
*
- * $Id: packet-h1.c,v 1.16 2001/01/05 08:34:35 guy Exp $
+ * $Id: packet-h1.c,v 1.17 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -317,5 +317,5 @@ proto_register_h1 (void)
void
proto_reg_handoff_h1(void)
{
- heur_dissector_add("cotp_is", dissect_h1);
+ heur_dissector_add("cotp_is", dissect_h1, proto_h1);
}
diff --git a/packet-hsrp.c b/packet-hsrp.c
index ad18bb48ad..ed0b4cbb02 100644
--- a/packet-hsrp.c
+++ b/packet-hsrp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-hsrp.c,v 1.14 2001/01/03 16:41:06 gram Exp $
+ * $Id: packet-hsrp.c,v 1.15 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -244,5 +244,5 @@ void proto_register_hsrp(void)
void
proto_reg_handoff_hsrp(void)
{
- dissector_add("udp.port", UDP_PORT_HSRP, dissect_hsrp);
+ dissector_add("udp.port", UDP_PORT_HSRP, dissect_hsrp, proto_hsrp);
}
diff --git a/packet-http.c b/packet-http.c
index 6ebe960f64..c427905656 100644
--- a/packet-http.c
+++ b/packet-http.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-http.c,v 1.32 2001/01/03 06:55:28 guy Exp $
+ * $Id: packet-http.c,v 1.33 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -395,13 +395,16 @@ proto_register_http(void)
void
proto_reg_handoff_http(void)
{
- dissector_add("tcp.port", TCP_PORT_HTTP, dissect_http);
- dissector_add("tcp.port", TCP_ALT_PORT_HTTP, dissect_http);
- dissector_add("tcp.port", TCP_PORT_PROXY_HTTP, dissect_http);
- dissector_add("tcp.port", TCP_PORT_PROXY_ADMIN_HTTP, dissect_http);
+ dissector_add("tcp.port", TCP_PORT_HTTP, dissect_http, proto_http);
+ dissector_add("tcp.port", TCP_ALT_PORT_HTTP, dissect_http, proto_http);
+ dissector_add("tcp.port", TCP_PORT_PROXY_HTTP, dissect_http,
+ proto_http);
+ dissector_add("tcp.port", TCP_PORT_PROXY_ADMIN_HTTP, dissect_http,
+ proto_http);
+ dissector_add("tcp.port", 631, dissect_http, proto_http);
- dissector_add("tcp.port", TCP_PORT_SSDP, dissect_http);
- dissector_add("udp.port", UDP_PORT_SSDP, dissect_http);
+ dissector_add("tcp.port", TCP_PORT_SSDP, dissect_http, proto_http);
+ dissector_add("udp.port", UDP_PORT_SSDP, dissect_http, proto_http);
/*
* Get a handle for the IPP dissector.
diff --git a/packet-icmpv6.c b/packet-icmpv6.c
index 7b0b6e5810..f73c5e640d 100644
--- a/packet-icmpv6.c
+++ b/packet-icmpv6.c
@@ -1,7 +1,7 @@
/* packet-icmpv6.c
* Routines for ICMPv6 packet disassembly
*
- * $Id: packet-icmpv6.c,v 1.33 2001/01/03 06:55:28 guy Exp $
+ * $Id: packet-icmpv6.c,v 1.34 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1194,5 +1194,5 @@ proto_register_icmpv6(void)
void
proto_reg_handoff_icmpv6(void)
{
- old_dissector_add("ip.proto", IP_PROTO_ICMPV6, dissect_icmpv6);
+ old_dissector_add("ip.proto", IP_PROTO_ICMPV6, dissect_icmpv6, proto_icmpv6);
}
diff --git a/packet-icp.c b/packet-icp.c
index b8490ac7f0..f9b13f89bd 100644
--- a/packet-icp.c
+++ b/packet-icp.c
@@ -2,7 +2,7 @@
* Routines for ICP (internet cache protocol) packet disassembly
* RFC 2186 && RFC 2187
*
- * $Id: packet-icp.c,v 1.14 2001/01/03 06:55:28 guy Exp $
+ * $Id: packet-icp.c,v 1.15 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Peter Torvals
@@ -298,5 +298,5 @@ proto_register_icp(void)
void
proto_reg_handoff_icp(void)
{
- old_dissector_add("udp.port", UDP_PORT_ICP, dissect_icp);
+ old_dissector_add("udp.port", UDP_PORT_ICP, dissect_icp, proto_icp);
}
diff --git a/packet-icq.c b/packet-icq.c
index b274242396..e79ecbc39a 100644
--- a/packet-icq.c
+++ b/packet-icq.c
@@ -1,7 +1,7 @@
/* packet-icq.c
* Routines for ICQ packet disassembly
*
- * $Id: packet-icq.c,v 1.25 2001/01/03 06:55:28 guy Exp $
+ * $Id: packet-icq.c,v 1.26 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Johan Feyaerts
@@ -2497,5 +2497,5 @@ proto_register_icq(void)
void
proto_reg_handoff_icq(void)
{
- old_dissector_add("udp.port", UDP_PORT_ICQ, dissect_icq);
+ old_dissector_add("udp.port", UDP_PORT_ICQ, dissect_icq, proto_icq);
}
diff --git a/packet-ieee80211.c b/packet-ieee80211.c
index a073c3cb71..9f32b6cb94 100644
--- a/packet-ieee80211.c
+++ b/packet-ieee80211.c
@@ -3,7 +3,7 @@
* Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
*
- * $Id: packet-ieee80211.c,v 1.8 2001/01/03 10:34:41 guy Exp $
+ * $Id: packet-ieee80211.c,v 1.9 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -1751,5 +1751,6 @@ proto_reg_handoff_wlan(void)
*/
llc_handle = find_dissector("llc");
- dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11, dissect_ieee80211);
+ dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11, dissect_ieee80211,
+ proto_wlan);
}
diff --git a/packet-igrp.c b/packet-igrp.c
index 5a8cf58ed9..6b2ad76e94 100644
--- a/packet-igrp.c
+++ b/packet-igrp.c
@@ -2,7 +2,7 @@
* Routines for IGRP dissection
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-igrp.c,v 1.3 2001/01/03 06:55:28 guy Exp $
+ * $Id: packet-igrp.c,v 1.4 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -207,7 +207,7 @@ void proto_register_igrp(void)
void
proto_reg_handoff_igrp(void)
{
- dissector_add("ip.proto", IP_PROTO_IGRP , dissect_igrp);
+ dissector_add("ip.proto", IP_PROTO_IGRP , dissect_igrp, proto_igrp);
}
/* IGRP Packet structure:
diff --git a/packet-imap.c b/packet-imap.c
index 0c18d550c7..bef3bb98f9 100644
--- a/packet-imap.c
+++ b/packet-imap.c
@@ -2,7 +2,7 @@
* Routines for imap packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-imap.c,v 1.12 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-imap.c,v 1.13 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -182,5 +182,5 @@ proto_register_imap(void)
void
proto_reg_handoff_imap(void)
{
- dissector_add("tcp.port", TCP_PORT_IMAP, dissect_imap);
+ dissector_add("tcp.port", TCP_PORT_IMAP, dissect_imap, proto_imap);
}
diff --git a/packet-ip.c b/packet-ip.c
index 78b5f4dd51..3bfef03767 100644
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
- * $Id: packet-ip.c,v 1.118 2001/01/03 16:41:06 gram Exp $
+ * $Id: packet-ip.c,v 1.119 2001/01/09 06:31:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1335,7 +1335,7 @@ proto_register_igmp(void)
void
proto_reg_handoff_igmp(void)
{
- dissector_add("ip.proto", IP_PROTO_IGMP, dissect_igmp);
+ dissector_add("ip.proto", IP_PROTO_IGMP, dissect_igmp, proto_igmp);
}
void
@@ -1473,19 +1473,19 @@ proto_register_ip(void)
"Whether the IPv4 type-of-service field should be decoded as a Differentiated Services field",
&g_ip_dscp_actif);
- register_dissector("ip", dissect_ip);
+ register_dissector("ip", dissect_ip, proto_ip);
}
void
proto_reg_handoff_ip(void)
{
- dissector_add("ethertype", ETHERTYPE_IP, dissect_ip);
- dissector_add("ppp.protocol", PPP_IP, dissect_ip);
- dissector_add("ppp.protocol", CISCO_IP, dissect_ip);
- dissector_add("llc.dsap", SAP_IP, dissect_ip);
- dissector_add("ip.proto", IP_PROTO_IPV4, dissect_ip);
- dissector_add("ip.proto", IP_PROTO_IPIP, dissect_ip);
- dissector_add("null.type", BSD_AF_INET, dissect_ip);
+ dissector_add("ethertype", ETHERTYPE_IP, dissect_ip, proto_ip);
+ dissector_add("ppp.protocol", PPP_IP, dissect_ip, proto_ip);
+ dissector_add("ppp.protocol", CISCO_IP, dissect_ip, proto_ip);
+ dissector_add("llc.dsap", SAP_IP, dissect_ip, proto_ip);
+ dissector_add("ip.proto", IP_PROTO_IPV4, dissect_ip, proto_ip);
+ dissector_add("ip.proto", IP_PROTO_IPIP, dissect_ip, proto_ip);
+ dissector_add("null.type", BSD_AF_INET, dissect_ip, proto_ip);
}
void
@@ -1518,5 +1518,5 @@ proto_register_icmp(void)
void
proto_reg_handoff_icmp(void)
{
- dissector_add("ip.proto", IP_PROTO_ICMP, dissect_icmp);
+ dissector_add("ip.proto", IP_PROTO_ICMP, dissect_icmp, proto_icmp);
}
diff --git a/packet-ipp.c b/packet-ipp.c
index 259914a255..4ae61b6e7f 100644
--- a/packet-ipp.c
+++ b/packet-ipp.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-ipp.c,v 1.18 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-ipp.c,v 1.19 2001/01/09 06:31:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -567,7 +567,7 @@ proto_register_ipp(void)
* (you can't refer to it directly from a plugin dissector
* on Windows without stuffing it into the Big Transfer Vector).
*/
- register_dissector("ipp", dissect_ipp);
+ register_dissector("ipp", dissect_ipp, proto_ipp);
}
void
@@ -581,5 +581,5 @@ proto_reg_handoff_ipp(void)
Or should the HTTP dissector decide that the payload is
IPP based on the MIME headers? */
- dissector_add("tcp.port", 631, dissect_http);
+ dissector_add("tcp.port", 631, dissect_http, -1); /* XXX */
}
diff --git a/packet-ipsec.c b/packet-ipsec.c
index 3f6c1d3ad5..08dad80436 100644
--- a/packet-ipsec.c
+++ b/packet-ipsec.c
@@ -1,7 +1,7 @@
/* packet-ipsec.c
* Routines for IPsec/IPComp packet disassembly
*
- * $Id: packet-ipsec.c,v 1.24 2001/01/03 07:53:43 guy Exp $
+ * $Id: packet-ipsec.c,v 1.25 2001/01/09 06:31:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -366,7 +366,8 @@ proto_register_ipsec(void)
void
proto_reg_handoff_ipsec(void)
{
- old_dissector_add("ip.proto", IP_PROTO_AH, dissect_ah);
- old_dissector_add("ip.proto", IP_PROTO_ESP, dissect_esp);
- old_dissector_add("ip.proto", IP_PROTO_IPCOMP, dissect_ipcomp);
+ old_dissector_add("ip.proto", IP_PROTO_AH, dissect_ah, proto_ah);
+ old_dissector_add("ip.proto", IP_PROTO_ESP, dissect_esp, proto_esp);
+ old_dissector_add("ip.proto", IP_PROTO_IPCOMP, dissect_ipcomp,
+ proto_ipcomp);
}
diff --git a/packet-ipv6.c b/packet-ipv6.c
index bcf48c5929..36d6edc35b 100644
--- a/packet-ipv6.c
+++ b/packet-ipv6.c
@@ -1,7 +1,7 @@
/* packet-ipv6.c
* Routines for IPv6 packet disassembly
*
- * $Id: packet-ipv6.c,v 1.49 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-ipv6.c,v 1.50 2001/01/09 06:31:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -526,10 +526,16 @@ proto_register_ipv6(void)
void
proto_reg_handoff_ipv6(void)
{
- old_dissector_add("ethertype", ETHERTYPE_IPv6, dissect_ipv6);
- old_dissector_add("ppp.protocol", PPP_IPV6, dissect_ipv6);
- old_dissector_add("ip.proto", IP_PROTO_IPV6, dissect_ipv6);
- old_dissector_add("null.type", BSD_AF_INET6_BSD, dissect_ipv6);
- old_dissector_add("null.type", BSD_AF_INET6_FREEBSD, dissect_ipv6);
- old_dissector_add("ip.proto", IP_PROTO_NONE, dissect_ipv6_none);
+ old_dissector_add("ethertype", ETHERTYPE_IPv6, dissect_ipv6,
+ proto_ipv6);
+ old_dissector_add("ppp.protocol", PPP_IPV6, dissect_ipv6,
+ proto_ipv6);
+ old_dissector_add("ip.proto", IP_PROTO_IPV6, dissect_ipv6,
+ proto_ipv6);
+ old_dissector_add("null.type", BSD_AF_INET6_BSD, dissect_ipv6,
+ proto_ipv6);
+ old_dissector_add("null.type", BSD_AF_INET6_FREEBSD, dissect_ipv6,
+ proto_ipv6);
+ old_dissector_add("ip.proto", IP_PROTO_NONE, dissect_ipv6_none,
+ proto_ipv6);
}
diff --git a/packet-ipx.c b/packet-ipx.c
index edf691454c..dd07c34d4d 100644
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -2,7 +2,7 @@
* Routines for NetWare's IPX
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-ipx.c,v 1.72 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-ipx.c,v 1.73 2001/01/09 06:31:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -912,13 +912,17 @@ proto_reg_handoff_ipx(void)
*/
nbipx_handle = find_dissector("nbipx");
- dissector_add("udp.port", UDP_PORT_IPX, dissect_ipx);
- dissector_add("ethertype", ETHERTYPE_IPX, dissect_ipx);
- dissector_add("ppp.protocol", PPP_IPX, dissect_ipx);
- dissector_add("llc.dsap", SAP_NETWARE, dissect_ipx);
- dissector_add("null.type", BSD_AF_IPX, dissect_ipx);
- dissector_add("ipx.packet_type", IPX_PACKET_TYPE_SPX, dissect_spx);
- dissector_add("ipx.socket", IPX_SOCKET_SAP, dissect_ipxsap);
- dissector_add("ipx.socket", IPX_SOCKET_IPXRIP, dissect_ipxrip);
- dissector_add("ipx.socket", IPX_SOCKET_IPX_MESSAGE, dissect_ipxmsg);
+ dissector_add("udp.port", UDP_PORT_IPX, dissect_ipx, proto_ipx);
+ dissector_add("ethertype", ETHERTYPE_IPX, dissect_ipx, proto_ipx);
+ dissector_add("ppp.protocol", PPP_IPX, dissect_ipx, proto_ipx);
+ dissector_add("llc.dsap", SAP_NETWARE, dissect_ipx, proto_ipx);
+ dissector_add("null.type", BSD_AF_IPX, dissect_ipx, proto_ipx);
+ dissector_add("ipx.packet_type", IPX_PACKET_TYPE_SPX, dissect_spx,
+ proto_spx);
+ dissector_add("ipx.socket", IPX_SOCKET_SAP, dissect_ipxsap,
+ proto_sap);
+ dissector_add("ipx.socket", IPX_SOCKET_IPXRIP, dissect_ipxrip,
+ proto_sap);
+ dissector_add("ipx.socket", IPX_SOCKET_IPX_MESSAGE, dissect_ipxmsg,
+ proto_ipxmsg);
}
diff --git a/packet-irc.c b/packet-irc.c
index 206bafe56f..3f91ac73d1 100644
--- a/packet-irc.c
+++ b/packet-irc.c
@@ -1,7 +1,7 @@
/* packet-irc.c
* Routines for MSX irc packet dissection
*
- * $Id: packet-irc.c,v 1.10 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-irc.c,v 1.11 2001/01/09 06:31:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -167,6 +167,6 @@ proto_register_irc(void)
void
proto_reg_handoff_irc(void)
{
- old_dissector_add("tcp.port", TCP_PORT_IRC, dissect_irc);
+ old_dissector_add("tcp.port", TCP_PORT_IRC, dissect_irc, proto_irc);
}
diff --git a/packet-isakmp.c b/packet-isakmp.c
index 7abecf39f6..efa111001d 100644
--- a/packet-isakmp.c
+++ b/packet-isakmp.c
@@ -3,7 +3,7 @@
* (ISAKMP) (RFC 2408)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-isakmp.c,v 1.33 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-isakmp.c,v 1.34 2001/01/09 06:31:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1454,5 +1454,6 @@ proto_register_isakmp(void)
void
proto_reg_handoff_isakmp(void)
{
- old_dissector_add("udp.port", UDP_PORT_ISAKMP, dissect_isakmp);
+ old_dissector_add("udp.port", UDP_PORT_ISAKMP, dissect_isakmp,
+ proto_isakmp);
}
diff --git a/packet-isis.c b/packet-isis.c
index d8079ea5ba..5a710debc1 100644
--- a/packet-isis.c
+++ b/packet-isis.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly, core
* bits.
*
- * $Id: packet-isis.c,v 1.16 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-isis.c,v 1.17 2001/01/09 06:31:37 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -337,5 +337,5 @@ proto_register_isis(void) {
void
proto_reg_handoff_isis(void)
{
- old_dissector_add("osinl", NLPID_ISO10589_ISIS, dissect_isis);
+ old_dissector_add("osinl", NLPID_ISO10589_ISIS, dissect_isis, proto_isis);
}
diff --git a/packet-isl.c b/packet-isl.c
index a611eb314f..ebd6bfdcd9 100644
--- a/packet-isl.c
+++ b/packet-isl.c
@@ -1,7 +1,7 @@
/* packet-isl.c
* Routines for Cisco ISL Ethernet header disassembly
*
- * $Id: packet-isl.c,v 1.20 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-isl.c,v 1.21 2001/01/09 06:31:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -346,5 +346,5 @@ proto_register_isl(void)
proto_register_field_array(proto_isl, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("isl", dissect_isl);
+ register_dissector("isl", dissect_isl, proto_isl);
}
diff --git a/packet-kerberos.c b/packet-kerberos.c
index 011a1bdf31..0e7b2c4b9d 100644
--- a/packet-kerberos.c
+++ b/packet-kerberos.c
@@ -3,7 +3,7 @@
* Wes Hardaker (c) 2000
* wjhardaker@ucdavis.edu
*
- * $Id: packet-kerberos.c,v 1.13 2001/01/03 16:41:06 gram Exp $
+ * $Id: packet-kerberos.c,v 1.14 2001/01/09 06:31:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1308,8 +1308,10 @@ proto_register_kerberos(void) {
void
proto_reg_handoff_kerberos(void)
{
- old_dissector_add("udp.port", UDP_PORT_KERBEROS, dissect_kerberos);
- old_dissector_add("tcp.port", TCP_PORT_KERBEROS, dissect_kerberos);
+ old_dissector_add("udp.port", UDP_PORT_KERBEROS, dissect_kerberos,
+ proto_kerberos);
+ old_dissector_add("tcp.port", TCP_PORT_KERBEROS, dissect_kerberos,
+ proto_kerberos);
}
/*
diff --git a/packet-l2tp.c b/packet-l2tp.c
index ff5541cf86..1a40ccfd3e 100644
--- a/packet-l2tp.c
+++ b/packet-l2tp.c
@@ -7,7 +7,7 @@
* Laurent Cazalet <laurent.cazalet@mailclub.net>
* Thomas Parvais <thomas.parvais@advalvas.be>
*
- * $Id: packet-l2tp.c,v 1.19 2001/01/03 16:41:06 gram Exp $
+ * $Id: packet-l2tp.c,v 1.20 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -831,7 +831,8 @@ proto_register_l2tp(void)
void
proto_reg_handoff_l2tp(void)
{
- dissector_add("udp.port", UDP_PORT_L2TP, dissect_l2tp);
+ dissector_add("udp.port", UDP_PORT_L2TP, dissect_l2tp,
+ proto_l2tp);
/*
* Get a handle for the PPP dissector.
diff --git a/packet-lapb.c b/packet-lapb.c
index f38e78aab0..e55f0b0880 100644
--- a/packet-lapb.c
+++ b/packet-lapb.c
@@ -2,7 +2,7 @@
* Routines for lapb frame disassembly
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-lapb.c,v 1.26 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-lapb.c,v 1.27 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -136,11 +136,11 @@ proto_register_lapb(void)
proto_register_field_array (proto_lapb, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("lapb", dissect_lapb);
+ register_dissector("lapb", dissect_lapb, proto_lapb);
}
void
proto_reg_handoff_lapb(void)
{
- dissector_add("wtap_encap", WTAP_ENCAP_LAPB, dissect_lapb);
+ dissector_add("wtap_encap", WTAP_ENCAP_LAPB, dissect_lapb, proto_lapb);
}
diff --git a/packet-lapbether.c b/packet-lapbether.c
index 784ed3c8de..50fc818fb5 100644
--- a/packet-lapbether.c
+++ b/packet-lapbether.c
@@ -3,7 +3,7 @@
* Richard Sharpe <rsharpe@ns.aus.com> based on the lapb module by
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-lapbether.c,v 1.3 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-lapbether.c,v 1.4 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -108,6 +108,6 @@ proto_reg_handoff_lapbether(void)
*/
lapb_handle = find_dissector("lapb");
- dissector_add("ethertype", ETHERTYPE_DEC, dissect_lapbether);
+ dissector_add("ethertype", ETHERTYPE_DEC, dissect_lapbether, proto_lapbether);
}
diff --git a/packet-lapd.c b/packet-lapd.c
index 5c30b71b28..0808d62aeb 100644
--- a/packet-lapd.c
+++ b/packet-lapd.c
@@ -2,7 +2,7 @@
* Routines for LAPD frame disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-lapd.c,v 1.18 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-lapd.c,v 1.19 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -206,5 +206,5 @@ proto_register_lapd(void)
void
proto_reg_handoff_lapd(void)
{
- dissector_add("wtap_encap", WTAP_ENCAP_LAPD, dissect_lapd);
+ dissector_add("wtap_encap", WTAP_ENCAP_LAPD, dissect_lapd, proto_lapd);
}
diff --git a/packet-ldap.c b/packet-ldap.c
index afe4bf0c4f..04f13df78a 100644
--- a/packet-ldap.c
+++ b/packet-ldap.c
@@ -1,7 +1,7 @@
/* packet-ldap.c
* Routines for ldap packet dissection
*
- * $Id: packet-ldap.c,v 1.20 2001/01/03 16:41:06 gram Exp $
+ * $Id: packet-ldap.c,v 1.21 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1209,5 +1209,5 @@ proto_register_ldap(void)
void
proto_reg_handoff_ldap(void)
{
- old_dissector_add("tcp.port", TCP_PORT_LDAP, dissect_ldap);
+ old_dissector_add("tcp.port", TCP_PORT_LDAP, dissect_ldap, proto_ldap);
}
diff --git a/packet-ldp.c b/packet-ldp.c
index 4f0228e222..fa3b23915e 100644
--- a/packet-ldp.c
+++ b/packet-ldp.c
@@ -1,7 +1,7 @@
/* packet-ldp.c
* Routines for ldp packet disassembly
*
- * $Id: packet-ldp.c,v 1.12 2001/01/03 07:53:43 guy Exp $
+ * $Id: packet-ldp.c,v 1.13 2001/01/09 06:31:38 guy Exp $
*
* Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
@@ -834,7 +834,7 @@ proto_reg_handoff_ldp(void)
tcp_port = global_ldp_tcp_port;
udp_port = global_ldp_udp_port;
- dissector_add("tcp.port", global_ldp_tcp_port, dissect_ldp);
- dissector_add("udp.port", global_ldp_udp_port, dissect_ldp);
+ dissector_add("tcp.port", global_ldp_tcp_port, dissect_ldp, proto_ldp);
+ dissector_add("udp.port", global_ldp_udp_port, dissect_ldp, proto_ldp);
}
diff --git a/packet-llc.c b/packet-llc.c
index 5406baf9fd..ce94ea5bab 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-llc.c,v 1.77 2001/01/05 19:07:37 guy Exp $
+ * $Id: packet-llc.c,v 1.78 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -479,7 +479,7 @@ proto_register_llc(void)
subdissector_table = register_dissector_table("llc.dsap");
cisco_subdissector_table = register_dissector_table("llc.cisco_pid");
- register_dissector("llc", dissect_llc);
+ register_dissector("llc", dissect_llc, proto_llc);
}
void
@@ -490,5 +490,6 @@ proto_reg_handoff_llc(void)
*/
bpdu_handle = find_dissector("bpdu");
- dissector_add("wtap_encap", WTAP_ENCAP_ATM_RFC1483, dissect_llc);
+ dissector_add("wtap_encap", WTAP_ENCAP_ATM_RFC1483, dissect_llc,
+ proto_llc);
}
diff --git a/packet-lpd.c b/packet-lpd.c
index f2ad5e4ea0..97b123c7e3 100644
--- a/packet-lpd.c
+++ b/packet-lpd.c
@@ -2,7 +2,7 @@
* Routines for LPR and LPRng packet disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-lpd.c,v 1.25 2001/01/06 00:02:41 guy Exp $
+ * $Id: packet-lpd.c,v 1.26 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -196,5 +196,5 @@ proto_register_lpd(void)
void
proto_reg_handoff_lpd(void)
{
- dissector_add("tcp.port", TCP_PORT_PRINTER, &dissect_lpd);
+ dissector_add("tcp.port", TCP_PORT_PRINTER, &dissect_lpd, proto_lpd);
}
diff --git a/packet-mapi.c b/packet-mapi.c
index 40ebbce7b4..0716e93697 100644
--- a/packet-mapi.c
+++ b/packet-mapi.c
@@ -1,7 +1,7 @@
/* packet-mapi.c
* Routines for MSX mapi packet dissection
*
- * $Id: packet-mapi.c,v 1.12 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-mapi.c,v 1.13 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -117,5 +117,5 @@ proto_register_mapi(void)
void
proto_reg_handoff_mapi(void)
{
- dissector_add("tcp.port", TCP_PORT_MAPI, dissect_mapi);
+ dissector_add("tcp.port", TCP_PORT_MAPI, dissect_mapi, proto_mapi);
}
diff --git a/packet-mip.c b/packet-mip.c
index 56a473df46..f7016d7e21 100644
--- a/packet-mip.c
+++ b/packet-mip.c
@@ -2,7 +2,7 @@
* Routines for Mobile IP dissection
* Copyright 2000, Stefan Raab <Stefan.Raab@nextel.com>
*
- * $Id: packet-mip.c,v 1.11 2001/01/03 16:41:06 gram Exp $
+ * $Id: packet-mip.c,v 1.12 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -299,5 +299,5 @@ void proto_register_mip(void)
void
proto_reg_handoff_mip(void)
{
- old_dissector_add("udp.port", UDP_PORT_MIP, dissect_mip);
+ old_dissector_add("udp.port", UDP_PORT_MIP, dissect_mip, proto_mip);
}
diff --git a/packet-mpls.c b/packet-mpls.c
index 32442e92ec..d8017a6eac 100644
--- a/packet-mpls.c
+++ b/packet-mpls.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-mpls.c,v 1.15 2001/01/06 05:11:32 guy Exp $
+ * $Id: packet-mpls.c,v 1.16 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -210,6 +210,6 @@ proto_reg_handoff_mpls(void)
*/
ip_handle = find_dissector("ip");
- dissector_add("ethertype", ETHERTYPE_MPLS, dissect_mpls);
- dissector_add("ppp.protocol", PPP_MPLS_UNI, dissect_mpls);
+ dissector_add("ethertype", ETHERTYPE_MPLS, dissect_mpls, proto_mpls);
+ dissector_add("ppp.protocol", PPP_MPLS_UNI, dissect_mpls, proto_mpls);
}
diff --git a/packet-msproxy.c b/packet-msproxy.c
index 58f15bb155..3547512c26 100644
--- a/packet-msproxy.c
+++ b/packet-msproxy.c
@@ -2,7 +2,7 @@
* Routines for Microsoft Proxy packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-msproxy.c,v 1.15 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-msproxy.c,v 1.16 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1354,5 +1354,6 @@ proto_reg_handoff_msproxy(void) {
/* dissector install routine */
- old_dissector_add("udp.port", UDP_PORT_MSPROXY, dissect_msproxy);
+ old_dissector_add("udp.port", UDP_PORT_MSPROXY, dissect_msproxy,
+ proto_msproxy);
}
diff --git a/packet-nbipx.c b/packet-nbipx.c
index ca218d1a82..bf261c55ae 100644
--- a/packet-nbipx.c
+++ b/packet-nbipx.c
@@ -2,7 +2,7 @@
* Routines for NetBIOS over IPX packet disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-nbipx.c,v 1.33 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-nbipx.c,v 1.34 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -476,11 +476,12 @@ proto_register_nbipx(void)
/* proto_register_field_array(proto_nbipx, hf, array_length(hf));*/
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("nbipx", dissect_nbipx);
+ register_dissector("nbipx", dissect_nbipx, proto_nbipx);
}
void
proto_reg_handoff_nbipx(void)
{
- dissector_add("ipx.socket", IPX_SOCKET_NWLINK_SMB_DGRAM, dissect_nwlink_dg);
+ dissector_add("ipx.socket", IPX_SOCKET_NWLINK_SMB_DGRAM,
+ dissect_nwlink_dg, proto_nbipx);
}
diff --git a/packet-nbns.c b/packet-nbns.c
index 035b0888da..89e8ceff8d 100644
--- a/packet-nbns.c
+++ b/packet-nbns.c
@@ -4,7 +4,7 @@
* Gilbert Ramirez <gram@xiexie.org>
* Much stuff added by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-nbns.c,v 1.49 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-nbns.c,v 1.50 2001/01/09 06:31:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1771,8 +1771,8 @@ proto_register_nbt(void)
void
proto_reg_handoff_nbt(void)
{
- old_dissector_add("udp.port", UDP_PORT_NBNS, dissect_nbns);
- old_dissector_add("udp.port", UDP_PORT_NBDGM, dissect_nbdgm);
- old_dissector_add("tcp.port", TCP_PORT_NBSS, dissect_nbss);
- old_dissector_add("tcp.port", TCP_PORT_CIFS, dissect_nbss);
+ old_dissector_add("udp.port", UDP_PORT_NBNS, dissect_nbns, proto_nbns);
+ old_dissector_add("udp.port", UDP_PORT_NBDGM, dissect_nbdgm, proto_nbdgm);
+ old_dissector_add("tcp.port", TCP_PORT_NBSS, dissect_nbss, proto_nbss);
+ old_dissector_add("tcp.port", TCP_PORT_CIFS, dissect_nbss, proto_nbss);
}
diff --git a/packet-ncp.c b/packet-ncp.c
index e204ea35c0..6ccd1d2b6b 100644
--- a/packet-ncp.c
+++ b/packet-ncp.c
@@ -3,7 +3,7 @@
* Gilbert Ramirez <gram@xiexie.org>
* Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net>
*
- * $Id: packet-ncp.c,v 1.45 2001/01/03 16:41:06 gram Exp $
+ * $Id: packet-ncp.c,v 1.46 2001/01/09 06:31:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -399,8 +399,9 @@ proto_register_ncp(void)
void
proto_reg_handoff_ncp(void)
{
- dissector_add("tcp.port", TCP_PORT_NCP, dissect_ncp);
- dissector_add("udp.port", UDP_PORT_NCP, dissect_ncp);
- dissector_add("ipx.packet_type", IPX_PACKET_TYPE_NCP, dissect_ncp);
- dissector_add("ipx.socket", IPX_SOCKET_NCP, dissect_ncp);
+ dissector_add("tcp.port", TCP_PORT_NCP, dissect_ncp, proto_ncp);
+ dissector_add("udp.port", UDP_PORT_NCP, dissect_ncp, proto_ncp);
+ dissector_add("ipx.packet_type", IPX_PACKET_TYPE_NCP, dissect_ncp,
+ proto_ncp);
+ dissector_add("ipx.socket", IPX_SOCKET_NCP, dissect_ncp, proto_ncp);
}
diff --git a/packet-netbios.c b/packet-netbios.c
index 4b828c92ab..a85403cad5 100644
--- a/packet-netbios.c
+++ b/packet-netbios.c
@@ -5,7 +5,7 @@
*
* derived from the packet-nbns.c
*
- * $Id: packet-netbios.c,v 1.28 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-netbios.c,v 1.29 2001/01/09 06:31:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1172,5 +1172,5 @@ void proto_register_netbios(void)
void
proto_reg_handoff_netbios(void)
{
- dissector_add("llc.dsap", SAP_NETBIOS, dissect_netbios);
+ dissector_add("llc.dsap", SAP_NETBIOS, dissect_netbios, proto_netbios);
}
diff --git a/packet-nntp.c b/packet-nntp.c
index a13e0f62d6..17d6e0f26d 100644
--- a/packet-nntp.c
+++ b/packet-nntp.c
@@ -2,7 +2,7 @@
* Routines for nntp packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-nntp.c,v 1.17 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-nntp.c,v 1.18 2001/01/09 06:31:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -149,5 +149,5 @@ proto_register_nntp(void)
void
proto_reg_handoff_nntp(void)
{
- dissector_add("tcp.port", TCP_PORT_NNTP, dissect_nntp);
+ dissector_add("tcp.port", TCP_PORT_NNTP, dissect_nntp, proto_nntp);
}
diff --git a/packet-ntp.c b/packet-ntp.c
index 55d381805e..31a39dfb4a 100644
--- a/packet-ntp.c
+++ b/packet-ntp.c
@@ -2,7 +2,7 @@
* Routines for NTP packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-ntp.c,v 1.23 2001/01/07 01:47:37 guy Exp $
+ * $Id: packet-ntp.c,v 1.24 2001/01/09 06:31:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -502,6 +502,6 @@ proto_register_ntp(void)
void
proto_reg_handoff_ntp(void)
{
- dissector_add("udp.port", UDP_PORT_NTP, dissect_ntp);
- dissector_add("tcp.port", TCP_PORT_NTP, dissect_ntp);
+ dissector_add("udp.port", UDP_PORT_NTP, dissect_ntp, proto_ntp);
+ dissector_add("tcp.port", TCP_PORT_NTP, dissect_ntp, proto_ntp);
}
diff --git a/packet-null.c b/packet-null.c
index 9e7bd53b8e..7d334aad81 100644
--- a/packet-null.c
+++ b/packet-null.c
@@ -1,7 +1,7 @@
/* packet-null.c
* Routines for null packet disassembly
*
- * $Id: packet-null.c,v 1.37 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-null.c,v 1.38 2001/01/09 06:31:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -322,5 +322,5 @@ proto_reg_handoff_null(void)
* Get a handle for the PPP dissector.
*/
ppp_handle = find_dissector("ppp");
- dissector_add("wtap_encap", WTAP_ENCAP_NULL, dissect_null);
+ dissector_add("wtap_encap", WTAP_ENCAP_NULL, dissect_null, proto_null);
}
diff --git a/packet-osi.c b/packet-osi.c
index 7f0bff2207..06ea30267e 100644
--- a/packet-osi.c
+++ b/packet-osi.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions
*
- * $Id: packet-osi.c,v 1.38 2000/11/19 08:54:00 guy Exp $
+ * $Id: packet-osi.c,v 1.39 2001/01/09 06:31:39 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -277,6 +277,6 @@ proto_register_osi(void)
void
proto_reg_handoff_osi(void)
{
- dissector_add("llc.dsap", SAP_OSINL, dissect_osi);
- dissector_add("null.type", BSD_AF_ISO, dissect_osi);
+ dissector_add("llc.dsap", SAP_OSINL, dissect_osi, -1);
+ dissector_add("null.type", BSD_AF_ISO, dissect_osi, -1);
}
diff --git a/packet-ospf.c b/packet-ospf.c
index eeb18e07be..09c03e230c 100644
--- a/packet-ospf.c
+++ b/packet-ospf.c
@@ -2,7 +2,7 @@
* Routines for OSPF packet disassembly
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-ospf.c,v 1.34 2001/01/03 16:41:07 gram Exp $
+ * $Id: packet-ospf.c,v 1.35 2001/01/09 06:31:40 guy Exp $
*
* At this time, this module is able to analyze OSPF
* packets as specified in RFC2328. MOSPF (RFC1584) and other
@@ -1053,5 +1053,5 @@ proto_register_ospf(void)
void
proto_reg_handoff_ospf(void)
{
- dissector_add("ip.proto", IP_PROTO_OSPF, dissect_ospf);
+ dissector_add("ip.proto", IP_PROTO_OSPF, dissect_ospf, proto_ospf);
}
diff --git a/packet-pim.c b/packet-pim.c
index 77fb2d676f..a3a953f4a4 100644
--- a/packet-pim.c
+++ b/packet-pim.c
@@ -2,7 +2,7 @@
* Routines for PIM disassembly
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-pim.c,v 1.20 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-pim.c,v 1.21 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -608,7 +608,7 @@ proto_register_pim(void)
void
proto_reg_handoff_pim(void)
{
- old_dissector_add("ip.proto", IP_PROTO_PIM, dissect_pim);
+ old_dissector_add("ip.proto", IP_PROTO_PIM, dissect_pim, proto_pim);
/*
* Get a handle for the IP dissector.
diff --git a/packet-pop.c b/packet-pop.c
index 13b494154a..ad73038174 100644
--- a/packet-pop.c
+++ b/packet-pop.c
@@ -2,7 +2,7 @@
* Routines for pop packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-pop.c,v 1.22 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-pop.c,v 1.23 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -222,5 +222,5 @@ proto_register_pop(void)
void
proto_reg_handoff_pop(void)
{
- dissector_add("tcp.port", TCP_PORT_POP, dissect_pop);
+ dissector_add("tcp.port", TCP_PORT_POP, dissect_pop, proto_pop);
}
diff --git a/packet-ppp.c b/packet-ppp.c
index 2aa17a141c..5f770c6acd 100644
--- a/packet-ppp.c
+++ b/packet-ppp.c
@@ -1,7 +1,7 @@
/* packet-ppp.c
* Routines for ppp packet disassembly
*
- * $Id: packet-ppp.c,v 1.50 2001/01/03 07:53:43 guy Exp $
+ * $Id: packet-ppp.c,v 1.51 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1425,8 +1425,8 @@ proto_register_ppp(void)
/* subdissector code */
subdissector_table = register_dissector_table("ppp.protocol");
- register_dissector("ppp", dissect_ppp);
- register_dissector("payload_ppp", dissect_payload_ppp);
+ register_dissector("ppp", dissect_ppp, proto_ppp);
+ register_dissector("payload_ppp", dissect_payload_ppp, proto_ppp);
/* Register the preferences for the ppp protocol */
ppp_module = prefs_register_protocol(proto_ppp, NULL);
@@ -1468,6 +1468,6 @@ proto_register_mp(void)
void
proto_reg_handoff_ppp(void)
{
- dissector_add("wtap_encap", WTAP_ENCAP_PPP, dissect_ppp);
- dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, dissect_ppp);
+ dissector_add("wtap_encap", WTAP_ENCAP_PPP, dissect_ppp, proto_ppp);
+ dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, dissect_ppp, proto_ppp);
}
diff --git a/packet-pppoe.c b/packet-pppoe.c
index 21207bdebb..64a78430d2 100644
--- a/packet-pppoe.c
+++ b/packet-pppoe.c
@@ -1,7 +1,7 @@
/* packet-pppoe.c
* Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516)
*
- * $Id: packet-pppoe.c,v 1.14 2001/01/04 04:15:30 guy Exp $
+ * $Id: packet-pppoe.c,v 1.15 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -222,7 +222,8 @@ proto_register_pppoed(void)
void
proto_reg_handoff_pppoed(void)
{
- dissector_add("ethertype", ETHERTYPE_PPPOED, dissect_pppoed);
+ dissector_add("ethertype", ETHERTYPE_PPPOED, dissect_pppoed,
+ proto_pppoed);
}
static void
@@ -296,7 +297,8 @@ proto_register_pppoes(void)
void
proto_reg_handoff_pppoes(void)
{
- dissector_add("ethertype", ETHERTYPE_PPPOES, dissect_pppoes);
+ dissector_add("ethertype", ETHERTYPE_PPPOES, dissect_pppoes,
+ proto_pppoes);
/*
* Get a handle for the PPP payload dissector.
diff --git a/packet-pptp.c b/packet-pptp.c
index 168e40d6db..c90565cb6e 100644
--- a/packet-pptp.c
+++ b/packet-pptp.c
@@ -2,7 +2,7 @@
* Routines for the Point-to-Point Tunnelling Protocol (PPTP) (RFC 2637)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-pptp.c,v 1.16 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-pptp.c,v 1.17 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -832,5 +832,5 @@ proto_register_pptp(void)
void
proto_reg_handoff_pptp(void)
{
- dissector_add("tcp.port", TCP_PORT_PPTP, dissect_pptp);
+ dissector_add("tcp.port", TCP_PORT_PPTP, dissect_pptp, proto_pptp);
}
diff --git a/packet-quake.c b/packet-quake.c
index ecd4f3f3bb..867a2b41dc 100644
--- a/packet-quake.c
+++ b/packet-quake.c
@@ -4,7 +4,7 @@
* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quake.c,v 1.11 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-quake.c,v 1.12 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -718,5 +718,5 @@ proto_register_quake(void)
void
proto_reg_handoff_quake(void)
{
- dissector_add("udp.port", DEFAULTnet_hostport, dissect_quake);
+ dissector_add("udp.port", DEFAULTnet_hostport, dissect_quake, proto_quake);
}
diff --git a/packet-radius.c b/packet-radius.c
index 9751fff1ee..be9269dee1 100644
--- a/packet-radius.c
+++ b/packet-radius.c
@@ -1,7 +1,7 @@
/* packet-radius.c
* Routines for RADIUS packet disassembly
*
- * $Id: packet-radius.c,v 1.21 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-radius.c,v 1.22 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Johan Feyaerts
@@ -784,8 +784,12 @@ proto_register_radius(void)
void
proto_reg_handoff_radius(void)
{
- old_dissector_add("udp.port", UDP_PORT_RADIUS, dissect_radius);
- old_dissector_add("udp.port", UDP_PORT_RADIUS_NEW, dissect_radius);
- old_dissector_add("udp.port", UDP_PORT_RADACCT, dissect_radius);
- old_dissector_add("udp.port", UDP_PORT_RADACCT_NEW, dissect_radius);
+ old_dissector_add("udp.port", UDP_PORT_RADIUS, dissect_radius,
+ proto_radius);
+ old_dissector_add("udp.port", UDP_PORT_RADIUS_NEW, dissect_radius,
+ proto_radius);
+ old_dissector_add("udp.port", UDP_PORT_RADACCT, dissect_radius,
+ proto_radius);
+ old_dissector_add("udp.port", UDP_PORT_RADACCT_NEW, dissect_radius,
+ proto_radius);
}
diff --git a/packet-raw.c b/packet-raw.c
index 077b78555a..807e4aab9a 100644
--- a/packet-raw.c
+++ b/packet-raw.c
@@ -1,7 +1,7 @@
/* packet-raw.c
* Routines for raw packet disassembly
*
- * $Id: packet-raw.c,v 1.23 2000/11/29 05:16:15 gram Exp $
+ * $Id: packet-raw.c,v 1.24 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -163,5 +163,5 @@ proto_reg_handoff_raw(void)
*/
ip_handle = find_dissector("ip");
ppp_handle = find_dissector("ppp");
- dissector_add("wtap_encap", WTAP_ENCAP_RAW_IP, dissect_raw);
+ dissector_add("wtap_encap", WTAP_ENCAP_RAW_IP, dissect_raw, -1);
}
diff --git a/packet-rip.c b/packet-rip.c
index 732cc2e551..95aea43745 100644
--- a/packet-rip.c
+++ b/packet-rip.c
@@ -2,7 +2,7 @@
* Routines for RIPv1 and RIPv2 packet disassembly
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-rip.c,v 1.21 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-rip.c,v 1.22 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -211,5 +211,5 @@ proto_register_rip(void)
void
proto_reg_handoff_rip(void)
{
- dissector_add("udp.port", UDP_PORT_RIP, dissect_rip);
+ dissector_add("udp.port", UDP_PORT_RIP, dissect_rip, proto_rip);
}
diff --git a/packet-ripng.c b/packet-ripng.c
index 6f97c7efb5..747a7b81f3 100644
--- a/packet-ripng.c
+++ b/packet-ripng.c
@@ -3,7 +3,7 @@
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
* derived from packet-rip.c
*
- * $Id: packet-ripng.c,v 1.16 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-ripng.c,v 1.17 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -159,5 +159,5 @@ proto_register_ripng(void)
void
proto_reg_handoff_ripng(void)
{
- old_dissector_add("udp.port", UDP_PORT_RIPNG, dissect_ripng);
+ old_dissector_add("udp.port", UDP_PORT_RIPNG, dissect_ripng, proto_ripng);
}
diff --git a/packet-rlogin.c b/packet-rlogin.c
index 33a10dedc0..3d9ee25a8f 100644
--- a/packet-rlogin.c
+++ b/packet-rlogin.c
@@ -2,7 +2,7 @@
* Routines for unix rlogin packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-rlogin.c,v 1.12 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-rlogin.c,v 1.13 2001/01/09 06:31:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -495,5 +495,6 @@ proto_reg_handoff_rlogin(void) {
/* dissector install routine */
- old_dissector_add("tcp.port", TCP_PORT_RLOGIN, dissect_rlogin);
+ old_dissector_add("tcp.port", TCP_PORT_RLOGIN, dissect_rlogin,
+ proto_rlogin);
}
diff --git a/packet-rpc.c b/packet-rpc.c
index 4881de4229..d3662b3879 100644
--- a/packet-rpc.c
+++ b/packet-rpc.c
@@ -2,7 +2,7 @@
* Routines for rpc dissection
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
*
- * $Id: packet-rpc.c,v 1.46 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-rpc.c,v 1.47 2001/01/09 06:31:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1772,6 +1772,6 @@ proto_register_rpc(void)
void
proto_reg_handoff_rpc(void)
{
- heur_dissector_add("tcp", dissect_rpc);
- heur_dissector_add("udp", dissect_rpc);
+ heur_dissector_add("tcp", dissect_rpc, proto_rpc);
+ heur_dissector_add("udp", dissect_rpc, proto_rpc);
}
diff --git a/packet-rsh.c b/packet-rsh.c
index dd23920673..78e1680faa 100644
--- a/packet-rsh.c
+++ b/packet-rsh.c
@@ -4,7 +4,7 @@
* Robert Tsai <rtsai@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-rsh.c,v 1.8 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-rsh.c,v 1.9 2001/01/09 06:31:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -129,5 +129,5 @@ proto_register_rsh(void)
void
proto_reg_handoff_rsh(void)
{
- dissector_add("tcp.port", TCP_PORT_RSH, dissect_rsh);
+ dissector_add("tcp.port", TCP_PORT_RSH, dissect_rsh, proto_rsh);
}
diff --git a/packet-rsvp.c b/packet-rsvp.c
index a0f0ac73ce..55eff132bc 100644
--- a/packet-rsvp.c
+++ b/packet-rsvp.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-rsvp.c,v 1.30 2001/01/03 16:41:07 gram Exp $
+ * $Id: packet-rsvp.c,v 1.31 2001/01/09 06:31:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -2044,5 +2044,6 @@ proto_register_rsvp(void)
void
proto_reg_handoff_rsvp(void)
{
- old_dissector_add("ip.proto", IP_PROTO_RSVP, dissect_rsvp);
+ old_dissector_add("ip.proto", IP_PROTO_RSVP, dissect_rsvp,
+ proto_rsvp);
}
diff --git a/packet-rtcp.c b/packet-rtcp.c
index 90a1d9d76a..40d8927cab 100644
--- a/packet-rtcp.c
+++ b/packet-rtcp.c
@@ -196,7 +196,7 @@ void rtcp_add_address( const unsigned char* ip_addr, int prt )
* know that we're interested in traffic
*/
if ( ! heur_init ) {
- heur_dissector_add( "udp", dissect_rtcp_heur );
+ heur_dissector_add( "udp", dissect_rtcp_heur, proto_rtcp );
heur_init = TRUE;
}
@@ -1226,5 +1226,5 @@ proto_reg_handoff_rtcp(void)
* Register this dissector as one that can be assigned to a
* UDP conversation.
*/
- conv_dissector_add("udp", dissect_rtcp);
+ conv_dissector_add("udp", dissect_rtcp, proto_rtcp);
}
diff --git a/packet-rtp.c b/packet-rtp.c
index c3d49e8b0e..caffb4378b 100644
--- a/packet-rtp.c
+++ b/packet-rtp.c
@@ -164,7 +164,7 @@ void rtp_add_address( const unsigned char* ip_addr, int prt )
* know that we're interested in traffic
*/
if ( ! heur_init ) {
- heur_dissector_add( "udp", dissect_rtp_heur );
+ heur_dissector_add( "udp", dissect_rtp_heur, proto_rtp );
heur_init = TRUE;
}
@@ -637,5 +637,5 @@ proto_reg_handoff_rtp(void)
* Register this dissector as one that can be assigned to a
* UDP conversation.
*/
- conv_dissector_add("udp", dissect_rtp);
+ conv_dissector_add("udp", dissect_rtp, proto_rtp);
}
diff --git a/packet-rtsp.c b/packet-rtsp.c
index 78682eb94b..f63de7069c 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.31 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-rtsp.c,v 1.32 2001/01/09 06:31:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -620,7 +620,7 @@ proto_register_rtsp(void)
void
proto_reg_handoff_rtsp(void)
{
- dissector_add("tcp.port", TCP_PORT_RTSP, dissect_rtsp);
+ dissector_add("tcp.port", TCP_PORT_RTSP, dissect_rtsp, proto_rtsp);
/*
* Get a handle for the SDP dissector.
diff --git a/packet-rx.c b/packet-rx.c
index 92c79339ac..c0119d6369 100644
--- a/packet-rx.c
+++ b/packet-rx.c
@@ -4,7 +4,7 @@
* Based on routines from tcpdump patches by
* Ken Hornstein <kenh@cmf.nrl.navy.mil>
*
- * $Id: packet-rx.c,v 1.17 2001/01/03 16:41:07 gram Exp $
+ * $Id: packet-rx.c,v 1.18 2001/01/09 06:31:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -253,6 +253,7 @@ proto_reg_handoff_rx(void)
/* Ports in the range UDP_PORT_RX_LOW to UDP_PORT_RX_HIGH
are all used for various AFS services. */
for (port = UDP_PORT_RX_LOW; port <= UDP_PORT_RX_HIGH; port++)
- old_dissector_add("udp.port", port, dissect_rx);
- old_dissector_add("udp.port", UDP_PORT_RX_AFS_BACKUPS, dissect_rx);
+ old_dissector_add("udp.port", port, dissect_rx, proto_rx);
+ old_dissector_add("udp.port", UDP_PORT_RX_AFS_BACKUPS, dissect_rx,
+ proto_rx);
}
diff --git a/packet-sap.c b/packet-sap.c
index 3125ddd8be..071cdef3c5 100644
--- a/packet-sap.c
+++ b/packet-sap.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-sap.c,v 1.17 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-sap.c,v 1.18 2001/01/09 06:31:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -366,7 +366,7 @@ void proto_register_sap(void)
void
proto_reg_handoff_sap(void)
{
- dissector_add("udp.port", UDP_PORT_SAP, dissect_sap);
+ dissector_add("udp.port", UDP_PORT_SAP, dissect_sap, proto_sap);
/*
* Get a handle for the SDP dissector.
diff --git a/packet-sctp.c b/packet-sctp.c
index 2ca59ad82c..a07fbd485e 100644
--- a/packet-sctp.c
+++ b/packet-sctp.c
@@ -2,7 +2,7 @@
* Routines for Stream Control Transmission Protocol dissection
* Copyright 2000, Michael Txen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-sctp.c,v 1.8 2001/01/03 06:55:32 guy Exp $
+ * $Id: packet-sctp.c,v 1.9 2001/01/09 06:31:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -1820,5 +1820,5 @@ proto_register_sctp(void)
void
proto_reg_handoff_sctp(void)
{
- dissector_add("ip.proto", IP_PROTO_SCTP, dissect_sctp);
+ dissector_add("ip.proto", IP_PROTO_SCTP, dissect_sctp, proto_sctp);
}
diff --git a/packet-sdp.c b/packet-sdp.c
index 13bd45aeb2..73c465047c 100644
--- a/packet-sdp.c
+++ b/packet-sdp.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-sdp.c,v 1.18 2001/01/03 06:55:32 guy Exp $
+ * $Id: packet-sdp.c,v 1.19 2001/01/09 06:31:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -227,5 +227,5 @@ proto_register_sdp(void)
* (you can't refer to it directly from a plugin dissector
* on Windows without stuffing it into the Big Transfer Vector).
*/
- register_dissector("sdp", dissect_sdp);
+ register_dissector("sdp", dissect_sdp, proto_sdp);
}
diff --git a/packet-sip.c b/packet-sip.c
index b3a5d5f254..0463916ada 100644
--- a/packet-sip.c
+++ b/packet-sip.c
@@ -7,7 +7,7 @@
*
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-sip.c,v 1.9 2001/01/03 06:55:32 guy Exp $
+ * $Id: packet-sip.c,v 1.10 2001/01/09 06:31:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -196,8 +196,8 @@ void proto_register_sip(void)
void
proto_reg_handoff_sip(void)
{
- dissector_add("tcp.port", TCP_PORT_SIP, dissect_sip);
- dissector_add("udp.port", UDP_PORT_SIP, dissect_sip);
+ dissector_add("tcp.port", TCP_PORT_SIP, dissect_sip, proto_sip);
+ dissector_add("udp.port", UDP_PORT_SIP, dissect_sip, proto_sip);
/*
* Get a handle for the SDP dissector.
diff --git a/packet-sll.c b/packet-sll.c
index 25e3794620..7f053e3f83 100644
--- a/packet-sll.c
+++ b/packet-sll.c
@@ -1,7 +1,7 @@
/* packet-sll.c
* Routines for disassembly of packets from Linux "cooked mode" captures
*
- * $Id: packet-sll.c,v 1.3 2001/01/03 10:34:41 guy Exp $
+ * $Id: packet-sll.c,v 1.4 2001/01/09 06:31:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -320,5 +320,5 @@ proto_reg_handoff_sll(void)
*/
llc_handle = find_dissector("llc");
- dissector_add("wtap_encap", WTAP_ENCAP_SLL, dissect_sll);
+ dissector_add("wtap_encap", WTAP_ENCAP_SLL, dissect_sll, proto_sll);
}
diff --git a/packet-smtp.c b/packet-smtp.c
index e55e1dde49..ae4ca6e633 100644
--- a/packet-smtp.c
+++ b/packet-smtp.c
@@ -1,7 +1,7 @@
/* packet-smtp.c
* Routines for SMTP packet disassembly
*
- * $Id: packet-smtp.c,v 1.13 2001/01/03 06:55:32 guy Exp $
+ * $Id: packet-smtp.c,v 1.14 2001/01/09 06:31:43 guy Exp $
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
@@ -592,6 +592,6 @@ proto_reg_handoff_smtp(void)
tcp_port = global_smtp_tcp_port;
- dissector_add("tcp.port", global_smtp_tcp_port, dissect_smtp);
+ dissector_add("tcp.port", global_smtp_tcp_port, dissect_smtp, proto_smtp);
}
diff --git a/packet-sna.c b/packet-sna.c
index 1eabad9aaa..34aaed50d5 100644
--- a/packet-sna.c
+++ b/packet-sna.c
@@ -2,7 +2,7 @@
* Routines for SNA
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-sna.c,v 1.22 2001/01/03 21:52:40 guy Exp $
+ * $Id: packet-sna.c,v 1.23 2001/01/09 06:31:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1224,5 +1224,6 @@ proto_register_sna(void)
void
proto_reg_handoff_sna(void)
{
- old_dissector_add("llc.dsap", SAP_SNA_PATHCTRL, dissect_sna);
+ old_dissector_add("llc.dsap", SAP_SNA_PATHCTRL, dissect_sna,
+ proto_sna);
}
diff --git a/packet-snmp.c b/packet-snmp.c
index 9ec3ba38e1..bc5778841c 100644
--- a/packet-snmp.c
+++ b/packet-snmp.c
@@ -2,7 +2,7 @@
* Routines for SNMP (simple network management protocol)
* D.Jorand (c) 1998
*
- * $Id: packet-snmp.c,v 1.56 2001/01/03 16:41:07 gram Exp $
+ * $Id: packet-snmp.c,v 1.57 2001/01/09 06:31:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -2090,10 +2090,16 @@ proto_register_snmp(void)
void
proto_reg_handoff_snmp(void)
{
- old_dissector_add("udp.port", UDP_PORT_SNMP, dissect_snmp);
- old_dissector_add("udp.port", UDP_PORT_SNMP_TRAP, dissect_snmp);
- old_dissector_add("tcp.port", TCP_PORT_SMUX, dissect_smux);
- old_dissector_add("ethertype", ETHERTYPE_SNMP, dissect_snmp);
- old_dissector_add("ipx.socket", IPX_SOCKET_SNMP_AGENT, dissect_snmp);
- old_dissector_add("ipx.socket", IPX_SOCKET_SNMP_SINK, dissect_snmp);
+ old_dissector_add("udp.port", UDP_PORT_SNMP, dissect_snmp,
+ proto_snmp);
+ old_dissector_add("udp.port", UDP_PORT_SNMP_TRAP, dissect_snmp,
+ proto_snmp);
+ old_dissector_add("tcp.port", TCP_PORT_SMUX, dissect_smux,
+ proto_smux);
+ old_dissector_add("ethertype", ETHERTYPE_SNMP, dissect_snmp,
+ proto_snmp);
+ old_dissector_add("ipx.socket", IPX_SOCKET_SNMP_AGENT, dissect_snmp,
+ proto_snmp);
+ old_dissector_add("ipx.socket", IPX_SOCKET_SNMP_SINK, dissect_snmp,
+ proto_snmp);
}
diff --git a/packet-socks.c b/packet-socks.c
index cb8701381f..33816efe30 100644
--- a/packet-socks.c
+++ b/packet-socks.c
@@ -2,7 +2,7 @@
* Routines for socks versions 4 &5 packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-socks.c,v 1.16 2001/01/03 06:55:33 guy Exp $
+ * $Id: packet-socks.c,v 1.17 2001/01/09 06:31:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1151,5 +1151,6 @@ proto_reg_handoff_socks(void) {
/* dissector install routine */
- old_dissector_add("tcp.port", TCP_PORT_SOCKS, dissect_socks);
+ old_dissector_add("tcp.port", TCP_PORT_SOCKS, dissect_socks,
+ proto_socks);
}
diff --git a/packet-srvloc.c b/packet-srvloc.c
index e61b47c44c..77d63825eb 100644
--- a/packet-srvloc.c
+++ b/packet-srvloc.c
@@ -6,7 +6,7 @@
* In particular I have not had an opportunity to see how it
* responds to SRVLOC over TCP.
*
- * $Id: packet-srvloc.c,v 1.18 2001/01/03 16:41:07 gram Exp $
+ * $Id: packet-srvloc.c,v 1.19 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -518,12 +518,12 @@ proto_register_srvloc(void)
FT_UINT16, BASE_DEC, VALS(srvloc_errs), 0x0,
""}
},
- };
+ };
- static gint *ett[] = {
- &ett_srvloc,
- &ett_srvloc_flags,
- };
+ static gint *ett[] = {
+ &ett_srvloc,
+ &ett_srvloc_flags,
+ };
proto_srvloc = proto_register_protocol("Service Location Protocol",
"SRVLOC", "srvloc");
@@ -534,7 +534,9 @@ proto_register_srvloc(void)
void
proto_reg_handoff_srvloc(void)
{
- old_dissector_add("tcp.port", TCP_PORT_SRVLOC, dissect_srvloc);
- old_dissector_add("udp.port", UDP_PORT_SRVLOC, dissect_srvloc);
+ old_dissector_add("tcp.port", TCP_PORT_SRVLOC, dissect_srvloc,
+ proto_srvloc);
+ old_dissector_add("udp.port", UDP_PORT_SRVLOC, dissect_srvloc,
+ proto_srvloc);
}
diff --git a/packet-syslog.c b/packet-syslog.c
index 16dd16a4f6..9759d4032c 100644
--- a/packet-syslog.c
+++ b/packet-syslog.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Gerald Combs <gerald@zing.org>
*
- * $Id: packet-syslog.c,v 1.8 2001/01/03 06:55:33 guy Exp $
+ * $Id: packet-syslog.c,v 1.9 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -249,5 +249,5 @@ void proto_register_syslog(void)
void
proto_reg_handoff_syslog(void)
{
- dissector_add("udp.port", UDP_PORT_SYSLOG, dissect_syslog);
+ dissector_add("udp.port", UDP_PORT_SYSLOG, dissect_syslog, proto_syslog);
}
diff --git a/packet-tacacs.c b/packet-tacacs.c
index fa7c4a461f..dc9170f207 100644
--- a/packet-tacacs.c
+++ b/packet-tacacs.c
@@ -1,7 +1,7 @@
/* packet-tacacs.c
* Routines for cisco tacacs/tacplus/AAA packet dissection
*
- * $Id: packet-tacacs.c,v 1.9 2001/01/03 06:55:33 guy Exp $
+ * $Id: packet-tacacs.c,v 1.10 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -159,6 +159,8 @@ proto_register_tacacs(void)
void
proto_reg_handoff_tacacs(void)
{
- old_dissector_add("udp.port", UDP_PORT_TACACS, dissect_tacacs);
- old_dissector_add("tcp.port", TCP_PORT_TACACS, dissect_tacplus);
+ old_dissector_add("udp.port", UDP_PORT_TACACS, dissect_tacacs,
+ proto_tacacs);
+ old_dissector_add("tcp.port", TCP_PORT_TACACS, dissect_tacplus,
+ proto_tacacs);
}
diff --git a/packet-tcp.c b/packet-tcp.c
index 08ec35b2ed..8e303f738e 100644
--- a/packet-tcp.c
+++ b/packet-tcp.c
@@ -1,7 +1,7 @@
/* packet-tcp.c
* Routines for TCP packet disassembly
*
- * $Id: packet-tcp.c,v 1.96 2001/01/09 05:53:20 guy Exp $
+ * $Id: packet-tcp.c,v 1.97 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -767,5 +767,5 @@ proto_register_tcp(void)
void
proto_reg_handoff_tcp(void)
{
- dissector_add("ip.proto", IP_PROTO_TCP, dissect_tcp);
+ dissector_add("ip.proto", IP_PROTO_TCP, dissect_tcp, proto_tcp);
}
diff --git a/packet-telnet.c b/packet-telnet.c
index cfcd02716f..57d0d8d643 100644
--- a/packet-telnet.c
+++ b/packet-telnet.c
@@ -2,7 +2,7 @@
* Routines for telnet packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-telnet.c,v 1.22 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-telnet.c,v 1.23 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -436,5 +436,6 @@ proto_register_telnet(void)
void
proto_reg_handoff_telnet(void)
{
- dissector_add("tcp.port", TCP_PORT_TELNET, dissect_telnet);
+ dissector_add("tcp.port", TCP_PORT_TELNET, dissect_telnet,
+ proto_telnet);
}
diff --git a/packet-tftp.c b/packet-tftp.c
index adf0b22f04..dce72a37f1 100644
--- a/packet-tftp.c
+++ b/packet-tftp.c
@@ -5,7 +5,7 @@
* Craig Newell <CraigN@cheque.uq.edu.au>
* RFC2347 TFTP Option Extension
*
- * $Id: packet-tftp.c,v 1.22 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-tftp.c,v 1.23 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -279,5 +279,5 @@ proto_register_tftp(void)
void
proto_reg_handoff_tftp(void)
{
- dissector_add("udp.port", UDP_PORT_TFTP, dissect_tftp);
+ dissector_add("udp.port", UDP_PORT_TFTP, dissect_tftp, proto_tftp);
}
diff --git a/packet-time.c b/packet-time.c
index 6f05cdb1d0..d5be771020 100644
--- a/packet-time.c
+++ b/packet-time.c
@@ -5,7 +5,7 @@
* Craig Newell <CraigN@cheque.uq.edu.au>
* RFC2347 TIME Option Extension
*
- * $Id: packet-time.c,v 1.11 2001/01/06 09:42:10 guy Exp $
+ * $Id: packet-time.c,v 1.12 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -98,5 +98,5 @@ proto_register_time(void)
void
proto_reg_handoff_time(void)
{
- dissector_add("udp.port", UDP_PORT_TIME, dissect_time);
+ dissector_add("udp.port", UDP_PORT_TIME, dissect_time, proto_time);
}
diff --git a/packet-tns.c b/packet-tns.c
index 4e7159b9f9..e0bd7da91f 100644
--- a/packet-tns.c
+++ b/packet-tns.c
@@ -1,7 +1,7 @@
/* packet-tns.c
* Routines for MSX tns packet dissection
*
- * $Id: packet-tns.c,v 1.11 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-tns.c,v 1.12 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -351,5 +351,5 @@ void proto_register_tns(void)
void
proto_reg_handoff_tns(void)
{
- old_dissector_add("tcp.port", TCP_PORT_TNS, dissect_tns);
+ old_dissector_add("tcp.port", TCP_PORT_TNS, dissect_tns, proto_tns);
}
diff --git a/packet-tr.c b/packet-tr.c
index 8d8698d069..69dfca9770 100644
--- a/packet-tr.c
+++ b/packet-tr.c
@@ -2,7 +2,7 @@
* Routines for Token-Ring packet disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-tr.c,v 1.54 2001/01/03 10:34:41 guy Exp $
+ * $Id: packet-tr.c,v 1.55 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -682,5 +682,6 @@ proto_reg_handoff_tr(void)
trmac_handle = find_dissector("trmac");
llc_handle = find_dissector("llc");
- dissector_add("wtap_encap", WTAP_ENCAP_TOKEN_RING, dissect_tr);
+ dissector_add("wtap_encap", WTAP_ENCAP_TOKEN_RING, dissect_tr,
+ proto_tr);
}
diff --git a/packet-trmac.c b/packet-trmac.c
index 6cd61d9e8c..8eda4136c0 100644
--- a/packet-trmac.c
+++ b/packet-trmac.c
@@ -2,7 +2,7 @@
* Routines for Token-Ring Media Access Control
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-trmac.c,v 1.29 2001/01/05 08:59:16 guy Exp $
+ * $Id: packet-trmac.c,v 1.30 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -409,5 +409,5 @@ proto_register_trmac(void)
proto_register_field_array(proto_trmac, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("trmac", dissect_trmac);
+ register_dissector("trmac", dissect_trmac, proto_trmac);
}
diff --git a/packet-udp.c b/packet-udp.c
index fcadf250ee..ee0010e799 100644
--- a/packet-udp.c
+++ b/packet-udp.c
@@ -1,7 +1,7 @@
/* packet-udp.c
* Routines for UDP packet disassembly
*
- * $Id: packet-udp.c,v 1.83 2001/01/09 05:53:20 guy Exp $
+ * $Id: packet-udp.c,v 1.84 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -280,5 +280,5 @@ proto_register_udp(void)
void
proto_reg_handoff_udp(void)
{
- dissector_add("ip.proto", IP_PROTO_UDP, dissect_udp);
+ dissector_add("ip.proto", IP_PROTO_UDP, dissect_udp, proto_udp);
}
diff --git a/packet-v120.c b/packet-v120.c
index 6d48003d23..a4fe672f5c 100644
--- a/packet-v120.c
+++ b/packet-v120.c
@@ -2,7 +2,7 @@
* Routines for v120 frame disassembly
* Bert Driehuis <driehuis@playbeing.org>
*
- * $Id: packet-v120.c,v 1.16 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-v120.c,v 1.17 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -235,5 +235,6 @@ proto_register_v120(void)
void
proto_reg_handoff_v120(void)
{
- dissector_add("wtap_encap", WTAP_ENCAP_V120, dissect_v120);
+ dissector_add("wtap_encap", WTAP_ENCAP_V120, dissect_v120,
+ proto_v120);
}
diff --git a/packet-vines.c b/packet-vines.c
index 5b70badf7e..8a858ccc02 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
/* packet-vines.c
* Routines for Banyan VINES protocol packet disassembly
*
- * $Id: packet-vines.c,v 1.22 2001/01/06 08:44:03 guy Exp $
+ * $Id: packet-vines.c,v 1.23 2001/01/09 06:31:44 guy Exp $
*
* Don Lafontaine <lafont02@cn.ca>
*
@@ -164,11 +164,13 @@ proto_register_vines_frp(void)
void
proto_reg_handoff_vines_frp(void)
{
- dissector_add("ip.proto", IP_PROTO_VINES, dissect_vines_frp);
+ dissector_add("ip.proto", IP_PROTO_VINES, dissect_vines_frp,
+ proto_vines_frp);
/* XXX: AFAIK, src and dst port must be the same; should
the dissector check for that? */
- dissector_add("udp.port", UDP_PORT_VINES, dissect_vines_frp);
+ dissector_add("udp.port", UDP_PORT_VINES, dissect_vines_frp,
+ proto_vines_frp);
}
gchar *
@@ -362,8 +364,8 @@ proto_register_vines(void)
void
proto_reg_handoff_vines(void)
{
- dissector_add("ethertype", ETHERTYPE_VINES, dissect_vines);
- dissector_add("ppp.protocol", PPP_VINES, dissect_vines);
+ dissector_add("ethertype", ETHERTYPE_VINES, dissect_vines, proto_vines);
+ dissector_add("ppp.protocol", PPP_VINES, dissect_vines, proto_vines);
}
static void
diff --git a/packet-vlan.c b/packet-vlan.c
index c97e1f24e6..d0f77af024 100644
--- a/packet-vlan.c
+++ b/packet-vlan.c
@@ -1,7 +1,7 @@
/* packet-vlan.c
* Routines for VLAN 802.1Q ethernet header disassembly
*
- * $Id: packet-vlan.c,v 1.27 2001/01/03 10:34:42 guy Exp $
+ * $Id: packet-vlan.c,v 1.28 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -240,5 +240,5 @@ proto_reg_handoff_vlan(void)
*/
llc_handle = find_dissector("llc");
- dissector_add("ethertype", ETHERTYPE_VLAN, dissect_vlan);
+ dissector_add("ethertype", ETHERTYPE_VLAN, dissect_vlan, proto_vlan);
}
diff --git a/packet-vrrp.c b/packet-vrrp.c
index 5aa53e0f02..6007a26c1f 100644
--- a/packet-vrrp.c
+++ b/packet-vrrp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-vrrp.c,v 1.12 2001/01/06 05:43:13 guy Exp $
+ * $Id: packet-vrrp.c,v 1.13 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -238,5 +238,5 @@ void proto_register_vrrp(void)
void
proto_reg_handoff_vrrp(void)
{
- dissector_add("ip.proto", IP_PROTO_VRRP, dissect_vrrp);
+ dissector_add("ip.proto", IP_PROTO_VRRP, dissect_vrrp, proto_vrrp);
}
diff --git a/packet-vtp.c b/packet-vtp.c
index 1903f3ada8..9402cb5b9b 100644
--- a/packet-vtp.c
+++ b/packet-vtp.c
@@ -1,7 +1,7 @@
/* packet-vtp.c
* Routines for the disassembly of Cisco's Virtual Trunking Protocol
*
- * $Id: packet-vtp.c,v 1.9 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-vtp.c,v 1.10 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -702,5 +702,5 @@ proto_register_vtp(void)
void
proto_reg_handoff_vtp(void)
{
- dissector_add("llc.cisco_pid", 0x2003, dissect_vtp);
+ dissector_add("llc.cisco_pid", 0x2003, dissect_vtp, proto_vtp);
}
diff --git a/packet-wccp.c b/packet-wccp.c
index 629fda25c2..b745f20897 100644
--- a/packet-wccp.c
+++ b/packet-wccp.c
@@ -2,7 +2,7 @@
* Routines for Web Cache Coordination Protocol dissection
* Jerry Talkington <jerryt@netapp.com>
*
- * $Id: packet-wccp.c,v 1.15 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-wccp.c,v 1.16 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1236,5 +1236,5 @@ proto_register_wccp(void)
void
proto_reg_handoff_wccp(void)
{
- dissector_add("udp.port", UDP_PORT_WCCP, dissect_wccp);
+ dissector_add("udp.port", UDP_PORT_WCCP, dissect_wccp, proto_wccp);
}
diff --git a/packet-who.c b/packet-who.c
index e21370a528..1880066e77 100644
--- a/packet-who.c
+++ b/packet-who.c
@@ -2,7 +2,7 @@
* Routines for who protocol (see man rwhod)
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-who.c,v 1.13 2001/01/06 06:18:54 guy Exp $
+ * $Id: packet-who.c,v 1.14 2001/01/09 06:31:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -310,5 +310,5 @@ proto_register_who(void)
void
proto_reg_handoff_who(void)
{
- dissector_add("udp.port", UDP_PORT_WHO, dissect_who);
+ dissector_add("udp.port", UDP_PORT_WHO, dissect_who, proto_who);
}
diff --git a/packet-wsp.c b/packet-wsp.c
index d5edc914c4..5bc5e7ed38 100644
--- a/packet-wsp.c
+++ b/packet-wsp.c
@@ -3,7 +3,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
- * $Id: packet-wsp.c,v 1.8 2001/01/03 16:41:07 gram Exp $
+ * $Id: packet-wsp.c,v 1.9 2001/01/09 06:31:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1477,15 +1477,15 @@ proto_register_wsp(void)
proto_register_field_array(proto_wsp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("wsp", dissect_wsp);
+ register_dissector("wsp", dissect_wsp, proto_wsp);
};
void
proto_reg_handoff_wsp(void)
{
/* Only connection-less WSP has no previous handler */
- dissector_add("udp.port", UDP_PORT_WSP, dissect_wsp);
- /* dissector_add("udp.port", UDP_PORT_WTP_WSP, dissect_wsp); */
- /* dissector_add("udp.port", UDP_PORT_WTLS_WSP, dissect_wsp); */
- /* dissector_add("udp.port", UDP_PORT_WTLS_WTP_WSP, dissect_wsp); */
+ dissector_add("udp.port", UDP_PORT_WSP, dissect_wsp, proto_wsp);
+ /* dissector_add("udp.port", UDP_PORT_WTP_WSP, dissect_wsp, proto_wsp); */
+ /* dissector_add("udp.port", UDP_PORT_WTLS_WSP, dissect_wsp, proto_wsp); */
+ /* dissector_add("udp.port", UDP_PORT_WTLS_WTP_WSP, dissect_wsp, proto_wsp); */
}
diff --git a/packet-wtp.c b/packet-wtp.c
index f578d0d671..e066b5b7d2 100644
--- a/packet-wtp.c
+++ b/packet-wtp.c
@@ -3,7 +3,7 @@
*
* Routines to dissect WTP component of WAP traffic.
*
- * $Id: packet-wtp.c,v 1.8 2001/01/03 16:41:08 gram Exp $
+ * $Id: packet-wtp.c,v 1.9 2001/01/09 06:31:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -629,6 +629,6 @@ proto_reg_handoff_wtp(void)
*/
wsp_handle = find_dissector("wsp");
- dissector_add("udp.port", UDP_PORT_WTP_WSP, dissect_wtp);
- /* dissector_add("udp.port", UDP_PORT_WTLS_WTP_WSP, dissect_wsp); */
+ dissector_add("udp.port", UDP_PORT_WTP_WSP, dissect_wtp, proto_wtp);
+ /* dissector_add("udp.port", UDP_PORT_WTLS_WTP_WSP, dissect_wsp, proto_wsp); */
}
diff --git a/packet-x11.c b/packet-x11.c
index e00aefbe06..74ba12056b 100644
--- a/packet-x11.c
+++ b/packet-x11.c
@@ -2,7 +2,7 @@
* Routines for X11 dissection
* Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
*
- * $Id: packet-x11.c,v 1.14 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-x11.c,v 1.15 2001/01/09 06:31:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -2949,7 +2949,7 @@ void proto_register_x11(void)
void
proto_reg_handoff_x11(void)
{
- dissector_add("tcp.port", TCP_PORT_X11, dissect_x11);
- dissector_add("tcp.port", TCP_PORT_X11_2, dissect_x11);
- dissector_add("tcp.port", TCP_PORT_X11_3, dissect_x11);
+ dissector_add("tcp.port", TCP_PORT_X11, dissect_x11, proto_x11);
+ dissector_add("tcp.port", TCP_PORT_X11_2, dissect_x11, proto_x11);
+ dissector_add("tcp.port", TCP_PORT_X11_3, dissect_x11, proto_x11);
}
diff --git a/packet-x25.c b/packet-x25.c
index d39578e0bf..adc83cdf95 100644
--- a/packet-x25.c
+++ b/packet-x25.c
@@ -2,7 +2,7 @@
* Routines for x25 packet disassembly
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-x25.c,v 1.44 2001/01/05 19:07:38 guy Exp $
+ * $Id: packet-x25.c,v 1.45 2001/01/09 06:31:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -2069,5 +2069,12 @@ proto_reg_handoff_x25(void)
ip_handle = find_dissector("ip");
ositp_handle = find_dissector("ositp");
- dissector_add("llc.dsap", SAP_X25, dissect_x25);
+ /*
+ * XXX - we can't associate this with both "proto_x25" and
+ * "proto_ex25"; we really should have only one X.25 protocol,
+ * but to do that right, we need to arrange that, for example,
+ * we can have two field definitions with the name "x.25.p_r",
+ * one for modulo-8 operation and one for modulo-128 operation.
+ */
+ dissector_add("llc.dsap", SAP_X25, dissect_x25, -1);
}
diff --git a/packet-xot.c b/packet-xot.c
index 28d7da88bc..be5299ba9f 100644
--- a/packet-xot.c
+++ b/packet-xot.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-xot.c,v 1.2 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-xot.c,v 1.3 2001/01/09 06:31:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -94,5 +94,5 @@ void proto_register_xot(void)
void
proto_reg_handoff_xot(void)
{
- dissector_add("tcp.port", TCP_PORT_XOT, dissect_xot);
+ dissector_add("tcp.port", TCP_PORT_XOT, dissect_xot, proto_xot);
}
diff --git a/packet-yhoo.c b/packet-yhoo.c
index 877314b617..507aac719d 100644
--- a/packet-yhoo.c
+++ b/packet-yhoo.c
@@ -2,7 +2,7 @@
* Routines for yahoo messenger packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-yhoo.c,v 1.12 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-yhoo.c,v 1.13 2001/01/09 06:31:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -225,5 +225,5 @@ proto_register_yhoo(void)
void
proto_reg_handoff_yhoo(void)
{
- old_heur_dissector_add("tcp", dissect_yhoo);
+ old_heur_dissector_add("tcp", dissect_yhoo, proto_yhoo);
}
diff --git a/packet-zebra.c b/packet-zebra.c
index 78df51ebc2..7a8f88634d 100644
--- a/packet-zebra.c
+++ b/packet-zebra.c
@@ -3,7 +3,7 @@
*
* Jochen Friedrich <jochen@scram.de>
*
- * $Id: packet-zebra.c,v 1.7 2001/01/03 08:26:40 guy Exp $
+ * $Id: packet-zebra.c,v 1.8 2001/01/09 06:31:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -653,5 +653,5 @@ proto_register_zebra(void)
void
proto_reg_handoff_zebra(void)
{
- dissector_add("tcp.port", TCP_PORT_ZEBRA, dissect_zebra);
+ dissector_add("tcp.port", TCP_PORT_ZEBRA, dissect_zebra, proto_zebra);
}
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 3d16cef8b4..0c9fb493ba 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -1,7 +1,7 @@
/* packet-gryphon.c
* Routines for Gryphon protocol packet disassembly
*
- * $Id: packet-gryphon.c,v 1.18 2001/01/04 04:56:20 gram Exp $
+ * $Id: packet-gryphon.c,v 1.19 2001/01/09 06:32:08 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Steve Limkemann <stevelim@dgtech.com>
@@ -1716,5 +1716,5 @@ plugin_init(plugin_address_table_t *pat)
G_MODULE_EXPORT void
plugin_reg_handoff(void)
{
- old_dissector_add("tcp.port", 7000, &dissect_gryphon);
+ old_dissector_add("tcp.port", 7000, &dissect_gryphon, proto_gryphon);
}
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c
index f94fe51f2c..01504dd234 100644
--- a/plugins/mgcp/packet-mgcp.c
+++ b/plugins/mgcp/packet-mgcp.c
@@ -2,7 +2,7 @@
* Routines for mgcp packet disassembly
* RFC 2705
*
- * $Id: packet-mgcp.c,v 1.13 2001/01/03 07:53:48 guy Exp $
+ * $Id: packet-mgcp.c,v 1.14 2001/01/09 06:32:10 guy Exp $
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
@@ -507,10 +507,14 @@ proto_reg_handoff_mgcp(void)
callagent_tcp_port = global_mgcp_callagent_tcp_port;
callagent_udp_port = global_mgcp_callagent_udp_port;
- dissector_add("tcp.port", global_mgcp_gateway_tcp_port, dissect_mgcp);
- dissector_add("udp.port", global_mgcp_gateway_udp_port, dissect_mgcp);
- dissector_add("tcp.port", global_mgcp_callagent_tcp_port, dissect_mgcp);
- dissector_add("udp.port", global_mgcp_callagent_udp_port, dissect_mgcp);
+ dissector_add("tcp.port", global_mgcp_gateway_tcp_port, dissect_mgcp,
+ proto_mgcp);
+ dissector_add("udp.port", global_mgcp_gateway_udp_port, dissect_mgcp,
+ proto_mgcp);
+ dissector_add("tcp.port", global_mgcp_callagent_tcp_port, dissect_mgcp,
+ proto_mgcp);
+ dissector_add("udp.port", global_mgcp_callagent_udp_port, dissect_mgcp,
+ proto_mgcp);
}
diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h
index f26b867b4e..21dc5e0157 100644
--- a/plugins/plugin_table.h
+++ b/plugins/plugin_table.h
@@ -1,7 +1,7 @@
/* plugin_table.h
* Table of exported addresses for Ethereal plugins.
*
- * $Id: plugin_table.h,v 1.13 2001/01/03 07:53:47 guy Exp $
+ * $Id: plugin_table.h,v 1.14 2001/01/09 06:32:07 guy Exp $
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@@ -43,13 +43,14 @@ typedef int (*addr_proto_register_protocol)(char*, char*, char*);
typedef void (*addr_proto_register_field_array)(int, hf_register_info*, int);
typedef void (*addr_proto_register_subtree_array)(int**, int);
-typedef void (*addr_dissector_add)(const char *, guint32, dissector_t);
-typedef void (*addr_old_dissector_add)(const char *, guint32, old_dissector_t);
+typedef void (*addr_dissector_add)(const char *, guint32, dissector_t, int);
+typedef void (*addr_old_dissector_add)(const char *, guint32, old_dissector_t,
+ int);
typedef void (*addr_dissector_delete)(const char *, guint32, dissector_t);
-typedef void (*addr_heur_dissector_add)(const char *, heur_dissector_t);
+typedef void (*addr_heur_dissector_add)(const char *, heur_dissector_t, int);
-typedef void (*addr_register_dissector)(const char *, dissector_t);
+typedef void (*addr_register_dissector)(const char *, dissector_t, int);
typedef dissector_handle_t (*addr_find_dissector)(const char *);
typedef void (*addr_old_call_dissector)(dissector_handle_t, const u_char *,
int, frame_data *, proto_tree *);