aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-01-21 07:37:49 +0000
committerGuy Harris <guy@alum.mit.edu>2002-01-21 07:37:49 +0000
commitee5ca25d31984b9768d5ae9419dea0e3b493b479 (patch)
tree8bf88b7d322dbff0c32339f1136ea77ad7dda975
parent64c8032c3b617f4be70603e0779905434546a36f (diff)
Include files from the "epan" directory and subdirectories thereof with
"epan/..." pathnames, so as to avoid collisions with header files in any of the directories in which we look (e.g., "proto.h", as some other package has its own "proto.h" file which it installs in the top-level include directory). Don't add "-I" flags to search "epan", as that's no longer necessary (and we want includes of "epan" headers to fail if the "epan/" is left out, so that we don't re-introduce includes lacking "epan/"). svn path=/trunk/; revision=4586
-rw-r--r--afn.c4
-rw-r--r--asn1.c7
-rw-r--r--capture.c4
-rw-r--r--column.c9
-rw-r--r--configure.in6
-rw-r--r--dftest.c16
-rw-r--r--doc/README.plugins4
-rw-r--r--epan/dfilter/dfilter-int.h7
-rw-r--r--epan/dfilter/dfilter.c7
-rw-r--r--epan/dfilter/dfilter.h9
-rw-r--r--epan/dfilter/dfvm.h7
-rw-r--r--epan/dfilter/gencode.c7
-rw-r--r--epan/dfilter/semcheck.c6
-rw-r--r--epan/dfilter/sttype-range.c7
-rw-r--r--epan/ftypes/ftype-bytes.c6
-rw-r--r--epan/ftypes/ftype-integer.c7
-rw-r--r--epan/ftypes/ftype-ipv4.c6
-rw-r--r--epan/ftypes/ftype-tvbuff.c7
-rw-r--r--epan/ftypes/ftypes-int.h7
-rw-r--r--epan/ftypes/ftypes.h10
-rw-r--r--file.c14
-rw-r--r--file.h6
-rw-r--r--filters.c4
-rw-r--r--follow.c7
-rw-r--r--follow.h7
-rw-r--r--globals.h4
-rw-r--r--greproto.h5
-rw-r--r--gtk/Makefile.nmake2
-rw-r--r--gtk/capture_dlg.c4
-rw-r--r--gtk/color_dlg.c6
-rw-r--r--gtk/colors.c6
-rw-r--r--gtk/colors.h11
-rw-r--r--gtk/decode_as_dlg.c6
-rw-r--r--gtk/display_opts.c8
-rw-r--r--gtk/file_dlg.c4
-rw-r--r--gtk/find_dlg.c9
-rw-r--r--gtk/follow_dlg.c6
-rw-r--r--gtk/goto_dlg.c4
-rw-r--r--gtk/help_dlg.c4
-rw-r--r--gtk/main.c18
-rw-r--r--gtk/menu.c10
-rw-r--r--gtk/nameres_prefs.c4
-rw-r--r--gtk/packet_win.c14
-rw-r--r--gtk/plugins_dlg.c7
-rw-r--r--gtk/prefs_dlg.c4
-rw-r--r--gtk/print_dlg.c4
-rw-r--r--gtk/proto_draw.c4
-rw-r--r--gtk/tcp_graph.c4
-rw-r--r--ipproto.c6
-rwxr-xr-xncp2222.py6
-rw-r--r--packet-aarp.c6
-rw-r--r--packet-afs.c8
-rw-r--r--packet-aim.c6
-rw-r--r--packet-arp.c8
-rw-r--r--packet-ascend.c4
-rw-r--r--packet-atalk.c6
-rw-r--r--packet-atm.c6
-rw-r--r--packet-auto_rp.c6
-rw-r--r--packet-bacapp.c4
-rw-r--r--packet-bacnet.c4
-rw-r--r--packet-beep.c8
-rw-r--r--packet-bgp.c4
-rw-r--r--packet-bootp.c6
-rw-r--r--packet-bpdu.c6
-rw-r--r--packet-bvlc.c6
-rw-r--r--packet-cdp.c6
-rw-r--r--packet-cgmp.c4
-rw-r--r--packet-chdlc.c6
-rw-r--r--packet-clip.c4
-rw-r--r--packet-clnp.c4
-rw-r--r--packet-cops.c4
-rw-r--r--packet-cups.c6
-rw-r--r--packet-data.c4
-rw-r--r--packet-dcerpc-conv.c4
-rw-r--r--packet-dcerpc-dfs.c4
-rw-r--r--packet-dcerpc-epm.c4
-rw-r--r--packet-dcerpc-lsa.c4
-rw-r--r--packet-dcerpc-mgmt.c4
-rw-r--r--packet-dcerpc-ndr.c4
-rw-r--r--packet-dcerpc-netlogon.c4
-rw-r--r--packet-dcerpc-nt.c4
-rw-r--r--packet-dcerpc-oxid.c4
-rw-r--r--packet-dcerpc-reg.c4
-rw-r--r--packet-dcerpc-remact.c4
-rw-r--r--packet-dcerpc-samr.c4
-rw-r--r--packet-dcerpc-spoolss.c4
-rw-r--r--packet-dcerpc-srvsvc.c4
-rw-r--r--packet-dcerpc-wkssvc.c4
-rw-r--r--packet-dcerpc.c6
-rw-r--r--packet-dcerpc.h4
-rw-r--r--packet-ddtp.c4
-rw-r--r--packet-dec-bpdu.c6
-rw-r--r--packet-dhcpv6.c8
-rw-r--r--packet-diameter.c8
-rw-r--r--packet-dlsw.c4
-rw-r--r--packet-dns.c6
-rw-r--r--packet-dsi.c8
-rw-r--r--packet-dvmrp.c4
-rw-r--r--packet-eap.c4
-rw-r--r--packet-eapol.c4
-rw-r--r--packet-eigrp.c8
-rw-r--r--packet-esis.c4
-rw-r--r--packet-eth.c6
-rw-r--r--packet-ethertype.c4
-rw-r--r--packet-fddi.c8
-rw-r--r--packet-fr.c6
-rw-r--r--packet-frame.c8
-rw-r--r--packet-ftp.c8
-rw-r--r--packet-giop.c4
-rw-r--r--packet-gmrp.c2
-rw-r--r--packet-gnutella.c4
-rw-r--r--packet-gre.c4
-rw-r--r--packet-gtp.c4
-rw-r--r--packet-gvrp.c4
-rw-r--r--packet-h1.c4
-rw-r--r--packet-h261.c4
-rw-r--r--packet-hsrp.c4
-rw-r--r--packet-http.c6
-rw-r--r--packet-icap.c4
-rw-r--r--packet-icmpv6.c6
-rw-r--r--packet-icp.c6
-rw-r--r--packet-icq.c6
-rw-r--r--packet-ieee80211.c10
-rw-r--r--packet-ieee8023.c7
-rw-r--r--packet-igmp.c4
-rw-r--r--packet-igrp.c4
-rw-r--r--packet-imap.c6
-rw-r--r--packet-ip.c6
-rw-r--r--packet-ipp.c6
-rw-r--r--packet-ipsec.c6
-rw-r--r--packet-ipv6.c6
-rw-r--r--packet-ipv6.h4
-rw-r--r--packet-ipx.c6
-rw-r--r--packet-irc.c4
-rw-r--r--packet-isakmp.c4
-rw-r--r--packet-iscsi.c6
-rw-r--r--packet-isis-clv.c4
-rw-r--r--packet-isis-hello.c4
-rw-r--r--packet-isis-lsp.c6
-rw-r--r--packet-isis-snp.c4
-rw-r--r--packet-isis.c4
-rw-r--r--packet-isl.c4
-rw-r--r--packet-isup.c4
-rw-r--r--packet-iua.c4
-rw-r--r--packet-kerberos.c6
-rw-r--r--packet-l2tp.c6
-rw-r--r--packet-lapb.c4
-rw-r--r--packet-lapbether.c4
-rw-r--r--packet-lapd.c4
-rw-r--r--packet-ldap.c4
-rw-r--r--packet-ldp.c6
-rw-r--r--packet-llc.c6
-rw-r--r--packet-lmi.c4
-rw-r--r--packet-lpd.c4
-rw-r--r--packet-m2pa.c4
-rw-r--r--packet-m2tp.c4
-rw-r--r--packet-m3ua.c4
-rw-r--r--packet-mapi.c4
-rw-r--r--packet-mbtcp.c4
-rw-r--r--packet-mip.c4
-rw-r--r--packet-mmse.c4
-rw-r--r--packet-mpeg1.c4
-rw-r--r--packet-mpls.c4
-rw-r--r--packet-mrdisc.c4
-rw-r--r--packet-msdp.c4
-rw-r--r--packet-msnip.c4
-rw-r--r--packet-msproxy.c8
-rw-r--r--packet-mtp2.c4
-rw-r--r--packet-mtp3.c4
-rw-r--r--packet-nbipx.c4
-rw-r--r--packet-nbns.c4
-rw-r--r--packet-ncp.c6
-rw-r--r--packet-ndmp.c4
-rw-r--r--packet-netbios.c4
-rw-r--r--packet-nntp.c6
-rw-r--r--packet-ntp.c6
-rw-r--r--packet-null.c6
-rw-r--r--packet-osi-options.c7
-rw-r--r--packet-osi.c4
-rw-r--r--packet-osi.h4
-rw-r--r--packet-ospf.c4
-rw-r--r--packet-pgm.c12
-rw-r--r--packet-pim.c4
-rw-r--r--packet-pop.c6
-rw-r--r--packet-ppp.c6
-rw-r--r--packet-pppoe.c6
-rw-r--r--packet-pptp.c4
-rw-r--r--packet-prism.c4
-rw-r--r--packet-q2931.c4
-rw-r--r--packet-q931.c6
-rw-r--r--packet-qllc.c4
-rw-r--r--packet-quake.c6
-rw-r--r--packet-quake2.c4
-rw-r--r--packet-quake3.c6
-rw-r--r--packet-quakeworld.c4
-rw-r--r--packet-radius.c6
-rw-r--r--packet-ranap.c4
-rw-r--r--packet-raw.c4
-rw-r--r--packet-rip.c4
-rw-r--r--packet-ripng.c4
-rw-r--r--packet-rlogin.c6
-rw-r--r--packet-rpc.c6
-rw-r--r--packet-rpc.h6
-rw-r--r--packet-rsh.c6
-rw-r--r--packet-rsvp.c6
-rw-r--r--packet-rtcp.c6
-rw-r--r--packet-rtp.c6
-rw-r--r--packet-rtsp.c8
-rw-r--r--packet-rx.c6
-rw-r--r--packet-sap.c4
-rw-r--r--packet-scsi.c6
-rw-r--r--packet-sctp.c4
-rw-r--r--packet-sdp.c6
-rw-r--r--packet-sip.c4
-rw-r--r--packet-skinny.c6
-rw-r--r--packet-slimp3.c6
-rw-r--r--packet-sll.c6
-rw-r--r--packet-smb-browse.c6
-rw-r--r--packet-smb-common.h6
-rw-r--r--packet-smb-pipe.c6
-rw-r--r--packet-smb.c8
-rw-r--r--packet-smpp.c4
-rw-r--r--packet-smtp.c10
-rw-r--r--packet-sna.c6
-rw-r--r--packet-snmp.c8
-rw-r--r--packet-socks.c10
-rw-r--r--packet-srvloc.c6
-rw-r--r--packet-sscop.c4
-rw-r--r--packet-ssl.c4
-rw-r--r--packet-sua.c4
-rw-r--r--packet-syslog.c4
-rw-r--r--packet-tacacs.c4
-rw-r--r--packet-tcp.c8
-rw-r--r--packet-telnet.c6
-rw-r--r--packet-tftp.c6
-rw-r--r--packet-time.c4
-rw-r--r--packet-tns.c4
-rw-r--r--packet-tpkt.c4
-rw-r--r--packet-tr.c4
-rw-r--r--packet-trmac.c4
-rw-r--r--packet-ucp.c4
-rw-r--r--packet-udp.c8
-rw-r--r--packet-v120.c4
-rw-r--r--packet-vines.c4
-rw-r--r--packet-vines.h4
-rw-r--r--packet-vj.c4
-rw-r--r--packet-vlan.c4
-rw-r--r--packet-vrrp.c4
-rw-r--r--packet-vtp.c4
-rw-r--r--packet-wap.c4
-rw-r--r--packet-wap.h4
-rw-r--r--packet-wccp.c6
-rw-r--r--packet-wcp.c6
-rw-r--r--packet-who.c4
-rw-r--r--packet-wsp.c8
-rw-r--r--packet-wtls.c4
-rw-r--r--packet-wtp.c4
-rw-r--r--packet-x11.c4
-rw-r--r--packet-x25.c4
-rw-r--r--packet-xot.c4
-rw-r--r--packet-yhoo.c4
-rw-r--r--packet-zebra.c4
-rw-r--r--plugins/Makefile.nmake4
-rw-r--r--plugins/giop/Makefile.nmake4
-rw-r--r--plugins/giop/packet-coseventcomm.c4
-rw-r--r--plugins/giop/packet-cosnaming.c4
-rw-r--r--plugins/gryphon/Makefile.nmake4
-rw-r--r--plugins/gryphon/packet-gryphon.c4
-rw-r--r--plugins/mgcp/Makefile.nmake4
-rw-r--r--plugins/mgcp/packet-mgcp.c8
-rw-r--r--plugins/plugin_api.h6
-rw-r--r--prefs.c10
-rw-r--r--print.c6
-rw-r--r--print.h4
-rw-r--r--proto_hier_stats.c4
-rw-r--r--proto_hier_stats.h4
-rw-r--r--ptvcursor.h6
-rw-r--r--reassemble.c4
-rw-r--r--summary.c8
-rw-r--r--tethereal.c16
-rw-r--r--xdlc.c4
281 files changed, 752 insertions, 773 deletions
diff --git a/afn.c b/afn.c
index 93b398859f..c819c7023f 100644
--- a/afn.c
+++ b/afn.c
@@ -1,7 +1,7 @@
/* afn.c
* RFC 1700 address family numbers
*
- * $Id: afn.c,v 1.1 2001/07/21 10:27:12 guy Exp $
+ * $Id: afn.c,v 1.2 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -26,7 +26,7 @@
# include "config.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "afn.h"
const value_string afn_vals[] = {
diff --git a/asn1.c b/asn1.c
index f9696d1853..6cc4f0c868 100644
--- a/asn1.c
+++ b/asn1.c
@@ -1,10 +1,10 @@
/* asn1.c
* Routines for ASN.1 BER dissection
*
- * $Id: asn1.c,v 1.7 2001/04/15 07:30:02 guy Exp $
+ * $Id: asn1.c,v 1.8 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
*
* Based on "g_asn1.c" from:
*
@@ -25,7 +25,6 @@
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
*/
/*
@@ -70,7 +69,7 @@
#endif
#include <glib.h>
-#include "tvbuff.h"
+#include <epan/tvbuff.h>
#include "asn1.h"
/*
diff --git a/capture.c b/capture.c
index c90f451bff..740dfad242 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
/* capture.c
* Routines for packet capture windows
*
- * $Id: capture.c,v 1.167 2002/01/10 11:05:48 guy Exp $
+ * $Id: capture.c,v 1.168 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -137,7 +137,7 @@
#include "gtk/main.h"
#include "gtk/gtkglobals.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "file.h"
#include "capture.h"
#include "util.h"
diff --git a/column.c b/column.c
index 95fc361775..d014bc218c 100644
--- a/column.c
+++ b/column.c
@@ -1,12 +1,11 @@
/* column.c
* Routines for handling column preferences
*
- * $Id: column.c,v 1.34 2001/07/22 21:56:25 guy Exp $
+ * $Id: column.c,v 1.35 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* 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
@@ -44,10 +43,10 @@
#include <sys/stat.h>
#endif
-#include "timestamp.h"
+#include <epan/timestamp.h>
#include "prefs.h"
#include "column.h"
-#include "packet.h"
+#include <epan/packet.h>
/* Given a format number (as defined in packet.h), returns its equivalent
string */
diff --git a/configure.in b/configure.in
index 24eba41710..7f2f76735b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.145 2002/01/20 23:05:22 gerald Exp $
+# $Id: configure.in,v 1.146 2002/01/21 07:36:31 guy Exp $
dnl
dnl Process this file with autoconf 2.13 or later to produce a
dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -114,8 +114,8 @@ else
esac
fi
-CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap -I\$(top_srcdir)/epan"
-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap -I\$(top_srcdir)/epan"
+CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
+CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
dnl Look in /usr/local for header files and libraries ?
AC_ARG_ENABLE(usr-local,
diff --git a/dftest.c b/dftest.c
index 7556d77360..fa7e0aac2f 100644
--- a/dftest.c
+++ b/dftest.c
@@ -1,9 +1,9 @@
/* dftest.c.c
*
- * $Id: dftest.c,v 1.2 2001/04/02 00:38:33 hagbard Exp $
+ * $Id: dftest.c,v 1.3 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* Shows display filter byte-code, for debugging dfilter routines.
@@ -65,19 +65,19 @@
#endif
#include <glib.h>
-#include <epan.h>
+#include <epan/epan.h>
#if 0
#include "globals.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "file.h"
#include "column.h"
#include "print.h"
-#include "resolv.h"
-#include "conversation.h"
+#include <epan/resolv.h>
+#include <epan/conversation.h>
#endif
-#include "timestamp.h"
-#include "plugins.h"
+#include <epan/timestamp.h>
+#include <epan/plugins.h>
#include "prefs.h"
#include "util.h"
#include "epan/dfilter/dfilter.h"
diff --git a/doc/README.plugins b/doc/README.plugins
index c5213dfd35..5bbefcec81 100644
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -1,4 +1,4 @@
-$Id: README.plugins,v 1.4 2001/11/13 23:55:35 gram Exp $
+$Id: README.plugins,v 1.5 2002/01/21 07:37:36 guy Exp $
Plugins
@@ -140,7 +140,7 @@ include ..\..\config.nmake
############### no need to modify below this line #########
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h
index 89e1857f8f..1bd2f04754 100644
--- a/epan/dfilter/dfilter-int.h
+++ b/epan/dfilter/dfilter-int.h
@@ -1,10 +1,9 @@
/*
- * $Id: dfilter-int.h,v 1.4 2001/12/18 19:09:06 gram Exp $
+ * $Id: dfilter-int.h,v 1.5 2002/01/21 07:37:37 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2001 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -27,7 +26,7 @@
#include "dfilter.h"
#include "syntax-tree.h"
-#include "proto.h"
+#include <epan/proto.h>
/* Passed back to user */
struct _dfilter_t {
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index 1f5743d23e..8c4aacbe7f 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -1,10 +1,9 @@
/*
- * $Id: dfilter.c,v 1.6 2001/12/18 19:09:06 gram Exp $
+ * $Id: dfilter.c,v 1.7 2002/01/21 07:37:37 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2001 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -37,7 +36,7 @@
#include "gencode.h"
#include "semcheck.h"
#include "dfvm.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
/* Balanced tree of abbreviations and IDs */
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index 49eba9c5db..aa6ef4321e 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -1,10 +1,9 @@
/*
- * $Id: dfilter.h,v 1.3 2001/12/18 19:09:06 gram Exp $
+ * $Id: dfilter.h,v 1.4 2002/01/21 07:37:37 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2001 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -29,8 +28,8 @@
/* Passed back to user */
typedef struct _dfilter_t dfilter_t;
-#include "epan.h"
-#include "proto.h"
+#include <epan/epan.h>
+#include <epan/proto.h>
/* Module-level initialization */
diff --git a/epan/dfilter/dfvm.h b/epan/dfilter/dfvm.h
index c4b00c655c..954027626c 100644
--- a/epan/dfilter/dfvm.h
+++ b/epan/dfilter/dfvm.h
@@ -1,10 +1,9 @@
/*
- * $Id: dfvm.h,v 1.3 2001/02/27 19:23:28 gram Exp $
+ * $Id: dfvm.h,v 1.4 2002/01/21 07:37:37 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2001 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -25,7 +24,7 @@
#define DFVM_H
#include <stdio.h>
-#include "proto.h"
+#include <epan/proto.h>
#include "dfilter-int.h"
#include "syntax-tree.h"
#include "drange.h"
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c
index d8d0119005..985a38a7e9 100644
--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.c
@@ -1,10 +1,9 @@
/*
- * $Id: gencode.c,v 1.4 2001/12/18 19:09:06 gram Exp $
+ * $Id: gencode.c,v 1.5 2002/01/21 07:37:37 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2001 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -31,7 +30,7 @@
#include "sttype-range.h"
#include "sttype-test.h"
#include "ftypes/ftypes.h"
-#include "gdebug.h"
+#include <epan/gdebug.h>
static void
gencode(dfwork_t *dfw, stnode_t *st_node);
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 5afb7b6b0a..4871507c50 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -1,5 +1,5 @@
/*
- * $Id: semcheck.c,v 1.7 2001/12/18 19:09:06 gram Exp $
+ * $Id: semcheck.c,v 1.8 2002/01/21 07:37:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,8 +31,8 @@
#include "sttype-range.h"
#include "sttype-test.h"
-#include "exceptions.h"
-#include "packet.h"
+#include <epan/exceptions.h>
+#include <epan/packet.h>
static void
semcheck(dfwork_t *dfw, stnode_t *st_node);
diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c
index 1195223eb1..79c4094f22 100644
--- a/epan/dfilter/sttype-range.c
+++ b/epan/dfilter/sttype-range.c
@@ -1,10 +1,9 @@
/*
- * $Id: sttype-range.c,v 1.3 2001/02/27 19:23:28 gram Exp $
+ * $Id: sttype-range.c,v 1.4 2002/01/21 07:37:37 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2001 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -32,7 +31,7 @@
#include <glib.h>
-#include "proto.h"
+#include <epan/proto.h>
#include "drange.h"
#include "sttype-range.h"
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index 63c7327501..facd917635 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-bytes.c,v 1.8 2001/11/22 03:07:07 hagbard Exp $
+ * $Id: ftype-bytes.c,v 1.9 2002/01/21 07:37:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -27,8 +27,8 @@
#include <ftypes-int.h>
#include <string.h>
#include <ctype.h>
-#include "resolv.h"
-#include "int-64bit.h"
+#include <epan/resolv.h>
+#include <epan/int-64bit.h>
#define ETHER_LEN 6
#define IPv6_LEN 16
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index fcfd996e97..08c22f6142 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -1,10 +1,9 @@
/*
- * $Id: ftype-integer.c,v 1.6 2001/07/13 00:55:56 guy Exp $
+ * $Id: ftype-integer.c,v 1.7 2002/01/21 07:37:39 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2001 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -33,7 +32,7 @@
#include <stdlib.h>
#include <errno.h>
#include "ftypes-int.h"
-#include "resolv.h"
+#include <epan/resolv.h>
static void
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c
index 0037923a92..7ab297e3a5 100644
--- a/epan/ftypes/ftype-ipv4.c
+++ b/epan/ftypes/ftype-ipv4.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-ipv4.c,v 1.6 2001/07/13 00:55:56 guy Exp $
+ * $Id: ftype-ipv4.c,v 1.7 2002/01/21 07:37:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -27,8 +27,8 @@
#include <string.h>
#include <ftypes-int.h>
-#include "ipv4.h"
-#include "resolv.h"
+#include <epan/ipv4.h>
+#include <epan/resolv.h>
static void
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index 97e3fa7ed2..1fd9abad2a 100644
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -1,10 +1,9 @@
/*
- * $Id: ftype-tvbuff.c,v 1.5 2001/03/13 21:34:28 gram Exp $
+ * $Id: ftype-tvbuff.c,v 1.6 2002/01/21 07:37:39 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2001 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -26,7 +25,7 @@
#endif
#include <ftypes-int.h>
-#include "gdebug.h"
+#include <epan/gdebug.h>
static void
value_new(fvalue_t *fv)
diff --git a/epan/ftypes/ftypes-int.h b/epan/ftypes/ftypes-int.h
index 32b4152310..f67297c5f2 100644
--- a/epan/ftypes/ftypes-int.h
+++ b/epan/ftypes/ftypes-int.h
@@ -1,10 +1,9 @@
/*
- * $Id: ftypes-int.h,v 1.4 2001/03/02 17:17:56 gram Exp $
+ * $Id: ftypes-int.h,v 1.5 2002/01/21 07:37:39 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2001 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -24,7 +23,7 @@
#ifndef FTYPES_INT_H
#define FTYPES_INT_H
-#include "packet.h"
+#include <epan/packet.h>
#include "ftypes.h"
typedef void (*FvalueNewFunc)(fvalue_t*);
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index 0bf117944a..a713ef7c2b 100644
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -1,7 +1,7 @@
/* ftypes.h
* Definitions for field types
*
- * $Id: ftypes.h,v 1.7 2001/11/02 10:09:51 guy Exp $
+ * $Id: ftypes.h,v 1.8 2002/01/21 07:37:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -112,15 +112,15 @@ ftype_can_le(enum ftenum ftype);
/* ---------------- FVALUE ----------------- */
-#include "ipv4.h"
+#include <epan/ipv4.h>
#ifdef HAVE_WINSOCK_H
#include <winsock.h>
#endif
-#include "tvbuff.h"
-#include "nstime.h"
-#include "dfilter/drange.h"
+#include <epan/tvbuff.h>
+#include <epan/nstime.h>
+#include <epan/dfilter/drange.h>
typedef struct {
ftype_t *ftype;
diff --git a/file.c b/file.c
index e7b858815a..4859ac2972 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
- * $Id: file.c,v 1.258 2002/01/10 11:05:48 guy Exp $
+ * $Id: file.c,v 1.259 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -68,14 +68,14 @@
# include <netinet/in.h>
#endif
-#include <epan.h>
-#include <filesystem.h>
+#include <epan/epan.h>
+#include <epan/filesystem.h>
#include "gtk/main.h"
#include "color.h"
#include "gtk/color_utils.h"
#include "column.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "print.h"
#include "file.h"
#include "menu.h"
@@ -87,12 +87,12 @@
#include "prefs.h"
#include "gtk/proto_draw.h"
#include "gtk/packet_win.h"
-#include "dfilter/dfilter.h"
-#include "conversation.h"
+#include <epan/dfilter/dfilter.h>
+#include <epan/conversation.h>
#include "reassemble.h"
#include "globals.h"
#include "gtk/colors.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
extern GtkWidget *packet_list, *byte_nb_ptr, *tree_view;
diff --git a/file.h b/file.h
index fc7d26ec1b..78b21aab0b 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,7 @@
/* file.h
* Definitions for file structures and routines
*
- * $Id: file.h,v 1.88 2001/12/06 04:25:07 gram Exp $
+ * $Id: file.h,v 1.89 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -30,10 +30,10 @@
#endif
#include "wiretap/wtap.h"
-#include "dfilter/dfilter.h"
+#include <epan/dfilter/dfilter.h>
#include "print.h"
#include <errno.h>
-#include <epan.h>
+#include <epan/epan.h>
/* Current state of file. */
typedef enum {
diff --git a/filters.c b/filters.c
index e904d8c5a9..5aaaeb0407 100644
--- a/filters.c
+++ b/filters.c
@@ -1,7 +1,7 @@
/* filters.c
* Code for reading and writing the filters file.
*
- * $Id: filters.c,v 1.13 2001/10/24 07:18:36 guy Exp $
+ * $Id: filters.c,v 1.14 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,7 +37,7 @@
#include <glib.h>
-#include <filesystem.h>
+#include <epan/filesystem.h>
#include "filters.h"
diff --git a/follow.c b/follow.c
index 3ecb36f613..f4911b4575 100644
--- a/follow.c
+++ b/follow.c
@@ -1,13 +1,12 @@
/* follow.c
*
- * $Id: follow.c,v 1.27 2001/05/24 23:07:40 guy Exp $
+ * $Id: follow.c,v 1.28 2002/01/21 07:36:31 guy Exp $
*
* Copyright 1998 Mike Hall <mlh@io.com>
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* 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
@@ -41,7 +40,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "follow.h"
FILE* data_out_file;
diff --git a/follow.h b/follow.h
index 02c8236fe1..6ba6d77161 100644
--- a/follow.h
+++ b/follow.h
@@ -1,13 +1,12 @@
/* follow.h
*
- * $Id: follow.h,v 1.10 2000/08/11 22:18:13 deniel Exp $
+ * $Id: follow.h,v 1.11 2002/01/21 07:36:31 guy Exp $
*
* Copyright 1998 Mike Hall <mlh@io.com>
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* 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
@@ -28,7 +27,7 @@
#ifndef __FOLLOW_H__
#define __FOLLOW_H__
-#include "packet.h"
+#include <epan/packet.h>
#define MAX_IPADDR_LEN 16
diff --git a/globals.h b/globals.h
index 94b37fd91f..cff4aea57d 100644
--- a/globals.h
+++ b/globals.h
@@ -1,7 +1,7 @@
/* globals.h
* Global defines, etc.
*
- * $Id: globals.h,v 1.27 2002/01/10 11:05:48 guy Exp $
+ * $Id: globals.h,v 1.28 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -27,7 +27,7 @@
#include <stdio.h>
#include "file.h"
-#include "timestamp.h"
+#include <epan/timestamp.h>
#define MIN_PACKET_SIZE 68 /* minimum amount of packet data we can read */
diff --git a/greproto.h b/greproto.h
index 96d34227d6..1451752964 100644
--- a/greproto.h
+++ b/greproto.h
@@ -10,12 +10,11 @@
* definition for them; when this file is empty, get rid of all includes
* of it, and get rid of it.
*
- * $Id: greproto.h,v 1.1 2001/01/13 07:47:48 guy Exp $
+ * $Id: greproto.h,v 1.2 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* 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
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 8b7488a059..9f6f07a291 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -2,7 +2,7 @@ include ..\config.nmake
############### no need to modify below this line #########
-CFLAGS=-DHAVE_CONFIG_H /I.. /I../epan /I../wiretap \
+CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 8bf437d433..49eabe85e6 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
- * $Id: capture_dlg.c,v 1.56 2002/01/13 20:35:11 guy Exp $
+ * $Id: capture_dlg.c,v 1.57 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
#include "capture.h"
#include "globals.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "main.h"
#include "ui_util.h"
#include "capture_dlg.h"
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 2672a98eaf..a04416c24c 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,7 +1,7 @@
/* color_dlg.c
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.c,v 1.11 2001/12/03 02:37:25 guy Exp $
+ * $Id: color_dlg.c,v 1.12 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -38,11 +38,11 @@
#endif
#include "gtk/main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "colors.h"
#include "color_dlg.h"
#include "file.h"
-#include "dfilter/dfilter.h"
+#include <epan/dfilter/dfilter.h>
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "ui_util.h"
diff --git a/gtk/colors.c b/gtk/colors.c
index bfd7ead5c6..e24e844f65 100644
--- a/gtk/colors.c
+++ b/gtk/colors.c
@@ -1,7 +1,7 @@
/* colors.c
* Definitions for color structures and routines
*
- * $Id: colors.c,v 1.18 2002/01/08 21:35:17 guy Exp $
+ * $Id: colors.c,v 1.19 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,10 +43,10 @@
#include <epan/filesystem.h>
#include "gtk/main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "colors.h"
#include "file.h"
-#include "dfilter/dfilter.h"
+#include <epan/dfilter/dfilter.h>
#include "simple_dialog.h"
extern capture_file cf;
diff --git a/gtk/colors.h b/gtk/colors.h
index b5e80ff67d..8f1a3d6f81 100644
--- a/gtk/colors.h
+++ b/gtk/colors.h
@@ -1,12 +1,11 @@
/* colors.h
* Definitions for color structures and routines
*
- * $Id: colors.h,v 1.5 2001/12/18 19:09:07 gram Exp $
+ * $Id: colors.h,v 1.6 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* 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
@@ -25,10 +24,10 @@
#ifndef __COLORS_H__
#define __COLORS_H__
-#include "proto.h"
-#include "dfilter/dfilter.h"
+#include <epan/proto.h>
+#include <epan/dfilter/dfilter.h>
#include <gtk/gtk.h>
-#include "epan.h"
+#include <epan/epan.h>
#define MAXCOLORS 255
#define MAX_COLOR_FILTER_NAME_LEN 33
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 13b45d64e5..ddcff3fa05 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1,6 +1,6 @@
/* decode_as_dlg.c
*
- * $Id: decode_as_dlg.c,v 1.21 2001/12/18 19:09:07 gram Exp $
+ * $Id: decode_as_dlg.c,v 1.22 2002/01/21 07:37:41 guy Exp $
*
* Routines to modify dissector tables on the fly.
*
@@ -42,10 +42,10 @@
#include "dlg_utils.h"
#include "globals.h"
#include "simple_dialog.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "ui_util.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
#undef DEBUG
diff --git a/gtk/display_opts.c b/gtk/display_opts.c
index 5c493e660b..b0cd04af61 100644
--- a/gtk/display_opts.c
+++ b/gtk/display_opts.c
@@ -1,7 +1,7 @@
/* display_opts.c
* Routines for packet display windows
*
- * $Id: display_opts.c,v 1.24 2002/01/13 20:35:11 guy Exp $
+ * $Id: display_opts.c,v 1.25 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -51,9 +51,9 @@
#endif
#include "globals.h"
-#include "resolv.h"
-#include "timestamp.h"
-#include "packet.h"
+#include <epan/resolv.h>
+#include <epan/timestamp.h>
+#include <epan/packet.h>
#include "file.h"
#include "display_opts.h"
#include "ui_util.h"
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 2257894a5f..e95c7a812b 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -1,7 +1,7 @@
/* file_dlg.c
* Dialog boxes for handling files
*
- * $Id: file_dlg.c,v 1.47 2002/01/13 20:35:11 guy Exp $
+ * $Id: file_dlg.c,v 1.48 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,7 +42,7 @@
#include "globals.h"
#include "gtkglobals.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "keys.h"
#include "filter_prefs.h"
#include "ui_util.h"
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 18b827f8f5..99dc35ef6d 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -1,12 +1,11 @@
/* find_dlg.c
* Routines for "find frame" window
*
- * $Id: find_dlg.c,v 1.19 2001/02/01 20:21:21 gram Exp $
+ * $Id: find_dlg.c,v 1.20 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* 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
@@ -36,8 +35,8 @@
#include <glib.h>
-#include "proto.h"
-#include "dfilter/dfilter.h"
+#include <epan/proto.h>
+#include <epan/dfilter/dfilter.h>
#include "globals.h"
#include "ui_util.h"
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index eac6965fd7..65751ee27f 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,6 +1,6 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.c,v 1.19 2002/01/18 19:46:19 guy Exp $
+ * $Id: follow_dlg.c,v 1.20 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -68,10 +68,10 @@
#include "simple_dialog.h"
#include "packet-ipv6.h"
#include "prefs.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "util.h"
#include "ui_util.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
/* Show Stream */
typedef enum {
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index 6fde232e79..0fed71f650 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -1,7 +1,7 @@
/* goto_dlg.c
* Routines for "go to frame" window
*
- * $Id: goto_dlg.c,v 1.13 2002/01/11 07:40:31 guy Exp $
+ * $Id: goto_dlg.c,v 1.14 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,7 +37,7 @@
#include <glib.h>
-#include "proto.h"
+#include <epan/proto.h>
#include "globals.h"
#include "goto_dlg.h"
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index 9d6941502e..2f4087d1cb 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -1,6 +1,6 @@
/* help_dlg.c
*
- * $Id: help_dlg.c,v 1.20 2002/01/11 07:40:31 guy Exp $
+ * $Id: help_dlg.c,v 1.21 2002/01/21 07:37:41 guy Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@@ -46,7 +46,7 @@
#include "gtkglobals.h"
#include "main.h"
#include "ui_util.h"
-#include "proto.h"
+#include <epan/proto.h>
typedef enum {
OVERVIEW_HELP,
diff --git a/gtk/main.c b/gtk/main.c
index 5a2ad80efe..68d0fabbab 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.230 2002/01/18 07:29:40 guy Exp $
+ * $Id: main.c,v 1.231 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -111,13 +111,13 @@
#include <conio.h>
#endif
-#include <epan.h>
+#include <epan/epan.h>
#include <epan/filesystem.h>
-#include <epan_dissect.h>
+#include <epan/epan_dissect.h>
#include "main.h"
-#include "timestamp.h"
-#include "packet.h"
+#include <epan/timestamp.h>
+#include <epan/packet.h>
#include "capture.h"
#include "summary.h"
#include "file.h"
@@ -131,20 +131,20 @@
#include "file_dlg.h"
#include "column.h"
#include "print.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#ifdef HAVE_LIBPCAP
#include "pcap-util.h"
#endif
#include "statusbar.h"
#include "simple_dialog.h"
#include "proto_draw.h"
-#include "dfilter/dfilter.h"
+#include <epan/dfilter/dfilter.h>
#include "keys.h"
#include "packet_win.h"
#include "gtkglobals.h"
-#include "plugins.h"
+#include <epan/plugins.h>
#include "colors.h"
-#include "strutil.h"
+#include <epan/strutil.h>
#include "register.h"
#include "ringbuffer.h"
#include "ui_util.h"
diff --git a/gtk/menu.c b/gtk/menu.c
index 732daf8b24..cb542145c3 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.61 2002/01/13 20:35:12 guy Exp $
+ * $Id: menu.c,v 1.62 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -40,8 +40,8 @@
#include "main.h"
#include "menu.h"
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "prefs.h"
#include "capture_dlg.h"
#include "color_dlg.h"
@@ -60,9 +60,9 @@
#include "proto_dlg.h"
#include "proto_hier_stats_dlg.h"
#include "keys.h"
-#include "plugins.h"
+#include <epan/plugins.h>
#include "tcp_graph.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
GtkWidget *popup_menu_object;
diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c
index 08d10587fd..6ae9ea49af 100644
--- a/gtk/nameres_prefs.c
+++ b/gtk/nameres_prefs.c
@@ -1,7 +1,7 @@
/* nameres_prefs.c
* Dialog box for name resolution preferences
*
- * $Id: nameres_prefs.c,v 1.2 2002/01/20 20:05:18 guy Exp $
+ * $Id: nameres_prefs.c,v 1.3 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,7 +33,7 @@
#include "globals.h"
#include "nameres_prefs.h"
#include "gtkglobals.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "prefs.h"
#include "prefs_dlg.h"
#include "ui_util.h"
diff --git a/gtk/packet_win.c b/gtk/packet_win.c
index 302eefa327..922cd3ff5d 100644
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet_win.c,v 1.31 2002/01/11 07:40:31 guy Exp $
+ * $Id: packet_win.c,v 1.32 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -45,10 +45,10 @@
#include <unistd.h>
#endif
-#include <epan.h>
+#include <epan/epan.h>
#include "main.h"
-#include "timestamp.h"
-#include "packet.h"
+#include <epan/timestamp.h>
+#include <epan/packet.h>
#include "summary.h"
#include "file.h"
#include "prefs.h"
@@ -56,14 +56,14 @@
#include "../menu.h"
#include "column.h"
#include "print.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "packet_win.h"
#include "simple_dialog.h"
#include "proto_draw.h"
#include "keys.h"
#include "gtkglobals.h"
-#include "plugins.h"
-#include "epan_dissect.h"
+#include <epan/plugins.h>
+#include <epan/epan_dissect.h>
/* Data structure holding information about a packet-detail window. */
struct PacketWinData {
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c
index 5f427fcd03..41d861dd29 100644
--- a/gtk/plugins_dlg.c
+++ b/gtk/plugins_dlg.c
@@ -1,13 +1,12 @@
/* plugins_dlg.c
* Dialog boxes for plugins
*
- * $Id: plugins_dlg.c,v 1.22 2001/01/28 21:17:29 guy Exp $
+ * $Id: plugins_dlg.c,v 1.23 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1999 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
@@ -38,7 +37,7 @@
#include <gtk/gtk.h>
#include "globals.h"
-#include "plugins.h"
+#include <epan/plugins.h>
#include "dlg_utils.h"
#ifdef HAVE_PLUGINS
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index e3fad138c3..f9ad6da158 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
/* prefs_dlg.c
* Routines for handling preferences
*
- * $Id: prefs_dlg.c,v 1.40 2002/01/20 20:05:18 guy Exp $
+ * $Id: prefs_dlg.c,v 1.41 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -48,7 +48,7 @@
#include <epan/filesystem.h>
#include "main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "file.h"
#include "prefs.h"
#include "column_prefs.h"
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 09de73e4eb..6cdd14211a 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,7 +1,7 @@
/* print_dlg.c
* Dialog boxes for printing
*
- * $Id: print_dlg.c,v 1.28 2002/01/11 07:40:31 guy Exp $
+ * $Id: print_dlg.c,v 1.29 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,7 +37,7 @@
#include "simple_dialog.h"
#include "ui_util.h"
#include "dlg_utils.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
/* On Win32, a GUI application apparently can't use "popen()" (it
"returns an invalid file handle, if used in a Windows program,
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index 9f99842786..a950d3a79d 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
/* proto_draw.c
* Routines for GTK+ packet display
*
- * $Id: proto_draw.c,v 1.44 2002/01/11 07:40:31 guy Exp $
+ * $Id: proto_draw.c,v 1.45 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
#include <string.h>
#include "main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "util.h"
#include "menu.h"
#include "keys.h"
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 54ca6f922c..adc5a7210d 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.c,v 1.12 2002/01/11 07:40:32 guy Exp $
+ * $Id: tcp_graph.c,v 1.13 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,7 +43,7 @@
#endif /* WIN32 */
#include "globals.h" /* cfile */
-#include "packet.h" /* frame_data */
+#include <epan/packet.h> /* frame_data */
#include "gtkglobals.h" /* packet_list */
#include "simple_dialog.h"
#include "ui_util.h"
diff --git a/ipproto.c b/ipproto.c
index af82bbd73c..cfc4f531fd 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,7 +1,7 @@
/* ipproto.c
* Routines for converting IPv4 protocol/v6 nxthdr field into string
*
- * $Id: ipproto.c,v 1.16 2002/01/13 20:35:08 guy Exp $
+ * $Id: ipproto.c,v 1.17 2002/01/21 07:36:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,8 +41,8 @@
#endif
#include "ipproto.h"
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "packet-ip.h"
static const value_string ipproto_val[] = {
diff --git a/ncp2222.py b/ncp2222.py
index 4904f9b6b9..6202d14d97 100755
--- a/ncp2222.py
+++ b/ncp2222.py
@@ -20,7 +20,7 @@ http://developer.novell.com/ndk/doc/docui/index.htm#../ncp/ncp__enu/data/
for a badly-formatted HTML version of the same PDF.
-$Id: ncp2222.py,v 1.13 2002/01/11 14:33:04 gram Exp $
+$Id: ncp2222.py,v 1.14 2002/01/21 07:36:31 guy Exp $
Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -1186,8 +1186,8 @@ def produce_code():
#endif
#include <glib.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "ptvcursor.h"
#include "packet-ncp-int.h"
diff --git a/packet-aarp.c b/packet-aarp.c
index e10a31a5ed..b62d2f6dc9 100644
--- a/packet-aarp.c
+++ b/packet-aarp.c
@@ -1,7 +1,7 @@
/* packet-aarp.c
* Routines for Appletalk ARP packet disassembly
*
- * $Id: packet-aarp.c,v 1.33 2001/12/10 00:25:25 guy Exp $
+ * $Id: packet-aarp.c,v 1.34 2002/01/21 07:36:32 guy Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@@ -34,8 +34,8 @@
#include <stdio.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#include "etypes.h"
static int proto_aarp = -1;
diff --git a/packet-afs.c b/packet-afs.c
index 70f4dff6e4..a750204e61 100644
--- a/packet-afs.c
+++ b/packet-afs.c
@@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs.c,v 1.38 2002/01/18 21:46:51 nneul Exp $
+ * $Id: packet-afs.c,v 1.39 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,9 +47,9 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "conversation.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
+#include <epan/resolv.h>
#include "packet-rx.h"
#include "packet-afs.h"
diff --git a/packet-aim.c b/packet-aim.c
index 7a09966eae..a58423809a 100644
--- a/packet-aim.c
+++ b/packet-aim.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-aim.c,v 1.12 2002/01/20 23:42:51 guy Exp $
+ * $Id: packet-aim.c,v 1.13 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -46,8 +46,8 @@
# include "snprintf.h"
#endif
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#define TCP_PORT_AIM 5190
#define MAX_BUDDYNAME_LENGTH 30
diff --git a/packet-arp.c b/packet-arp.c
index 5c1100b4a8..7f21c35cf1 100644
--- a/packet-arp.c
+++ b/packet-arp.c
@@ -1,7 +1,7 @@
/* packet-arp.c
* Routines for ARP packet disassembly
*
- * $Id: packet-arp.c,v 1.48 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-arp.c,v 1.49 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,9 +32,9 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
+#include <epan/resolv.h>
#include "packet-arp.h"
#include "etypes.h"
diff --git a/packet-ascend.c b/packet-ascend.c
index d16a9fbd4a..5e196ff92a 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.29 2001/12/20 05:34:50 guy Exp $
+ * $Id: packet-ascend.c,v 1.30 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,7 +31,7 @@
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_ascend = -1;
static int hf_link_type = -1;
diff --git a/packet-atalk.c b/packet-atalk.c
index 918ca1a46a..413ccb835b 100644
--- a/packet-atalk.c
+++ b/packet-atalk.c
@@ -1,7 +1,7 @@
/* packet-atalk.c
* Routines for Appletalk packet disassembly (DDP, currently).
*
- * $Id: packet-atalk.c,v 1.61 2002/01/20 22:12:25 guy Exp $
+ * $Id: packet-atalk.c,v 1.62 2002/01/21 07:36:32 guy Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@@ -37,11 +37,11 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "etypes.h"
#include "ppptypes.h"
#include "aftypes.h"
-#include "atalk-utils.h"
+#include <epan/atalk-utils.h>
static int proto_llap = -1;
static int hf_llap_dst = -1;
diff --git a/packet-atm.c b/packet-atm.c
index 0b3e26071c..a1be23e41d 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.39 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-atm.c,v 1.40 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,9 +32,9 @@
#include <stdio.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "oui.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "packet-snmp.h"
diff --git a/packet-auto_rp.c b/packet-auto_rp.c
index 6081b04a50..84779b05be 100644
--- a/packet-auto_rp.c
+++ b/packet-auto_rp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-auto_rp.c,v 1.16 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-auto_rp.c,v 1.17 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -39,8 +39,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
static gint proto_auto_rp = -1;
static gint ett_auto_rp = -1;
diff --git a/packet-bacapp.c b/packet-bacapp.c
index 21938945c4..ae2a89a969 100644
--- a/packet-bacapp.c
+++ b/packet-bacapp.c
@@ -2,7 +2,7 @@
* Routines for BACnet (APDU) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bacapp.c,v 1.8 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-bacapp.c,v 1.9 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
static const char*
bacapp_type_name (guint8 bacapp_type){
diff --git a/packet-bacnet.c b/packet-bacnet.c
index 072d3b3baa..8b09002e23 100644
--- a/packet-bacnet.c
+++ b/packet-bacnet.c
@@ -2,7 +2,7 @@
* Routines for BACnet (NPDU) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bacnet.c,v 1.9 2002/01/20 22:12:25 guy Exp $
+ * $Id: packet-bacnet.c,v 1.10 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
static dissector_handle_t bacapp_handle;
static dissector_handle_t data_handle;
diff --git a/packet-beep.c b/packet-beep.c
index 919939a6b1..a5c553f7a7 100644
--- a/packet-beep.c
+++ b/packet-beep.c
@@ -1,7 +1,7 @@
/* packet-beep.c
* Routines for BEEP packet disassembly
*
- * $Id: packet-beep.c,v 1.2 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-beep.c,v 1.3 2002/01/21 07:36:32 guy Exp $
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
* Modified 2001 Darren New <dnew@invisible.net> for BEEP.
@@ -46,10 +46,10 @@
#include <time.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "prefs.h"
-#include "conversation.h"
+#include <epan/conversation.h>
#define TCP_PORT_BEEP 10288
void proto_reg_handoff_beep(void);
diff --git a/packet-bgp.c b/packet-bgp.c
index 60ac3ec47d..ab6a6f0e42 100644
--- a/packet-bgp.c
+++ b/packet-bgp.c
@@ -2,7 +2,7 @@
* Routines for BGP packet dissection.
* Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-bgp.c,v 1.52 2002/01/17 09:25:55 guy Exp $
+ * $Id: packet-bgp.c,v 1.53 2002/01/21 07:36:32 guy Exp $
*
* Supports:
* RFC1771 A Border Gateway Protocol 4 (BGP-4)
@@ -63,7 +63,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-bgp.h"
#include "packet-ipv6.h"
#include "afn.h"
diff --git a/packet-bootp.c b/packet-bootp.c
index e51cc1002e..b135689193 100644
--- a/packet-bootp.c
+++ b/packet-bootp.c
@@ -2,7 +2,7 @@
* Routines for BOOTP/DHCP packet disassembly
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-bootp.c,v 1.61 2001/12/27 23:53:10 guy Exp $
+ * $Id: packet-bootp.c,v 1.62 2002/01/21 07:36:32 guy Exp $
*
* The information used comes from:
* RFC 951: Bootstrap Protocol
@@ -45,8 +45,8 @@
#include <string.h>
#include <glib.h>
-#include "int-64bit.h"
-#include "packet.h"
+#include <epan/int-64bit.h>
+#include <epan/packet.h>
#include "packet-arp.h"
static int proto_bootp = -1;
diff --git a/packet-bpdu.c b/packet-bpdu.c
index 6c57b066cc..c062f1dedc 100644
--- a/packet-bpdu.c
+++ b/packet-bpdu.c
@@ -1,7 +1,7 @@
/* packet-bpdu.c
* Routines for BPDU (Spanning Tree Protocol) disassembly
*
- * $Id: packet-bpdu.c,v 1.30 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-bpdu.c,v 1.31 2002/01/21 07:36:32 guy Exp $
*
* Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
*
@@ -39,10 +39,10 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "llcsaps.h"
#include "ppptypes.h"
-#include "resolv.h"
+#include <epan/resolv.h>
/* Offsets of fields within a BPDU */
diff --git a/packet-bvlc.c b/packet-bvlc.c
index d361f97ead..1430f28b38 100644
--- a/packet-bvlc.c
+++ b/packet-bvlc.c
@@ -2,7 +2,7 @@
* Routines for BACnet/IP (BVLL, BVLC) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bvlc.c,v 1.8 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-bvlc.c,v 1.9 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,7 +33,7 @@
#include <stdlib.h>
#include <string.h>
#include "prefs.h"
-#include "strutil.h"
+#include <epan/strutil.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -49,7 +49,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
static int proto_bvlc = -1;
static int hf_bvlc_type = -1;
diff --git a/packet-cdp.c b/packet-cdp.c
index 51e1e4de6c..e5122a2406 100644
--- a/packet-cdp.c
+++ b/packet-cdp.c
@@ -2,7 +2,7 @@
* Routines for the disassembly of the "Cisco Discovery Protocol"
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-cdp.c,v 1.42 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-cdp.c,v 1.43 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,8 +33,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#include "nlpid.h"
/*
diff --git a/packet-cgmp.c b/packet-cgmp.c
index 2581eb1847..844501688b 100644
--- a/packet-cgmp.c
+++ b/packet-cgmp.c
@@ -1,7 +1,7 @@
/* packet-cgmp.c
* Routines for the disassembly of the Cisco Group Management Protocol
*
- * $Id: packet-cgmp.c,v 1.12 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-cgmp.c,v 1.13 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,7 +32,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/*
* See
diff --git a/packet-chdlc.c b/packet-chdlc.c
index 90705e5acd..a836a7ef51 100644
--- a/packet-chdlc.c
+++ b/packet-chdlc.c
@@ -1,7 +1,7 @@
/* packet-chdlc.c
* Routines for Cisco HDLC packet disassembly
*
- * $Id: packet-chdlc.c,v 1.9 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-chdlc.c,v 1.10 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,9 +31,9 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "etypes.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "packet-chdlc.h"
#include "packet-ip.h"
diff --git a/packet-clip.c b/packet-clip.c
index 1b8af50893..114c191dc0 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.18 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-clip.c,v 1.19 2002/01/21 07:36:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-clip.h"
#include "packet-ip.h"
diff --git a/packet-clnp.c b/packet-clnp.c
index 7d2a26cd8d..203599adbc 100644
--- a/packet-clnp.c
+++ b/packet-clnp.c
@@ -1,7 +1,7 @@
/* packet-clnp.c
* Routines for ISO/OSI network and transport protocol packet disassembly
*
- * $Id: packet-clnp.c,v 1.46 2002/01/20 01:04:18 guy Exp $
+ * $Id: packet-clnp.c,v 1.47 2002/01/21 07:36:32 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -37,7 +37,7 @@
#include <ctype.h>
#include <glib.h>
#include "prefs.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "reassemble.h"
#include "packet-osi.h"
#include "packet-osi-options.h"
diff --git a/packet-cops.c b/packet-cops.c
index 541c9584e0..8f0d948dfc 100644
--- a/packet-cops.c
+++ b/packet-cops.c
@@ -4,7 +4,7 @@
*
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-cops.c,v 1.15 2001/12/10 00:25:26 guy Exp $
+ * $Id: packet-cops.c,v 1.16 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipv6.h"
#define TCP_PORT_COPS 3288
diff --git a/packet-cups.c b/packet-cups.c
index 32032ddd61..2706c4bb0b 100644
--- a/packet-cups.c
+++ b/packet-cups.c
@@ -5,7 +5,7 @@
* Charles Levert <charles@comm.polymtl.ca>
* Copyright 2001 Charles Levert
*
-* $Id: packet-cups.c,v 1.8 2001/12/10 00:25:27 guy Exp $
+* $Id: packet-cups.c,v 1.9 2002/01/21 07:36:33 guy Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -35,8 +35,8 @@
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
/**********************************************************************/
diff --git a/packet-data.c b/packet-data.c
index 967e96993c..9eb4e9453b 100644
--- a/packet-data.c
+++ b/packet-data.c
@@ -2,7 +2,7 @@
* Routines for raw data (default case)
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-data.c,v 1.25 2001/11/26 05:41:11 hagbard Exp $
+ * $Id: packet-data.c,v 1.26 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,7 +32,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/* proto_data cannot be static because it's referenced in the
* print routines
diff --git a/packet-dcerpc-conv.c b/packet-dcerpc-conv.c
index 14254a0dd7..c2a7b71530 100644
--- a/packet-dcerpc-conv.c
+++ b/packet-dcerpc-conv.c
@@ -2,7 +2,7 @@
* Routines for dcerpc conv dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-conv.c,v 1.1 2001/07/11 01:25:44 guy Exp $
+ * $Id: packet-dcerpc-conv.c,v 1.2 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
diff --git a/packet-dcerpc-dfs.c b/packet-dcerpc-dfs.c
index 7256c22463..b56fe5efeb 100644
--- a/packet-dcerpc-dfs.c
+++ b/packet-dcerpc-dfs.c
@@ -2,7 +2,7 @@
* Routines for SMB \\PIPE\\netdfs packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-dfs.c,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-dfs.c,v 1.2 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,7 +28,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-dfs.h"
diff --git a/packet-dcerpc-epm.c b/packet-dcerpc-epm.c
index 26af6a669d..b198363bff 100644
--- a/packet-dcerpc-epm.c
+++ b/packet-dcerpc-epm.c
@@ -2,7 +2,7 @@
* Routines for dcerpc endpoint mapper dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-epm.c,v 1.3 2001/12/06 23:30:35 guy Exp $
+ * $Id: packet-dcerpc-epm.c,v 1.4 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c
index b54bd63c7c..79a2836b73 100644
--- a/packet-dcerpc-lsa.c
+++ b/packet-dcerpc-lsa.c
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\lsarpc packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-lsa.c,v 1.6 2002/01/03 20:42:40 guy Exp $
+ * $Id: packet-dcerpc-lsa.c,v 1.7 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -30,7 +30,7 @@
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-nt.h"
#include "packet-dcerpc-lsa.h"
diff --git a/packet-dcerpc-mgmt.c b/packet-dcerpc-mgmt.c
index 0eaff99b4b..a7be8f0bee 100644
--- a/packet-dcerpc-mgmt.c
+++ b/packet-dcerpc-mgmt.c
@@ -2,7 +2,7 @@
* Routines for dcerpc mgmt dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-mgmt.c,v 1.1 2001/07/11 01:25:44 guy Exp $
+ * $Id: packet-dcerpc-mgmt.c,v 1.2 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
diff --git a/packet-dcerpc-ndr.c b/packet-dcerpc-ndr.c
index c1e80458cd..ac95fc1003 100644
--- a/packet-dcerpc-ndr.c
+++ b/packet-dcerpc-ndr.c
@@ -2,7 +2,7 @@
* Routines for DCERPC NDR dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-ndr.c,v 1.2 2001/12/06 23:30:35 guy Exp $
+ * $Id: packet-dcerpc-ndr.c,v 1.3 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c
index 5e588153cc..ee15c398eb 100644
--- a/packet-dcerpc-netlogon.c
+++ b/packet-dcerpc-netlogon.c
@@ -2,7 +2,7 @@
* Routines for SMB \\PIPE\\NETLOGON packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-netlogon.c,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-netlogon.c,v 1.2 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,7 +28,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-netlogon.h"
diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c
index ec3124c2a1..4721930cb0 100644
--- a/packet-dcerpc-nt.c
+++ b/packet-dcerpc-nt.c
@@ -2,7 +2,7 @@
* Routines for DCERPC over SMB packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-nt.c,v 1.3 2002/01/07 19:55:48 guy Exp $
+ * $Id: packet-dcerpc-nt.c,v 1.4 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,7 +28,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-nt.h"
#include "smb.h"
diff --git a/packet-dcerpc-oxid.c b/packet-dcerpc-oxid.c
index 2f08bbff44..67169c72bf 100644
--- a/packet-dcerpc-oxid.c
+++ b/packet-dcerpc-oxid.c
@@ -2,7 +2,7 @@
* Routines for DCOM OXID Resolver
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-oxid.c,v 1.1 2001/07/11 01:25:44 guy Exp $
+ * $Id: packet-dcerpc-oxid.c,v 1.2 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
diff --git a/packet-dcerpc-reg.c b/packet-dcerpc-reg.c
index 98097d89b2..fdf152daa6 100644
--- a/packet-dcerpc-reg.c
+++ b/packet-dcerpc-reg.c
@@ -2,7 +2,7 @@
* Routines for SMB \\PIPE\\winreg packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-reg.c,v 1.2 2002/01/03 20:42:40 guy Exp $
+ * $Id: packet-dcerpc-reg.c,v 1.3 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,7 +28,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-reg.h"
diff --git a/packet-dcerpc-remact.c b/packet-dcerpc-remact.c
index 37f0892fbe..abfd82a617 100644
--- a/packet-dcerpc-remact.c
+++ b/packet-dcerpc-remact.c
@@ -2,7 +2,7 @@
* Routines for DCOM Remote Activation
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-remact.c,v 1.2 2001/07/24 00:38:43 guy Exp $
+ * $Id: packet-dcerpc-remact.c,v 1.3 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c
index 1592962cb2..550004b3bd 100644
--- a/packet-dcerpc-samr.c
+++ b/packet-dcerpc-samr.c
@@ -2,7 +2,7 @@
* Routines for SMB \\PIPE\\samr packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-samr.c,v 1.2 2001/12/06 23:30:35 guy Exp $
+ * $Id: packet-dcerpc-samr.c,v 1.3 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,7 +28,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-samr.h"
#include "smb.h" /* for "NT_errors[]" */
diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c
index ddcdd0b09f..98896eec65 100644
--- a/packet-dcerpc-spoolss.c
+++ b/packet-dcerpc-spoolss.c
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\spoolss packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-spoolss.c,v 1.3 2002/01/07 19:55:48 guy Exp $
+ * $Id: packet-dcerpc-spoolss.c,v 1.4 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -30,7 +30,7 @@
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-nt.h"
#include "packet-dcerpc-spoolss.h"
diff --git a/packet-dcerpc-srvsvc.c b/packet-dcerpc-srvsvc.c
index 1df7045c11..f36fedf5bf 100644
--- a/packet-dcerpc-srvsvc.c
+++ b/packet-dcerpc-srvsvc.c
@@ -2,7 +2,7 @@
* Routines for SMB \\PIPE\\srvsvc packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-srvsvc.c,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-srvsvc.c,v 1.2 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,7 +28,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-srvsvc.h"
diff --git a/packet-dcerpc-wkssvc.c b/packet-dcerpc-wkssvc.c
index 30b34c552a..c35f66d67b 100644
--- a/packet-dcerpc-wkssvc.c
+++ b/packet-dcerpc-wkssvc.c
@@ -2,7 +2,7 @@
* Routines for SMB \\PIPE\\wkssvc packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-wkssvc.c,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-wkssvc.c,v 1.2 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,7 +28,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-wkssvc.h"
diff --git a/packet-dcerpc.c b/packet-dcerpc.c
index 9f04aeca90..d6a261f88f 100644
--- a/packet-dcerpc.c
+++ b/packet-dcerpc.c
@@ -2,7 +2,7 @@
* Routines for DCERPC packet disassembly
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc.c,v 1.23 2002/01/03 20:42:40 guy Exp $
+ * $Id: packet-dcerpc.c,v 1.24 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,9 +35,9 @@
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
-#include "conversation.h"
+#include <epan/conversation.h>
#include "prefs.h"
static const value_string pckt_vals[] = {
diff --git a/packet-dcerpc.h b/packet-dcerpc.h
index 5b36a622b2..0e884b535d 100644
--- a/packet-dcerpc.h
+++ b/packet-dcerpc.h
@@ -1,7 +1,7 @@
/* packet-dcerpc.h
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc.h,v 1.6 2002/01/03 20:42:40 guy Exp $
+ * $Id: packet-dcerpc.h,v 1.7 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -25,7 +25,7 @@
#ifndef __PACKET_DCERPC_H__
#define __PACKET_DCERPC_H__
-#include "conversation.h"
+#include <epan/conversation.h>
typedef struct _e_uuid_t {
guint32 Data1;
diff --git a/packet-ddtp.c b/packet-ddtp.c
index 87786a6413..2818faea53 100644
--- a/packet-ddtp.c
+++ b/packet-ddtp.c
@@ -3,7 +3,7 @@
* see http://ddt.sourceforge.net/
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-ddtp.c,v 1.18 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-ddtp.c,v 1.19 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,7 +41,7 @@
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ddtp.h"
static int proto_ddtp = -1;
diff --git a/packet-dec-bpdu.c b/packet-dec-bpdu.c
index 14b2bcb0d5..1d95fdfd40 100644
--- a/packet-dec-bpdu.c
+++ b/packet-dec-bpdu.c
@@ -1,7 +1,7 @@
/* packet-dec-bpdu.c
* Routines for DEC BPDU (DEC Spanning Tree Protocol) disassembly
*
- * $Id: packet-dec-bpdu.c,v 1.9 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-dec-bpdu.c,v 1.10 2002/01/21 07:36:33 guy Exp $
*
* Copyright 2001 Paul Ionescu <paul@acorp.ro>
*
@@ -39,8 +39,8 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "etypes.h"
#include "ppptypes.h"
diff --git a/packet-dhcpv6.c b/packet-dhcpv6.c
index 4504819501..e5a5dacea1 100644
--- a/packet-dhcpv6.c
+++ b/packet-dhcpv6.c
@@ -2,7 +2,7 @@
* Routines for DHCPv6 packet disassembly
* Jun-ichiro itojun Hagino <itojun@iijlab.net>
*
- * $Id: packet-dhcpv6.c,v 1.2 2002/01/11 11:07:21 guy Exp $
+ * $Id: packet-dhcpv6.c,v 1.3 2002/01/21 07:36:33 guy Exp $
*
* The information used comes from:
* draft-ietf-dhc-dhcpv6-22.txt
@@ -38,9 +38,9 @@
#include <string.h>
#include <glib.h>
-#include "int-64bit.h"
-#include "packet.h"
-#include "ipv6-utils.h"
+#include <epan/int-64bit.h>
+#include <epan/packet.h>
+#include <epan/ipv6-utils.h>
static int proto_dhcpv6 = -1;
static int hf_dhcpv6_msgtype = -1;
diff --git a/packet-diameter.c b/packet-diameter.c
index bb652c6a9e..713f456bd3 100644
--- a/packet-diameter.c
+++ b/packet-diameter.c
@@ -1,7 +1,7 @@
/* packet-diameter.c
* Routines for Diameter packet disassembly
*
- * $Id: packet-diameter.c,v 1.40 2002/01/15 10:01:19 guy Exp $
+ * $Id: packet-diameter.c,v 1.41 2002/01/21 07:36:33 guy Exp $
*
* Copyright (c) 2001 by David Frascone <dave@frascone.com>
*
@@ -42,10 +42,10 @@
#include <ctype.h>
#include <time.h>
#include <glib.h>
-#include <filesystem.h>
+#include <epan/filesystem.h>
#include "xmlstub.h"
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "prefs.h"
/* This must be defined before we include packet-diameter-defs.h */
diff --git a/packet-dlsw.c b/packet-dlsw.c
index baf4bfd816..aba9d697a7 100644
--- a/packet-dlsw.c
+++ b/packet-dlsw.c
@@ -2,7 +2,7 @@
* Routines for DLSw packet dissection (Data Link Switching)
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-dlsw.c,v 1.2 2001/12/26 21:21:00 guy Exp $
+ * $Id: packet-dlsw.c,v 1.3 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,7 +41,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_dlsw = -1;
diff --git a/packet-dns.c b/packet-dns.c
index bd8999d515..ed615dc920 100644
--- a/packet-dns.c
+++ b/packet-dns.c
@@ -1,7 +1,7 @@
/* packet-dns.c
* Routines for DNS packet disassembly
*
- * $Id: packet-dns.c,v 1.79 2002/01/20 22:12:25 guy Exp $
+ * $Id: packet-dns.c,v 1.80 2002/01/21 07:36:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,9 +35,9 @@
#include <memory.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "packet-dns.h"
#include "prefs.h"
diff --git a/packet-dsi.c b/packet-dsi.c
index 38c99bc045..b24e0e9ce5 100644
--- a/packet-dsi.c
+++ b/packet-dsi.c
@@ -2,7 +2,7 @@
* Routines for dsi packet dissection
* Copyright 2001, Randy McEoin <rmceoin@pe.com>
*
- * $Id: packet-dsi.c,v 1.7 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-dsi.c,v 1.8 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,9 +41,9 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
+#include <epan/conversation.h>
/* The information in this module (DSI) comes from:
diff --git a/packet-dvmrp.c b/packet-dvmrp.c
index 094291da36..c8624226fa 100644
--- a/packet-dvmrp.c
+++ b/packet-dvmrp.c
@@ -1,7 +1,7 @@
/* packet-dvmrp.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP/DVMRP packet disassembly
*
- * $Id: packet-dvmrp.c,v 1.6 2002/01/20 22:12:25 guy Exp $
+ * $Id: packet-dvmrp.c,v 1.7 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -63,7 +63,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "in_cksum.h"
#include "packet-dvmrp.h"
diff --git a/packet-eap.c b/packet-eap.c
index de92869db4..0d9c9db0ff 100644
--- a/packet-eap.c
+++ b/packet-eap.c
@@ -1,7 +1,7 @@
/* packet-eap.c
* Routines for EAP Extensible Authentication Protocol header disassembly
*
- * $Id: packet-eap.c,v 1.4 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-eap.c,v 1.5 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee8023.h"
#include "packet-ipx.h"
#include "packet-llc.h"
diff --git a/packet-eapol.c b/packet-eapol.c
index f5c08b6d24..9518463e74 100644
--- a/packet-eapol.c
+++ b/packet-eapol.c
@@ -1,7 +1,7 @@
/* packet-eapol.c
* Routines for EAPOL 802.1X authentication header disassembly
*
- * $Id: packet-eapol.c,v 1.4 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-eapol.c,v 1.5 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee8023.h"
#include "packet-ipx.h"
#include "packet-llc.h"
diff --git a/packet-eigrp.c b/packet-eigrp.c
index d3be9058ca..a5d666ce15 100644
--- a/packet-eigrp.c
+++ b/packet-eigrp.c
@@ -2,7 +2,7 @@
* Routines for EIGRP dissection
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-eigrp.c,v 1.19 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-eigrp.c,v 1.20 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,10 +36,10 @@
#endif
#include <glib.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
-#include "atalk-utils.h"
+#include <epan/atalk-utils.h>
#include "ipproto.h"
#include "packet-ipx.h"
diff --git a/packet-esis.c b/packet-esis.c
index bafe84c663..1556c56acb 100644
--- a/packet-esis.c
+++ b/packet-esis.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI End System to Intermediate System
* Routing Exchange Protocol ISO 9542.
*
- * $Id: packet-esis.c,v 1.19 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-esis.c,v 1.20 2002/01/21 07:36:34 guy Exp $
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "nlpid.h"
#include "packet-osi.h"
#include "packet-osi-options.h"
diff --git a/packet-eth.c b/packet-eth.c
index 19ad37440b..4c2a7c500d 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.71 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-eth.c,v 1.72 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,9 +31,9 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "etypes.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "packet-eth.h"
#include "packet-ieee8023.h"
#include "packet-ipx.h"
diff --git a/packet-ethertype.c b/packet-ethertype.c
index 5fefb16ffd..12044e625c 100644
--- a/packet-ethertype.c
+++ b/packet-ethertype.c
@@ -1,7 +1,7 @@
/* ethertype.c
* Routines for calling the right protocol for the ethertype.
*
- * $Id: packet-ethertype.c,v 1.24 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-ethertype.c,v 1.25 2002/01/21 07:36:34 guy Exp $
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
@@ -33,7 +33,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ip.h"
#include "packet-ipx.h"
#include "packet-vlan.h"
diff --git a/packet-fddi.c b/packet-fddi.c
index 1c5a970972..a17803baeb 100644
--- a/packet-fddi.c
+++ b/packet-fddi.c
@@ -3,7 +3,7 @@
*
* Laurent Deniel <deniel@worldnet.fr>
*
- * $Id: packet-fddi.c,v 1.55 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-fddi.c,v 1.56 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,11 +35,11 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "bitswap.h"
-#include "packet.h"
+#include <epan/bitswap.h>
+#include <epan/packet.h>
#include "packet-fddi.h"
#include "packet-llc.h"
-#include "resolv.h"
+#include <epan/resolv.h>
static int proto_fddi = -1;
static int hf_fddi_fc = -1;
diff --git a/packet-fr.c b/packet-fr.c
index 93d5e48764..44e1209fa1 100644
--- a/packet-fr.c
+++ b/packet-fr.c
@@ -3,7 +3,7 @@
*
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-fr.c,v 1.27 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-fr.c,v 1.28 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -44,7 +44,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-osi.h"
#include "packet-llc.h"
#include "packet-chdlc.h"
@@ -53,7 +53,7 @@
#include "oui.h"
#include "nlpid.h"
#include "greproto.h"
-#include "conversation.h"
+#include <epan/conversation.h>
/*
* Bits in the address field.
diff --git a/packet-frame.c b/packet-frame.c
index 306d82d59a..4593e84177 100644
--- a/packet-frame.c
+++ b/packet-frame.c
@@ -2,7 +2,7 @@
*
* Top-most dissector. Decides dissector based on Wiretap Encapsulation Type.
*
- * $Id: packet-frame.c,v 1.19 2002/01/17 09:28:22 guy Exp $
+ * $Id: packet-frame.c,v 1.20 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,9 +28,9 @@
#endif
#include <glib.h>
-#include "packet.h"
-#include "timestamp.h"
-#include "tvbuff.h"
+#include <epan/packet.h>
+#include <epan/timestamp.h>
+#include <epan/tvbuff.h>
#include "packet-frame.h"
#include "prefs.h"
diff --git a/packet-ftp.c b/packet-ftp.c
index e5e615fa9a..89dada09b7 100644
--- a/packet-ftp.c
+++ b/packet-ftp.c
@@ -3,7 +3,7 @@
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* Copyright 2001, Juan Toledo <toledo@users.sourceforge.net> (Passive FTP)
*
- * $Id: packet-ftp.c,v 1.39 2001/12/10 00:25:27 guy Exp $
+ * $Id: packet-ftp.c,v 1.40 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -44,9 +44,9 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
+#include <epan/conversation.h>
static int proto_ftp = -1;
static int proto_ftp_data = -1;
diff --git a/packet-giop.c b/packet-giop.c
index 20be6a5060..ab7f7ee151 100644
--- a/packet-giop.c
+++ b/packet-giop.c
@@ -9,7 +9,7 @@
* Frank Singleton <frank.singleton@ericsson.com>
* Trevor Shepherd <eustrsd@am1.ericsson.se>
*
- * $Id: packet-giop.c,v 1.53 2001/12/19 08:59:06 guy Exp $
+ * $Id: packet-giop.c,v 1.54 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -296,7 +296,7 @@
#include "strerror.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-giop.h"
/*
diff --git a/packet-gmrp.c b/packet-gmrp.c
index cc0db5766d..07478d1c6b 100644
--- a/packet-gmrp.c
+++ b/packet-gmrp.c
@@ -46,7 +46,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "llcsaps.h"
/* Initialize the protocol and registered fields */
diff --git a/packet-gnutella.c b/packet-gnutella.c
index d0b64bdad4..5c99dab154 100644
--- a/packet-gnutella.c
+++ b/packet-gnutella.c
@@ -2,7 +2,7 @@
* Routines for gnutella dissection
* Copyright 2001, B. Johannessen <bob@havoq.com>
*
- * $Id: packet-gnutella.c,v 1.10 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-gnutella.c,v 1.11 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -46,7 +46,7 @@
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-gnutella.h"
static int proto_gnutella = -1;
diff --git a/packet-gre.c b/packet-gre.c
index df13dd5cb7..6d32b48eab 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.49 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-gre.c,v 1.50 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <netinet/in.h>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-wccp.h"
#include "in_cksum.h"
#include "etypes.h"
diff --git a/packet-gtp.c b/packet-gtp.c
index 397d134bd3..8fb4a9cd21 100644
--- a/packet-gtp.c
+++ b/packet-gtp.c
@@ -4,7 +4,7 @@
* Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
* Nicolas Balkota <balkota@mac.com>
*
- * $Id: packet-gtp.c,v 1.19 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-gtp.c,v 1.20 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipv6.h"
#include "prefs.h"
diff --git a/packet-gvrp.c b/packet-gvrp.c
index d55d053c97..2ea834eaae 100644
--- a/packet-gvrp.c
+++ b/packet-gvrp.c
@@ -2,7 +2,7 @@
* Routines for GVRP (GARP VLAN Registration Protocol) dissection
* Copyright 2000, Kevin Shi <techishi@ms22.hinet.net>
*
- * $Id: packet-gvrp.c,v 1.9 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-gvrp.c,v 1.10 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -45,7 +45,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "llcsaps.h"
/* Initialize the protocol and registered fields */
diff --git a/packet-h1.c b/packet-h1.c
index 7e009595c6..764476dcc8 100644
--- a/packet-h1.c
+++ b/packet-h1.c
@@ -2,7 +2,7 @@
* Routines for Sinec H1 packet disassembly
* Gerrit Gehnen <G.Gehnen@atrie.de>
*
- * $Id: packet-h1.c,v 1.22 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-h1.c,v 1.23 2002/01/21 07:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_h1 = -1;
static int hf_h1_header = -1;
diff --git a/packet-h261.c b/packet-h261.c
index 87724c566c..39d7f984de 100644
--- a/packet-h261.c
+++ b/packet-h261.c
@@ -2,7 +2,7 @@
*
* Routines for ITU-T Recommendation H.261 dissection
*
- * $Id: packet-h261.c,v 1.10 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-h261.c,v 1.11 2002/01/21 07:36:35 guy Exp $
*
* Copyright 2000, Philips Electronics N.V.
* Andreas Sikkema <andreas.sikkema@philips.com>
@@ -39,7 +39,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
diff --git a/packet-hsrp.c b/packet-hsrp.c
index 80ea29066f..98b2180766 100644
--- a/packet-hsrp.c
+++ b/packet-hsrp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-hsrp.c,v 1.20 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-hsrp.c,v 1.21 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,7 +41,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static gint proto_hsrp = -1;
diff --git a/packet-http.c b/packet-http.c
index 5c0f7010f2..b11e3dc8f5 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.44 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-http.c,v 1.45 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,8 +36,8 @@
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#include "packet-http.h"
diff --git a/packet-icap.c b/packet-icap.c
index 54fe489ca9..766c751d5f 100644
--- a/packet-icap.c
+++ b/packet-icap.c
@@ -36,8 +36,8 @@
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
typedef enum _icap_type {
ICAP_OPTIONS,
diff --git a/packet-icmpv6.c b/packet-icmpv6.c
index f4e1abe734..e1d8dc1b34 100644
--- a/packet-icmpv6.c
+++ b/packet-icmpv6.c
@@ -1,7 +1,7 @@
/* packet-icmpv6.c
* Routines for ICMPv6 packet disassembly
*
- * $Id: packet-icmpv6.c,v 1.62 2002/01/15 20:11:10 guy Exp $
+ * $Id: packet-icmpv6.c,v 1.63 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -53,11 +53,11 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipv6.h"
#include "packet-dns.h"
#include "in_cksum.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "ipproto.h"
#ifndef offsetof
diff --git a/packet-icp.c b/packet-icp.c
index f2b8f7422e..b7a055fe68 100644
--- a/packet-icp.c
+++ b/packet-icp.c
@@ -4,7 +4,7 @@
* By Peter Torvals
* Copyright 1999 Peter Torvals
*
- * $Id: packet-icp.c,v 1.20 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-icp.c,v 1.21 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,8 +42,8 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
static int proto_icp=-1;
static int hf_icp_length=-1;
diff --git a/packet-icq.c b/packet-icq.c
index e550bd940f..dbab104ef3 100644
--- a/packet-icq.c
+++ b/packet-icq.c
@@ -1,7 +1,7 @@
/* packet-icq.c
* Routines for ICQ packet disassembly
*
- * $Id: packet-icq.c,v 1.37 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-icq.c,v 1.38 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -61,8 +61,8 @@
# include "snprintf.h"
#endif
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
static int proto_icq = -1;
static int hf_icq_uin = -1;
diff --git a/packet-ieee80211.c b/packet-ieee80211.c
index d24fcdd90f..f55e67e84b 100644
--- a/packet-ieee80211.c
+++ b/packet-ieee80211.c
@@ -3,7 +3,7 @@
* Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
*
- * $Id: packet-ieee80211.c,v 1.46 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-ieee80211.c,v 1.47 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -61,10 +61,10 @@
#include <string.h>
#include <glib.h>
-#include "bitswap.h"
-#include "proto.h"
-#include "packet.h"
-#include "resolv.h"
+#include <epan/bitswap.h>
+#include <epan/proto.h>
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "packet-ipx.h"
#include "packet-llc.h"
#include "packet-ieee80211.h"
diff --git a/packet-ieee8023.c b/packet-ieee8023.c
index 2a671860c4..d7197b61e9 100644
--- a/packet-ieee8023.c
+++ b/packet-ieee8023.c
@@ -1,12 +1,11 @@
/* packet-ieee8023.c
* Routine for dissecting 802.3 (as opposed to D/I/X Ethernet) packets.
*
- * $Id: packet-ieee8023.c,v 1.1 2001/02/08 07:08:05 guy Exp $
+ * $Id: packet-ieee8023.c,v 1.2 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* 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
@@ -32,7 +31,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee8023.h"
static dissector_handle_t ipx_handle;
diff --git a/packet-igmp.c b/packet-igmp.c
index bb4ca5cddc..8aee8a400e 100644
--- a/packet-igmp.c
+++ b/packet-igmp.c
@@ -1,7 +1,7 @@
/* packet-igmp.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP packet disassembly
*
- * $Id: packet-igmp.c,v 1.16 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-igmp.c,v 1.17 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -104,7 +104,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "in_cksum.h"
#include "packet-dvmrp.h"
diff --git a/packet-igrp.c b/packet-igrp.c
index 7bf8dc5daa..edadfd79f3 100644
--- a/packet-igrp.c
+++ b/packet-igrp.c
@@ -2,7 +2,7 @@
* Routines for IGRP dissection
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-igrp.c,v 1.10 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-igrp.c,v 1.11 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#define IGRP_HEADER_LENGTH 12
diff --git a/packet-imap.c b/packet-imap.c
index 74c0c13a3e..42b6434145 100644
--- a/packet-imap.c
+++ b/packet-imap.c
@@ -2,7 +2,7 @@
* Routines for imap packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-imap.c,v 1.17 2001/12/10 00:25:28 guy Exp $
+ * $Id: packet-imap.c,v 1.18 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,8 +41,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
static int proto_imap = -1;
static int hf_imap_response = -1;
diff --git a/packet-ip.c b/packet-ip.c
index e09244aa8a..01d6fb5c2a 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.157 2002/01/20 01:04:18 guy Exp $
+ * $Id: packet-ip.c,v 1.158 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,8 +42,8 @@
# include "snprintf.h"
#endif
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "ipproto.h"
#include "prefs.h"
#include "reassemble.h"
diff --git a/packet-ipp.c b/packet-ipp.c
index 35b334f26c..ec80820a86 100644
--- a/packet-ipp.c
+++ b/packet-ipp.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-ipp.c,v 1.27 2001/12/10 00:25:29 guy Exp $
+ * $Id: packet-ipp.c,v 1.28 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,8 +36,8 @@
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#include "packet-http.h"
static int proto_ipp = -1;
diff --git a/packet-ipsec.c b/packet-ipsec.c
index 761e7fefa6..870bc528a7 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.36 2001/12/10 00:25:29 guy Exp $
+ * $Id: packet-ipsec.c,v 1.37 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -38,10 +38,10 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipsec.h"
#include "packet-ip.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "ipproto.h"
#include "prefs.h"
diff --git a/packet-ipv6.c b/packet-ipv6.c
index b15cea288e..d5b11fa973 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.74 2002/01/20 01:04:18 guy Exp $
+ * $Id: packet-ipv6.c,v 1.75 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,11 +43,11 @@
#include <string.h>
#include <stdio.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ip.h"
#include "packet-ipsec.h"
#include "packet-ipv6.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "prefs.h"
#include "reassemble.h"
#include "ipproto.h"
diff --git a/packet-ipv6.h b/packet-ipv6.h
index 2cdcf43661..899dafb1ed 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.25 2002/01/15 20:11:10 guy Exp $
+ * $Id: packet-ipv6.h,v 1.26 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -30,7 +30,7 @@
#ifndef __PACKET_IPV6_H_DEFINED__
#define __PACKET_IPV6_H_DEFINED__
-#include "ipv6-utils.h"
+#include <epan/ipv6-utils.h>
#define INET6_ADDRSTRLEN 46
diff --git a/packet-ipx.c b/packet-ipx.c
index a605438ee5..b96d762eb2 100644
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -2,7 +2,7 @@
* Routines for NetWare's IPX
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-ipx.c,v 1.98 2001/12/10 00:25:29 guy Exp $
+ * $Id: packet-ipx.c,v 1.99 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,9 +34,9 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipx.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "etypes.h"
#include "ppptypes.h"
#include "llcsaps.h"
diff --git a/packet-irc.c b/packet-irc.c
index 982c261cac..c9c92c5885 100644
--- a/packet-irc.c
+++ b/packet-irc.c
@@ -1,7 +1,7 @@
/* packet-irc.c
* Routines for IRC packet dissection
*
- * $Id: packet-irc.c,v 1.16 2001/12/10 00:25:29 guy Exp $
+ * $Id: packet-irc.c,v 1.17 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -40,7 +40,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_irc = -1;
static int hf_irc_request = -1;
diff --git a/packet-isakmp.c b/packet-isakmp.c
index d78545a2f0..d59d770136 100644
--- a/packet-isakmp.c
+++ b/packet-isakmp.c
@@ -4,7 +4,7 @@
* for ISAKMP (RFC 2407)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-isakmp.c,v 1.51 2001/12/10 00:25:29 guy Exp $
+ * $Id: packet-isakmp.c,v 1.52 2002/01/21 07:36:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -46,7 +46,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
static int proto_isakmp = -1;
diff --git a/packet-iscsi.c b/packet-iscsi.c
index 76d1ae6f65..76a97231d8 100644
--- a/packet-iscsi.c
+++ b/packet-iscsi.c
@@ -4,7 +4,7 @@
*
* Conforms to the protocol described in: draft-ietf-ips-iscsi-08.txt
*
- * $Id: packet-iscsi.c,v 1.21 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-iscsi.c,v 1.22 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -53,9 +53,9 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
-#include "conversation.h"
+#include <epan/conversation.h>
#include "packet-scsi.h"
static gboolean iscsi_desegment = TRUE;
diff --git a/packet-isis-clv.c b/packet-isis-clv.c
index cf64063a88..45e4145ea9 100644
--- a/packet-isis-clv.c
+++ b/packet-isis-clv.c
@@ -1,7 +1,7 @@
/* packet-isis-clv.c
* Common CLV decode routines.
*
- * $Id: packet-isis-clv.c,v 1.15 2001/08/22 18:00:40 guy Exp $
+ * $Id: packet-isis-clv.c,v 1.16 2002/01/21 07:36:36 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -41,7 +41,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-osi.h"
#include "packet-isis.h"
#include "packet-isis-clv.h"
diff --git a/packet-isis-hello.c b/packet-isis-hello.c
index 0aff4520a1..882164b235 100644
--- a/packet-isis-hello.c
+++ b/packet-isis-hello.c
@@ -1,7 +1,7 @@
/* packet-isis-hello.c
* Routines for decoding isis hello packets and their CLVs
*
- * $Id: packet-isis-hello.c,v 1.24 2001/12/26 21:37:21 guy Exp $
+ * $Id: packet-isis-hello.c,v 1.25 2002/01/21 07:36:36 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-osi.h"
#include "packet-isis.h"
#include "packet-isis-clv.h"
diff --git a/packet-isis-lsp.c b/packet-isis-lsp.c
index 8ac186edac..a8c04b3073 100644
--- a/packet-isis-lsp.c
+++ b/packet-isis-lsp.c
@@ -1,7 +1,7 @@
/* packet-isis-lsp.c
* Routines for decoding isis lsp packets and their CLVs
*
- * $Id: packet-isis-lsp.c,v 1.24 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-isis-lsp.c,v 1.25 2002/01/21 07:36:36 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -40,13 +40,13 @@
#endif
#include "epan/ipv4.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-osi.h"
#include "packet-ipv6.h"
#include "packet-isis.h"
#include "packet-isis-clv.h"
#include "packet-isis-lsp.h"
-#include "resolv.h"
+#include <epan/resolv.h>
/* lsp packets */
static int hf_isis_lsp_pdu_length = -1;
diff --git a/packet-isis-snp.c b/packet-isis-snp.c
index 2d7e1c0030..1f96364960 100644
--- a/packet-isis-snp.c
+++ b/packet-isis-snp.c
@@ -1,7 +1,7 @@
/* packet-isis-snp.c
* Routines for decoding isis complete & partial SNP and their payload
*
- * $Id: packet-isis-snp.c,v 1.12 2001/12/20 07:33:21 guy Exp $
+ * $Id: packet-isis-snp.c,v 1.13 2002/01/21 07:36:36 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-osi.h"
#include "packet-isis.h"
#include "packet-isis-clv.h"
diff --git a/packet-isis.c b/packet-isis.c
index ac050c0243..ed2236a24c 100644
--- a/packet-isis.c
+++ b/packet-isis.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly, core
* bits.
*
- * $Id: packet-isis.c,v 1.28 2001/12/20 07:33:21 guy Exp $
+ * $Id: packet-isis.c,v 1.29 2002/01/21 07:36:36 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "nlpid.h"
#include "packet-osi.h"
#include "packet-isis.h"
diff --git a/packet-isl.c b/packet-isl.c
index bb7ca2da83..5c7e0c6374 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.29 2001/12/10 00:25:29 guy Exp $
+ * $Id: packet-isl.c,v 1.30 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-isl.h"
#include "packet-eth.h"
#include "packet-tr.h"
diff --git a/packet-isup.c b/packet-isup.c
index 28633270e8..58de47bd70 100644
--- a/packet-isup.c
+++ b/packet-isup.c
@@ -2,7 +2,7 @@
* Routines for ISUP dissection
* Copyright 2001, Martina Obermeier <martina.obermeier@icn.siemens.de>
*
- * $Id: packet-isup.c,v 1.7 2001/12/10 00:25:29 guy Exp $
+ * $Id: packet-isup.c,v 1.8 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ip.h"
#define MTP3_ISUP_SERVICE_INDICATOR 5
diff --git a/packet-iua.c b/packet-iua.c
index e9184157d9..c725c87a38 100644
--- a/packet-iua.c
+++ b/packet-iua.c
@@ -8,7 +8,7 @@
*
* Copyright 2000, Michael Txen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-iua.c,v 1.10 2001/12/10 00:25:29 guy Exp $
+ * $Id: packet-iua.c,v 1.11 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -54,7 +54,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#define SCTP_PORT_IUA 9900
#define IUA_PAYLOAD_PROTO_ID 1
diff --git a/packet-kerberos.c b/packet-kerberos.c
index cd3323b5bb..e6da1efcce 100644
--- a/packet-kerberos.c
+++ b/packet-kerberos.c
@@ -3,7 +3,7 @@
* Wes Hardaker (c) 2000
* wjhardaker@ucdavis.edu
*
- * $Id: packet-kerberos.c,v 1.19 2001/12/10 00:25:29 guy Exp $
+ * $Id: packet-kerberos.c,v 1.20 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -38,9 +38,9 @@
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
-#include "strutil.h"
+#include <epan/strutil.h>
#include "asn1.h"
diff --git a/packet-l2tp.c b/packet-l2tp.c
index f2912cbae4..bef7981bdc 100644
--- a/packet-l2tp.c
+++ b/packet-l2tp.c
@@ -7,7 +7,7 @@
* Laurent Cazalet <laurent.cazalet@mailclub.net>
* Thomas Parvais <thomas.parvais@advalvas.be>
*
- * $Id: packet-l2tp.c,v 1.29 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-l2tp.c,v 1.30 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -66,8 +66,8 @@ static int hf_l2tp_tie_breaker = -1;
#include <string.h>
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#define UDP_PORT_L2TP 1701
diff --git a/packet-lapb.c b/packet-lapb.c
index 2a07db7ea0..6f459034eb 100644
--- a/packet-lapb.c
+++ b/packet-lapb.c
@@ -2,7 +2,7 @@
* Routines for lapb frame disassembly
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-lapb.c,v 1.32 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-lapb.c,v 1.33 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "xdlc.h"
#define FROM_DCE 0x80
diff --git a/packet-lapbether.c b/packet-lapbether.c
index 623e42189f..2b8cf59f48 100644
--- a/packet-lapbether.c
+++ b/packet-lapbether.c
@@ -3,7 +3,7 @@
* Richard Sharpe <rsharpe@ns.aus.com> based on the lapb module by
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-lapbether.c,v 1.8 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-lapbether.c,v 1.9 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "etypes.h"
static int proto_lapbether = -1;
diff --git a/packet-lapd.c b/packet-lapd.c
index b8aaa13079..c377b2368e 100644
--- a/packet-lapd.c
+++ b/packet-lapd.c
@@ -2,7 +2,7 @@
* Routines for LAPD frame disassembly
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-lapd.c,v 1.27 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-lapd.c,v 1.28 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "xdlc.h"
/* ISDN/LAPD references:
diff --git a/packet-ldap.c b/packet-ldap.c
index 4106bae3ff..f7b33f8bfc 100644
--- a/packet-ldap.c
+++ b/packet-ldap.c
@@ -1,7 +1,7 @@
/* packet-ldap.c
* Routines for ldap packet dissection
*
- * $Id: packet-ldap.c,v 1.32 2002/01/14 03:01:13 guy Exp $
+ * $Id: packet-ldap.c,v 1.33 2002/01/21 07:36:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -59,7 +59,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ldap.h"
#include "asn1.h"
diff --git a/packet-ldp.c b/packet-ldp.c
index e2df72f20b..ac5ed43d8c 100644
--- a/packet-ldp.c
+++ b/packet-ldp.c
@@ -1,7 +1,7 @@
/* packet-ldp.c
* Routines for LDP (RFC 3036) packet disassembly
*
- * $Id: packet-ldp.c,v 1.25 2002/01/20 23:25:54 guy Exp $
+ * $Id: packet-ldp.c,v 1.26 2002/01/21 07:36:36 guy Exp $
*
* Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
@@ -42,8 +42,8 @@
#include <time.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "prefs.h"
#include "afn.h"
diff --git a/packet-llc.c b/packet-llc.c
index befa82067b..e6f10670d3 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-llc.c,v 1.94 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-llc.c,v 1.95 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,7 +32,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "oui.h"
#include "xdlc.h"
#include "etypes.h"
@@ -41,7 +41,7 @@
#include "packet-ip.h"
#include "packet-ipx.h"
#include "packet-netbios.h"
-#include "sna-utils.h"
+#include <epan/sna-utils.h>
#include "packet-llc.h"
diff --git a/packet-lmi.c b/packet-lmi.c
index 5de5fb1fb2..460c788119 100644
--- a/packet-lmi.c
+++ b/packet-lmi.c
@@ -2,7 +2,7 @@
* Routines for Frame Relay Local Management Interface (LMI) disassembly
* Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-lmi.c,v 1.8 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-lmi.c,v 1.9 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -45,7 +45,7 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "nlpid.h"
static int proto_lmi = -1;
diff --git a/packet-lpd.c b/packet-lpd.c
index 542a57ec56..e212262ec1 100644
--- a/packet-lpd.c
+++ b/packet-lpd.c
@@ -2,7 +2,7 @@
* Routines for LPR and LPRng packet disassembly
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-lpd.c,v 1.32 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-lpd.c,v 1.33 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define TCP_PORT_PRINTER 515
diff --git a/packet-m2pa.c b/packet-m2pa.c
index 56ac3c2f2a..7257204b52 100644
--- a/packet-m2pa.c
+++ b/packet-m2pa.c
@@ -6,7 +6,7 @@
* Copyright 2001, Jeff Morriss <jeff.morriss[AT]ulticom.com>,
* updated by Michael Tuexen <michael.tuexen[AT]icn.siemens.de>
*
- * $Id: packet-m2pa.c,v 1.5 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-m2pa.c,v 1.6 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -52,7 +52,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
/* Warning: Neither of these are standardized yet! */
diff --git a/packet-m2tp.c b/packet-m2tp.c
index 38fc4ec199..3fe7a4f6c5 100644
--- a/packet-m2tp.c
+++ b/packet-m2tp.c
@@ -5,7 +5,7 @@
*
* Copyright 2001, Heinz Prantner <heinz.prantner[AT]radisys.com>
*
- * $Id: packet-m2tp.c,v 1.1 2001/12/16 22:30:09 guy Exp $
+ * $Id: packet-m2tp.c,v 1.2 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define SCTP_PORT_M2TP 9908 /* unassigned port number (not assigned by IANA) */
#define M2TP_PAYLOAD_PROTO_ID 99 /* s-link */
diff --git a/packet-m3ua.c b/packet-m3ua.c
index 2390935895..ddf22ad50a 100644
--- a/packet-m3ua.c
+++ b/packet-m3ua.c
@@ -8,7 +8,7 @@
*
* Copyright 2000, Michael Txen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-m3ua.c,v 1.10 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-m3ua.c,v 1.11 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -54,7 +54,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#define SCTP_PORT_M3UA 2905
#define M3UA_PAYLOAD_PROTO_ID 3
diff --git a/packet-mapi.c b/packet-mapi.c
index fa2c37a386..8b966c7fd4 100644
--- a/packet-mapi.c
+++ b/packet-mapi.c
@@ -1,7 +1,7 @@
/* packet-mapi.c
* Routines for MSX mapi packet dissection
*
- * $Id: packet-mapi.c,v 1.18 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-mapi.c,v 1.19 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -40,7 +40,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_mapi = -1;
static int hf_mapi_request = -1;
diff --git a/packet-mbtcp.c b/packet-mbtcp.c
index 968bb687ba..b27aa87cc2 100644
--- a/packet-mbtcp.c
+++ b/packet-mbtcp.c
@@ -10,7 +10,7 @@
*
* for information on Modbus/TCP.
*
- * $Id: packet-mbtcp.c,v 1.7 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-mbtcp.c,v 1.8 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -60,7 +60,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#define DEBUG
diff --git a/packet-mip.c b/packet-mip.c
index 1c9d9b1cc3..14b960c64b 100644
--- a/packet-mip.c
+++ b/packet-mip.c
@@ -2,7 +2,7 @@
* Routines for Mobile IP dissection
* Copyright 2000, Stefan Raab <sraab@cisco.com>
*
- * $Id: packet-mip.c,v 1.25 2002/01/05 22:09:17 guy Exp $
+ * $Id: packet-mip.c,v 1.26 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -46,7 +46,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
/* Initialize the protocol and registered fields */
static int proto_mip = -1;
diff --git a/packet-mmse.c b/packet-mmse.c
index 7f7e5cc3d3..84f0d5e84f 100644
--- a/packet-mmse.c
+++ b/packet-mmse.c
@@ -2,7 +2,7 @@
* Routines for MMS Message Encapsulation dissection
* Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl>
*
- * $Id: packet-mmse.c,v 1.5 2002/01/08 20:51:16 guy Exp $
+ * $Id: packet-mmse.c,v 1.6 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -50,7 +50,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-wap.h"
#include "packet-wsp.h"
/* #include "packet-mmse.h" */ /* We autoregister */
diff --git a/packet-mpeg1.c b/packet-mpeg1.c
index 6f6bedc561..975245f079 100644
--- a/packet-mpeg1.c
+++ b/packet-mpeg1.c
@@ -2,7 +2,7 @@
*
* Routines for RFC 2250 MPEG-1 dissection
*
- * $Id: packet-mpeg1.c,v 1.4 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-mpeg1.c,v 1.5 2002/01/21 07:36:37 guy Exp $
*
* Copyright 2001,
* Francisco Javier Cabello Torres, <fjcabello@vtools.es>
@@ -38,7 +38,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
diff --git a/packet-mpls.c b/packet-mpls.c
index 035914f3b3..93d5cd203e 100644
--- a/packet-mpls.c
+++ b/packet-mpls.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-mpls.c,v 1.24 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-mpls.c,v 1.25 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,7 +42,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ppptypes.h"
#include "etypes.h"
diff --git a/packet-mrdisc.c b/packet-mrdisc.c
index ceda3c85fe..724a5a4732 100644
--- a/packet-mrdisc.c
+++ b/packet-mrdisc.c
@@ -1,7 +1,7 @@
/* packet-mrdisc.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP/MRDISC packet disassembly
*
- * $Id: packet-mrdisc.c,v 1.5 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-mrdisc.c,v 1.6 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -48,7 +48,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "in_cksum.h"
#include "packet-mrdisc.h"
diff --git a/packet-msdp.c b/packet-msdp.c
index a73f0a696d..5097417ba0 100644
--- a/packet-msdp.c
+++ b/packet-msdp.c
@@ -4,7 +4,7 @@
*
* Copyright 2001, Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-msdp.c,v 1.4 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-msdp.c,v 1.5 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,7 +42,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/* MSDP message types. The messages are TLV (Type-Length-Value) encoded */
enum { MSDP_SA = 1,
diff --git a/packet-msnip.c b/packet-msnip.c
index b816b0f7cd..c4eacfa56d 100644
--- a/packet-msnip.c
+++ b/packet-msnip.c
@@ -1,7 +1,7 @@
/* packet-msnip.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP/MSNIP packet disassembly
*
- * $Id: packet-msnip.c,v 1.4 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-msnip.c,v 1.5 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "in_cksum.h"
#include "packet-msnip.h"
diff --git a/packet-msproxy.c b/packet-msproxy.c
index 55f15abbd7..d42100197f 100644
--- a/packet-msproxy.c
+++ b/packet-msproxy.c
@@ -2,7 +2,7 @@
* Routines for Microsoft Proxy packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-msproxy.c,v 1.25 2001/12/10 00:25:30 guy Exp $
+ * $Id: packet-msproxy.c,v 1.26 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -63,10 +63,10 @@
# include "snprintf.h"
#endif
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "alignment.h"
-#include "conversation.h"
+#include <epan/conversation.h>
#include "packet-tcp.h"
#include "packet-udp.h"
diff --git a/packet-mtp2.c b/packet-mtp2.c
index 07606f94bf..08d18eb28d 100644
--- a/packet-mtp2.c
+++ b/packet-mtp2.c
@@ -5,7 +5,7 @@
*
* Copyright 2001, Michael Tuexen <michael.tuexen[AT]icn.siemens.de>
*
- * $Id: packet-mtp2.c,v 1.2 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-mtp2.c,v 1.3 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/* Initialize the protocol and registered fields */
static int proto_mtp2 = -1;
diff --git a/packet-mtp3.c b/packet-mtp3.c
index 8d1fb39383..2d86cabebc 100644
--- a/packet-mtp3.c
+++ b/packet-mtp3.c
@@ -2,7 +2,7 @@
* Routines for Message Transfer Part Level 3 dissection
* Copyright 2001, Michael Tuexen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-mtp3.c,v 1.8 2001/12/11 03:04:26 gram Exp $
+ * $Id: packet-mtp3.c,v 1.9 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,7 +31,7 @@
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
/* Initialize the protocol and registered fields */
diff --git a/packet-nbipx.c b/packet-nbipx.c
index 844fd683be..26c87869b6 100644
--- a/packet-nbipx.c
+++ b/packet-nbipx.c
@@ -2,7 +2,7 @@
* Routines for NetBIOS over IPX packet disassembly
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-nbipx.c,v 1.45 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-nbipx.c,v 1.46 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,7 +33,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipx.h"
#include "packet-netbios.h"
diff --git a/packet-nbns.c b/packet-nbns.c
index dd9ee37aca..7127d5c3ca 100644
--- a/packet-nbns.c
+++ b/packet-nbns.c
@@ -3,7 +3,7 @@
* to when it had only NBNS)
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-nbns.c,v 1.71 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-nbns.c,v 1.72 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dns.h"
#include "packet-netbios.h"
#include "packet-tcp.h"
diff --git a/packet-ncp.c b/packet-ncp.c
index cfe0c6ebfc..7c6fcc4183 100644
--- a/packet-ncp.c
+++ b/packet-ncp.c
@@ -3,7 +3,7 @@
* Gilbert Ramirez <gram@alumni.rice.edu>
* Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net>
*
- * $Id: packet-ncp.c,v 1.53 2002/01/05 04:12:14 gram Exp $
+ * $Id: packet-ncp.c,v 1.54 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,8 +37,8 @@
#endif
#include <glib.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "prefs.h"
#include "packet-ipx.h"
#include "packet-ncp-int.h"
diff --git a/packet-ndmp.c b/packet-ndmp.c
index 7da76c5234..43a7d5e891 100644
--- a/packet-ndmp.c
+++ b/packet-ndmp.c
@@ -12,7 +12,7 @@
* Routines for NDMP dissection
* 2001 Ronnie Sahlberg (see AUTHORS for email)
*
- * $Id: packet-ndmp.c,v 1.9 2002/01/20 22:12:26 guy Exp $
+ * $Id: packet-ndmp.c,v 1.10 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -49,7 +49,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-rpc.h"
#include "prefs.h"
diff --git a/packet-netbios.c b/packet-netbios.c
index 1217fb0807..a991b59392 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.43 2001/12/10 00:25:31 guy Exp $
+ * $Id: packet-netbios.c,v 1.44 2002/01/21 07:36:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -38,7 +38,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "llcsaps.h"
#include "packet-netbios.h"
diff --git a/packet-nntp.c b/packet-nntp.c
index 5de375d78f..0c68628f1b 100644
--- a/packet-nntp.c
+++ b/packet-nntp.c
@@ -2,7 +2,7 @@
* Routines for nntp packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-nntp.c,v 1.22 2001/12/10 00:25:31 guy Exp $
+ * $Id: packet-nntp.c,v 1.23 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -39,8 +39,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
static int proto_nntp = -1;
static int hf_nntp_response = -1;
diff --git a/packet-ntp.c b/packet-ntp.c
index 69b33f4ae5..b7fc392e3f 100644
--- a/packet-ntp.c
+++ b/packet-ntp.c
@@ -2,7 +2,7 @@
* Routines for NTP packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-ntp.c,v 1.32 2001/12/10 00:25:31 guy Exp $
+ * $Id: packet-ntp.c,v 1.33 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -48,8 +48,8 @@
# include "snprintf.h"
#endif
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "packet-ntp.h"
/*
diff --git a/packet-null.c b/packet-null.c
index c36d983080..4b2997c1ba 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.51 2001/12/10 00:25:31 guy Exp $
+ * $Id: packet-null.c,v 1.52 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -39,9 +39,9 @@
#endif
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-null.h"
-#include "atalk-utils.h"
+#include <epan/atalk-utils.h>
#include "packet-ip.h"
#include "packet-ipx.h"
#include "packet-osi.h"
diff --git a/packet-osi-options.c b/packet-osi-options.c
index 0f654a5d12..43640850ec 100644
--- a/packet-osi-options.c
+++ b/packet-osi-options.c
@@ -5,13 +5,12 @@
* ISO 10589 ISIS (Intradomain Routing Information Exchange Protocol)
* ISO 9542 ESIS (End System To Intermediate System Routing Exchange Protocol)
*
- * $Id: packet-osi-options.c,v 1.8 2001/08/13 00:56:18 sharpe Exp $
+ * $Id: packet-osi-options.c,v 1.9 2002/01/21 07:36:38 guy Exp $
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* 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
@@ -41,7 +40,7 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "nlpid.h"
#include "packet-osi.h"
#include "packet-isis.h"
diff --git a/packet-osi.c b/packet-osi.c
index 19ba6144fb..9f74a75309 100644
--- a/packet-osi.c
+++ b/packet-osi.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions
*
- * $Id: packet-osi.c,v 1.52 2001/12/10 00:25:31 guy Exp $
+ * $Id: packet-osi.c,v 1.53 2002/01/21 07:36:38 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -37,7 +37,7 @@
#include <string.h>
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "llcsaps.h"
#include "aftypes.h"
#include "nlpid.h"
diff --git a/packet-osi.h b/packet-osi.h
index 6b2573526f..7dc1688d36 100644
--- a/packet-osi.h
+++ b/packet-osi.h
@@ -1,6 +1,6 @@
/* packet-osi.h
*
- * $Id: packet-osi.h,v 1.8 2001/06/05 09:06:19 guy Exp $
+ * $Id: packet-osi.h,v 1.9 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -24,7 +24,7 @@
#ifndef _PACKET_OSI_H
#define _PACKET_OSI_H
-#include "osi-utils.h"
+#include <epan/osi-utils.h>
#define PDU_TYPE_ESIS_ESH 100
#define PDU_TYPE_ESIS_ISH 101
diff --git a/packet-ospf.c b/packet-ospf.c
index f5cc57eee2..669111e87f 100644
--- a/packet-ospf.c
+++ b/packet-ospf.c
@@ -2,7 +2,7 @@
* Routines for OSPF packet disassembly
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-ospf.c,v 1.53 2001/12/10 00:25:31 guy Exp $
+ * $Id: packet-ospf.c,v 1.54 2002/01/21 07:36:38 guy Exp $
*
* At this time, this module is able to analyze OSPF
* packets as specified in RFC2328. MOSPF (RFC1584) and other
@@ -48,7 +48,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "in_cksum.h"
#include "ieee-float.h"
diff --git a/packet-pgm.c b/packet-pgm.c
index 0ff3266b24..27280a156d 100644
--- a/packet-pgm.c
+++ b/packet-pgm.c
@@ -1,7 +1,7 @@
/* packet-pgm.c
* Routines for pgm packet disassembly
*
- * $Id: packet-pgm.c,v 1.13 2002/01/20 23:25:54 guy Exp $
+ * $Id: packet-pgm.c,v 1.14 2002/01/21 07:36:38 guy Exp $
*
* Copyright (c) 2000 by Talarian Corp
*
@@ -45,16 +45,16 @@
#include <ctype.h>
#include <time.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-pgm.h"
#include "afn.h"
#include "ipproto.h"
-#include "resolv.h"
-#include "strutil.h"
-#include "conversation.h"
+#include <epan/resolv.h>
+#include <epan/strutil.h>
+#include <epan/conversation.h>
#include "prefs.h"
-#include "proto.h"
+#include <epan/proto.h>
void proto_reg_handoff_pgm(void);
static void proto_rereg_pgm(void);
diff --git a/packet-pim.c b/packet-pim.c
index 3758fbb7e4..2b99cc27a0 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.36 2001/12/10 00:25:32 guy Exp $
+ * $Id: packet-pim.c,v 1.37 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,7 +43,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "afn.h"
#include "packet-ipv6.h"
diff --git a/packet-pop.c b/packet-pop.c
index f27a77e142..6a205c4576 100644
--- a/packet-pop.c
+++ b/packet-pop.c
@@ -2,7 +2,7 @@
* Routines for pop packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-pop.c,v 1.28 2001/12/10 00:25:32 guy Exp $
+ * $Id: packet-pop.c,v 1.29 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,8 +41,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
static int proto_pop = -1;
static int hf_pop_response = -1;
diff --git a/packet-ppp.c b/packet-ppp.c
index 5385ac033e..beace65e46 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.86 2002/01/20 22:12:27 guy Exp $
+ * $Id: packet-ppp.c,v 1.87 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,11 +34,11 @@
#include <glib.h>
#include "prefs.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ppp.h"
#include "ppptypes.h"
#include "etypes.h"
-#include "atalk-utils.h"
+#include <epan/atalk-utils.h>
#include "packet-chdlc.h"
#include "packet-ip.h"
#include "packet-ipx.h"
diff --git a/packet-pppoe.c b/packet-pppoe.c
index 8500bcae2b..8398195d54 100644
--- a/packet-pppoe.c
+++ b/packet-pppoe.c
@@ -1,7 +1,7 @@
/* packet-pppoe.c
* Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516)
*
- * $Id: packet-pppoe.c,v 1.20 2001/12/10 00:25:32 guy Exp $
+ * $Id: packet-pppoe.c,v 1.21 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,8 +31,8 @@
#endif
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#include "etypes.h"
static int proto_pppoed = -1;
diff --git a/packet-pptp.c b/packet-pptp.c
index 6aff17465e..7ec2a2266e 100644
--- a/packet-pptp.c
+++ b/packet-pptp.c
@@ -2,7 +2,7 @@
* Routines for the Point-to-Point Tunnelling Protocol (PPTP) (RFC 2637)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-pptp.c,v 1.22 2001/12/10 00:25:32 guy Exp $
+ * $Id: packet-pptp.c,v 1.23 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -38,7 +38,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_pptp = -1;
static int hf_pptp_message_type = -1;
diff --git a/packet-prism.c b/packet-prism.c
index a3ef4907cb..0de8b4e8ca 100644
--- a/packet-prism.c
+++ b/packet-prism.c
@@ -9,7 +9,7 @@
*
* By Tim Newsham
*
- * $Id: packet-prism.c,v 1.5 2001/12/10 00:25:32 guy Exp $
+ * $Id: packet-prism.c,v 1.6 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,7 +42,7 @@
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee80211.h"
#include "packet-prism.h"
diff --git a/packet-q2931.c b/packet-q2931.c
index a862cec441..b3ecefeea0 100644
--- a/packet-q2931.c
+++ b/packet-q2931.c
@@ -2,7 +2,7 @@
* Routines for Q.2931 frame disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-q2931.c,v 1.20 2001/12/10 00:25:32 guy Exp $
+ * $Id: packet-q2931.c,v 1.21 2002/01/21 07:36:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "oui.h"
#include "nlpid.h"
#include "etypes.h"
diff --git a/packet-q931.c b/packet-q931.c
index 511216afc7..f0ed89e2bc 100644
--- a/packet-q931.c
+++ b/packet-q931.c
@@ -2,7 +2,7 @@
* Routines for Q.931 frame disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-q931.c,v 1.33 2001/12/10 00:25:32 guy Exp $
+ * $Id: packet-q931.c,v 1.34 2002/01/21 07:36:38 guy Exp $
*
* Modified by Andreas Sikkema for possible use with H.323
*
@@ -36,8 +36,8 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#include "nlpid.h"
#include "packet-q931.h"
diff --git a/packet-qllc.c b/packet-qllc.c
index 42b207b40b..34bc2618f3 100644
--- a/packet-qllc.c
+++ b/packet-qllc.c
@@ -2,7 +2,7 @@
* Routines for QLLC protocol - Qualified? LLC
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-qllc.c,v 1.3 2001/12/10 00:25:32 guy Exp $
+ * $Id: packet-qllc.c,v 1.4 2002/01/21 07:36:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,7 +32,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_qllc = -1;
diff --git a/packet-quake.c b/packet-quake.c
index 3e780d8abb..59f2a9dd3d 100644
--- a/packet-quake.c
+++ b/packet-quake.c
@@ -4,7 +4,7 @@
* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quake.c,v 1.23 2001/12/10 00:25:32 guy Exp $
+ * $Id: packet-quake.c,v 1.24 2002/01/21 07:36:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -40,8 +40,8 @@
#endif
#include <glib.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "prefs.h"
static int proto_quake = -1;
diff --git a/packet-quake2.c b/packet-quake2.c
index 3ec964a8ff..7a9e11f263 100644
--- a/packet-quake2.c
+++ b/packet-quake2.c
@@ -7,7 +7,7 @@
* http://www.dgs.monash.edu.au/~timf/bottim/
* http://www.opt-sci.Arizona.EDU/Pandora/default.asp
*
- * $Id: packet-quake2.c,v 1.7 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-quake2.c,v 1.8 2002/01/21 07:36:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -39,7 +39,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
static int proto_quake2 = -1;
diff --git a/packet-quake3.c b/packet-quake3.c
index 1e6adecb26..9f4bbc3fa2 100644
--- a/packet-quake3.c
+++ b/packet-quake3.c
@@ -3,7 +3,7 @@
*
* Uwe Girlich <uwe@planetquake.com>
*
- * $Id: packet-quake3.c,v 1.8 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-quake3.c,v 1.9 2002/01/21 07:36:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,9 +47,9 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
-#include "resolv.h"
+#include <epan/resolv.h>
static int proto_quake3 = -1;
diff --git a/packet-quakeworld.c b/packet-quakeworld.c
index 850d3ae2f7..919cc5b8c4 100644
--- a/packet-quakeworld.c
+++ b/packet-quakeworld.c
@@ -4,7 +4,7 @@
* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quakeworld.c,v 1.9 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-quakeworld.c,v 1.10 2002/01/21 07:36:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,7 +37,7 @@
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
static int proto_quakeworld = -1;
diff --git a/packet-radius.c b/packet-radius.c
index 8e89947d80..53ae88e854 100644
--- a/packet-radius.c
+++ b/packet-radius.c
@@ -2,7 +2,7 @@
* Routines for RADIUS packet disassembly
* Copyright 1999 Johan Feyaerts
*
- * $Id: packet-radius.c,v 1.40 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-radius.c,v 1.41 2002/01/21 07:36:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,8 +41,8 @@
#include <ctype.h>
#include <glib.h>
#include <time.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
static int proto_radius = -1;
static int hf_radius_length = -1;
diff --git a/packet-ranap.c b/packet-ranap.c
index 1766e45166..cb7856bfdc 100644
--- a/packet-ranap.c
+++ b/packet-ranap.c
@@ -3,7 +3,7 @@
* Based on 3GPP TS 25.413 V3.4.0
* Copyright 2001, Martin Held <Martin.Held@icn.siemens.de>
*
- * $Id: packet-ranap.c,v 1.9 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-ranap.c,v 1.10 2002/01/21 07:36:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -49,7 +49,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#define SCCP_SSN_RANAP 0x8E
diff --git a/packet-raw.c b/packet-raw.c
index 0ea7a2cef7..be20204dc9 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.31 2002/01/03 02:10:01 guy Exp $
+ * $Id: packet-raw.c,v 1.32 2002/01/21 07:36:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-raw.h"
#include "packet-ip.h"
#include "packet-ppp.h"
diff --git a/packet-rip.c b/packet-rip.c
index 79fc1e4c4c..079ce1ba30 100644
--- a/packet-rip.c
+++ b/packet-rip.c
@@ -2,7 +2,7 @@
* Routines for RIPv1 and RIPv2 packet disassembly
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-rip.c,v 1.28 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-rip.c,v 1.29 2002/01/21 07:36:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define UDP_PORT_RIP 520
diff --git a/packet-ripng.c b/packet-ripng.c
index 0baba5b6c4..86537d23e0 100644
--- a/packet-ripng.c
+++ b/packet-ripng.c
@@ -3,7 +3,7 @@
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
* derived from packet-rip.c
*
- * $Id: packet-ripng.c,v 1.23 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-ripng.c,v 1.24 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ripng.h"
#ifndef offsetof
diff --git a/packet-rlogin.c b/packet-rlogin.c
index 0073623c00..a2b8328198 100644
--- a/packet-rlogin.c
+++ b/packet-rlogin.c
@@ -2,7 +2,7 @@
* Routines for unix rlogin packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-rlogin.c,v 1.24 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-rlogin.c,v 1.25 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,8 +41,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "packet-tcp.h"
diff --git a/packet-rpc.c b/packet-rpc.c
index 5e7246becb..1a25c9e513 100644
--- a/packet-rpc.c
+++ b/packet-rpc.c
@@ -2,7 +2,7 @@
* Routines for rpc dissection
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
*
- * $Id: packet-rpc.c,v 1.84 2002/01/20 22:12:27 guy Exp $
+ * $Id: packet-rpc.c,v 1.85 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,8 +37,8 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "packet-rpc.h"
#include "packet-frame.h"
#include "prefs.h"
diff --git a/packet-rpc.h b/packet-rpc.h
index 19631f8f76..f6db687faa 100644
--- a/packet-rpc.h
+++ b/packet-rpc.h
@@ -1,6 +1,6 @@
/* packet-rpc.h
*
- * $Id: packet-rpc.h,v 1.31 2002/01/12 10:24:47 guy Exp $
+ * $Id: packet-rpc.h,v 1.32 2002/01/21 07:36:41 guy Exp $
*
* (c) 1999 Uwe Girlich
*
@@ -28,8 +28,8 @@
#define __PACKET_RPC_H__
#include <glib.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#define EXTRACT_UINT(p,o) pntohl(&p[o])
diff --git a/packet-rsh.c b/packet-rsh.c
index 16169402c1..cb3e917693 100644
--- a/packet-rsh.c
+++ b/packet-rsh.c
@@ -4,7 +4,7 @@
* Robert Tsai <rtsai@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-rsh.c,v 1.14 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-rsh.c,v 1.15 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,8 +34,8 @@
#endif
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
static int proto_rsh = -1;
static int hf_rsh_response = -1;
diff --git a/packet-rsvp.c b/packet-rsvp.c
index 7b08edd5cc..5e2148bfcc 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.51 2001/12/29 00:43:55 ashokn Exp $
+ * $Id: packet-rsvp.c,v 1.52 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -66,8 +66,8 @@
# include "snprintf.h"
#endif
-#include "tvbuff.h"
-#include "packet.h"
+#include <epan/tvbuff.h>
+#include <epan/packet.h>
#include "in_cksum.h"
#include "ieee-float.h"
#include "etypes.h"
diff --git a/packet-rtcp.c b/packet-rtcp.c
index 63a633318b..da671fddfb 100644
--- a/packet-rtcp.c
+++ b/packet-rtcp.c
@@ -1,6 +1,6 @@
/* packet-rtcp.c
*
- * $Id: packet-rtcp.c,v 1.29 2002/01/20 22:12:27 guy Exp $
+ * $Id: packet-rtcp.c,v 1.30 2002/01/21 07:36:41 guy Exp $
*
* Routines for RTCP dissection
* RTCP = Real-time Transport Control Protocol
@@ -44,7 +44,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -61,7 +61,7 @@
#if 0
#include "packet-ntp.h"
#endif
-#include "conversation.h"
+#include <epan/conversation.h>
/* Version is the first 2 bits of the first octet*/
#define RTCP_VERSION(octet) ((octet) >> 6)
diff --git a/packet-rtp.c b/packet-rtp.c
index d04e3e38de..9bcc052c5e 100644
--- a/packet-rtp.c
+++ b/packet-rtp.c
@@ -6,7 +6,7 @@
* Copyright 2000, Philips Electronics N.V.
* Written by Andreas Sikkema <andreas.sikkema@philips.com>
*
- * $Id: packet-rtp.c,v 1.31 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-rtp.c,v 1.32 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -56,7 +56,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -70,7 +70,7 @@
#include <string.h>
#include "packet-rtp.h"
-#include "conversation.h"
+#include <epan/conversation.h>
/* RTP header fields */
static int proto_rtp = -1;
diff --git a/packet-rtsp.c b/packet-rtsp.c
index fadadcc2d9..7d9eda7f52 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.46 2002/01/20 22:12:27 guy Exp $
+ * $Id: packet-rtsp.c,v 1.47 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,11 +36,11 @@
#include <stdlib.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-rtp.h"
#include "packet-rtcp.h"
-#include "conversation.h"
-#include "strutil.h"
+#include <epan/conversation.h>
+#include <epan/strutil.h>
static int proto_rtsp = -1;
static gint ett_rtsp = -1;
diff --git a/packet-rx.c b/packet-rx.c
index 357a41feaf..42d16f7d53 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.30 2002/01/20 22:12:27 guy Exp $
+ * $Id: packet-rx.c,v 1.31 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,9 +43,9 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-rx.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#define UDP_PORT_RX_LOW 7000
#define UDP_PORT_RX_HIGH 7009
diff --git a/packet-sap.c b/packet-sap.c
index 530474013e..248e430d77 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.25 2001/12/10 00:25:34 guy Exp $
+ * $Id: packet-sap.c,v 1.26 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,7 +41,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipv6.h"
#define UDP_PORT_SAP 9875
diff --git a/packet-scsi.c b/packet-scsi.c
index c9e115f9d5..49677b2bd6 100644
--- a/packet-scsi.c
+++ b/packet-scsi.c
@@ -2,7 +2,7 @@
* Routines for decoding SCSI CDBs and responses
* Author: Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-scsi.c,v 1.2 2002/01/16 20:25:07 guy Exp $
+ * $Id: packet-scsi.c,v 1.3 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -81,8 +81,8 @@
#include <glib.h>
#include <string.h>
-#include "strutil.h"
-#include "conversation.h"
+#include <epan/strutil.h>
+#include <epan/conversation.h>
#include "prefs.h"
#include "packet-scsi.h"
diff --git a/packet-sctp.c b/packet-sctp.c
index 01264453c5..c088b125f3 100644
--- a/packet-sctp.c
+++ b/packet-sctp.c
@@ -10,7 +10,7 @@
* - support for reassembly
* - code cleanup
*
- * $Id: packet-sctp.c,v 1.29 2002/01/20 22:28:50 guy Exp $
+ * $Id: packet-sctp.c,v 1.30 2002/01/21 07:36:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -57,7 +57,7 @@
#endif
#include "prefs.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
/* Initialize the protocol and registered fields */
diff --git a/packet-sdp.c b/packet-sdp.c
index 74ee22849d..5d26d565cc 100644
--- a/packet-sdp.c
+++ b/packet-sdp.c
@@ -4,7 +4,7 @@
* Jason Lango <jal@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-sdp.c,v 1.24 2001/12/15 20:22:47 hagbard Exp $
+ * $Id: packet-sdp.c,v 1.25 2002/01/21 07:36:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,8 +35,8 @@
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
static int proto_sdp = -1;
diff --git a/packet-sip.c b/packet-sip.c
index 04f9395dd9..18772a1848 100644
--- a/packet-sip.c
+++ b/packet-sip.c
@@ -15,7 +15,7 @@
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
* Copyright 2001, Jean-Francois Mule <jfm@clarent.com>
*
- * $Id: packet-sip.c,v 1.20 2001/12/10 00:25:34 guy Exp $
+ * $Id: packet-sip.c,v 1.21 2002/01/21 07:36:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define TCP_PORT_SIP 5060
#define UDP_PORT_SIP 5060
diff --git a/packet-skinny.c b/packet-skinny.c
index c1969178aa..dacfd6c67a 100644
--- a/packet-skinny.c
+++ b/packet-skinny.c
@@ -7,7 +7,7 @@
* This file is based on packet-aim.c, which is
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-skinny.c,v 1.7 2001/12/10 00:25:34 guy Exp $
+ * $Id: packet-skinny.c,v 1.8 2002/01/21 07:36:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -57,9 +57,9 @@
* #endif
*/
-#include "packet.h"
+#include <epan/packet.h>
/* REMOVE?
- * #include "strutil.h"
+ * #include <epan/strutil.h>
*/
#define TCP_PORT_SKINNY 2000
diff --git a/packet-slimp3.c b/packet-slimp3.c
index 34c5008609..ecbea5587f 100644
--- a/packet-slimp3.c
+++ b/packet-slimp3.c
@@ -6,7 +6,7 @@
* Adds support for the data packet protocol for the SliMP3
* See www.slimdevices.com for details.
*
- * $Id: packet-slimp3.c,v 1.1 2001/12/27 05:24:20 ashokn Exp $
+ * $Id: packet-slimp3.c,v 1.2 2002/01/21 07:36:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -40,8 +40,8 @@
#endif
#include <glib.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
static int proto_slimp3 = -1;
static int hf_slimp3_opcode = -1;
diff --git a/packet-sll.c b/packet-sll.c
index cf1cd78383..bed9459242 100644
--- a/packet-sll.c
+++ b/packet-sll.c
@@ -1,7 +1,7 @@
/* packet-sll.c
* Routines for disassembly of packets from Linux "cooked mode" captures
*
- * $Id: packet-sll.c,v 1.15 2001/12/10 00:25:34 guy Exp $
+ * $Id: packet-sll.c,v 1.16 2002/01/21 07:36:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,11 +33,11 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-sll.h"
#include "packet-ipx.h"
#include "packet-llc.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "etypes.h"
static int proto_sll = -1;
diff --git a/packet-smb-browse.c b/packet-smb-browse.c
index d33ff94832..fc47798df9 100644
--- a/packet-smb-browse.c
+++ b/packet-smb-browse.c
@@ -2,7 +2,7 @@
* Routines for SMB Browser packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-smb-browse.c,v 1.19 2001/12/10 00:25:34 guy Exp $
+ * $Id: packet-smb-browse.c,v 1.20 2002/01/21 07:36:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,8 +43,8 @@
#include <string.h>
#include <glib.h>
#include <ctype.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "smb.h"
#include "alignment.h"
diff --git a/packet-smb-common.h b/packet-smb-common.h
index b8f93d73ae..7a96327b99 100644
--- a/packet-smb-common.h
+++ b/packet-smb-common.h
@@ -2,7 +2,7 @@
* Routines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-smb-common.h,v 1.4 2001/07/08 11:32:02 guy Exp $
+ * $Id: packet-smb-common.h,v 1.5 2002/01/21 07:36:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -46,8 +46,8 @@
#include <string.h>
#include <glib.h>
#include <ctype.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "smb.h"
#include "alignment.h"
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c
index c1c4403cf0..b8426615c0 100644
--- a/packet-smb-pipe.c
+++ b/packet-smb-pipe.c
@@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
* significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
* Guy Harris 2001
*
- * $Id: packet-smb-pipe.c,v 1.65 2002/01/20 22:12:28 guy Exp $
+ * $Id: packet-smb-pipe.c,v 1.66 2002/01/21 07:36:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -49,8 +49,8 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
#include <string.h>
#include <glib.h>
#include <ctype.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "smb.h"
#include "packet-smb-pipe.h"
#include "packet-smb-browse.h"
diff --git a/packet-smb.c b/packet-smb.c
index 563cdb3625..00e49d688d 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -3,7 +3,7 @@
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* 2001 Rewrite by Ronnie Sahlberg and Guy Harris
*
- * $Id: packet-smb.c,v 1.196 2002/01/20 22:12:28 guy Exp $
+ * $Id: packet-smb.c,v 1.197 2002/01/21 07:36:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -44,11 +44,11 @@
#include <string.h>
#include <glib.h>
#include <ctype.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "smb.h"
#include "alignment.h"
-#include "strutil.h"
+#include <epan/strutil.h>
#include "prefs.h"
#include "reassemble.h"
diff --git a/packet-smpp.c b/packet-smpp.c
index c6e57cce59..aca9b78a6c 100644
--- a/packet-smpp.c
+++ b/packet-smpp.c
@@ -2,7 +2,7 @@
* Routines for Short Message Peer to Peer dissection
* Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl>
*
- * $Id: packet-smpp.c,v 1.3 2001/12/10 00:25:35 guy Exp $
+ * $Id: packet-smpp.c,v 1.4 2002/01/21 07:36:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -51,7 +51,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
/* #include "packet-smpp.h" */ /* We autoregister */
/* Forward declarations */
diff --git a/packet-smtp.c b/packet-smtp.c
index fd443b61f3..01ede5e4a3 100644
--- a/packet-smtp.c
+++ b/packet-smtp.c
@@ -1,7 +1,7 @@
/* packet-smtp.c
* Routines for SMTP packet disassembly
*
- * $Id: packet-smtp.c,v 1.23 2001/12/10 00:25:36 guy Exp $
+ * $Id: packet-smtp.c,v 1.24 2002/01/21 07:36:43 guy Exp $
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
@@ -42,11 +42,11 @@
#include <time.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
-#include "conversation.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
+#include <epan/resolv.h>
#include "prefs.h"
-#include "strutil.h"
+#include <epan/strutil.h>
#define TCP_PORT_SMTP 25
diff --git a/packet-sna.c b/packet-sna.c
index ec3c3d92ec..d9fcd5b988 100644
--- a/packet-sna.c
+++ b/packet-sna.c
@@ -2,7 +2,7 @@
* Routines for SNA
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-sna.c,v 1.37 2002/01/20 22:12:29 guy Exp $
+ * $Id: packet-sna.c,v 1.38 2002/01/21 07:36:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,9 +32,9 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "llcsaps.h"
-#include "sna-utils.h"
+#include <epan/sna-utils.h>
/*
* http://www.wanresources.com/snacell.html
diff --git a/packet-snmp.c b/packet-snmp.c
index eacf5b67fe..d1a050464f 100644
--- a/packet-snmp.c
+++ b/packet-snmp.c
@@ -8,7 +8,7 @@
*
* See RFCs 1905, 1906, 1909, and 1910 for SNMPv2u.
*
- * $Id: packet-snmp.c,v 1.77 2001/12/12 05:26:53 gerald Exp $
+ * $Id: packet-snmp.c,v 1.78 2002/01/21 07:36:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -59,9 +59,9 @@
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
+#include <epan/conversation.h>
#include "etypes.h"
#include "packet-ipx.h"
diff --git a/packet-socks.c b/packet-socks.c
index 9d3c50da83..d5cab46e7e 100644
--- a/packet-socks.c
+++ b/packet-socks.c
@@ -2,7 +2,7 @@
* Routines for socks versions 4 &5 packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-socks.c,v 1.33 2001/12/11 21:35:01 jfoster Exp $
+ * $Id: packet-socks.c,v 1.34 2002/01/21 07:36:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -71,14 +71,14 @@
# include "snprintf.h"
#endif
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "alignment.h"
-#include "conversation.h"
+#include <epan/conversation.h>
#include "packet-tcp.h"
#include "packet-udp.h"
-#include "strutil.h"
+#include <epan/strutil.h>
#define compare_packet(X) (X == (pinfo->fd->num))
diff --git a/packet-srvloc.c b/packet-srvloc.c
index 6a9abda8c6..1f05b31a70 100644
--- a/packet-srvloc.c
+++ b/packet-srvloc.c
@@ -6,7 +6,7 @@
* In particular I have not had an opportunity to see how it
* responds to SRVLOC over TCP.
*
- * $Id: packet-srvloc.c,v 1.27 2001/12/10 00:25:36 guy Exp $
+ * $Id: packet-srvloc.c,v 1.28 2002/01/21 07:36:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -52,8 +52,8 @@
# include "snprintf.h"
#endif
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
static int proto_srvloc = -1;
static int hf_srvloc_version = -1;
diff --git a/packet-sscop.c b/packet-sscop.c
index 3f5066493e..f9658922d4 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.17 2001/12/10 00:25:36 guy Exp $
+ * $Id: packet-sscop.c,v 1.18 2002/01/21 07:36:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_sscop = -1;
diff --git a/packet-ssl.c b/packet-ssl.c
index b6c303aadd..01490dd9eb 100644
--- a/packet-ssl.c
+++ b/packet-ssl.c
@@ -2,7 +2,7 @@
* Routines for ssl dissection
* Copyright (c) 2000-2001, Scott Renfro <scott@renfro.org>
*
- * $Id: packet-ssl.c,v 1.13 2002/01/17 09:24:05 guy Exp $
+ * $Id: packet-ssl.c,v 1.14 2002/01/21 07:36:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -66,7 +66,7 @@
# include "snprintf.h"
#endif
-#include "conversation.h"
+#include <epan/conversation.h>
#include "prefs.h"
static gboolean ssl_desegment = TRUE;
diff --git a/packet-sua.c b/packet-sua.c
index 8aa6172def..e121729b00 100644
--- a/packet-sua.c
+++ b/packet-sua.c
@@ -6,7 +6,7 @@
*
* Copyright 2000, Michael Txen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-sua.c,v 1.4 2001/12/10 00:25:36 guy Exp $
+ * $Id: packet-sua.c,v 1.5 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -52,7 +52,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
#define SCTP_PORT_SUA 14001
diff --git a/packet-syslog.c b/packet-syslog.c
index eae06abfc2..391e15a219 100644
--- a/packet-syslog.c
+++ b/packet-syslog.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Gerald Combs <gerald@ethereal.com>
*
- * $Id: packet-syslog.c,v 1.13 2001/12/10 00:25:39 guy Exp $
+ * $Id: packet-syslog.c,v 1.14 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define UDP_PORT_SYSLOG 514
diff --git a/packet-tacacs.c b/packet-tacacs.c
index 5f4b1bb607..a22e3027d7 100644
--- a/packet-tacacs.c
+++ b/packet-tacacs.c
@@ -2,7 +2,7 @@
* Routines for cisco tacacs/xtacacs/tacacs+ packet dissection
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-tacacs.c,v 1.18 2001/12/10 00:25:39 guy Exp $
+ * $Id: packet-tacacs.c,v 1.19 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -46,7 +46,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_tacacs = -1;
static int hf_tacacs_version = -1;
diff --git a/packet-tcp.c b/packet-tcp.c
index 42b9825aac..9e6c90f2ee 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.127 2002/01/20 22:12:29 guy Exp $
+ * $Id: packet-tcp.c,v 1.128 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,14 +43,14 @@
# include "snprintf.h"
#endif
-#include "resolv.h"
+#include <epan/resolv.h>
#include "ipproto.h"
#include "follow.h"
#include "prefs.h"
#include "packet-tcp.h"
#include "packet-ip.h"
-#include "conversation.h"
-#include "strutil.h"
+#include <epan/conversation.h>
+#include <epan/strutil.h>
#include "reassemble.h"
/* Place TCP summary in proto tree */
diff --git a/packet-telnet.c b/packet-telnet.c
index 219fdea564..5296595f7b 100644
--- a/packet-telnet.c
+++ b/packet-telnet.c
@@ -2,7 +2,7 @@
* Routines for telnet packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-telnet.c,v 1.27 2001/12/10 00:25:40 guy Exp $
+ * $Id: packet-telnet.c,v 1.28 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,8 +41,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
static int proto_telnet = -1;
diff --git a/packet-tftp.c b/packet-tftp.c
index ad8d84dd77..bc7df10c85 100644
--- a/packet-tftp.c
+++ b/packet-tftp.c
@@ -5,7 +5,7 @@
* Craig Newell <CraigN@cheque.uq.edu.au>
* RFC2347 TFTP Option Extension
*
- * $Id: packet-tftp.c,v 1.34 2001/12/10 00:25:40 guy Exp $
+ * $Id: packet-tftp.c,v 1.35 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,8 +41,8 @@
#endif
#include <glib.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
static int proto_tftp = -1;
static int hf_tftp_opcode = -1;
diff --git a/packet-time.c b/packet-time.c
index 4e6f0daafb..89b912c508 100644
--- a/packet-time.c
+++ b/packet-time.c
@@ -3,7 +3,7 @@
*
* Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-time.c,v 1.16 2001/12/10 00:25:40 guy Exp $
+ * $Id: packet-time.c,v 1.17 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -30,7 +30,7 @@
# include "config.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
static int proto_time = -1;
static int hf_time_time = -1;
diff --git a/packet-tns.c b/packet-tns.c
index cc3a34cf92..6d0e1e4f0b 100644
--- a/packet-tns.c
+++ b/packet-tns.c
@@ -1,7 +1,7 @@
/* packet-tns.c
* Routines for Oracle TNS packet dissection
*
- * $Id: packet-tns.c,v 1.26 2002/01/18 00:03:50 guy Exp $
+ * $Id: packet-tns.c,v 1.27 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -40,7 +40,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-tns.h"
static int proto_tns = -1;
diff --git a/packet-tpkt.c b/packet-tpkt.c
index e38528387e..a932a5b082 100644
--- a/packet-tpkt.c
+++ b/packet-tpkt.c
@@ -7,7 +7,7 @@
* Routine to dissect RFC 1006 TPKT packet containing OSI TP PDU
* Copyright 2001, Martin Thomas <Martin_A_Thomas@yahoo.com>
*
- * $Id: packet-tpkt.c,v 1.9 2001/12/10 00:25:40 guy Exp $
+ * $Id: packet-tpkt.c,v 1.10 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,7 +33,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
diff --git a/packet-tr.c b/packet-tr.c
index 94a045edc5..465d653585 100644
--- a/packet-tr.c
+++ b/packet-tr.c
@@ -2,7 +2,7 @@
* Routines for Token-Ring packet disassembly
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-tr.c,v 1.68 2001/12/10 00:25:40 guy Exp $
+ * $Id: packet-tr.c,v 1.69 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <string.h>
#include <stdio.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-tr.h"
#include "packet-llc.h"
diff --git a/packet-trmac.c b/packet-trmac.c
index 7bd7fb67d8..ed8fbb322b 100644
--- a/packet-trmac.c
+++ b/packet-trmac.c
@@ -2,7 +2,7 @@
* Routines for Token-Ring Media Access Control
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-trmac.c,v 1.34 2001/12/10 00:25:40 guy Exp $
+ * $Id: packet-trmac.c,v 1.35 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,7 +33,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_trmac = -1;
static int hf_trmac_mv = -1;
diff --git a/packet-ucp.c b/packet-ucp.c
index ff5b9ed448..8f5dbc59a5 100644
--- a/packet-ucp.c
+++ b/packet-ucp.c
@@ -2,7 +2,7 @@
* Routines for Universal Computer Protocol dissection
* Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl>
*
- * $Id: packet-ucp.c,v 1.9 2001/12/17 23:17:34 guy Exp $
+ * $Id: packet-ucp.c,v 1.10 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -54,7 +54,7 @@
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
/* #include "packet-ucp.h" */ /* We autoregister */
/* Prototypes */
diff --git a/packet-udp.c b/packet-udp.c
index d7c30ab324..53fe97656c 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.100 2001/12/10 00:25:40 guy Exp $
+ * $Id: packet-udp.c,v 1.101 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,8 +42,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "ipproto.h"
#include "in_cksum.h"
#include "prefs.h"
@@ -51,7 +51,7 @@
#include "packet-udp.h"
#include "packet-ip.h"
-#include "conversation.h"
+#include <epan/conversation.h>
static int proto_udp = -1;
static int hf_udp_srcport = -1;
diff --git a/packet-v120.c b/packet-v120.c
index 609b67d337..9d762020f8 100644
--- a/packet-v120.c
+++ b/packet-v120.c
@@ -2,7 +2,7 @@
* Routines for v120 frame disassembly
* Bert Driehuis <driehuis@playbeing.org>
*
- * $Id: packet-v120.c,v 1.23 2002/01/20 22:12:29 guy Exp $
+ * $Id: packet-v120.c,v 1.24 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "xdlc.h"
#define FROM_DCE 0x80
diff --git a/packet-vines.c b/packet-vines.c
index a7c3a7632e..b383b738f1 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
/* packet-vines.c
* Routines for Banyan VINES protocol packet disassembly
*
- * $Id: packet-vines.c,v 1.38 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-vines.c,v 1.39 2002/01/21 07:36:44 guy Exp $
*
* Don Lafontaine <lafont02@cn.ca>
*
@@ -39,7 +39,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-vines.h"
#include "etypes.h"
#include "ppptypes.h"
diff --git a/packet-vines.h b/packet-vines.h
index 15db004576..8ccb580848 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.10 2001/11/20 21:59:13 guy Exp $
+ * $Id: packet-vines.h,v 1.11 2002/01/21 07:36:44 guy Exp $
*
* Don Lafontaine <lafont02@cn.ca>
*
@@ -37,7 +37,7 @@
#ifndef __PACKETVINES_H__
#define __PACKETVINES_H__
-#include "to_str.h"
+#include <epan/to_str.h>
#define VINES_ADDR_LEN 6
diff --git a/packet-vj.c b/packet-vj.c
index c387351698..aa43981b51 100644
--- a/packet-vj.c
+++ b/packet-vj.c
@@ -1,7 +1,7 @@
/* packet-vj.c
* Routines for Van Jacobson header decompression.
*
- * $Id: packet-vj.c,v 1.4 2002/01/10 22:07:49 guy Exp $
+ * $Id: packet-vj.c,v 1.5 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -69,7 +69,7 @@
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ppp.h"
#include "ppptypes.h"
#include "in_cksum.h"
diff --git a/packet-vlan.c b/packet-vlan.c
index 15a3b67ed2..cf181cd9c5 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.37 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-vlan.c,v 1.38 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee8023.h"
#include "packet-ipx.h"
#include "packet-llc.h"
diff --git a/packet-vrrp.c b/packet-vrrp.c
index ac5cca5ae2..1247b2f7e1 100644
--- a/packet-vrrp.c
+++ b/packet-vrrp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-vrrp.c,v 1.19 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-vrrp.c,v 1.20 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -39,7 +39,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "in_cksum.h"
diff --git a/packet-vtp.c b/packet-vtp.c
index 06407ae18f..0dc9bba95e 100644
--- a/packet-vtp.c
+++ b/packet-vtp.c
@@ -1,7 +1,7 @@
/* packet-vtp.c
* Routines for the disassembly of Cisco's Virtual Trunking Protocol
*
- * $Id: packet-vtp.c,v 1.17 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-vtp.c,v 1.18 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,7 +32,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/*
* See
diff --git a/packet-wap.c b/packet-wap.c
index fae9a81022..0c0fd08403 100644
--- a/packet-wap.c
+++ b/packet-wap.c
@@ -2,7 +2,7 @@
*
* Utility routines for WAP dissectors
*
- * $Id: packet-wap.c,v 1.4 2001/12/03 02:10:31 guy Exp $
+ * $Id: packet-wap.c,v 1.5 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-wap.h"
/*
diff --git a/packet-wap.h b/packet-wap.h
index c9eaf3a124..57ef6a7dbe 100644
--- a/packet-wap.h
+++ b/packet-wap.h
@@ -2,7 +2,7 @@
*
* Declarations for WAP packet disassembly
*
- * $Id: packet-wap.h,v 1.6 2001/12/03 02:10:31 guy Exp $
+ * $Id: packet-wap.h,v 1.7 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,7 +31,7 @@
#define __PACKET_WAP_H__
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/* Port Numbers as per IANA */
/* < URL:http://www.isi.edu/in-notes/iana/assignments/port-numbers/ > */
diff --git a/packet-wccp.c b/packet-wccp.c
index 25986ecf5e..6a5f4882d8 100644
--- a/packet-wccp.c
+++ b/packet-wccp.c
@@ -2,7 +2,7 @@
* Routines for Web Cache Coordination Protocol dissection
* Jerry Talkington <jerryt@netapp.com>
*
- * $Id: packet-wccp.c,v 1.25 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-wccp.c,v 1.26 2002/01/21 07:36:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,8 +37,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#include "packet-wccp.h"
static int proto_wccp = -1;
diff --git a/packet-wcp.c b/packet-wcp.c
index 6ea2011c8a..313d090811 100644
--- a/packet-wcp.c
+++ b/packet-wcp.c
@@ -2,7 +2,7 @@
* Routines for Wellfleet Compression frame disassembly
* Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-wcp.c,v 1.19 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-wcp.c,v 1.20 2002/01/21 07:36:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -107,9 +107,9 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-frame.h"
-#include "conversation.h"
+#include <epan/conversation.h>
#include "etypes.h"
#include "nlpid.h"
diff --git a/packet-who.c b/packet-who.c
index e6d9ec0196..26d7179fd0 100644
--- a/packet-who.c
+++ b/packet-who.c
@@ -2,7 +2,7 @@
* Routines for who protocol (see man rwhod)
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-who.c,v 1.21 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-who.c,v 1.22 2002/01/21 07:36:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <string.h>
#include <time.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/*
diff --git a/packet-wsp.c b/packet-wsp.c
index cf1126a04a..d1069c28f4 100644
--- a/packet-wsp.c
+++ b/packet-wsp.c
@@ -2,7 +2,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
- * $Id: packet-wsp.c,v 1.50 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-wsp.c,v 1.51 2002/01/21 07:36:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -53,9 +53,9 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "ipv6-utils.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/ipv6-utils.h>
+#include <epan/conversation.h>
#include "packet-wap.h"
#include "packet-wsp.h"
diff --git a/packet-wtls.c b/packet-wtls.c
index 4949fe926e..d3a127826c 100644
--- a/packet-wtls.c
+++ b/packet-wtls.c
@@ -2,7 +2,7 @@
*
* Routines to dissect WTLS component of WAP traffic.
*
- * $Id: packet-wtls.c,v 1.16 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-wtls.c,v 1.17 2002/01/21 07:36:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -53,7 +53,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-wap.h"
#include "packet-wtls.h"
diff --git a/packet-wtp.c b/packet-wtp.c
index 3fd9078f36..99f796d2f3 100644
--- a/packet-wtp.c
+++ b/packet-wtp.c
@@ -2,7 +2,7 @@
*
* Routines to dissect WTP component of WAP traffic.
*
- * $Id: packet-wtp.c,v 1.25 2002/01/17 06:29:17 guy Exp $
+ * $Id: packet-wtp.c,v 1.26 2002/01/21 07:36:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -53,7 +53,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "reassemble.h"
#include "packet-wap.h"
#include "packet-wtp.h"
diff --git a/packet-x11.c b/packet-x11.c
index 22acff5f45..cde3a5259a 100644
--- a/packet-x11.c
+++ b/packet-x11.c
@@ -2,7 +2,7 @@
* Routines for X11 dissection
* Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
*
- * $Id: packet-x11.c,v 1.27 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-x11.c,v 1.28 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -59,7 +59,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define cVALS(x) (const value_string*)(x)
diff --git a/packet-x25.c b/packet-x25.c
index 646eecfce2..f0869212bb 100644
--- a/packet-x25.c
+++ b/packet-x25.c
@@ -2,7 +2,7 @@
* Routines for x25 packet disassembly
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-x25.c,v 1.62 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-x25.c,v 1.63 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,7 @@
#include <stdlib.h>
#include <string.h>
#include "llcsaps.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
#include "nlpid.h"
#include "x264_prt_id.h"
diff --git a/packet-xot.c b/packet-xot.c
index 0b90a1c5e0..72696e061c 100644
--- a/packet-xot.c
+++ b/packet-xot.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-xot.c,v 1.8 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-xot.c,v 1.9 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define TCP_PORT_XOT 1998
diff --git a/packet-yhoo.c b/packet-yhoo.c
index a421c37fdf..758118298a 100644
--- a/packet-yhoo.c
+++ b/packet-yhoo.c
@@ -2,7 +2,7 @@
* Routines for yahoo messenger packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-yhoo.c,v 1.20 2001/12/17 23:17:34 guy Exp $
+ * $Id: packet-yhoo.c,v 1.21 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,7 +41,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-yhoo.h"
static int proto_yhoo = -1;
diff --git a/packet-zebra.c b/packet-zebra.c
index a57d7dfd5f..c0c40a54f8 100644
--- a/packet-zebra.c
+++ b/packet-zebra.c
@@ -3,7 +3,7 @@
*
* Jochen Friedrich <jochen@scram.de>
*
- * $Id: packet-zebra.c,v 1.17 2001/12/10 00:25:41 guy Exp $
+ * $Id: packet-zebra.c,v 1.18 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,7 @@
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_zebra = -1;
static int hf_zebra_len = -1;
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 9215ba64c0..ee5ea02043 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -1,12 +1,12 @@
#
-# $Id: Makefile.nmake,v 1.11 2001/12/12 01:29:08 guy Exp $
+# $Id: Makefile.nmake,v 1.12 2002/01/21 07:37:45 guy Exp $
#
include ..\config.nmake
############### no need to modify below this line #########
-CFLAGS=/DHAVE_CONFIG_H /I.. /I../epan /I../wiretap /I. \
+CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index a676cc0290..12d6ed1686 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -1,12 +1,12 @@
#
-# $Id: Makefile.nmake,v 1.4 2001/12/12 01:29:09 guy Exp $
+# $Id: Makefile.nmake,v 1.5 2002/01/21 07:37:46 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c
index 5d1705c7d3..7eb0e0aac6 100644
--- a/plugins/giop/packet-coseventcomm.c
+++ b/plugins/giop/packet-coseventcomm.c
@@ -60,8 +60,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "proto.h"
+#include <epan/packet.h>
+#include <epan/proto.h>
#include "packet-giop.h"
#include "plugins/plugin_api_defs.h"
diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c
index 5bd3a3f115..32282594f9 100644
--- a/plugins/giop/packet-cosnaming.c
+++ b/plugins/giop/packet-cosnaming.c
@@ -61,8 +61,8 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "proto.h"
+#include <epan/packet.h>
+#include <epan/proto.h>
#include "packet-giop.h"
#include "plugins/plugin_api_defs.h"
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index dad3f4d622..768c014077 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -1,12 +1,12 @@
#
-# $Id: Makefile.nmake,v 1.6 2001/12/12 01:29:10 guy Exp $
+# $Id: Makefile.nmake,v 1.7 2002/01/21 07:37:48 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index fdc451179c..311f8afdf0 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -3,7 +3,7 @@
* By Steve Limkemann <stevelim@dgtech.com>
* Copyright 1998 Steve Limkemann
*
- * $Id: packet-gryphon.c,v 1.26 2001/12/10 00:26:20 guy Exp $
+ * $Id: packet-gryphon.c,v 1.27 2002/01/21 07:37:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -44,7 +44,7 @@
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-gryphon.h"
#include "plugins/plugin_api_defs.h"
diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index a1f12b9cfe..a925755d83 100644
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -1,12 +1,12 @@
#
-# $Id: Makefile.nmake,v 1.3 2001/12/12 01:29:11 guy Exp $
+# $Id: Makefile.nmake,v 1.4 2002/01/21 07:37:49 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c
index 5e09043b42..417c69ee9f 100644
--- a/plugins/mgcp/packet-mgcp.c
+++ b/plugins/mgcp/packet-mgcp.c
@@ -2,7 +2,7 @@
* Routines for mgcp packet disassembly
* RFC 2705
*
- * $Id: packet-mgcp.c,v 1.30 2002/01/20 23:25:55 guy Exp $
+ * $Id: packet-mgcp.c,v 1.31 2002/01/21 07:37:49 guy Exp $
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
@@ -47,10 +47,10 @@
#include <ctype.h>
#include <time.h>
#include <string.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "prefs.h"
-#include "strutil.h"
+#include <epan/strutil.h>
#include "plugins/plugin_api_defs.h"
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index f9bc5af54b..fdefaf07e4 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -1,7 +1,7 @@
/* plugin_api.h
* Routines for Ethereal plugins.
*
- * $Id: plugin_api.h,v 1.33 2002/01/05 04:12:17 gram Exp $
+ * $Id: plugin_api.h,v 1.34 2002/01/21 07:37:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -188,8 +188,8 @@
#endif
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "prefs.h"
#include "packet-giop.h"
diff --git a/prefs.c b/prefs.c
index 7a8eacdfc8..c53092da5e 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.79 2002/01/15 20:09:55 guy Exp $
+ * $Id: prefs.c,v 1.80 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,13 +41,13 @@
#include <glib.h>
-#include <filesystem.h>
+#include <epan/filesystem.h>
#include "globals.h"
-#include <resolv.h>
-#include "packet.h"
+#include <epan/resolv.h>
+#include <epan/packet.h>
#include "file.h"
#include "prefs.h"
-#include "proto.h"
+#include <epan/proto.h>
#include "column.h"
#include "print.h"
diff --git a/print.c b/print.c
index 787a700643..250f9841c8 100644
--- a/print.c
+++ b/print.c
@@ -1,7 +1,7 @@
/* print.c
* Routines for printing packet analysis trees.
*
- * $Id: print.c,v 1.38 2001/12/18 21:31:02 gram Exp $
+ * $Id: print.c,v 1.39 2002/01/21 07:36:48 guy Exp $
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
@@ -35,11 +35,11 @@
# include <sys/types.h>
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "print.h"
#include "ps.h"
#include "util.h"
-#include "tvbuff.h"
+#include <epan/tvbuff.h>
static void proto_tree_print_node_text(GNode *node, gpointer data);
static void proto_tree_print_node_ps(GNode *node, gpointer data);
diff --git a/print.h b/print.h
index 11f1923e42..5c769f78bd 100644
--- a/print.h
+++ b/print.h
@@ -1,7 +1,7 @@
/* print.h
* Definitions for printing packet analysis trees.
*
- * $Id: print.h,v 1.24 2001/11/13 23:55:30 gram Exp $
+ * $Id: print.h,v 1.25 2002/01/21 07:36:48 guy Exp $
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
@@ -27,7 +27,7 @@
#ifndef __PRINT_H__
#define __PRINT_H__
-#include "packet.h"
+#include <epan/packet.h>
#define PR_FMT_TEXT 0
#define PR_FMT_PS 1
diff --git a/proto_hier_stats.c b/proto_hier_stats.c
index 3ee1708ad2..8493949d43 100644
--- a/proto_hier_stats.c
+++ b/proto_hier_stats.c
@@ -1,7 +1,7 @@
/* proto_hier_stats.c
* Routines for calculating statistics based on protocol.
*
- * $Id: proto_hier_stats.c,v 1.10 2002/01/02 20:23:46 gram Exp $
+ * $Id: proto_hier_stats.c,v 1.11 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -30,7 +30,7 @@
#include "globals.h"
#include "proto_hier_stats.h"
#include "progress_dlg.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
#include <wtap.h>
#include <stdio.h>
diff --git a/proto_hier_stats.h b/proto_hier_stats.h
index 49d248cb12..f7c3f775fc 100644
--- a/proto_hier_stats.h
+++ b/proto_hier_stats.h
@@ -1,6 +1,6 @@
/* proto_hier_stats.h
*
- * $Id: proto_hier_stats.h,v 1.2 2001/06/12 06:31:14 guy Exp $
+ * $Id: proto_hier_stats.h,v 1.3 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -24,7 +24,7 @@
#ifndef PROTO_HIER_STATS_H
#define PROTO_HIER_STATS_H
-#include "proto.h"
+#include <epan/proto.h>
typedef struct {
header_field_info *hfinfo;
diff --git a/ptvcursor.h b/ptvcursor.h
index 366796954d..7840ddba63 100644
--- a/ptvcursor.h
+++ b/ptvcursor.h
@@ -3,10 +3,10 @@
* Proto Tree TVBuff cursor
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: ptvcursor.h,v 1.4 2002/01/10 04:44:34 gram Exp $
+ * $Id: ptvcursor.h,v 1.5 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
typedef struct ptvcursor ptvcursor_t;
diff --git a/reassemble.c b/reassemble.c
index f24311c279..40a919f507 100644
--- a/reassemble.c
+++ b/reassemble.c
@@ -1,7 +1,7 @@
/* reassemble.c
* Routines for {fragment,segment} reassembly
*
- * $Id: reassemble.c,v 1.7 2002/01/04 20:20:08 guy Exp $
+ * $Id: reassemble.c,v 1.8 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,7 +28,7 @@
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "reassemble.h"
diff --git a/summary.c b/summary.c
index 3da60a62b1..180b3747a4 100644
--- a/summary.c
+++ b/summary.c
@@ -1,13 +1,12 @@
/* summary.c
* Routines for capture file summary info
*
- * $Id: summary.c,v 1.20 2001/02/11 09:28:15 guy Exp $
+ * $Id: summary.c,v 1.21 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* 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
@@ -23,12 +22,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "globals.h"
#include "summary.h"
diff --git a/tethereal.c b/tethereal.c
index a507262ee9..c7081ec11a 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
/* tethereal.c
*
- * $Id: tethereal.c,v 1.118 2002/01/15 23:11:02 gram Exp $
+ * $Id: tethereal.c,v 1.119 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -87,28 +87,28 @@
#endif
#include <glib.h>
-#include <epan.h>
+#include <epan/epan.h>
#include "globals.h"
-#include "timestamp.h"
-#include "packet.h"
+#include <epan/timestamp.h>
+#include <epan/packet.h>
#include "file.h"
#include "prefs.h"
#include "column.h"
#include "print.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "util.h"
#ifdef HAVE_LIBPCAP
#include "pcap-util.h"
#endif
-#include "conversation.h"
+#include <epan/conversation.h>
#include "reassemble.h"
-#include "plugins.h"
+#include <epan/plugins.h>
#include "register.h"
#include "conditions.h"
#include "capture_stop_conditions.h"
#include "ringbuffer.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
#ifdef WIN32
#include "capture-wpcap.h"
diff --git a/xdlc.c b/xdlc.c
index ec0ca1ac69..b27cedec99 100644
--- a/xdlc.c
+++ b/xdlc.c
@@ -2,7 +2,7 @@
* Routines for use by various SDLC-derived protocols, such as HDLC
* and its derivatives LAPB, IEEE 802.2 LLC, etc..
*
- * $Id: xdlc.c,v 1.16 2001/12/10 00:25:42 guy Exp $
+ * $Id: xdlc.c,v 1.17 2002/01/21 07:36:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "xdlc.h"
/*