Create a header file for every packet-*.c file. Prune the packet.h file.

This change allows you to add a new packet-*.c file and not cause a
recompilation of everything that #include's packet.h

Add the plugin_api.[ch] files ot the plugins/Makefile.am packaging list.

Add #define YY_NO_UNPUT 1 to the lex source so that the yyunput symbol
is not defined, squelching a compiler complaint when compiling the generated
C file.

svn path=/trunk/; revision=1637

131 files changed, 2554 insertions, 688 deletions

diff --git a/Makefile.am b/Makefile.am
index b68c87a6ee..3c6fdc9266 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.166 2000/02/14 04:02:02 guy Exp $
+# $Id: Makefile.am,v 1.167 2000/02/15 21:01:50 gram Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -34,48 +34,72 @@ YFLAGS=-d -p dfilter_
 
 DISSECTOR_SOURCES = \
 	packet-aarp.c  \
+	packet-aarp.h  \
 	packet-afs.c   \
 	packet-afs.h   \
 	packet-arp.c   \
 	packet-arp.h   \
 	packet-ascend.c\
+	packet-ascend.h\
 	packet-atalk.c \
 	packet-atalk.h \
 	packet-atm.c   \
+	packet-atm.h   \
 	packet-auto_rp.c   \
+	packet-auto_rp.h   \
 	packet-bgp.c   \
 	packet-bgp.h   \
 	packet-bootp.c \
+	packet-bootp.h \
 	packet-bootparams.c \
 	packet-bootparams.h \
 	packet-bpdu.c  \
+	packet-bpdu.h  \
 	packet-cdp.c   \
+	packet-cdp.h   \
 	packet-cgmp.c  \
+	packet-cgmp.h  \
 	packet-clip.c  \
+	packet-clip.h  \
 	packet-data.c  \
 	packet-dns.c   \
 	packet-dns.h   \
 	packet-eth.c   \
+	packet-eth.h   \
 	packet-fddi.c  \
+	packet-fddi.h  \
 	packet-ftp.c   \
+	packet-ftp.h   \
 	packet-giop.c  \
+	packet-giop.h  \
 	packet-gre.c   \
+	packet-gre.h   \
 	packet-hsrp.c  \
+	packet-hsrp.h  \
 	packet-http.c  \
+	packet-http.h  \
 	packet-icmpv6.c\
+	packet-icmpv6.h\
 	packet-icp.c   \
+	packet-icp.h   \
 	packet-icq.c   \
+	packet-icq.h   \
 	packet-imap.c   \
+	packet-imap.h   \
 	packet-ip.c    \
 	packet-ip.h    \
 	packet-ipp.c   \
+	packet-ipp.h   \
 	packet-ipsec.c \
+	packet-ipsec.h \
 	packet-ipv6.c  \
 	packet-ipv6.h  \
 	packet-ipx.c   \
 	packet-ipx.h   \
 	packet-irc.c   \
+	packet-irc.h   \
 	packet-isakmp.c\
+	packet-isakmp.h\
 	packet-isis.h  \
 	packet-isis.c  \
 	packet-isis-clv.h \
@@ -87,17 +111,27 @@ DISSECTOR_SOURCES = \
 	packet-isis-snp.h \
 	packet-isis-snp.c \
 	packet-isl.c   \
+	packet-isl.h   \
 	packet-l2tp.c  \
+	packet-l2tp.h  \
 	packet-lapb.c  \
+	packet-lapb.h  \
 	packet-lapd.c  \
+	packet-lapd.h  \
 	packet-ldap.c  \
+	packet-ldap.h  \
 	packet-llc.c   \
+	packet-llc.h   \
 	packet-lpd.c   \
+	packet-lpd.h   \
 	packet-mapi.c  \
+	packet-mapi.h  \
 	packet-mount.c \
 	packet-mount.h \
 	packet-nbipx.c \
+	packet-nbipx.h \
 	packet-nbns.c  \
+	packet-nbns.h  \
 	packet-ncp.c   \
 	packet-ncp.h   \
 	packet-netbios.c \
@@ -107,24 +141,35 @@ DISSECTOR_SOURCES = \
 	packet-nlm.c   \
 	packet-nlm.h   \
 	packet-nntp.c  \
+	packet-nntp.h  \
 	packet-ntp.c  \
 	packet-ntp.h  \
 	packet-null.c  \
+	packet-null.h  \
 	packet-osi.c   \
+	packet-osi.h   \
 	packet-ospf.c  \
 	packet-ospf.h  \
 	packet-pim.c   \
+	packet-pim.h   \
 	packet-pop.c   \
+	packet-pop.h   \
 	packet-portmap.c   \
 	packet-portmap.h   \
 	packet-ppp.c   \
+	packet-ppp.h   \
 	packet-pppoe.c \
+	packet-pppoe.h \
 	packet-pptp.c  \
+	packet-pptp.h  \
 	packet-q2931.c \
+	packet-q2931.h \
 	packet-q931.c  \
 	packet-q931.h  \
 	packet-radius.c\
+	packet-radius.h\
 	packet-raw.c   \
+	packet-raw.h   \
 	packet-rip.c   \
 	packet-rip.h   \
 	packet-ripng.c \
@@ -134,11 +179,15 @@ DISSECTOR_SOURCES = \
 	packet-rsvp.c  \
 	packet-rsvp.h  \
 	packet-rtsp.c  \
+	packet-rtsp.h  \
 	packet-rx.c  \
 	packet-rx.h  \
 	packet-sap.c   \
+	packet-sap.h   \
 	packet-sdp.c   \
+	packet-sdp.h   \
 	packet-smb.c   \
+	packet-smb.h   \
 	packet-smb-browse.c \
 	packet-smb-common.c \
 	packet-smb-common.h \
@@ -150,28 +199,45 @@ DISSECTOR_SOURCES = \
 	packet-snmp.c	\
 	packet-snmp.h	\
 	packet-srvloc.c \
+	packet-srvloc.h \
 	packet-sscop.c \
+	packet-sscop.h \
 	packet-stat.c   \
 	packet-stat.h   \
 	packet-tacacs.c \
+	packet-tacacs.h \
 	packet-tcp.c   \
+	packet-tcp.h   \
 	packet-telnet.c\
+	packet-telnet.h\
 	packet-tftp.c  \
+	packet-tftp.h  \
 	packet-time.c  \
+	packet-time.h  \
 	packet-tns.c \
 	packet-tns.h \
 	packet-tr.c    \
+	packet-tr.h    \
 	packet-trmac.c \
+	packet-trmac.h \
 	packet-udp.c   \
+	packet-udp.h   \
 	packet-v120.c \
+	packet-v120.h \
 	packet-vines.c \
 	packet-vines.h \
 	packet-vlan.c \
+	packet-vlan.h \
 	packet-vrrp.c \
+	packet-vrrp.h \
 	packet-vtp.c  \
+	packet-vtp.h  \
 	packet-wccp.c\
+	packet-wccp.h\
 	packet-who.c\
+	packet-who.h\
 	packet-x25.c   \
+	packet-x25.h   \
 	packet-yhoo.c  \
 	packet-yhoo.h  \
 	packet-ypbind.c \
diff --git a/capture.c b/capture.c
index 957703a96d..043f858955 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
 /* capture.c
  * Routines for packet capture windows
  *
- * $Id: capture.c,v 1.95 2000/02/09 19:17:50 gram Exp $
+ * $Id: capture.c,v 1.96 2000/02/15 21:01:53 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -96,6 +96,13 @@
 #include "prefs.h"
 #include "globals.h"
 
+#include "packet-eth.h"
+#include "packet-fddi.h"
+#include "packet-null.h"
+#include "packet-ppp.h"
+#include "packet-raw.h"
+#include "packet-tr.h"
+
 int sync_mode;	/* fork a child to do the capture, and sync between them */
 static int sync_pipe[2]; /* used to sync father */
 int quit_after_cap; /* Makes a "capture only mode". Implies -k */
diff --git a/dfilter-scanner.l b/dfilter-scanner.l
index ec002fc475..6fcfe7d6f4 100644
--- a/dfilter-scanner.l
+++ b/dfilter-scanner.l
@@ -3,7 +3,7 @@
 /* dfilter-scanner.l
  * Scanner for display filters
  *
- * $Id: dfilter-scanner.l,v 1.28 2000/02/05 06:07:16 guy Exp $
+ * $Id: dfilter-scanner.l,v 1.29 2000/02/15 21:01:55 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -79,6 +79,10 @@
  */
 YY_BUFFER_STATE	string_input_buffer;
 
+/* We don't need yyunput, so use this macro to get it out of the
+ * generated C file, avoiding a compiler warning about its lack of use */
+#define YY_NO_UNPUT 1
+
 #else
 
 static char *in_buffer;
@@ -87,6 +91,7 @@ static char *in_buffer;
 
 #endif
 
+
 %}
 
 whitespace	[\t ]
diff --git a/ethertype.c b/ethertype.c
index 43a3d141a0..60387139a9 100644
--- a/ethertype.c
+++ b/ethertype.c
@@ -2,7 +2,7 @@
  * Routines for calling the right protocol for the ethertype.
  * This is called by both packet-eth.c (Ethernet II) and packet-llc.c (SNAP)
  *
- * $Id: ethertype.c,v 1.26 2000/01/23 08:55:31 guy Exp $
+ * $Id: ethertype.c,v 1.27 2000/02/15 21:01:56 gram Exp $
  *
  * Gilbert Ramirez <gram@xiexie.org>
  *
@@ -37,6 +37,17 @@
 #include <glib.h>
 #include "packet.h"
 #include "etypes.h"
