/* 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>
# include "config.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "afn.h"
const value_string afn_vals[] = {
/* 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:
*
* 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.
- *
*/
/*
#endif
#include <glib.h>
-#include "tvbuff.h"
+#include <epan/tvbuff.h>
#include "asn1.h"
/*
/* 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>
#include "gtk/main.h"
#include "gtk/gtkglobals.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "file.h"
#include "capture.h"
#include "util.h"
/* 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
#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 */
-# $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
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,
/* 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.
#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"
-$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
############### 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)
/*
- * $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
#include "dfilter.h"
#include "syntax-tree.h"
-#include "proto.h"
+#include <epan/proto.h>
/* Passed back to user */
struct _dfilter_t {
/*
- * $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
#include "gencode.h"
#include "semcheck.h"
#include "dfvm.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
/* Balanced tree of abbreviations and IDs */
/*
- * $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
/* 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 */
/*
- * $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
#define DFVM_H
#include <stdio.h>
-#include "proto.h"
+#include <epan/proto.h>
#include "dfilter-int.h"
#include "syntax-tree.h"
#include "drange.h"
/*
- * $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
#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);
/*
- * $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>
#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);
/*
- * $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
#include <glib.h>
-#include "proto.h"
+#include <epan/proto.h>
#include "drange.h"
#include "sttype-range.h"
/*
- * $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>
#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
/*
- * $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
#include <stdlib.h>
#include <errno.h>
#include "ftypes-int.h"
-#include "resolv.h"
+#include <epan/resolv.h>
static void
/*
- * $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>
#include <string.h>
#include <ftypes-int.h>
-#include "ipv4.h"
-#include "resolv.h"
+#include <epan/ipv4.h>
+#include <epan/resolv.h>
static void
/*
- * $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
#endif
#include <ftypes-int.h>
-#include "gdebug.h"
+#include <epan/gdebug.h>
static void
value_new(fvalue_t *fv)
/*
- * $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
#ifndef FTYPES_INT_H
#define FTYPES_INT_H
-#include "packet.h"
+#include <epan/packet.h>
#include "ftypes.h"
typedef void (*FvalueNewFunc)(fvalue_t*);
/* 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>
/* ---------------- 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;
/* 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>
# 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"
#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;
/* 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>
#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 {
/* 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>
#include <glib.h>
-#include <filesystem.h>
+#include <epan/filesystem.h>
#include "filters.h"
/* 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
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "follow.h"
FILE* data_out_file;
/* 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
#ifndef __FOLLOW_H__
#define __FOLLOW_H__
-#include "packet.h"
+#include <epan/packet.h>
#define MAX_IPADDR_LEN 16
/* 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>
#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 */
* 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
############### 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 \
/* 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>
#include "capture.h"
#include "globals.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "main.h"
#include "ui_util.h"
#include "capture_dlg.h"
/* 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>
#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"
/* 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>
#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;
/* 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
#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
/* 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.
*
#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
/* 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>
#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"
/* 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>
#include "globals.h"
#include "gtkglobals.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "keys.h"
#include "filter_prefs.h"
#include "ui_util.h"
/* 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
#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"
/* 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>
#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 {
/* 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>
#include <glib.h>
-#include "proto.h"
+#include <epan/proto.h>
#include "globals.h"
#include "goto_dlg.h"
/* 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>
*
#include "gtkglobals.h"
#include "main.h"
#include "ui_util.h"
-#include "proto.h"
+#include <epan/proto.h>
typedef enum {
OVERVIEW_HELP,
/* 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>
#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"
#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"
/* 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>
#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"
#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;
/* 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>
#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"
*
* 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>
#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"
#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 {
/* 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
#include <gtk/gtk.h>
#include "globals.h"
-#include "plugins.h"
+#include <epan/plugins.h>
#include "dlg_utils.h"
#ifdef HAVE_PLUGINS
/* 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>
#include <epan/filesystem.h>
#include "main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "file.h"
#include "prefs.h"
#include "column_prefs.h"
/* 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>
#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,
/* 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>
#include <string.h>
#include "main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "util.h"
#include "menu.h"
#include "keys.h"
* 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>
#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"
/* 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>
#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[] = {
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>
#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"
/* 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>
*
#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;
* 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>
#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"
* 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>
# 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
/* 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>
#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"
/* 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>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_ascend = -1;
static int hf_link_type = -1;
/* 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>
*
#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;
/* 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>
#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"
*
* 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>
#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;
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
static const char*
bacapp_type_name (guint8 bacapp_type){
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
static dissector_handle_t bacapp_handle;
static dissector_handle_t data_handle;
/* 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.
#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);
* 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)
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-bgp.h"
#include "packet-ipv6.h"
#include "afn.h"
* 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
#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;
/* 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>
*
#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 */
* 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>
#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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
static int proto_bvlc = -1;
static int hf_bvlc_type = -1;
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#include "nlpid.h"
/*
/* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/*
* See
/* 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>
#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"
/* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-clip.h"
#include "packet-ip.h"
/* 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>
*
#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"
*
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipv6.h"
#define TCP_PORT_COPS 3288
* 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
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
/**********************************************************************/
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/* proto_data cannot be static because it's referenced in the
* print routines
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-dfs.h"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
* 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>
#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"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
* 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>
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-netlogon.h"
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-nt.h"
#include "smb.h"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-reg.h"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
* 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>
#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[]" */
* 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>
#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"
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-srvsvc.h"
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-dcerpc.h"
#include "packet-dcerpc-wkssvc.h"
* 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>
#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[] = {
/* 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>
#ifndef __PACKET_DCERPC_H__
#define __PACKET_DCERPC_H__
-#include "conversation.h"
+#include <epan/conversation.h>
typedef struct _e_uuid_t {
guint32 Data1;
* 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>
#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;
/* 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>
*
#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"
* 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
#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;
/* 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>
*
#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 */
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_dlsw = -1;
/* 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>
#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"
* 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>
#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:
/* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "in_cksum.h"
#include "packet-dvmrp.h"
/* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee8023.h"
#include "packet-ipx.h"
#include "packet-llc.h"
/* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee8023.h"
#include "packet-ipx.h"
#include "packet-llc.h"
* 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>
#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"
* 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
#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"
/* 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>
#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"
/* 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>
*
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ip.h"
#include "packet-ipx.h"
#include "packet-vlan.h"
*
* 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>
#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;
*
* 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>
#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"
#include "oui.h"
#include "nlpid.h"
#include "greproto.h"
-#include "conversation.h"
+#include <epan/conversation.h>
/*
* Bits in the address field.
*
* 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>
#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"
* 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>
#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;
* 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>
#include "strerror.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-giop.h"
/*
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "llcsaps.h"
/* Initialize the protocol and registered fields */
* 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>
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-gnutella.h"
static int proto_gnutella = -1;
* 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>
#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"
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipv6.h"
#include "prefs.h"
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "llcsaps.h"
/* Initialize the protocol and registered fields */
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_h1 = -1;
static int hf_h1_header = -1;
*
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
*
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static gint proto_hsrp = -1;
*
* 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>
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
#include "packet-http.h"
#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,
/* 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>
# 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
* 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>
#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;
/* 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>
# 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;
* 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>
#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"
/* 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
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee8023.h"
static dissector_handle_t ipx_handle;
/* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "in_cksum.h"
#include "packet-dvmrp.h"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#define IGRP_HEADER_LENGTH 12
* 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>
#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;
/* 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>
# 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"
*
* 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>
#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;
/* 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>
#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"
/* 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>
#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"
/* 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>
#ifndef __PACKET_IPV6_H_DEFINED__
#define __PACKET_IPV6_H_DEFINED__
-#include "ipv6-utils.h"
+#include <epan/ipv6-utils.h>
#define INET6_ADDRSTRLEN 46
* 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>
#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"
/* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_irc = -1;
static int hf_irc_request = -1;
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
static int proto_isakmp = -1;
*
* 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>
# 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;
/* 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
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-osi.h"
#include "packet-isis.h"
#include "packet-isis-clv.h"
/* 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
#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"
/* 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
#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;
/* 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
#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"
* 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
#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"
/* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-isl.h"
#include "packet-eth.h"
#include "packet-tr.h"
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ip.h"
#define MTP3_ISUP_SERVICE_INDICATOR 5
*
* Copyright 2000, Michael Tüxen <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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#define SCTP_PORT_IUA 9900
#define IUA_PAYLOAD_PROTO_ID 1
* 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>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
-#include "strutil.h"
+#include <epan/strutil.h>
#include "asn1.h"
* 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>
#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
* 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>
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "xdlc.h"
#define FROM_DCE 0x80
* 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>
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "etypes.h"
static int proto_lapbether = -1;
* 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>
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "xdlc.h"
/* ISDN/LAPD references:
/* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ldap.h"
#include "asn1.h"
/* 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>
*
#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"
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "oui.h"
#include "xdlc.h"
#include "etypes.h"
#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"
* 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>
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "nlpid.h"
static int proto_lmi = -1;
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define TCP_PORT_PRINTER 515
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
/* Warning: Neither of these are standardized yet! */
*
* 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>
#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 */
*
* Copyright 2000, Michael Tüxen <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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#define SCTP_PORT_M3UA 2905
#define M3UA_PAYLOAD_PROTO_ID 3
/* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_mapi = -1;
static int hf_mapi_request = -1;
*
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#define DEBUG
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
/* Initialize the protocol and registered fields */
static int proto_mip = -1;
* 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>
# 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 */
*
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
*
* (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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ppptypes.h"
#include "etypes.h"
/* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "in_cksum.h"
#include "packet-mrdisc.h"
*
* 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>
#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,
/* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "in_cksum.h"
#include "packet-msnip.h"
* 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>
# 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"
*
* 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>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/* Initialize the protocol and registered fields */
static int proto_mtp2 = -1;
* 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>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
/* Initialize the protocol and registered fields */
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipx.h"
#include "packet-netbios.h"
* 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>
#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"
* 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>
#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"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-rpc.h"
#include "prefs.h"
*
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "llcsaps.h"
#include "packet-netbios.h"
* 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>
#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;
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "packet-ntp.h"
/*
/* 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>
#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"
* 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
#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"
* 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>
*
#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"
/* 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>
#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
* 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
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "in_cksum.h"
#include "ieee-float.h"
/* 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
*
#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);
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "afn.h"
#include "packet-ipv6.h"
* 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>
#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;
/* 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>
#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"
/* 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>
#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;
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_pptp = -1;
static int hf_pptp_message_type = -1;
*
* 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>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee80211.h"
#include "packet-prism.h"
* 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>
#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"
* 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
*
#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"
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_qllc = -1;
* 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>
#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;
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
static int proto_quake2 = -1;
*
* 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>
#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;
* 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>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
static int proto_quakeworld = -1;
* 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>
#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;
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#define SCCP_SSN_RANAP 0x8E
/* 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>
#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"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define UDP_PORT_RIP 520
* (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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ripng.h"
#ifndef offsetof
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "packet-tcp.h"
* 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>
#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"
/* 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
*
#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])
* 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>
#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;
*
* (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>
# 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"
/* 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
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#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)
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#include <string.h>
#include "packet-rtp.h"
-#include "conversation.h"
+#include <epan/conversation.h>
/* RTP header fields */
static int proto_rtp = -1;
* 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>
#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;
* 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>
#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
*
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ipv6.h"
#define UDP_PORT_SAP 9875
* 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>
#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"
* - 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>
#endif
#include "prefs.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
/* Initialize the protocol and registered fields */
* 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>
#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;
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define TCP_PORT_SIP 5060
#define UDP_PORT_SIP 5060
* 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>
* #endif
*/
-#include "packet.h"
+#include <epan/packet.h>
/* REMOVE?
- * #include "strutil.h"
+ * #include <epan/strutil.h>
*/
#define TCP_PORT_SKINNY 2000
* 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>
#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;
/* 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>
#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;
* 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>
#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"
* 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>
#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"
* 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>
#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"
* 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>
#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"
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
/* #include "packet-smpp.h" */ /* We autoregister */
/* Forward declarations */
/* 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>
*
#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
* 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>
#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
*
* 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>
#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"
* 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>
# 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))
* 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>
# 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;
* 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>
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_sscop = -1;
* 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>
# include "snprintf.h"
#endif
-#include "conversation.h"
+#include <epan/conversation.h>
#include "prefs.h"
static gboolean ssl_desegment = TRUE;
*
* Copyright 2000, Michael Tüxen <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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
#include "prefs.h"
#define SCTP_PORT_SUA 14001
*
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define UDP_PORT_SYSLOG 514
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_tacacs = -1;
static int hf_tacacs_version = -1;
/* 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>
# 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 */
* 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>
#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;
* 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>
#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;
*
* 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>
# include "config.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
static int proto_time = -1;
static int hf_time_time = -1;
/* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-tns.h"
static int proto_tns = -1;
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
* 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>
#include <string.h>
#include <stdio.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-tr.h"
#include "packet-llc.h"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_trmac = -1;
static int hf_trmac_mv = -1;
* 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>
# include "snprintf.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
/* #include "packet-ucp.h" */ /* We autoregister */
/* Prototypes */
/* 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>
#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"
#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;
* 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>
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "xdlc.h"
#define FROM_DCE 0x80
/* 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>
*
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-vines.h"
#include "etypes.h"
#include "ppptypes.h"
/* 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>
*
#ifndef __PACKETVINES_H__
#define __PACKETVINES_H__
-#include "to_str.h"
+#include <epan/to_str.h>
#define VINES_ADDR_LEN 6
/* 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>
#include <glib.h>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ppp.h"
#include "ppptypes.h"
#include "in_cksum.h"
/* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ieee8023.h"
#include "packet-ipx.h"
#include "packet-llc.h"
*
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "in_cksum.h"
/* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/*
* See
*
* 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>
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-wap.h"
/*
*
* 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>
#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/ > */
* 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>
#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;
* 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>
#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"
* 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>
#include <string.h>
#include <time.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
/*
*
* 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>
#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"
*
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-wap.h"
#include "packet-wtls.h"
*
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "reassemble.h"
#include "packet-wap.h"
#include "packet-wtp.h"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define cVALS(x) (const value_string*)(x)
* 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>
#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"
*
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#define TCP_PORT_XOT 1998
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-yhoo.h"
static int proto_yhoo = -1;
*
* 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>
#include <ctype.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
static int proto_zebra = -1;
static int hf_zebra_len = -1;
#
-# $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)
#
-# $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)
#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"
#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"
#
-# $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)
* 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>
#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"
#
-# $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)
* 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>
*
#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"
/* 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>
#endif
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
#include "prefs.h"
#include "packet-giop.h"
/* 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>
#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"
/* 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>
*
# 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);
/* 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>
*
#ifndef __PRINT_H__
#define __PRINT_H__
-#include "packet.h"
+#include <epan/packet.h>
#define PR_FMT_TEXT 0
#define PR_FMT_PS 1
/* 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>
#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>
/* 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>
#ifndef PROTO_HIER_STATS_H
#define PROTO_HIER_STATS_H
-#include "proto.h"
+#include <epan/proto.h>
typedef struct {
header_field_info *hfinfo;
* 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
#endif
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
typedef struct ptvcursor ptvcursor_t;
/* 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>
#include <string.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "reassemble.h"
/* 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
* 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"
/* 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>
#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"
* 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>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "xdlc.h"
/*
git.samba.org / obnox / wireshark / wip.git / commitdiff