+#include "packet-aarp.h"
+#include "packet-arp.h"
+#include "packet-atalk.h"
+#include "packet-ip.h"
+#include "packet-ipv6.h"
+#include "packet-ipx.h"
+#include "packet-pppoe.h"
+#include "packet-snmp.h"
+#include "packet-vines.h"
+#include "packet-vlan.h"
+#include "packet-x25.h"
 
 const value_string etype_vals[] = {
     {ETHERTYPE_IP,     "IP"             },
diff --git a/packet-aarp.h b/packet-aarp.h
new file mode 100644
index 0000000000..83def70f47
--- /dev/null
+++ b/packet-aarp.h
@@ -0,0 +1,26 @@
+/* packet-aarp.h
+ *
+ * $Id: packet-aarp.h,v 1.1 2000/02/15 21:01:56 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_aarp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-afs.h b/packet-afs.h
index bf301111d7..456f473dd4 100644
--- a/packet-afs.h
+++ b/packet-afs.h
@@ -1,7 +1,7 @@
 /* packet-afs.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet-afs.h,v 1.1 1999/10/20 16:41:18 gram Exp $
+ * $Id: packet-afs.h,v 1.2 2000/02/15 21:01:57 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -27,6 +27,8 @@
 #ifndef PACKET_AFS_H
 #define PACKET_AFS_H
 
+void dissect_afs(const u_char *, int, frame_data *, proto_tree *);
+
 #define AFS_PORT_FS	7000
 #define AFS_PORT_CB	7001
 #define AFS_PORT_PROT	7002
diff --git a/packet-arp.h b/packet-arp.h
index ac32d16b24..9b3f61bfbb 100644
--- a/packet-arp.h
+++ b/packet-arp.h
@@ -2,7 +2,7 @@
  * Definitions of routines for ARP packet disassembly that are used
  * elsewhere
  *
- * $Id: packet-arp.h,v 1.1 1999/11/27 04:48:12 guy Exp $
+ * $Id: packet-arp.h,v 1.2 2000/02/15 21:01:57 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -31,5 +31,6 @@ gchar *arphrdaddr_to_str(guint8 *ad, int ad_len, guint16 type);
 gchar *arphrdtype_to_str(guint16 hwtype, const char *fmt);
 
 void dissect_atm_nsap(const u_char *pd, int offset, int len, proto_tree *tree);
+void dissect_arp(const u_char *, int, frame_data *, proto_tree *);
 
 #endif /* packet-atm.h */
diff --git a/packet-ascend.c b/packet-ascend.c
index b21cf49212..b6330c62f5 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.8 1999/11/16 11:42:25 guy Exp $
+ * $Id: packet-ascend.c,v 1.9 2000/02/15 21:01:58 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -32,6 +32,8 @@
 #include <glib.h>
 #include <string.h>
 #include "packet.h"
+#include "packet-eth.h"
+#include "packet-ppp.h"
 
 static int proto_ascend  = -1;
 static int hf_link_type  = -1;
diff --git a/packet-ascend.h b/packet-ascend.h
new file mode 100644
index 0000000000..e857570660
--- /dev/null
+++ b/packet-ascend.h
@@ -0,0 +1,26 @@
+/* packet-ascend.h
+ *
+ * $Id: packet-ascend.h,v 1.1 2000/02/15 21:01:58 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_ascend(const u_char *, frame_data *, proto_tree *);
diff --git a/packet-atalk.h b/packet-atalk.h
index c57a1ea6ef..2de21f7864 100644
--- a/packet-atalk.h
+++ b/packet-atalk.h
@@ -1,7 +1,7 @@
 /* packet-atalk.h
  * Definitions for Appletalk packet disassembly (DDP, currently).
  *
- * $Id: packet-atalk.h,v 1.1 1999/10/22 08:11:40 guy Exp $
+ * $Id: packet-atalk.h,v 1.2 2000/02/15 21:01:59 gram Exp $
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,3 +32,6 @@ struct atalk_ddp_addr {
  * Routine to take a DDP address and generate a string.
  */
 extern gchar *atalk_addr_to_str(const struct atalk_ddp_addr *addrp);
+
+void dissect_ddp(const u_char *, int, frame_data *, proto_tree *);
+
diff --git a/packet-atm.c b/packet-atm.c
index 4296753d3f..294b4b6af2 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.11 1999/12/29 05:20:00 guy Exp $
+ * $Id: packet-atm.c,v 1.12 2000/02/15 21:02:00 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -37,7 +37,11 @@
 #include "oui.h"
 #include "resolv.h"
 
+#include "packet-eth.h"
+#include "packet-llc.h"
 #include "packet-snmp.h"
+#include "packet-sscop.h"
+#include "packet-tr.h"
 
 static int proto_atm = -1;
 static int hf_atm_vpi = -1;
diff --git a/packet-atm.h b/packet-atm.h
new file mode 100644
index 0000000000..6298cebabf
--- /dev/null
+++ b/packet-atm.h
@@ -0,0 +1,26 @@
+/* packet-atm.h
+ *
+ * $Id: packet-atm.h,v 1.1 2000/02/15 21:02:01 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_atm(const u_char *, frame_data *, proto_tree *);
diff --git a/packet-auto_rp.h b/packet-auto_rp.h
new file mode 100644
index 0000000000..d380eeaaaf
--- /dev/null
+++ b/packet-auto_rp.h
@@ -0,0 +1,26 @@
+/* packet-auto_rp.h
+ *
+ * $Id: packet-auto_rp.h,v 1.1 2000/02/15 21:02:02 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_auto_rp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-bgp.h b/packet-bgp.h
index b6cfd468bb..27b80eae39 100644
--- a/packet-bgp.h
+++ b/packet-bgp.h
@@ -1,7 +1,7 @@
 /* packet-bgp.c
  * Definitions for BGP packet disassembly structures and routine
  *
- * $Id: packet-bgp.h,v 1.6 2000/01/07 22:05:30 guy Exp $
+ * $Id: packet-bgp.h,v 1.7 2000/02/15 21:02:02 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -25,6 +25,8 @@
 #ifndef __PACKET_BGP_H__
 #define __PACKET_BGP_H__
 
+void dissect_bgp(const u_char *, int, frame_data *, proto_tree *);
+
 /* some handy things to know */
 #define BGP_MAX_PACKET_SIZE		4096
 #define BGP_MARKER_SIZE			16
diff --git a/packet-bootp.h b/packet-bootp.h
new file mode 100644
index 0000000000..ed2bc27328
--- /dev/null
+++ b/packet-bootp.h
@@ -0,0 +1,26 @@
+/* packet-bootp.h
+ *
+ * $Id: packet-bootp.h,v 1.1 2000/02/15 21:02:03 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_bootp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-bpdu.h b/packet-bpdu.h
new file mode 100644
index 0000000000..d93f9a59fb
--- /dev/null
+++ b/packet-bpdu.h
@@ -0,0 +1,26 @@
+/* packet-bpdu.h
+ *
+ * $Id: packet-bpdu.h,v 1.1 2000/02/15 21:02:04 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_bpdu(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-cdp.h b/packet-cdp.h
new file mode 100644
index 0000000000..6781fb5493
--- /dev/null
+++ b/packet-cdp.h
@@ -0,0 +1,26 @@
+/* packet-cdp.h
+ *
+ * $Id: packet-cdp.h,v 1.1 2000/02/15 21:02:04 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_cdp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-cgmp.h b/packet-cgmp.h
new file mode 100644
index 0000000000..fa22f523f0
--- /dev/null
+++ b/packet-cgmp.h
@@ -0,0 +1,26 @@
+/* packet-cgmp.h
+ *
+ * $Id: packet-cgmp.h,v 1.1 2000/02/15 21:02:05 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_cgmp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-clip.c b/packet-clip.c
index d873d21a01..18c5ef019a 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.4 2000/01/23 08:55:32 guy Exp $
+ * $Id: packet-clip.c,v 1.5 2000/02/15 21:02:05 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -35,6 +35,7 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-ip.h"
 
 static gint ett_clip = -1;
 
diff --git a/packet-clip.h b/packet-clip.h
new file mode 100644
index 0000000000..7010eacb35
--- /dev/null
+++ b/packet-clip.h
@@ -0,0 +1,26 @@
+/* packet-clip.h
+ *
+ * $Id: packet-clip.h,v 1.1 2000/02/15 21:02:06 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_clip(const u_char *, packet_counts *);
+void dissect_clip(const u_char *, frame_data *, proto_tree *);
diff --git a/packet-dns.h b/packet-dns.h
index be22b440b9..66705ea05f 100644
--- a/packet-dns.h
+++ b/packet-dns.h
@@ -2,7 +2,7 @@
  * Definitions for packet disassembly structures and routines used both by
  * DNS and NBNS.
  *
- * $Id: packet-dns.h,v 1.4 1999/10/07 07:44:28 guy Exp $
+ * $Id: packet-dns.h,v 1.5 2000/02/15 21:02:06 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -40,4 +40,6 @@ add_rr_to_tree(proto_item *trr, int rr_type, int offset, const char *name,
   int namelen, const char *type_name, const char *class_name, u_int ttl,
   u_short data_len);
 
+void dissect_dns(const u_char *, int, frame_data *, proto_tree *);
+
 #endif /* packet-dns.h */
diff --git a/packet-eth.c b/packet-eth.c
index 3784d2c5ec..39acc5c1fd 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.28 2000/01/24 18:46:44 guy Exp $
+ * $Id: packet-eth.c,v 1.29 2000/02/15 21:02:07 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -35,6 +35,9 @@
 #include "packet.h"
 #include "etypes.h"
 #include "resolv.h"
+#include "packet-ipx.h"
+#include "packet-isl.h"
+#include "packet-llc.h"
 
 extern const value_string etype_vals[];
 
diff --git a/packet-eth.h b/packet-eth.h
new file mode 100644
index 0000000000..8d17b83ea9
--- /dev/null
+++ b/packet-eth.h
@@ -0,0 +1,26 @@
+/* packet-eth.h
+ *
+ * $Id: packet-eth.h,v 1.1 2000/02/15 21:02:08 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_eth(const u_char *, int, packet_counts *);
+void dissect_eth(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-fddi.c b/packet-fddi.c
index a044ac87be..7e21bf446a 100644
--- a/packet-fddi.c
+++ b/packet-fddi.c
@@ -3,7 +3,7 @@
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
- * $Id: packet-fddi.c,v 1.26 2000/01/23 08:55:32 guy Exp $
+ * $Id: packet-fddi.c,v 1.27 2000/02/15 21:02:08 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -36,6 +36,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include "packet.h"
+#include "packet-llc.h"
 #include "resolv.h"
 
 static int proto_fddi = -1;
diff --git a/packet-fddi.h b/packet-fddi.h
new file mode 100644
index 0000000000..c540c9578d
--- /dev/null
+++ b/packet-fddi.h
@@ -0,0 +1,27 @@
+/* packet-fddi.h
+ *
+ * $Id: packet-fddi.h,v 1.1 2000/02/15 21:02:09 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_fddi(const u_char *, packet_counts *);
+void dissect_fddi(const u_char *pd, frame_data *fd, proto_tree *tree,
+		gboolean bitswapped);
diff --git a/packet-ftp.h b/packet-ftp.h
new file mode 100644
index 0000000000..98fce50a2a
--- /dev/null
+++ b/packet-ftp.h
@@ -0,0 +1,27 @@
+/* packet-ftp.h
+ *
+ * $Id: packet-ftp.h,v 1.1 2000/02/15 21:02:10 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_ftp(const u_char *, int, frame_data *, proto_tree *);
+void dissect_ftpdata(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-giop.h b/packet-giop.h
new file mode 100644
index 0000000000..a2bd8e0734
--- /dev/null
+++ b/packet-giop.h
@@ -0,0 +1,26 @@
+/* packet-giop.h
+ *
+ * $Id: packet-giop.h,v 1.1 2000/02/15 21:02:10 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_giop(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-gre.c b/packet-gre.c
index 91f6fe328c..939516f6e0 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.14 2000/01/07 22:05:31 guy Exp $
+ * $Id: packet-gre.c,v 1.15 2000/02/15 21:02:11 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -37,6 +37,8 @@
 #endif
 #include <glib.h>
 #include "packet.h"
+#include "packet-ip.h"
+#include "packet-ppp.h"
 
 static int proto_gre = -1;
 static int hf_gre_proto = -1;
diff --git a/packet-gre.h b/packet-gre.h
new file mode 100644
index 0000000000..65ae808b14
--- /dev/null
+++ b/packet-gre.h
@@ -0,0 +1,26 @@
+/* packet-gre.h
+ *
+ * $Id: packet-gre.h,v 1.1 2000/02/15 21:02:12 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_gre(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-hsrp.h b/packet-hsrp.h
new file mode 100644
index 0000000000..80367c6b89
--- /dev/null
+++ b/packet-hsrp.h
@@ -0,0 +1,26 @@
+/* packet-hsrp.h
+ *
+ * $Id: packet-hsrp.h,v 1.1 2000/02/15 21:02:12 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_hsrp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-http.c b/packet-http.c
index 4d00eba7bf..de9e7f0b7d 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.13 2000/01/22 06:22:13 guy Exp $
+ * $Id: packet-http.c,v 1.14 2000/02/15 21:02:12 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -40,6 +40,7 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-ipp.h"
 
 static int proto_http = -1;
 static int hf_http_response = -1;
diff --git a/packet-http.h b/packet-http.h
new file mode 100644
index 0000000000..d1adc194b4
--- /dev/null
+++ b/packet-http.h
@@ -0,0 +1,26 @@
+/* packet-http.h
+ *
+ * $Id: packet-http.h,v 1.1 2000/02/15 21:02:13 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_http(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-icmpv6.h b/packet-icmpv6.h
new file mode 100644
index 0000000000..3134d28939
--- /dev/null
+++ b/packet-icmpv6.h
@@ -0,0 +1,26 @@
+/* packet-icmpv6.h
+ *
+ * $Id: packet-icmpv6.h,v 1.1 2000/02/15 21:02:14 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_icmpv6(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-icp.h b/packet-icp.h
new file mode 100644
index 0000000000..8981506dbc
--- /dev/null
+++ b/packet-icp.h
@@ -0,0 +1,26 @@
+/* packet-icp.h
+ *
+ * $Id: packet-icp.h,v 1.1 2000/02/15 21:02:14 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_icp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-icq.h b/packet-icq.h
new file mode 100644
index 0000000000..9384689b16
--- /dev/null
+++ b/packet-icq.h
@@ -0,0 +1,26 @@
+/* packet-icq.h
+ *
+ * $Id: packet-icq.h,v 1.1 2000/02/15 21:02:14 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_icq(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-imap.h b/packet-imap.h
new file mode 100644
index 0000000000..6d9399369a
--- /dev/null
+++ b/packet-imap.h
@@ -0,0 +1,26 @@
+/* packet-imap.h
+ *
+ * $Id: packet-imap.h,v 1.1 2000/02/15 21:02:15 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_imap(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-ip.c b/packet-ip.c
index d2ae6a4b5d..873e53f8c5 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.73 2000/02/09 19:17:51 gram Exp $
+ * $Id: packet-ip.c,v 1.74 2000/02/15 21:02:15 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -50,9 +50,22 @@
 # include "snprintf.h"
 #endif
 
-#ifndef __PACKET_IP_H__
+#include "packet-gre.h"
 #include "packet-ip.h"
-#endif
+#include "packet-ipsec.h"
+#include "packet-ipv6.h"
+#include "packet-ospf.h"
+#include "packet-pim.h"
+#include "packet-rsvp.h"
+#include "packet-tcp.h"
+#include "packet-udp.h"
+#include "packet-vines.h"
+#include "packet-vrrp.h"
+
+static void dissect_eigrp(const u_char *, int, frame_data *, proto_tree *);
+static void dissect_icmp(const u_char *, int, frame_data *, proto_tree *);
+static void dissect_igmp(const u_char *, int, frame_data *, proto_tree *);
+
 
 /* Decode the old IPv4 TOS field as the DiffServ DS Field */
 gboolean g_ip_dscp_actif = TRUE;
@@ -1094,7 +1107,7 @@ static const gchar *par_str[] = {"IP header bad", "Required option missing"};
 
 #define	N_PARAMPROB	(sizeof par_str / sizeof par_str[0])
 
-void
+static void
 dissect_icmp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
   e_icmp     ih;
   proto_tree *icmp_tree;
@@ -1298,7 +1311,7 @@ dissect_icmp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
   }
 }
 
-void
+static void
 dissect_igmp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
   e_igmp     ih;
   proto_tree *igmp_tree;
@@ -1549,7 +1562,7 @@ static int proto_eigrp = -1;
 
 static gint ett_eigrp = -1;
 
-void
+static void
 dissect_eigrp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
   e_eigrp     ih;
   proto_tree *eigrp_tree;
diff --git a/packet-ip.h b/packet-ip.h
index 5911bccdfa..24f94d58e0 100644
--- a/packet-ip.h
+++ b/packet-ip.h
@@ -1,7 +1,7 @@
 /* packet-ip.h
  * Definitions for IP packet disassembly structures and routines
  *
- * $Id: packet-ip.h,v 1.10 2000/01/20 21:34:15 guy Exp $
+ * $Id: packet-ip.h,v 1.11 2000/02/15 21:02:18 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -27,6 +27,9 @@
 #ifndef __PACKET_IP_H__
 #define __PACKET_IP_H__
 
+void capture_ip(const u_char *, int, packet_counts *);
+void dissect_ip(const u_char *, int, frame_data *, proto_tree *);
+
 #define IP_PROTO_IP		0		/* dummy for IP */
 #define IP_PROTO_HOPOPTS	0		/* IP6 hop-by-hop options */
 #define IP_PROTO_ICMP		1		/* control message protocol */
diff --git a/packet-ipp.h b/packet-ipp.h
new file mode 100644
index 0000000000..20c9786928
--- /dev/null
+++ b/packet-ipp.h
@@ -0,0 +1,26 @@
+/* packet-ipp.h
+ *
+ * $Id: packet-ipp.h,v 1.1 2000/02/15 21:02:19 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_ipp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-ipsec.c b/packet-ipsec.c
index 7ee18aa5d3..ad1374b023 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.10 1999/11/16 11:42:35 guy Exp $
+ * $Id: packet-ipsec.c,v 1.11 2000/02/15 21:02:19 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -39,6 +39,7 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-ipsec.h"
 #include "resolv.h"
 
 static int proto_ah = -1;
diff --git a/packet-ipsec.h b/packet-ipsec.h
new file mode 100644
index 0000000000..bb945d2619
--- /dev/null
+++ b/packet-ipsec.h
@@ -0,0 +1,28 @@
+/* packet-ipsec.h
+ *
+ * $Id: packet-ipsec.h,v 1.1 2000/02/15 21:02:20 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+int dissect_ah(const u_char *, int, frame_data *, proto_tree *);
+void dissect_esp(const u_char *, int, frame_data *, proto_tree *);
+void dissect_ipcomp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-ipv6.c b/packet-ipv6.c
index f40f475d9d..f1aa9716ed 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.26 2000/01/15 04:17:36 guy Exp $
+ * $Id: packet-ipv6.c,v 1.27 2000/02/15 21:02:21 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -43,8 +43,13 @@
 #include <stdio.h>
 #include <glib.h>
 #include "packet.h"
+#include "packet-icmpv6.h"
 #include "packet-ip.h"
+#include "packet-ipsec.h"
 #include "packet-ipv6.h"
+#include "packet-pim.h"
+#include "packet-tcp.h"
+#include "packet-udp.h"
 #include "resolv.h"
 
 /*
diff --git a/packet-ipv6.h b/packet-ipv6.h
index 424c61eb5a..7a8684d7f5 100644
--- a/packet-ipv6.h
+++ b/packet-ipv6.h
@@ -1,7 +1,7 @@
 /* packet-ipv6.h
  * Definitions for IPv6 packet disassembly 
  *
- * $Id: packet-ipv6.h,v 1.11 1999/12/06 20:20:35 guy Exp $
+ * $Id: packet-ipv6.h,v 1.12 2000/02/15 21:02:22 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -26,6 +26,8 @@
 #ifndef __PACKET_IPV6_H_DEFINED__
 #define __PACKET_IPV6_H_DEFINED__
 
+void dissect_ipv6(const u_char *, int, frame_data *, proto_tree *);
+
 struct e_in6_addr {
 	union {
 		guint32  u6_addr32[4];
diff --git a/packet-ipx.c b/packet-ipx.c
index 3883d84d32..48413dd099 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.48 2000/01/24 03:33:33 guy Exp $
+ * $Id: packet-ipx.c,v 1.49 2000/02/15 21:02:23 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -36,6 +36,7 @@
 #include <glib.h>
 #include "packet.h"
 #include "packet-ipx.h"
+#include "packet-nbipx.h"
 #include "packet-ncp.h"
 #include "resolv.h"
 
diff --git a/packet-ipx.h b/packet-ipx.h
index a6358ef252..790843ab2f 100644
--- a/packet-ipx.h
+++ b/packet-ipx.h
@@ -2,7 +2,7 @@
  * Routines for NetWare's IPX
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-ipx.h,v 1.5 2000/01/22 06:22:14 guy Exp $
+ * $Id: packet-ipx.h,v 1.6 2000/02/15 21:02:25 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -91,7 +91,9 @@ struct ipx_rip_packet
 #define IPX_NODE_LEN (6)
 #endif
 
-gchar*
-ipxnet_to_string(const guint8 *ad);
-gchar *
-ipxnet_to_str_punct(const guint32 ad, char punct);
+gchar* ipxnet_to_string(const guint8 *ad);
+gchar* ipxnet_to_str_punct(const guint32 ad, char punct);
+
+void capture_ipx(const u_char *, int, packet_counts *);
+void dissect_ipx(const u_char *, int, frame_data *, proto_tree *);
+
diff --git a/packet-irc.h b/packet-irc.h
new file mode 100644
index 0000000000..1b1dd89aa7
--- /dev/null
+++ b/packet-irc.h
@@ -0,0 +1,26 @@
+/* packet-irc.h
+ *
+ * $Id: packet-irc.h,v 1.1 2000/02/15 21:02:26 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_irc(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-isakmp.h b/packet-isakmp.h
new file mode 100644
index 0000000000..f03b8ad7fc
--- /dev/null
+++ b/packet-isakmp.h
@@ -0,0 +1,26 @@
+/* packet-isakmp.h
+ *
+ * $Id: packet-isakmp.h,v 1.1 2000/02/15 21:02:27 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_isakmp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-isl.c b/packet-isl.c
index 2af7c3a0d3..9a7ec6f40c 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.4 2000/01/24 21:56:24 guy Exp $
+ * $Id: packet-isl.c,v 1.5 2000/02/15 21:02:27 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -37,6 +37,8 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-eth.h"
+#include "packet-tr.h"
 #include "etypes.h"
 
 /*
diff --git a/packet-isl.h b/packet-isl.h
new file mode 100644
index 0000000000..6dee5a3a1d
--- /dev/null
+++ b/packet-isl.h
@@ -0,0 +1,26 @@
+/* packet-isl.h
+ *
+ * $Id: packet-isl.h,v 1.1 2000/02/15 21:02:28 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_isl(const u_char *, int, packet_counts *);
+void dissect_isl(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-l2tp.h b/packet-l2tp.h
new file mode 100644
index 0000000000..86997fded4
--- /dev/null
+++ b/packet-l2tp.h
@@ -0,0 +1,26 @@
+/* packet-l2tp.h
+ *
+ * $Id: packet-l2tp.h,v 1.1 2000/02/15 21:02:29 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_l2tp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-lapb.c b/packet-lapb.c
index be18620143..011b5366af 100644
--- a/packet-lapb.c
+++ b/packet-lapb.c
@@ -2,7 +2,7 @@
  * Routines for lapb frame disassembly
  * Olivier Abad <abad@daba.dhis.net>
  *
- * $Id: packet-lapb.c,v 1.9 1999/11/29 22:44:47 gram Exp $
+ * $Id: packet-lapb.c,v 1.10 2000/02/15 21:02:29 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -36,6 +36,7 @@
 #include <glib.h>
 #include <string.h>
 #include "packet.h"
+#include "packet-x25.h"
 #include "xdlc.h"
 
 #define FROM_DCE	0x80
diff --git a/packet-lapb.h b/packet-lapb.h
new file mode 100644
index 0000000000..2aec445185
--- /dev/null
+++ b/packet-lapb.h
@@ -0,0 +1,26 @@
+/* packet-lapb.h
+ *
+ * $Id: packet-lapb.h,v 1.1 2000/02/15 21:02:30 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_lapb(const u_char *, frame_data *, proto_tree *);
diff --git a/packet-lapd.c b/packet-lapd.c
index d0de40bb7e..8bc6f360d8 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.4 2000/01/24 02:05:38 guy Exp $
+ * $Id: packet-lapd.c,v 1.5 2000/02/15 21:02:31 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -36,6 +36,7 @@
 #include <glib.h>
 #include <string.h>
 #include "packet.h"
+#include "packet-q931.h"
 #include "xdlc.h"
 
 /* ISDN/LAPD references:
diff --git a/packet-lapd.h b/packet-lapd.h
new file mode 100644
index 0000000000..c9354c7331
--- /dev/null
+++ b/packet-lapd.h
@@ -0,0 +1,26 @@
+/* packet-lapd.h
+ *
+ * $Id: packet-lapd.h,v 1.1 2000/02/15 21:02:32 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_lapd(const u_char *, frame_data *, proto_tree *);
diff --git a/packet-ldap.h b/packet-ldap.h
new file mode 100644
index 0000000000..ffff538712
--- /dev/null
+++ b/packet-ldap.h
@@ -0,0 +1,26 @@
+/* packet-ldap.h
+ *
+ * $Id: packet-ldap.h,v 1.1 2000/02/15 21:02:32 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_ldap(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-llc.c b/packet-llc.c
index 19b96e28bd..acd96d1f55 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
  * Routines for IEEE 802.2 LLC layer
  * Gilbert Ramirez <gramirez@tivoli.com>
  *
- * $Id: packet-llc.c,v 1.48 2000/02/12 11:22:26 guy Exp $
+ * $Id: packet-llc.c,v 1.49 2000/02/15 21:02:33 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -37,7 +37,16 @@
 #include "oui.h"
 #include "xdlc.h"
 #include "etypes.h"
-	
+#include "packet-bpdu.h"
+#include "packet-cdp.h"
+#include "packet-cgmp.h"
+#include "packet-ip.h"
+#include "packet-ipx.h"
+#include "packet-netbios.h"
+#include "packet-osi.h"
+#include "packet-sna.h"
+#include "packet-vtp.h"
+
 static int proto_llc = -1;
 static int hf_llc_dsap = -1;
 static int hf_llc_ssap = -1;
diff --git a/packet-llc.h b/packet-llc.h
new file mode 100644
index 0000000000..721656c898
--- /dev/null
+++ b/packet-llc.h
@@ -0,0 +1,26 @@
+/* packet-llc.h
+ *
+ * $Id: packet-llc.h,v 1.1 2000/02/15 21:02:34 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_llc(const u_char *, int, packet_counts *);
+void dissect_llc(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-lpd.h b/packet-lpd.h
new file mode 100644
index 0000000000..57a4fd58ba
--- /dev/null
+++ b/packet-lpd.h
@@ -0,0 +1,26 @@
+/* packet-lpd.h
+ *
+ * $Id: packet-lpd.h,v 1.1 2000/02/15 21:02:34 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_lpd(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-mapi.h b/packet-mapi.h
new file mode 100644
index 0000000000..935a7e60f2
--- /dev/null
+++ b/packet-mapi.h
@@ -0,0 +1,26 @@
+/* packet-mapi.h
+ *
+ * $Id: packet-mapi.h,v 1.1 2000/02/15 21:02:34 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_mapi(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-nbipx.c b/packet-nbipx.c
index d2d21c737d..d31a6c7553 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.17 2000/01/22 06:22:14 guy Exp $
+ * $Id: packet-nbipx.c,v 1.18 2000/02/15 21:02:35 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -34,8 +34,9 @@
 
 #include <glib.h>
 #include "packet.h"
-#include "packet-ipx.h" /* for ipxnet_to_string() */
+#include "packet-ipx.h"
 #include "packet-netbios.h"
+#include "packet-smb.h"
 
 static int proto_nbipx = -1;
 
diff --git a/packet-nbipx.h b/packet-nbipx.h
new file mode 100644
index 0000000000..e3ffd9370e
--- /dev/null
+++ b/packet-nbipx.h
@@ -0,0 +1,27 @@
+/* packet-nbipx.h
+ *
+ * $Id: packet-nbipx.h,v 1.1 2000/02/15 21:02:36 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_nbipx(const u_char *, int, frame_data *, proto_tree *);
+void dissect_nwlink_dg(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-nbns.c b/packet-nbns.c
index 49d598ef90..8daca2331c 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.36 2000/01/22 06:22:15 guy Exp $
+ * $Id: packet-nbns.c,v 1.37 2000/02/15 21:02:37 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -37,9 +37,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
+
 #include "packet.h"
 #include "packet-dns.h"
 #include "packet-netbios.h"
+#include "packet-smb.h"
 
 static int proto_nbns = -1;
 static int hf_nbns_response = -1;
diff --git a/packet-nbns.h b/packet-nbns.h
new file mode 100644
index 0000000000..4cd78f575f
--- /dev/null
+++ b/packet-nbns.h
@@ -0,0 +1,28 @@
+/* packet-nbns.h
+ *
+ * $Id: packet-nbns.h,v 1.1 2000/02/15 21:02:39 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_nbdgm(const u_char *, int, frame_data *, proto_tree *);
+void dissect_nbns(const u_char *, int, frame_data *, proto_tree *);
+void dissect_nbss(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-ncp.h b/packet-ncp.h
index 199e889ebc..338ab7cb9d 100644
--- a/packet-ncp.h
+++ b/packet-ncp.h
@@ -2,7 +2,7 @@
  * Routines for NetWare Core Protocol
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-ncp.h,v 1.8 2000/01/22 06:22:17 guy Exp $
+ * $Id: packet-ncp.h,v 1.9 2000/02/15 21:02:40 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -24,5 +24,5 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-
+void dissect_ncp(const u_char *, int, frame_data *, proto_tree *);
 extern guint32 nw_server_address;
diff --git a/packet-netbios.c b/packet-netbios.c
index f9386cca66..6079a97dc6 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.14 2000/01/23 08:55:34 guy Exp $
+ * $Id: packet-netbios.c,v 1.15 2000/02/15 21:02:40 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -38,8 +38,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
+
 #include "packet.h"
 #include "packet-netbios.h"
+#include "packet-smb.h"
 
 /* Netbios command numbers */
 #define NB_ADD_GROUP		0x00
diff --git a/packet-netbios.h b/packet-netbios.h
index 28a19210d8..45b99d7e67 100644
--- a/packet-netbios.h
+++ b/packet-netbios.h
@@ -5,7 +5,7 @@
  * 
  * derived from the packet-nbns.c
  *
- * $Id: packet-netbios.h,v 1.4 1999/11/30 07:45:42 guy Exp $
+ * $Id: packet-netbios.h,v 1.5 2000/02/15 21:02:42 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -30,6 +30,9 @@
 /* Length of NetBIOS names */
 #define NETBIOS_NAME_LEN	16
 
+void capture_netbios(const u_char *, int, packet_counts *);
+void dissect_netbios(const u_char *, int, frame_data *, proto_tree *);
+
 extern int process_netbios_name(const u_char *name_ptr, char *name_ret);
 extern int get_netbios_name(const u_char *data_ptr, int offset,
     char *name_ret);
diff --git a/packet-nntp.h b/packet-nntp.h
new file mode 100644
index 0000000000..4326e5f931
--- /dev/null
+++ b/packet-nntp.h
@@ -0,0 +1,26 @@
+/* packet-nntp.h
+ *
+ * $Id: packet-nntp.h,v 1.1 2000/02/15 21:02:43 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_nntp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-ntp.h b/packet-ntp.h
index 1b87d6ef30..7dedb55e7f 100644
--- a/packet-ntp.h
+++ b/packet-ntp.h
@@ -1,7 +1,7 @@
 /* packet-ntp.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet-ntp.h,v 1.2 1999/10/22 06:30:45 guy Exp $
+ * $Id: packet-ntp.h,v 1.3 2000/02/15 21:02:43 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -29,6 +29,8 @@
 #ifndef PACKET_NTP_H
 #define PACKET_NTP_H
 
+void dissect_ntp(const u_char *, int, frame_data *, proto_tree *);
+
 #define NTP_LI_MASK	192
 #define NTP_LI_NONE	0
 #define NTP_LI_61	64
diff --git a/packet-null.c b/packet-null.c
index 8cc9a31b46..ee7f9088cc 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.18 2000/01/23 08:55:35 guy Exp $
+ * $Id: packet-null.c,v 1.19 2000/02/15 21:02:44 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -39,6 +39,12 @@
 #endif
 
 #include "packet.h"
+#include "packet-atalk.h"
+#include "packet-ip.h"
+#include "packet-ipv6.h"
+#include "packet-ipx.h"
+#include "packet-osi.h"
+#include "packet-ppp.h"
 #include "etypes.h"
 
 extern const value_string etype_vals[];
diff --git a/packet-null.h b/packet-null.h
new file mode 100644
index 0000000000..3a51eb1d3f
--- /dev/null
+++ b/packet-null.h
@@ -0,0 +1,26 @@
+/* packet-null.h
+ *
+ * $Id: packet-null.h,v 1.1 2000/02/15 21:02:45 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_null(const u_char *, packet_counts *);
+void dissect_null(const u_char *, frame_data *, proto_tree *);
diff --git a/packet-osi.c b/packet-osi.c
index 99d1bb01ad..365781b85b 100644
--- a/packet-osi.c
+++ b/packet-osi.c
@@ -1,7 +1,7 @@
 /* packet-osi.c
  * Routines for ISO/OSI network and transport protocol packet disassembly
  *
- * $Id: packet-osi.c,v 1.20 2000/01/30 05:50:02 guy Exp $
+ * $Id: packet-osi.c,v 1.21 2000/02/15 21:02:46 gram Exp $
  * Laurent Deniel <deniel@worldnet.fr>
  *
  * Ethereal - Network traffic analyzer
@@ -44,6 +44,7 @@
 #include <string.h>
 #include <glib.h>
 #include "packet.h"
+#include "packet-isis.h"
 #include "nlpid.h"
 
 /* protocols and fields */
diff --git a/packet-osi.h b/packet-osi.h
new file mode 100644
index 0000000000..31ebed81a2
--- /dev/null
+++ b/packet-osi.h
@@ -0,0 +1,27 @@
+/* packet-osi.h
+ *
+ * $Id: packet-osi.h,v 1.1 2000/02/15 21:02:48 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_cotp(const u_char *, int, frame_data *, proto_tree *);
+void dissect_osi(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-ospf.h b/packet-ospf.h
index 8acbef4037..d7618e2c16 100644
--- a/packet-ospf.h
+++ b/packet-ospf.h
@@ -1,6 +1,6 @@
 /* packet-ospf.h (c) 1998 Hannes Boehm */
 
-/* $Id: packet-ospf.h,v 1.5 1999/10/19 15:59:04 gram Exp $ */
+/* $Id: packet-ospf.h,v 1.6 2000/02/15 21:02:49 gram Exp $ */
 
 #define OSPF_HEADER_LENGTH	24
 
@@ -130,7 +130,7 @@ typedef struct _e_ospf_crypto {
     guint32   sequence_num;
 } e_ospf_crypto;
 
-
+void dissect_ospf(const u_char *, int, frame_data *, proto_tree *);
 void dissect_ospf_hello(const u_char*, int, frame_data*, proto_tree*);
 void dissect_ospf_db_desc(const u_char*, int, frame_data*, proto_tree*); 
 void dissect_ospf_ls_req(const u_char*, int, frame_data*, proto_tree*); 
diff --git a/packet-pim.c b/packet-pim.c
index 37d2471440..e481fa7563 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.8 2000/01/15 04:17:35 guy Exp $
+ * $Id: packet-pim.c,v 1.9 2000/02/15 21:02:49 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -45,6 +45,7 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-ip.h"
 #include "packet-ipv6.h"
 
 #ifndef offsetof
diff --git a/packet-pim.h b/packet-pim.h
new file mode 100644
index 0000000000..7023542ea4
--- /dev/null
+++ b/packet-pim.h
@@ -0,0 +1,26 @@
+/* packet-pim.h
+ *
+ * $Id: packet-pim.h,v 1.1 2000/02/15 21:02:50 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_pim(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-pop.h b/packet-pop.h
new file mode 100644
index 0000000000..e3a391b227
--- /dev/null
+++ b/packet-pop.h
@@ -0,0 +1,26 @@
+/* packet-pop.h
+ *
+ * $Id: packet-pop.h,v 1.1 2000/02/15 21:02:51 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_pop(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-ppp.c b/packet-ppp.c
index 93acd76780..f8d0971407 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.27 2000/01/29 04:47:34 gram Exp $
+ * $Id: packet-ppp.c,v 1.28 2000/02/15 21:02:51 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -34,7 +34,11 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-atalk.h"
 #include "packet-ip.h"
+#include "packet-ipv6.h"
+#include "packet-ipx.h"
+#include "packet-vines.h"
 
 static int proto_ppp = -1;
 
diff --git a/packet-ppp.h b/packet-ppp.h
new file mode 100644
index 0000000000..08df2bd54b
--- /dev/null
+++ b/packet-ppp.h
@@ -0,0 +1,27 @@
+/* packet-ppp.h
+ *
+ * $Id: packet-ppp.h,v 1.1 2000/02/15 21:02:53 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_ppp(const u_char *, packet_counts *);
+void dissect_ppp(const u_char *, frame_data *, proto_tree *);
+void dissect_payload_ppp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-pppoe.c b/packet-pppoe.c
index 31e1e52ef1..ff1161250c 100644
--- a/packet-pppoe.c
+++ b/packet-pppoe.c
@@ -1,7 +1,7 @@
 /* packet-arp.c
  * Routines for ARP packet disassembly
  *
- * $Id: packet-pppoe.c,v 1.4 1999/11/16 11:42:48 guy Exp $
+ * $Id: packet-pppoe.c,v 1.5 2000/02/15 21:02:54 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -33,6 +33,7 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-ppp.h"
 
 static gint ett_pppoed = -1;
 static gint ett_pppoed_tags = -1;
diff --git a/packet-pppoe.h b/packet-pppoe.h
new file mode 100644
index 0000000000..3c50f68fb5
--- /dev/null
+++ b/packet-pppoe.h
@@ -0,0 +1,27 @@
+/* packet-pppoe.h
+ *
+ * $Id: packet-pppoe.h,v 1.1 2000/02/15 21:02:54 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_pppoed(const u_char *, int, frame_data *, proto_tree *);
+void dissect_pppoes(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-pptp.h b/packet-pptp.h
new file mode 100644
index 0000000000..e29e4bc519
--- /dev/null
+++ b/packet-pptp.h
@@ -0,0 +1,26 @@
+/* packet-pptp.h
+ *
+ * $Id: packet-pptp.h,v 1.1 2000/02/15 21:02:55 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_pptp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-q2931.h b/packet-q2931.h
new file mode 100644
index 0000000000..fcf949d2d8
--- /dev/null
+++ b/packet-q2931.h
@@ -0,0 +1,26 @@
+/* packet-q2931.h
+ *
+ * $Id: packet-q2931.h,v 1.1 2000/02/15 21:02:56 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_q2931(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-q931.h b/packet-q931.h
index ea4e09aea6..3aa9b866ff 100644
--- a/packet-q931.h
+++ b/packet-q931.h
@@ -2,7 +2,7 @@
  * Declarations of exported routines for Q.931 and Q.2931 frame disassembly
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-q931.h,v 1.1 1999/11/25 10:01:16 guy Exp $
+ * $Id: packet-q931.h,v 1.2 2000/02/15 21:02:56 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -24,6 +24,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+void dissect_q931(const u_char *, int, frame_data *, proto_tree *);
+
 extern void dissect_q931_bearer_capability_ie(const u_char *, int, int,
     proto_tree *);
 
diff --git a/packet-radius.h b/packet-radius.h
new file mode 100644
index 0000000000..5eebb6466c
--- /dev/null
+++ b/packet-radius.h
@@ -0,0 +1,26 @@
+/* packet-radius.h
+ *
+ * $Id: packet-radius.h,v 1.1 2000/02/15 21:02:57 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_radius(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-raw.c b/packet-raw.c
index 6465bcb51b..398748992f 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.12 2000/01/23 08:55:36 guy Exp $
+ * $Id: packet-raw.c,v 1.13 2000/02/15 21:02:57 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -34,6 +34,7 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-ip.h"
 
 static gint ett_raw = -1;
 
diff --git a/packet-raw.h b/packet-raw.h
new file mode 100644
index 0000000000..559c032c67
--- /dev/null
+++ b/packet-raw.h
@@ -0,0 +1,26 @@
+/* packet-raw.h
+ *
+ * $Id: packet-raw.h,v 1.1 2000/02/15 21:02:58 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_raw(const u_char *, packet_counts *);
+void dissect_raw(const u_char *, frame_data *, proto_tree *);
diff --git a/packet-rip.h b/packet-rip.h
index 234e29fc83..67ea57dcc9 100644
--- a/packet-rip.h
+++ b/packet-rip.h
@@ -1,6 +1,6 @@
 /* packet-rip.h (c) 1998 Hannes Boehm */
 
-/* $Id: packet-rip.h,v 1.3 1999/10/06 03:33:48 guy Exp $ */
+/* $Id: packet-rip.h,v 1.4 2000/02/15 21:02:59 gram Exp $ */
 
 #define	RIPv1	1
 #define	RIPv2	2
@@ -33,3 +33,5 @@ typedef union _e_rip_entry {
     e_rip_vektor	vektor;
     e_rip_authentication authentication;
 } e_rip_entry;
+
+void dissect_rip(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-ripng.h b/packet-ripng.h
index d6302ee592..9c2ce4144e 100644
--- a/packet-ripng.h
+++ b/packet-ripng.h
@@ -2,7 +2,7 @@
  * RIPng definition
  * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
  *
- * $Id: packet-ripng.h,v 1.1 1999/10/12 23:12:06 guy Exp $
+ * $Id: packet-ripng.h,v 1.2 2000/02/15 21:02:59 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -31,6 +31,12 @@
 #include "globals.h"
 #endif
 
+#ifndef __PACKET_IPV6_H_DEFINED__
+#include "packet-ipv6.h"
+#endif
+
+void dissect_ripng(const u_char *, int, frame_data *, proto_tree *);
+
 /*
  * KAME Header: /cvsroot/kame/kame/kame/kame/route6d/route6d.h,v 1.1.1.1 1999/08/08 23:31:35 itojun Exp
  */
diff --git a/packet-rpc.h b/packet-rpc.h
index 3b23a9c348..460c0b55ec 100644
--- a/packet-rpc.h
+++ b/packet-rpc.h
@@ -1,5 +1,5 @@
 /* packet-rpc.h (c) 1999 Uwe Girlich */
-/* $Id: packet-rpc.h,v 1.12 2000/01/22 05:49:08 guy Exp $ */
+/* $Id: packet-rpc.h,v 1.13 2000/02/15 21:03:00 gram Exp $ */
 
 #ifndef __PACKET_RPC_H__
 #define __PACKET_RPC_H__
@@ -97,6 +97,7 @@ extern void init_dissect_rpc();
 extern void cleanup_dissect_rpc();
 
 extern unsigned int rpc_roundup(unsigned int a);
+gboolean dissect_rpc(const u_char *, int, frame_data *, proto_tree *);
 extern int dissect_rpc_bool(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree, int hfindex);
 extern int dissect_rpc_string(const u_char *pd, int offset, frame_data *fd,
diff --git a/packet-rsvp.c b/packet-rsvp.c
index a6446bd6d4..9c3051e998 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.12 2000/01/24 03:33:30 guy Exp $
+ * $Id: packet-rsvp.c,v 1.13 2000/02/15 21:03:01 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -94,6 +94,438 @@ static gint ett_rsvp_integrity = -1;
 static gint ett_rsvp_policy = -1;
 static gint ett_rsvp_unknown_class = -1;
 
+
+/*
+ * RSVP message types
+ */
+typedef enum {
+    RSVP_MSG_PATH=1, RSVP_MSG_RESV, RSVP_MSG_PERR, RSVP_MSG_RERR,
+    RSVP_MSG_PTEAR, RSVP_MSG_RTEAR, RSVP_MSG_CONFIRM, 
+    RSVP_MSG_RTEAR_CONFIRM=10
+} rsvp_message_types;
+
+static value_string message_type_vals[] = { 
+    {RSVP_MSG_PATH, "PATH Message"},
+    {RSVP_MSG_RESV, "RESV Message"},
+    {RSVP_MSG_PERR, "PATH ERROR Message"},
+    {RSVP_MSG_RERR, "RESV ERROR Message"},
+    {RSVP_MSG_PTEAR, "PATH TEAR Message"},
+    {RSVP_MSG_RTEAR, "RESV TEAR Message"},
+    {RSVP_MSG_CONFIRM, "CONFIRM Message"},
+    {RSVP_MSG_RTEAR_CONFIRM, "RESV TEAR CONFIRM Message"}
+};
+
+/* 
+ * RSVP classes
+ */
+#define MAX_RSVP_CLASS 15
+
+enum rsvp_classes {
+    RSVP_CLASS_NULL=0,
+    RSVP_CLASS_SESSION,
+    RSVP_CLASS_HOP=3,
+    RSVP_CLASS_INTEGRITY,
+    RSVP_CLASS_TIME_VALUES,
+    RSVP_CLASS_ERROR,
+    RSVP_CLASS_SCOPE,
+    RSVP_CLASS_STYLE,
+    RSVP_CLASS_FLOWSPEC,
+    RSVP_CLASS_FILTER_SPEC,
+    RSVP_CLASS_SENDER_TEMPLATE,
+    RSVP_CLASS_SENDER_TSPEC,
+    RSVP_CLASS_ADSPEC,
+    RSVP_CLASS_POLICY,
+    RSVP_CLASS_CONFIRM
+};
+
+static value_string rsvp_class_vals[] = { 
+    {RSVP_CLASS_NULL, "NULL object"},
+    {RSVP_CLASS_SESSION, "SESSION object"},
+    {RSVP_CLASS_HOP, "HOP object"},
+    {RSVP_CLASS_INTEGRITY, "INTEGRITY object"},
+    {RSVP_CLASS_TIME_VALUES, "TIME VALUES object"},
+    {RSVP_CLASS_ERROR, "ERROR object"},
+    {RSVP_CLASS_SCOPE, "SCOPE object"},
+    {RSVP_CLASS_STYLE, "STYLE object"},
+    {RSVP_CLASS_FLOWSPEC, "FLOWSPEC object"},
+    {RSVP_CLASS_FILTER_SPEC, "FILTER SPEC object"},
+    {RSVP_CLASS_SENDER_TEMPLATE, "SENDER TEMPLATE object"},
+    {RSVP_CLASS_SENDER_TSPEC, "SENDER TSPEC object"},
+    {RSVP_CLASS_ADSPEC, "ADSPEC object"},
+    {RSVP_CLASS_POLICY, "POLICY object"},
+    {RSVP_CLASS_CONFIRM, "CONFIRM object"}
+};
+
+/*
+ * RSVP error values
+ */
+enum rsvp_error_types {
+    RSVP_ERROR_CONFIRM = 0,
+    RSVP_ERROR_ADMISSION,
+    RSVP_ERROR_POLICY,
+    RSVP_ERROR_NO_PATH,
+    RSVP_ERROR_NO_SENDER,
+    RSVP_ERROR_CONFLICT_RESV_STYLE,
+    RSVP_ERROR_UNKNOWN_RESV_STYLE,
+    RSVP_ERROR_CONFLICT_DEST_PORTS,
+    RSVP_ERROR_CONFLICT_SRC_PORTS,
+    RSVP_ERROR_PREEMPTED=12,
+    RSVP_ERROR_UNKNOWN_CLASS,
+    RSVP_ERROR_UNKNOWN_C_TYPE,
+    RSVP_ERROR_TRAFFIC = 21,
+    RSVP_ERROR_TRAFFIC_SYSTEM,
+    RSVP_ERROR_SYSTEM
+};
+
+static value_string rsvp_error_vals[] = {
+    {RSVP_ERROR_CONFIRM, "Confirmation"},
+    {RSVP_ERROR_ADMISSION, "Admission Control Failure "},
+    {RSVP_ERROR_POLICY, "Policy Control Failure"},
+    {RSVP_ERROR_NO_PATH, "No PATH information for this RESV message"},
+    {RSVP_ERROR_NO_SENDER, "No sender information for this RESV message"},
+    {RSVP_ERROR_CONFLICT_RESV_STYLE, "Conflicting reservation styles"},
+    {RSVP_ERROR_UNKNOWN_RESV_STYLE, "Unknown reservation style"},
+    {RSVP_ERROR_CONFLICT_DEST_PORTS, "Conflicting destination ports"},
+    {RSVP_ERROR_CONFLICT_SRC_PORTS, "Conflicting source ports"},
+    {RSVP_ERROR_PREEMPTED, "Service preempted"},
+    {RSVP_ERROR_UNKNOWN_CLASS, "Unknown object class"},
+    {RSVP_ERROR_UNKNOWN_C_TYPE, "Unknown object C-type"},
+    {RSVP_ERROR_TRAFFIC, "Traffic Control Error"},
+    {RSVP_ERROR_TRAFFIC_SYSTEM, "Traffic Control System Error"}
+};
+
+/*
+ * Defines the reservation style plus style-specific information that
+ * is not a FLOWSPEC or FILTER_SPEC object, in a RESV message.
+ */
+#define RSVP_DISTINCT (1 << 3)
+#define RSVP_SHARED (2 << 3)
+#define RSVP_SHARING_MASK (RSVP_DISTINCT | RSVP_SHARED)
+
+#define RSVP_SCOPE_WILD 1
+#define RSVP_SCOPE_EXPLICIT 2
+#define RSVP_SCOPE_MASK 0x07
+
+#define RSVP_WF (RSVP_SHARED | RSVP_SCOPE_WILD)
+#define RSVP_FF (RSVP_DISTINCT | RSVP_SCOPE_EXPLICIT)
+#define RSVP_SE (RSVP_SHARED | RSVP_SCOPE_EXPLICIT)
+
+static value_string style_vals[] = {
+    { RSVP_WF, "Wildcard Filter" },
+    { RSVP_FF, "Fixed Filter" },
+    { RSVP_SE, "Shared-Explicit" }
+};
+
+/*------------------------------*
+ * Object definitions
+ *------------------------------*/
+
+/*
+ * Base RSVP object
+ */
+typedef struct {
+    guint16 length;
+    guint8 class;	
+    guint8 type;
+    /* Data follows, as a sequence of bytes */
+} rsvp_object;
+
+/*
+ * RSVP message header
+ */
+
+typedef struct {
+    guint8    ver_flags;		/* RSVP Version & flags */
+    guint8    message_type;		/* type of message */
+    guint16   cksum;			/* IP Checksum */
+    guint8    sending_ttl;		/* ttl of message */
+    guint8    reserved_byte;		/* reserved */
+    guint16   rsvp_length;		/* length of RSVP data */
+    /* Objects follow, as a sequence of "rsvp_object"s */
+} rsvp_header;
+
+/*
+ * NULL object 
+*/
+typedef struct {
+    rsvp_object base;
+} rsvp_null;
+
+/*
+ * SESSION object
+ */
+typedef struct {
+    rsvp_object base;
+    guint32 destination;
+    guint8 protocol;
+    guint8 flags;
+    guint16 port;
+} rsvp_session_ipv4;
+
+typedef struct {
+    rsvp_object base;
+    struct e_in6_addr destination;
+    guint8 protocol;
+    guint8 flags;
+    guint16 port;
+} rsvp_session_ipv6;
+
+/*
+ * HOP object
+ * Can be a PHOP or a NHOP
+ */
+typedef struct {
+    rsvp_object base;
+    guint32 neighbor;
+    guint32 lif_handle;
+} rsvp_hop_ipv4;
+
+typedef struct {
+    rsvp_object base;
+    struct e_in6_addr neighbor;
+    guint32 lif_handle;
+} rsvp_hop_ipv6;
+
+/*
+ * TIME_VALUES object
+ */
+typedef struct {
+    rsvp_object base;
+    gint32 refresh_ms;
+} rsvp_time_values;
+
+/*
+ * ERROR object
+ */
+typedef struct {
+    rsvp_object base;
+    guint32 error_node;
+    guint8 flags;
+    guint8 error_code;
+    guint16 error_value;
+} rsvp_error_ipv4;
+
+typedef struct {
+    rsvp_object base;
+    struct e_in6_addr error_node;
+    guint8 flags;
+    guint8 error_code;
+    guint16 error_value;
+} rsvp_error_ipv6;
+
+/*
+ * CONFIRM object
+ */
+typedef struct {
+    rsvp_object base;
+    guint32 receiver;
+} rsvp_confirm_ipv4;
+
+typedef struct {
+    rsvp_object base;
+    struct e_in6_addr receiver;
+} rsvp_confirm_ipv6;
+
+/*
+ * SCOPE object
+ */
+typedef struct {
+    rsvp_object base;
+    /* Source follows, as a sequence of 32-bit integers */
+} rsvp_scope;
+
+/*
+ * STYLE object
+ */
+typedef struct {
+    rsvp_object base;
+    guint32 reservation_type;
+} rsvp_style;
+
+/*
+ * Defines a subset of session data packets that should receive the
+ * desired QoS (specified by an FLOWSPEC object), in a RESV message.
+ */
+typedef struct {
+    rsvp_object base;
+    guint32 source;			/* source sending data */
+    guint16 unused;
+    guint16 udp_source_port;		/* port number */
+} rsvp_filter_ipv4;
+
+/*
+ * Contains a sender IP address and perhaps some additional
+ * demultiplexing information to identify a sender, in a PATH
+ * message.
+ */
+typedef struct {
+    rsvp_object base;
+    guint32 source;			/* source sending data */
+    guint16 __reserved;
+    guint16 source_port;		/* port number */
+} rsvp_template_ipv4;
+
+typedef struct {
+    rsvp_object base;
+    struct e_in6_addr source;		/* source sending data */
+    guint16 __reserved;
+    guint16 source_port;		/* port number */
+} rsvp_template_ipv6;
+
+/*
+ * Defines a desired QoS, in a RESV message.
+ */
+enum    qos_service_type {
+    QOS_QUALITATIVE =     128,          /* Qualitative service */
+    QOS_CONTROLLED_LOAD=    5,		/* Controlled Load Service */
+    QOS_GUARANTEED =        2,		/* Guaranteed service */
+    QOS_TSPEC =             1		/* Traffic specification */
+    };
+
+static value_string qos_vals[] = {
+    { QOS_QUALITATIVE, "Qualitative QoS" },
+    { QOS_CONTROLLED_LOAD, "Controlled-load QoS" },
+    { QOS_GUARANTEED, "Guaranteed rate QoS" },
+    { QOS_TSPEC, "Traffic specification" },
+};
+
+static value_string svc_vals[] = {
+    { 127, "Token bucket TSpec" },
+    { 128, "Qualitative TSpec" },
+    { 130, "Guaranteed-rate RSpec" }
+};
+
+enum rsvp_spec_types { INTSRV = 2 };
+
+enum intsrv_services {
+	INTSRV_GENERAL = 1,
+	INTSRV_GTD = 2,
+	INTSRV_CLOAD = 5,
+	INTSRV_QUALITATIVE = 128
+};
+
+static value_string intsrv_services_str[] = { 
+    {INTSRV_GENERAL, "Default General Parameters"},
+    {INTSRV_GTD, "Guaranteed"},
+    {INTSRV_CLOAD, "Controlled Load"},
+    {INTSRV_QUALITATIVE, "Qualitative"},
+};
+
+enum intsrv_field_name {
+	INTSRV_NON_IS_HOPS = 1, INTSRV_COMPOSED_NON_IS_HOPS,
+	INTSRV_IS_HOPS, INTSRV_COMPOSED_IS_HOPS,
+	INTSRV_PATH_BANDWIDTH, INTSRV_MIN_PATH_BANDWIDTH,
+	INTSRV_IF_LATENCY, INTSRV_PATH_LATENCY,
+	INTSRV_MTU, INTSRV_COMPOSED_MTU,
+
+	INTSRV_TOKEN_BUCKET_TSPEC = 127,
+	INTSRV_QUALITATIVE_TSPEC = 128,
+	INTSRV_GTD_RSPEC = 130,
+
+    	INTSRV_DELAY = 131,	/* Gtd Parameter C - Max Delay Bound - bytes */
+	INTSRV_MAX_JITTER,	/* Gtd Parameter D - Max Jitter */
+    	INTSRV_E2E_DELAY,	/* Gtd Parameter Ctot */
+	INTSRV_E2E_MAX_JITTER,	/* Gtd Parameter Dtot */
+    	INTSRV_SHP_DELAY,	/* Gtd Parameter Csum */
+	INTSRV_SHP_MAX_JITTER	/* Gtd Parameter Dsum */
+};
+
+/*
+ * Subobjects for Integrated Services
+ */
+
+typedef struct {
+    guint8 service_num;
+    guint8 break_bit;
+    guint16 length;
+} service_hdr;
+
+typedef struct {					
+    service_hdr svchdr;
+
+    guint8	param_id;
+    guint8	flags_tspec;
+    guint16	parameter_length;
+
+    guint32	rate;
+    guint32	depth;
+    guint32	peak;
+    guint32	min_unit;
+    guint32	max_unit;
+} IS_tspec; /* RFC2210 */
+
+typedef struct {
+    service_hdr svchdr;
+    
+    guint8	param_id;
+    guint8	flags_tspec;
+    guint16	parameter_length;
+
+    guint32	max_unit;
+} QUAL_tspec; /* Qualitative */
+
+typedef struct {
+    rsvp_object base;
+    guint8	version;	
+    guint8 	__reserved_;
+    guint16	length_in_words;
+
+    /* Data follows, as a sequence of bytes */
+} rsvp_tspec;
+
+typedef struct {
+    guint8	param_id;
+    guint8	flags_rspec;
+    guint16	param2_length;
+    guint32	requested_rate;
+    guint32	slack;
+} IS_rspec;
+
+typedef struct {
+    IS_tspec tspec;
+    IS_rspec rspec;
+} IS_flowspec; /* RFC 2210 */
+
+typedef struct {
+    service_hdr svchdr;
+    
+    guint8	param_id;
+    guint8	flags_tspec;
+    guint16	parameter_length;
+
+    guint32	max_unit;
+} QUAL_flowspec; /* Qualitative */
+
+
+typedef struct {
+    rsvp_object base;
+    guint8	version;	
+    guint8 	__reserved_;
+    guint16	length_in_words;
+
+    /* Data follows, as a sequence of bytes */
+} rsvp_flowspec;
+					
+
+typedef struct {
+    guint8 id;
+    guint8 flags;
+    guint16 length;
+    guint32 dataval;
+} param_hdr;
+    
+static value_string adspec_params[] = { 
+    {4, "IS Hop Count"},
+    {6, "Path b/w estimate"},
+    {8, "Minimum path latency"},
+    {10, "Composed MTU"},
+    {133, "End-to-end composed value for C"},
+    {134, "End-to-end composed value for D"},
+    {135, "Since-last-reshaping point composed C"},
+    {136, "Since-last-reshaping point composed D"},
+};
+
+
 /* Stuff for IEEE float handling */
 
 #define IEEE_NUMBER_WIDTH	32	/* bits in number */
diff --git a/packet-rsvp.h b/packet-rsvp.h
index fea398bc74..f700ca0e4e 100644
--- a/packet-rsvp.h
+++ b/packet-rsvp.h
@@ -4,445 +4,10 @@
  *
  * (C) Ashok Narayanan <ashokn@cisco.com>
  *
- * $Id: packet-rsvp.h,v 1.7 1999/11/18 01:45:02 guy Exp $
+ * $Id: packet-rsvp.h,v 1.8 2000/02/15 21:03:03 gram Exp $
  *
  * For license details, see the COPYING file with this distribution
  *
  **********************************************************************/
 
-#ifndef PACKET_RSVP_H
-#define PACKET_RSVP_H
-
-/*
- * RSVP message types
- */
-typedef enum {
-    RSVP_MSG_PATH=1, RSVP_MSG_RESV, RSVP_MSG_PERR, RSVP_MSG_RERR,
-    RSVP_MSG_PTEAR, RSVP_MSG_RTEAR, RSVP_MSG_CONFIRM, 
-    RSVP_MSG_RTEAR_CONFIRM=10
-} rsvp_message_types;
-
-static value_string message_type_vals[] = { 
-    {RSVP_MSG_PATH, "PATH Message"},
-    {RSVP_MSG_RESV, "RESV Message"},
-    {RSVP_MSG_PERR, "PATH ERROR Message"},
-    {RSVP_MSG_RERR, "RESV ERROR Message"},
-    {RSVP_MSG_PTEAR, "PATH TEAR Message"},
-    {RSVP_MSG_RTEAR, "RESV TEAR Message"},
-    {RSVP_MSG_CONFIRM, "CONFIRM Message"},
-    {RSVP_MSG_RTEAR_CONFIRM, "RESV TEAR CONFIRM Message"}
-};
-
-/* 
- * RSVP classes
- */
-#define MAX_RSVP_CLASS 15
-
-enum rsvp_classes {
-    RSVP_CLASS_NULL=0,
-    RSVP_CLASS_SESSION,
-    RSVP_CLASS_HOP=3,
-    RSVP_CLASS_INTEGRITY,
-    RSVP_CLASS_TIME_VALUES,
-    RSVP_CLASS_ERROR,
-    RSVP_CLASS_SCOPE,
-    RSVP_CLASS_STYLE,
-    RSVP_CLASS_FLOWSPEC,
-    RSVP_CLASS_FILTER_SPEC,
-    RSVP_CLASS_SENDER_TEMPLATE,
-    RSVP_CLASS_SENDER_TSPEC,
-    RSVP_CLASS_ADSPEC,
-    RSVP_CLASS_POLICY,
-    RSVP_CLASS_CONFIRM
-};
-
-static value_string rsvp_class_vals[] = { 
-    {RSVP_CLASS_NULL, "NULL object"},
-    {RSVP_CLASS_SESSION, "SESSION object"},
-    {RSVP_CLASS_HOP, "HOP object"},
-    {RSVP_CLASS_INTEGRITY, "INTEGRITY object"},
-    {RSVP_CLASS_TIME_VALUES, "TIME VALUES object"},
-    {RSVP_CLASS_ERROR, "ERROR object"},
-    {RSVP_CLASS_SCOPE, "SCOPE object"},
-    {RSVP_CLASS_STYLE, "STYLE object"},
-    {RSVP_CLASS_FLOWSPEC, "FLOWSPEC object"},
-    {RSVP_CLASS_FILTER_SPEC, "FILTER SPEC object"},
-    {RSVP_CLASS_SENDER_TEMPLATE, "SENDER TEMPLATE object"},
-    {RSVP_CLASS_SENDER_TSPEC, "SENDER TSPEC object"},
-    {RSVP_CLASS_ADSPEC, "ADSPEC object"},
-    {RSVP_CLASS_POLICY, "POLICY object"},
-    {RSVP_CLASS_CONFIRM, "CONFIRM object"}
-};
-
-/*
- * RSVP error values
- */
-enum rsvp_error_types {
-    RSVP_ERROR_CONFIRM = 0,
-    RSVP_ERROR_ADMISSION,
-    RSVP_ERROR_POLICY,
-    RSVP_ERROR_NO_PATH,
-    RSVP_ERROR_NO_SENDER,
-    RSVP_ERROR_CONFLICT_RESV_STYLE,
-    RSVP_ERROR_UNKNOWN_RESV_STYLE,
-    RSVP_ERROR_CONFLICT_DEST_PORTS,
-    RSVP_ERROR_CONFLICT_SRC_PORTS,
-    RSVP_ERROR_PREEMPTED=12,
-    RSVP_ERROR_UNKNOWN_CLASS,
-    RSVP_ERROR_UNKNOWN_C_TYPE,
-    RSVP_ERROR_TRAFFIC = 21,
-    RSVP_ERROR_TRAFFIC_SYSTEM,
-    RSVP_ERROR_SYSTEM
-};
-
-static value_string rsvp_error_vals[] = {
-    {RSVP_ERROR_CONFIRM, "Confirmation"},
-    {RSVP_ERROR_ADMISSION, "Admission Control Failure "},
-    {RSVP_ERROR_POLICY, "Policy Control Failure"},
-    {RSVP_ERROR_NO_PATH, "No PATH information for this RESV message"},
-    {RSVP_ERROR_NO_SENDER, "No sender information for this RESV message"},
-    {RSVP_ERROR_CONFLICT_RESV_STYLE, "Conflicting reservation styles"},
-    {RSVP_ERROR_UNKNOWN_RESV_STYLE, "Unknown reservation style"},
-    {RSVP_ERROR_CONFLICT_DEST_PORTS, "Conflicting destination ports"},
-    {RSVP_ERROR_CONFLICT_SRC_PORTS, "Conflicting source ports"},
-    {RSVP_ERROR_PREEMPTED, "Service preempted"},
-    {RSVP_ERROR_UNKNOWN_CLASS, "Unknown object class"},
-    {RSVP_ERROR_UNKNOWN_C_TYPE, "Unknown object C-type"},
-    {RSVP_ERROR_TRAFFIC, "Traffic Control Error"},
-    {RSVP_ERROR_TRAFFIC_SYSTEM, "Traffic Control System Error"}
-};
-
-/*
- * Defines the reservation style plus style-specific information that
- * is not a FLOWSPEC or FILTER_SPEC object, in a RESV message.
- */
-#define RSVP_DISTINCT (1 << 3)
-#define RSVP_SHARED (2 << 3)
-#define RSVP_SHARING_MASK (RSVP_DISTINCT | RSVP_SHARED)
-
-#define RSVP_SCOPE_WILD 1
-#define RSVP_SCOPE_EXPLICIT 2
-#define RSVP_SCOPE_MASK 0x07
-
-#define RSVP_WF (RSVP_SHARED | RSVP_SCOPE_WILD)
-#define RSVP_FF (RSVP_DISTINCT | RSVP_SCOPE_EXPLICIT)
-#define RSVP_SE (RSVP_SHARED | RSVP_SCOPE_EXPLICIT)
-
-static value_string style_vals[] = {
-    { RSVP_WF, "Wildcard Filter" },
-    { RSVP_FF, "Fixed Filter" },
-    { RSVP_SE, "Shared-Explicit" }
-};
-
-/*------------------------------*
- * Object definitions
- *------------------------------*/
-
-/*
- * Base RSVP object
- */
-typedef struct {
-    guint16 length;
-    guint8 class;	
-    guint8 type;
-    /* Data follows, as a sequence of bytes */
-} rsvp_object;
-
-/*
- * RSVP message header
- */
-
-typedef struct {
-    guint8    ver_flags;		/* RSVP Version & flags */
-    guint8    message_type;		/* type of message */
-    guint16   cksum;			/* IP Checksum */
-    guint8    sending_ttl;		/* ttl of message */
-    guint8    reserved_byte;		/* reserved */
-    guint16   rsvp_length;		/* length of RSVP data */
-    /* Objects follow, as a sequence of "rsvp_object"s */
-} rsvp_header;
-
-/*
- * NULL object 
-*/
-typedef struct {
-    rsvp_object base;
-} rsvp_null;
-
-/*
- * SESSION object
- */
-typedef struct {
-    rsvp_object base;
-    guint32 destination;
-    guint8 protocol;
-    guint8 flags;
-    guint16 port;
-} rsvp_session_ipv4;
-
-typedef struct {
-    rsvp_object base;
-    struct e_in6_addr destination;
-    guint8 protocol;
-    guint8 flags;
-    guint16 port;
-} rsvp_session_ipv6;
-
-/*
- * HOP object
- * Can be a PHOP or a NHOP
- */
-typedef struct {
-    rsvp_object base;
-    guint32 neighbor;
-    guint32 lif_handle;
-} rsvp_hop_ipv4;
-
-typedef struct {
-    rsvp_object base;
-    struct e_in6_addr neighbor;
-    guint32 lif_handle;
-} rsvp_hop_ipv6;
-
-/*
- * TIME_VALUES object
- */
-typedef struct {
-    rsvp_object base;
-    gint32 refresh_ms;
-} rsvp_time_values;
-
-/*
- * ERROR object
- */
-typedef struct {
-    rsvp_object base;
-    guint32 error_node;
-    guint8 flags;
-    guint8 error_code;
-    guint16 error_value;
-} rsvp_error_ipv4;
-
-typedef struct {
-    rsvp_object base;
-    struct e_in6_addr error_node;
-    guint8 flags;
-    guint8 error_code;
-    guint16 error_value;
-} rsvp_error_ipv6;
-
-/*
- * CONFIRM object
- */
-typedef struct {
-    rsvp_object base;
-    guint32 receiver;
-} rsvp_confirm_ipv4;
-
-typedef struct {
-    rsvp_object base;
-    struct e_in6_addr receiver;
-} rsvp_confirm_ipv6;
-
-/*
- * SCOPE object
- */
-typedef struct {
-    rsvp_object base;
-    /* Source follows, as a sequence of 32-bit integers */
-} rsvp_scope;
-
-/*
- * STYLE object
- */
-typedef struct {
-    rsvp_object base;
-    guint32 reservation_type;
-} rsvp_style;
-
-/*
- * Defines a subset of session data packets that should receive the
- * desired QoS (specified by an FLOWSPEC object), in a RESV message.
- */
-typedef struct {
-    rsvp_object base;
-    guint32 source;			/* source sending data */
-    guint16 unused;
-    guint16 udp_source_port;		/* port number */
-} rsvp_filter_ipv4;
-
-/*
- * Contains a sender IP address and perhaps some additional
- * demultiplexing information to identify a sender, in a PATH
- * message.
- */
-typedef struct {
-    rsvp_object base;
-    guint32 source;			/* source sending data */
-    guint16 __reserved;
-    guint16 source_port;		/* port number */
-} rsvp_template_ipv4;
-
-typedef struct {
-    rsvp_object base;
-    struct e_in6_addr source;		/* source sending data */
-    guint16 __reserved;
-    guint16 source_port;		/* port number */
-} rsvp_template_ipv6;
-
-/*
- * Defines a desired QoS, in a RESV message.
- */
-enum    qos_service_type {
-    QOS_QUALITATIVE =     128,          /* Qualitative service */
-    QOS_CONTROLLED_LOAD=    5,		/* Controlled Load Service */
-    QOS_GUARANTEED =        2,		/* Guaranteed service */
-    QOS_TSPEC =             1		/* Traffic specification */
-    };
-
-static value_string qos_vals[] = {
-    { QOS_QUALITATIVE, "Qualitative QoS" },
-    { QOS_CONTROLLED_LOAD, "Controlled-load QoS" },
-    { QOS_GUARANTEED, "Guaranteed rate QoS" },
-    { QOS_TSPEC, "Traffic specification" },
-};
-
-static value_string svc_vals[] = {
-    { 127, "Token bucket TSpec" },
-    { 128, "Qualitative TSpec" },
-    { 130, "Guaranteed-rate RSpec" }
-};
-
-enum rsvp_spec_types { INTSRV = 2 };
-
-enum intsrv_services {
-	INTSRV_GENERAL = 1,
-	INTSRV_GTD = 2,
-	INTSRV_CLOAD = 5,
-	INTSRV_QUALITATIVE = 128
-};
-
-static value_string intsrv_services_str[] = { 
-    {INTSRV_GENERAL, "Default General Parameters"},
-    {INTSRV_GTD, "Guaranteed"},
-    {INTSRV_CLOAD, "Controlled Load"},
-    {INTSRV_QUALITATIVE, "Qualitative"},
-};
-
-enum intsrv_field_name {
-	INTSRV_NON_IS_HOPS = 1, INTSRV_COMPOSED_NON_IS_HOPS,
-	INTSRV_IS_HOPS, INTSRV_COMPOSED_IS_HOPS,
-	INTSRV_PATH_BANDWIDTH, INTSRV_MIN_PATH_BANDWIDTH,
-	INTSRV_IF_LATENCY, INTSRV_PATH_LATENCY,
-	INTSRV_MTU, INTSRV_COMPOSED_MTU,
-
-	INTSRV_TOKEN_BUCKET_TSPEC = 127,
-	INTSRV_QUALITATIVE_TSPEC = 128,
-	INTSRV_GTD_RSPEC = 130,
-
-    	INTSRV_DELAY = 131,	/* Gtd Parameter C - Max Delay Bound - bytes */
-	INTSRV_MAX_JITTER,	/* Gtd Parameter D - Max Jitter */
-    	INTSRV_E2E_DELAY,	/* Gtd Parameter Ctot */
-	INTSRV_E2E_MAX_JITTER,	/* Gtd Parameter Dtot */
-    	INTSRV_SHP_DELAY,	/* Gtd Parameter Csum */
-	INTSRV_SHP_MAX_JITTER	/* Gtd Parameter Dsum */
-};
-
-/*
- * Subobjects for Integrated Services
- */
-
-typedef struct {
-    guint8 service_num;
-    guint8 break_bit;
-    guint16 length;
-} service_hdr;
-
-typedef struct {					
-    service_hdr svchdr;
-
-    guint8	param_id;
-    guint8	flags_tspec;
-    guint16	parameter_length;
-
-    guint32	rate;
-    guint32	depth;
-    guint32	peak;
-    guint32	min_unit;
-    guint32	max_unit;
-} IS_tspec; /* RFC2210 */
-
-typedef struct {
-    service_hdr svchdr;
-    
-    guint8	param_id;
-    guint8	flags_tspec;
-    guint16	parameter_length;
-
-    guint32	max_unit;
-} QUAL_tspec; /* Qualitative */
-
-typedef struct {
-    rsvp_object base;
-    guint8	version;	
-    guint8 	__reserved_;
-    guint16	length_in_words;
-
-    /* Data follows, as a sequence of bytes */
-} rsvp_tspec;
-
-typedef struct {
-    guint8	param_id;
-    guint8	flags_rspec;
-    guint16	param2_length;
-    guint32	requested_rate;
-    guint32	slack;
-} IS_rspec;
-
-typedef struct {
-    IS_tspec tspec;
-    IS_rspec rspec;
-} IS_flowspec; /* RFC 2210 */
-
-typedef struct {
-    service_hdr svchdr;
-    
-    guint8	param_id;
-    guint8	flags_tspec;
-    guint16	parameter_length;
-
-    guint32	max_unit;
-} QUAL_flowspec; /* Qualitative */
-
-
-typedef struct {
-    rsvp_object base;
-    guint8	version;	
-    guint8 	__reserved_;
-    guint16	length_in_words;
-
-    /* Data follows, as a sequence of bytes */
-} rsvp_flowspec;
-					
-
-typedef struct {
-    guint8 id;
-    guint8 flags;
-    guint16 length;
-    guint32 dataval;
-} param_hdr;
-    
-static value_string adspec_params[] = { 
-    {4, "IS Hop Count"},
-    {6, "Path b/w estimate"},
-    {8, "Minimum path latency"},
-    {10, "Composed MTU"},
-    {133, "End-to-end composed value for C"},
-    {134, "End-to-end composed value for D"},
-    {135, "Since-last-reshaping point composed C"},
-    {136, "Since-last-reshaping point composed D"},
-};
-
-
-
-#endif
+void dissect_rsvp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-rtsp.c b/packet-rtsp.c
index 004a43f06a..912910b15a 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.7 2000/01/22 06:22:17 guy Exp $
+ * $Id: packet-rtsp.c,v 1.8 2000/02/15 21:03:04 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -39,6 +39,7 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-sdp.h"
 
 static int proto_rtsp = -1;
 static gint ett_rtsp = -1;
diff --git a/packet-rtsp.h b/packet-rtsp.h
new file mode 100644
index 0000000000..100603c3dc
--- /dev/null
+++ b/packet-rtsp.h
@@ -0,0 +1,26 @@
+/* packet-rtsp.h
+ *
+ * $Id: packet-rtsp.h,v 1.1 2000/02/15 21:03:05 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_rtsp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-rx.c b/packet-rx.c
index 680c2a591f..98172e339a 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.7 2000/01/14 19:11:26 guy Exp $
+ * $Id: packet-rx.c,v 1.8 2000/02/15 21:03:05 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -45,6 +45,7 @@
 #include <glib.h>
 #include "packet.h"
 #include "packet-rx.h"
+#include "packet-afs.h"
 #include "resolv.h"
 
 static const value_string rx_types[] = {
diff --git a/packet-rx.h b/packet-rx.h
index 089c99dfb9..c3de964fd9 100644
--- a/packet-rx.h
+++ b/packet-rx.h
@@ -1,7 +1,7 @@
 /* packet-rx.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet-rx.h,v 1.1 1999/10/20 16:41:19 gram Exp $
+ * $Id: packet-rx.h,v 1.2 2000/02/15 21:03:06 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -27,6 +27,8 @@
 #ifndef PACKET_RX_H
 #define PACKET_RX_H
 
+void dissect_rx(const u_char *, int, frame_data *, proto_tree *);
+
 struct rx_header {
 	guint32 epoch;
 	guint32 cid;
diff --git a/packet-sap.c b/packet-sap.c
index ea1b64fe19..76788a3952 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.4 2000/01/07 22:05:36 guy Exp $
+ * $Id: packet-sap.c,v 1.5 2000/02/15 21:03:07 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -43,7 +43,7 @@
 #include <glib.h>
 #include "packet.h"
 #include "packet-ipv6.h"
-
+#include "packet-sdp.h"
 
 #define MCAST_SAP_VERSION_MASK 0xE0 /* 3 bits for  SAP version*/
 #define MCAST_SAP_VERSION_SHIFT 5   /* Right shift 5 bits to get the version */
diff --git a/packet-sap.h b/packet-sap.h
new file mode 100644
index 0000000000..b47846de7d
--- /dev/null
+++ b/packet-sap.h
@@ -0,0 +1,26 @@
+/* packet-sap.h
+ *
+ * $Id: packet-sap.h,v 1.1 2000/02/15 21:03:08 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_sap(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-sdp.h b/packet-sdp.h
new file mode 100644
index 0000000000..0a24f10427
--- /dev/null
+++ b/packet-sdp.h
@@ -0,0 +1,26 @@
+/* packet-sdp.h
+ *
+ * $Id: packet-sdp.h,v 1.1 2000/02/15 21:03:08 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_sdp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-smb.h b/packet-smb.h
new file mode 100644
index 0000000000..44d298a285
--- /dev/null
+++ b/packet-smb.h
@@ -0,0 +1,26 @@
+/* packet-smb.h
+ *
+ * $Id: packet-smb.h,v 1.1 2000/02/15 21:03:09 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int max_data);
diff --git a/packet-sna.h b/packet-sna.h
index 0159fbfeb3..71d3921c2f 100644
--- a/packet-sna.h
+++ b/packet-sna.h
@@ -1,7 +1,7 @@
 /* packet-sna.h
  * Definitions for SNA dissection.
  *
- * $Id: packet-sna.h,v 1.1 1999/10/22 08:53:41 guy Exp $
+ * $Id: packet-sna.h,v 1.2 2000/02/15 21:03:10 gram Exp $
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -33,3 +33,5 @@ struct sna_fid_type_4_addr {
  * Routine to take an SNA FID Type 4 address and generate a string.
  */
 extern gchar *sna_fid_type_4_addr_to_str(const struct sna_fid_type_4_addr *addrp);
+
+void dissect_sna(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-snmp.h b/packet-snmp.h
index 34146fc7f0..d01d2c2b6c 100644
--- a/packet-snmp.h
+++ b/packet-snmp.h
@@ -2,7 +2,7 @@
  * Exported routines for SNMP (simple network management protocol)
  * D.Jorand (c) 1998
  *
- * $Id: packet-snmp.h,v 1.2 2000/01/07 22:05:40 guy Exp $
+ * $Id: packet-snmp.h,v 1.3 2000/02/15 21:03:10 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -24,6 +24,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+void dissect_snmp(const u_char *, int, frame_data *, proto_tree *);
+
 /*
  * Guts of the SNMP dissector - exported for use by protocols such as
  * ILMI.
diff --git a/packet-srvloc.h b/packet-srvloc.h
new file mode 100644
index 0000000000..86ab043284
--- /dev/null
+++ b/packet-srvloc.h
@@ -0,0 +1,26 @@
+/* packet-srvloc.h
+ *
+ * $Id: packet-srvloc.h,v 1.1 2000/02/15 21:03:11 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_srvloc(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-sscop.c b/packet-sscop.c
index aa1ab5b4ba..80a0bbc63a 100644
--- a/packet-sscop.c
+++ b/packet-sscop.c
@@ -2,7 +2,7 @@
  * Routines for SSCOP (Q.2110, Q.SAAL) frame disassembly
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-sscop.c,v 1.4 1999/11/23 07:19:14 guy Exp $
+ * $Id: packet-sscop.c,v 1.5 2000/02/15 21:03:12 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -36,6 +36,7 @@
 #include <glib.h>
 #include <string.h>
 #include "packet.h"
+#include "packet-q2931.h"
 
 static int proto_sscop = -1;
 
diff --git a/packet-sscop.h b/packet-sscop.h
new file mode 100644
index 0000000000..8545669584
--- /dev/null
+++ b/packet-sscop.h
@@ -0,0 +1,26 @@
+/* packet-sscop.h
+ *
+ * $Id: packet-sscop.h,v 1.1 2000/02/15 21:03:13 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_sscop(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-tacacs.h b/packet-tacacs.h
new file mode 100644
index 0000000000..be017a07f9
--- /dev/null
+++ b/packet-tacacs.h
@@ -0,0 +1,27 @@
+/* packet-tacacs.h
+ *
+ * $Id: packet-tacacs.h,v 1.1 2000/02/15 21:03:14 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_tacacs(const u_char *, int, frame_data *, proto_tree *);
+void dissect_tacplus(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-tcp.c b/packet-tcp.c
index cde6c8e926..e85e10e23a 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.56 2000/01/16 02:54:49 guy Exp $
+ * $Id: packet-tcp.c,v 1.57 2000/02/15 21:03:15 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -52,9 +52,29 @@
 
 #include "plugins.h"
 
-#ifndef __PACKET_IP_H__
+#include "packet-bgp.h"
 #include "packet-ip.h"
-#endif
+#include "packet-ftp.h"
+#include "packet-giop.h"
+#include "packet-http.h"
+#include "packet-imap.h"
+#include "packet-irc.h"
+#include "packet-ldap.h"
+#include "packet-lpd.h"
+#include "packet-mapi.h"
+#include "packet-nbns.h"
+#include "packet-ncp.h"
+#include "packet-nntp.h"
+#include "packet-ntp.h"
+#include "packet-pop.h"
+#include "packet-pptp.h"
+#include "packet-rpc.h"
+#include "packet-rtsp.h"
+#include "packet-srvloc.h"
+#include "packet-tacacs.h"
+#include "packet-telnet.h"
+#include "packet-tns.h"
+#include "packet-yhoo.h"
 
 extern FILE* data_out_file;
 
@@ -569,7 +589,7 @@ dissect_tcp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
       dissect_srvloc(pd, offset, fd, tree);
     } else if (PORT_IS(TCP_PORT_NCP)) {
       pi.match_port = TCP_PORT_NCP;
-      dissect_ncp(pd, offset, fd, tree);
+      dissect_ncp(pd, offset, fd, tree); /* XXX -- need to handle nw_server_address */
     } else {
         /* check existence of high level protocols */
 
diff --git a/packet-tcp.h b/packet-tcp.h
new file mode 100644
index 0000000000..1185675528
--- /dev/null
+++ b/packet-tcp.h
@@ -0,0 +1,26 @@
+/* packet-tcp.h
+ *
+ * $Id: packet-tcp.h,v 1.1 2000/02/15 21:03:17 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_tcp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-telnet.h b/packet-telnet.h
new file mode 100644
index 0000000000..ad8065b49f
--- /dev/null
+++ b/packet-telnet.h
@@ -0,0 +1,26 @@
+/* packet-telnet.h
+ *
+ * $Id: packet-telnet.h,v 1.1 2000/02/15 21:03:17 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_telnet(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-tftp.h b/packet-tftp.h
new file mode 100644
index 0000000000..69edadcb56
--- /dev/null
+++ b/packet-tftp.h
@@ -0,0 +1,26 @@
+/* packet-tftp.h
+ *
+ * $Id: packet-tftp.h,v 1.1 2000/02/15 21:03:18 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_tftp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-time.h b/packet-time.h
new file mode 100644
index 0000000000..f79504f34e
--- /dev/null
+++ b/packet-time.h
@@ -0,0 +1,26 @@
+/* packet-time.h
+ *
+ * $Id: packet-time.h,v 1.1 2000/02/15 21:03:18 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_time(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-tns.h b/packet-tns.h
index 355e864541..6d29f0c90c 100644
--- a/packet-tns.h
+++ b/packet-tns.h
@@ -1,5 +1,28 @@
-/* packet-tns.h */
-/* $Id: packet-tns.h,v 1.1 1999/11/29 19:43:26 nneul Exp $ */
+/* packet-tns.h
+ *
+ * $Id: packet-tns.h,v 1.2 2000/02/15 21:03:19 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void dissect_tns(const u_char *, int, frame_data *, proto_tree *);
 
 #ifndef PACKET_TNS_H
 #define PACKET_TNS_H
diff --git a/packet-tr.c b/packet-tr.c
index 9bd3aa2cc0..43020fe06b 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.34 2000/01/23 08:55:36 guy Exp $
+ * $Id: packet-tr.c,v 1.35 2000/02/15 21:03:19 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -35,6 +35,8 @@
 #include <stdio.h>
 #include <glib.h>
 #include "packet.h"
+#include "packet-llc.h"
+#include "packet-trmac.h"
 	
 static int proto_tr = -1;
 static int hf_tr_dst = -1;
diff --git a/packet-tr.h b/packet-tr.h
new file mode 100644
index 0000000000..9212ed48af
--- /dev/null
+++ b/packet-tr.h
@@ -0,0 +1,26 @@
+/* packet-tr.h
+ *
+ * $Id: packet-tr.h,v 1.1 2000/02/15 21:03:21 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_tr(const u_char *, int, packet_counts *);
+void dissect_tr(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-trmac.h b/packet-trmac.h
new file mode 100644
index 0000000000..9629de0b8f
--- /dev/null
+++ b/packet-trmac.h
@@ -0,0 +1,26 @@
+/* packet-trmac.h
+ *
+ * $Id: packet-trmac.h,v 1.1 2000/02/15 21:03:22 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_trmac(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-udp.c b/packet-udp.c
index d1fcea283b..90d3a32585 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.49 2000/02/09 19:09:02 guy Exp $
+ * $Id: packet-udp.c,v 1.50 2000/02/15 21:03:23 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -46,6 +46,33 @@
 
 #include "plugins.h"
 
+#include "packet-auto_rp.h"
+#include "packet-bootp.h"
+#include "packet-dns.h"
+#include "packet-hsrp.h"
+#include "packet-icp.h"
+#include "packet-icq.h"
+#include "packet-ipx.h"
+#include "packet-isakmp.h"
+#include "packet-l2tp.h"
+#include "packet-nbns.h"
+#include "packet-ncp.h"
+#include "packet-ntp.h"
+#include "packet-radius.h"
+#include "packet-rip.h"
+#include "packet-ripng.h"
+#include "packet-rpc.h"
+#include "packet-rx.h"
+#include "packet-sap.h"
+#include "packet-snmp.h"
+#include "packet-srvloc.h"
+#include "packet-tacacs.h"
+#include "packet-tftp.h"
+#include "packet-time.h"
+#include "packet-vines.h"
+#include "packet-wccp.h"
+#include "packet-who.h"
+
 static int proto_udp = -1;		
 static int hf_udp_srcport = -1;
 static int hf_udp_dstport = -1;
@@ -280,7 +307,7 @@ dissect_udp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
   } else if (PORT_IS(UDP_PORT_RIPNG))
       dissect_ripng(pd, offset, fd, tree);
   else if (PORT_IS(UDP_PORT_NCP))
-      dissect_ncp(pd, offset, fd, tree);
+      dissect_ncp(pd, offset, fd, tree); /* XXX -- need to handle nw_server_address */
   else if (PORT_IS(UDP_PORT_NBNS))
       dissect_nbns(pd, offset, fd, tree);
   else if (PORT_IS(UDP_PORT_NBDGM))
diff --git a/packet-udp.h b/packet-udp.h
new file mode 100644
index 0000000000..3bf5b1de96
--- /dev/null
+++ b/packet-udp.h
@@ -0,0 +1,26 @@
+/* packet-udp.h
+ *
+ * $Id: packet-udp.h,v 1.1 2000/02/15 21:03:24 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_udp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-v120.h b/packet-v120.h
new file mode 100644
index 0000000000..d439a94bd2
--- /dev/null
+++ b/packet-v120.h
@@ -0,0 +1,26 @@
+/* packet-v120.h
+ *
+ * $Id: packet-v120.h,v 1.1 2000/02/15 21:03:24 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_v120(const u_char *, frame_data *, proto_tree *);
diff --git a/packet-vines.h b/packet-vines.h
index 83b44b729f..baf1579765 100644
--- a/packet-vines.h
+++ b/packet-vines.h
@@ -1,7 +1,7 @@
 /* packet-vines.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet-vines.h,v 1.3 1999/10/22 08:30:04 guy Exp $
+ * $Id: packet-vines.h,v 1.4 2000/02/15 21:03:25 gram Exp $
  *
  * Don Lafontaine <lafont02@cn.ca>
  *
@@ -38,6 +38,16 @@
 #ifndef __PACKETVINES_H__
 #define __PACKETVINES_H__
 
+void capture_vines(const u_char *, int, packet_counts *);
+void dissect_vines(const u_char *, int, frame_data *, proto_tree *);
+void dissect_vines_arp(const u_char *, int, frame_data *, proto_tree *);
+void dissect_vines_frp(const u_char *, int, frame_data *, proto_tree *);
+void dissect_vines_icp(const u_char *, int, frame_data *, proto_tree *);
+void dissect_vines_ipc(const u_char *, int, frame_data *, proto_tree *);
+void dissect_vines_rtp(const u_char *, int, frame_data *, proto_tree *);
+void dissect_vines_spp(const u_char *, int, frame_data *, proto_tree *);
+
+
 /* VINES IP structs and definitions */
 
 enum {
diff --git a/packet-vlan.c b/packet-vlan.c
index 7df004b6ee..f6215eb9c2 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.7 2000/01/23 08:55:37 guy Exp $
+ * $Id: packet-vlan.c,v 1.8 2000/02/15 21:03:25 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -37,6 +37,8 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "packet-ipx.h"
+#include "packet-llc.h"
 #include "etypes.h"
 
 static int proto_vlan = -1;
diff --git a/packet-vlan.h b/packet-vlan.h
new file mode 100644
index 0000000000..9c4785fa44
--- /dev/null
+++ b/packet-vlan.h
@@ -0,0 +1,26 @@
+/* packet-vlan.h
+ *
+ * $Id: packet-vlan.h,v 1.1 2000/02/15 21:03:26 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+void capture_vlan(const u_char *, int, packet_counts *);
+void dissect_vlan(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-vrrp.h b/packet-vrrp.h
new file mode 100644
index 0000000000..46a7f2cf7d
--- /dev/null
+++ b/packet-vrrp.h
@@ -0,0 +1,26 @@
+/* packet-vrrp.h
+ *
+ * $Id: packet-vrrp.h,v 1.1 2000/02/15 21:03:26 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_vrrp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-vtp.h b/packet-vtp.h
new file mode 100644
index 0000000000..120af89721
--- /dev/null
+++ b/packet-vtp.h
@@ -0,0 +1,26 @@
+/* packet-vtp.h
+ *
+ * $Id: packet-vtp.h,v 1.1 2000/02/15 21:03:27 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_vtp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-wccp.h b/packet-wccp.h
new file mode 100644
index 0000000000..7163be494c
--- /dev/null
+++ b/packet-wccp.h
@@ -0,0 +1,26 @@
+/* packet-wccp.h
+ *
+ * $Id: packet-wccp.h,v 1.1 2000/02/15 21:03:27 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_wccp(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-who.h b/packet-who.h
new file mode 100644
index 0000000000..cb1bdd4b08
--- /dev/null
+++ b/packet-who.h
@@ -0,0 +1,26 @@
+/* packet-who.h
+ *
+ * $Id: packet-who.h,v 1.1 2000/02/15 21:03:28 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_who(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-x25.c b/packet-x25.c
index 7971d12fea..e8e44287b1 100644
--- a/packet-x25.c
+++ b/packet-x25.c
@@ -2,7 +2,7 @@
  * Routines for x25 packet disassembly
  * Olivier Abad <abad@daba.dhis.net>
  *
- * $Id: packet-x25.c,v 1.17 2000/01/30 05:58:02 guy Exp $
+ * $Id: packet-x25.c,v 1.18 2000/02/15 21:03:29 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -37,6 +37,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "packet.h"
+#include "packet-ip.h"
+#include "packet-osi.h"
 #include "nlpid.h"
 
 #define FROM_DCE			0x80
diff --git a/packet-x25.h b/packet-x25.h
new file mode 100644
index 0000000000..064aa3fa52
--- /dev/null
+++ b/packet-x25.h
@@ -0,0 +1,26 @@
+/* packet-x25.h
+ *
+ * $Id: packet-x25.h,v 1.1 2000/02/15 21:03:32 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+void dissect_x25(const u_char *, int, frame_data *, proto_tree *);
diff --git a/packet-yhoo.h b/packet-yhoo.h
index c5afb262d3..848642a1f0 100644
--- a/packet-yhoo.h
+++ b/packet-yhoo.h
@@ -1,7 +1,7 @@
 /* packet-yhoo.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet-yhoo.h,v 1.4 1999/10/20 16:36:08 gram Exp $
+ * $Id: packet-yhoo.h,v 1.5 2000/02/15 21:03:32 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -29,6 +29,8 @@
 #ifndef YAHOO_LIB_H
 #define YAHOO_LIB_H
 
+void dissect_yhoo(const u_char *, int, frame_data *, proto_tree *);
+
 /* Service constants */
 #define YAHOO_SERVICE_LOGON		1
 #define YAHOO_SERVICE_LOGOFF		2
diff --git a/packet.c b/packet.c
index 69bd2ac8f5..a3c7cbb2b2 100644
--- a/packet.c
+++ b/packet.c
@@ -1,7 +1,7 @@
 /* packet.c
  * Routines for packet disassembly
  *
- * $Id: packet.c,v 1.63 2000/01/10 17:32:52 gram Exp $
+ * $Id: packet.c,v 1.64 2000/02/15 21:03:33 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -68,12 +68,21 @@
 #include "timestamp.h"
 #include "file.h"
 
+#include "packet-ascend.h"
 #include "packet-atalk.h"
-
+#include "packet-atm.h"
+#include "packet-clip.h"
+#include "packet-eth.h"
+#include "packet-fddi.h"
 #include "packet-ipv6.h"
-
+#include "packet-lapb.h"
+#include "packet-lapd.h"
+#include "packet-null.h"
+#include "packet-ppp.h"
+#include "packet-raw.h"
 #include "packet-sna.h"
-
+#include "packet-tr.h"
+#include "packet-v120.h"
 #include "packet-vines.h"
 
 #ifndef __RESOLV_H__
diff --git a/packet.h b/packet.h
index 912316e03c..1676c17f7e 100644
--- a/packet.h
+++ b/packet.h
@@ -1,7 +1,7 @@
 /* packet.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet.h,v 1.171 2000/02/09 17:15:47 gram Exp $
+ * $Id: packet.h,v 1.172 2000/02/15 21:03:35 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -266,181 +266,20 @@ void register_init_routine(void (*func)(void));
 /* Call all the registered "init" routines. */
 void init_all_protocols(void);
 
-void dissect_packet(const u_char *, frame_data *, proto_tree *);
-
-/*
- * Routines in packet-*.c
- * Routines should take two args: packet data *, packet_counts *
- * They should never modify the packet data.
- */
-void capture_clip(const u_char *, packet_counts *);
-void capture_fddi(const u_char *, packet_counts *);
-void capture_null(const u_char *, packet_counts *);
-void capture_ppp(const u_char *, packet_counts *);
-void capture_raw(const u_char *, packet_counts *);
-
-/*
- * Routines in packet-*.c
- * Routines should take three args: packet data *, offset, packet_counts *
- * They should never modify the packet data.
- */
-void capture_eth(const u_char *, int, packet_counts *);
-void capture_ip(const u_char *, int, packet_counts *);
-void capture_ipx(const u_char *, int, packet_counts *);
-void capture_isl(const u_char *, int, packet_counts *);
-void capture_llc(const u_char *, int, packet_counts *);
-void capture_netbios(const u_char *, int, packet_counts *);
-void capture_tr(const u_char *, int, packet_counts *);
-void capture_vines(const u_char *, int, packet_counts *);
-void capture_vlan(const u_char *, int, packet_counts *);
-
-/*
- * Routines in packet-*.c
- * Routines should take three args: packet data *, frame_data *, tree *
- * They should never modify the packet data.
- */
-void dissect_ascend(const u_char *, frame_data *, proto_tree *);
-void dissect_atm(const u_char *, frame_data *, proto_tree *);
-void dissect_clip(const u_char *, frame_data *, proto_tree *);
-void dissect_lapb(const u_char *, frame_data *, proto_tree *);
-void dissect_lapd(const u_char *, frame_data *, proto_tree *);
-void dissect_null(const u_char *, frame_data *, proto_tree *);
-void dissect_ppp(const u_char *, frame_data *, proto_tree *);
-void dissect_raw(const u_char *, frame_data *, proto_tree *);
-void dissect_v120(const u_char *, frame_data *, proto_tree *);
-
-/*
- * Routines in packet-*.c
- * Routines should take four args: packet data *, frame_data *, tree *,
- * gboolean
- * They should never modify the packet data.
- */
-void dissect_fddi(const u_char *, frame_data *, proto_tree *, gboolean);
+void init_dissect_rpc(void);
+void init_dissect_udp(void);
+void init_dissect_x25(void);
 
 typedef void	(*DissectFunc)	(const u_char*, int, frame_data*, proto_tree*);
 
 /*
- * Routines in packet-*.c
  * Routines should take four args: packet data *, offset, frame_data *,
  * tree *
  * They should never modify the packet data.
  */
-int dissect_ah(const u_char *, int, frame_data *, proto_tree *);
-void dissect_aarp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_afs(const u_char *, int, frame_data *, proto_tree *);
-void dissect_arp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_auto_rp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_bgp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_bootp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_bpdu(const u_char *, int, frame_data *, proto_tree *);
-void dissect_cdp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_cgmp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_cotp(const u_char *, int, frame_data *, proto_tree *);
+void dissect_packet(const u_char *, frame_data *, proto_tree *);
 void dissect_data(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ddp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_dns(const u_char *, int, frame_data *, proto_tree *);
-void dissect_eigrp(const u_char *, int, frame_data *, proto_tree *);            
-void dissect_esp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_eth(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ftp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ftpdata(const u_char *, int, frame_data *, proto_tree *);
-void dissect_giop(const u_char *, int, frame_data *, proto_tree *);
-void dissect_hsrp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_http(const u_char *, int, frame_data *, proto_tree *);
-void dissect_icmp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_icmpv6(const u_char *, int, frame_data *, proto_tree *);
-void dissect_igmp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ip(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ipcomp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ipp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ipv6(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ipx(const u_char *, int, frame_data *, proto_tree *);
-void dissect_irc(const u_char *, int, frame_data *, proto_tree *);
-void dissect_isis(const u_char *, int, frame_data *, proto_tree *);
-void dissect_isl(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ldap(const u_char *, int, frame_data *, proto_tree *);
-void dissect_llc(const u_char *, int, frame_data *, proto_tree *);
-void dissect_lpd(const u_char *, int, frame_data *, proto_tree *);
-void dissect_mapi(const u_char *, int, frame_data *, proto_tree *);
-void dissect_nbdgm(const u_char *, int, frame_data *, proto_tree *);
-void dissect_netbios(const u_char *, int, frame_data *, proto_tree *);
-void dissect_nbipx(const u_char *, int, frame_data *, proto_tree *);
-void dissect_nbns(const u_char *, int, frame_data *, proto_tree *);
-void dissect_nbss(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ncp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_nntp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ntp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_nwlink_dg(const u_char *, int, frame_data *, proto_tree *);
-void dissect_osi(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ospf(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ospf_hello(const u_char *, int, frame_data *, proto_tree *);
-void dissect_pim(const u_char *, int, frame_data *, proto_tree *);
-void dissect_pop(const u_char *, int, frame_data *, proto_tree *);
-void dissect_pppoed(const u_char *, int, frame_data *, proto_tree *);
-void dissect_pppoes(const u_char *, int, frame_data *, proto_tree *);
-void dissect_icp(const u_char *,int, frame_data *, proto_tree *);
-void dissect_icq(const u_char *,int, frame_data *, proto_tree *);
-void dissect_imap(const u_char *,int, frame_data *, proto_tree *);
-void dissect_isakmp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_pim(const u_char *, int, frame_data *, proto_tree *);
-void dissect_q931(const u_char *, int, frame_data *, proto_tree *);
-void dissect_q2931(const u_char *, int, frame_data *, proto_tree *);
-void dissect_radius(const u_char *, int, frame_data *, proto_tree *);
-void dissect_l2tp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_rip(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ripng(const u_char *, int, frame_data *, proto_tree *);
-void dissect_rsvp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_rtsp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_rx(const u_char *, int, frame_data *, proto_tree *);
-void dissect_sap(const u_char *, int, frame_data *, proto_tree *);
-void dissect_sdp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_sna(const u_char *, int, frame_data *, proto_tree *);
-void dissect_snmp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_sscop(const u_char *, int, frame_data *, proto_tree *);
-void dissect_tacacs(const u_char *, int, frame_data *, proto_tree *);
-void dissect_tacplus(const u_char *, int, frame_data *, proto_tree *);
-void dissect_tcp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_telnet(const u_char *, int, frame_data *, proto_tree *);
-void dissect_tftp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_time(const u_char *, int, frame_data *, proto_tree *);
-void dissect_tns(const u_char *, int, frame_data *, proto_tree *);
-void dissect_tr(const u_char *, int, frame_data *, proto_tree *);
-void dissect_trmac(const u_char *, int, frame_data *, proto_tree *);
-void dissect_udp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vines(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vines_arp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vines_frp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vines_icp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vines_ipc(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vines_rtp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vines_spp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vlan(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vrrp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_vtp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_wccp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_who(const u_char *, int, frame_data *, proto_tree *);
-void dissect_payload_ppp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_x25(const u_char *, int, frame_data *, proto_tree *);
-void dissect_yhoo(const u_char *, int, frame_data *, proto_tree *);
-void dissect_srvloc(const u_char *, int, frame_data *, proto_tree *);
-
-void dissect_smb(const u_char *, int, frame_data *, proto_tree *, int);
-void dissect_pptp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_gre(const u_char *, int, frame_data *, proto_tree *);
 
-/*
- * Routines in packet-*.c
- * Routines should take four args: packet data *, offset, frame_data *,
- * tree *
- * They should never modify the packet data.
- * They should return TRUE if the packet is of the type the routine would
- * dissect, FALSE otherwise.
- */
-gboolean dissect_rpc(const u_char *, int, frame_data *, proto_tree *);
-
-void init_dissect_rpc(void);
-void init_dissect_udp(void);
-void init_dissect_x25(void);
 
 /* These functions are in ethertype.c */
 void capture_ethertype(guint16 etype, int offset,
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 834bd88978..5a43d5a88c 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.2 2000/01/08 19:36:38 gram Exp $
+# $Id: Makefile.am,v 1.3 2000/02/15 21:06:39 gram Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -25,3 +25,7 @@
 SUBDIRS = gryphon
 
 plugindir = @PLUGIN_DIR@
+
+EXTRA_DIST = \
+	plugin_api.c	\
+	plugin_api.h
diff --git a/wiretap/ascend-scanner.l b/wiretap/ascend-scanner.l
index 69097a89dc..90baee246f 100644
--- a/wiretap/ascend-scanner.l
+++ b/wiretap/ascend-scanner.l
@@ -1,7 +1,7 @@
 %{
 /* ascend-scanner.l
  *
- * $Id: ascend-scanner.l,v 1.12 2000/01/22 06:22:35 guy Exp $
+ * $Id: ascend-scanner.l,v 1.13 2000/02/15 21:06:58 gram Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -48,6 +48,11 @@ result = (c==EOF) ? YY_NULL : (buf[0] = c, 1); }
 
 int at_eof;
 int mul, scratch;
+
+/* We don't need yyunput, so use this macro to get it out of the
+ * generated C file, avoiding a compiler warning about its lack of use */
+#define YY_NO_UNPUT 1
+
 %}
 
 /* %option debug */