aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--capture.c10
-rw-r--r--column.c4
-rw-r--r--dfilter.c26
-rw-r--r--dfilter.h4
-rw-r--r--file.c17
-rw-r--r--file.h14
-rw-r--r--globals.h13
-rw-r--r--gtk/capture_dlg.c7
-rw-r--r--gtk/color_dlg.c5
-rw-r--r--gtk/colors.c5
-rw-r--r--gtk/colors.h7
-rw-r--r--gtk/column_prefs.c9
-rw-r--r--gtk/display_opts.c15
-rw-r--r--gtk/dlg_utils.h7
-rw-r--r--gtk/file_dlg.c20
-rw-r--r--gtk/filter_prefs.c6
-rw-r--r--gtk/find_dlg.c4
-rw-r--r--gtk/follow_dlg.c13
-rw-r--r--gtk/follow_dlg.h6
-rw-r--r--gtk/goto_dlg.c4
-rw-r--r--gtk/gui_prefs.c8
-rw-r--r--gtk/gui_prefs.h6
-rw-r--r--gtk/help_dlg.c10
-rw-r--r--gtk/help_dlg.h7
-rw-r--r--gtk/main.c13
-rw-r--r--gtk/main.h6
-rw-r--r--gtk/packet_win.h7
-rw-r--r--gtk/plugins_dlg.c6
-rw-r--r--gtk/prefs_dlg.c4
-rw-r--r--gtk/prefs_dlg.h4
-rw-r--r--gtk/print_dlg.c17
-rw-r--r--gtk/print_prefs.c18
-rw-r--r--gtk/print_prefs.h6
-rw-r--r--gtk/simple_dialog.c7
-rw-r--r--gtk/stream_prefs.c17
-rw-r--r--gtk/stream_prefs.h6
-rw-r--r--gtk/summary_dlg.c7
-rw-r--r--inet_aton.h8
-rw-r--r--inet_ntop.c9
-rw-r--r--inet_pton.c4
-rw-r--r--inet_v6defs.h7
-rw-r--r--ipproto.c15
-rw-r--r--nlpid.h6
-rw-r--r--oui.h7
-rw-r--r--packet-ascend.h7
-rw-r--r--packet-atalk.h6
-rw-r--r--packet-atm.h7
-rw-r--r--packet-bgp.c20
-rw-r--r--packet-bpdu.h6
-rw-r--r--packet-cdp.h6
-rw-r--r--packet-cgmp.h6
-rw-r--r--packet-clip.h7
-rw-r--r--packet-ddtp.h7
-rw-r--r--packet-diameter.h7
-rw-r--r--packet-eth.h8
-rw-r--r--packet-fddi.h7
-rw-r--r--packet-http.h6
-rw-r--r--packet-icmpv6.c10
-rw-r--r--packet-icq.c7
-rw-r--r--packet-ip.c13
-rw-r--r--packet-ipp.h6
-rw-r--r--packet-ipsec.h6
-rw-r--r--packet-ipx.h6
-rw-r--r--packet-isakmp.c10
-rw-r--r--packet-isis-clv.c14
-rw-r--r--packet-isl.h7
-rw-r--r--packet-kerberos.h7
-rw-r--r--packet-lapb.h7
-rw-r--r--packet-lapd.h7
-rw-r--r--packet-ldap.c7
-rw-r--r--packet-ldap.h7
-rw-r--r--packet-llc.h7
-rw-r--r--packet-mip.c12
-rw-r--r--packet-msproxy.c17
-rw-r--r--packet-nbipx.h6
-rw-r--r--packet-ncp-int.h7
-rw-r--r--packet-netbios.h9
-rw-r--r--packet-ntp.c7
-rw-r--r--packet-null.h7
-rw-r--r--packet-ospf.h33
-rw-r--r--packet-pim.c16
-rw-r--r--packet-portmap.h25
-rw-r--r--packet-ppp.h7
-rw-r--r--packet-q2931.h7
-rw-r--r--packet-q931.h7
-rw-r--r--packet-raw.h7
-rw-r--r--packet-rip.h31
-rw-r--r--packet-ripng.h7
-rw-r--r--packet-rlogin.c15
-rw-r--r--packet-rpc.h27
-rw-r--r--packet-rsvp.c10
-rw-r--r--packet-rtcp.h7
-rw-r--r--packet-rtp.h7
-rw-r--r--packet-sctp.c13
-rw-r--r--packet-sdp.h6
-rw-r--r--packet-smb-common.h7
-rw-r--r--packet-smb.h6
-rw-r--r--packet-sna.h7
-rw-r--r--packet-snmp.h7
-rw-r--r--packet-socks.c17
-rw-r--r--packet-srvloc.c14
-rw-r--r--packet-sscop.h7
-rw-r--r--packet-stat.h25
-rw-r--r--packet-tcp.c16
-rw-r--r--packet-tcp.h7
-rw-r--r--packet-tftp.h6
-rw-r--r--packet-tr.h7
-rw-r--r--packet-trmac.h6
-rw-r--r--packet-udp.h7
-rw-r--r--packet-v120.h7
-rw-r--r--packet-vlan.h7
-rw-r--r--packet-vtp.h6
-rw-r--r--packet-x11-declarations.h7
-rw-r--r--packet-x11-keysym.h7
-rw-r--r--packet-x25.h7
-rw-r--r--packet-ypbind.h25
-rw-r--r--packet-ypserv.h25
-rw-r--r--packet-ypxfr.h25
-rw-r--r--packet.c12
-rw-r--r--packet.h11
-rw-r--r--plugins.c8
-rw-r--r--plugins.h7
-rw-r--r--plugins/plugin_api.h5
-rw-r--r--prefs.c4
-rw-r--r--print.h4
-rw-r--r--proto.c28
-rw-r--r--proto.h11
-rw-r--r--ptvcursor.c4
-rw-r--r--ptvcursor.h11
-rw-r--r--snprintf-imp.h6
-rw-r--r--snprintf.c2
-rw-r--r--snprintf.h12
-rw-r--r--strerror.h7
-rw-r--r--tethereal.c17
-rw-r--r--tvbuff.c4
-rw-r--r--tvbuff.h7
-rw-r--r--util.c7
-rw-r--r--wiretap/ascend.c4
-rw-r--r--wiretap/ascend.h7
-rw-r--r--wiretap/buffer.c4
-rw-r--r--wiretap/buffer.h7
-rw-r--r--wiretap/config.h.win329
-rw-r--r--wiretap/configure.in4
-rw-r--r--wiretap/csids.h7
-rw-r--r--wiretap/file.c11
-rw-r--r--wiretap/i4btrace.h7
-rw-r--r--wiretap/iptrace.h7
-rw-r--r--wiretap/lanalyzer.h7
-rw-r--r--wiretap/libpcap.h7
-rw-r--r--wiretap/netmon.h7
-rw-r--r--wiretap/nettl.h7
-rw-r--r--wiretap/netxray.h7
-rw-r--r--wiretap/ngsniffer.h7
-rw-r--r--wiretap/radcom.h7
-rw-r--r--wiretap/snoop.h7
-rw-r--r--wiretap/toshiba.h7
-rw-r--r--wiretap/wtap-int.h5
-rw-r--r--wiretap/wtap.h4
-rw-r--r--xdlc.h7
159 files changed, 885 insertions, 595 deletions
diff --git a/capture.c b/capture.c
index 668e783c53..bb3756e999 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
/* capture.c
* Routines for packet capture windows
*
- * $Id: capture.c,v 1.116 2000/07/31 04:03:31 guy Exp $
+ * $Id: capture.c,v 1.117 2000/08/11 13:34:41 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -50,7 +50,10 @@
#include <stdio.h>
#include <ctype.h>
#include <string.h>
+
+#ifdef HAVE_FCNTL_H
#include <fcntl.h>
+#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -74,11 +77,6 @@
#include <errno.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/column.c b/column.c
index 9bff391618..1c802807ac 100644
--- a/column.c
+++ b/column.c
@@ -1,7 +1,7 @@
/* column.c
* Routines for handling column preferences
*
- * $Id: column.c,v 1.27 2000/01/10 01:43:47 guy Exp $
+ * $Id: column.c,v 1.28 2000/08/11 13:34:48 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -39,7 +39,9 @@
#include <unistd.h>
#endif
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
#include "timestamp.h"
#include "prefs.h"
diff --git a/dfilter.c b/dfilter.c
index 1fa0b3932b..ec163e6e64 100644
--- a/dfilter.c
+++ b/dfilter.c
@@ -1,7 +1,7 @@
/* dfilter.c
* Routines for display filters
*
- * $Id: dfilter.c,v 1.36 2000/08/01 18:10:05 gram Exp $
+ * $Id: dfilter.c,v 1.37 2000/08/11 13:35:31 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -31,39 +31,17 @@
# include <sys/types.h>
#endif
-#ifndef _STDIO_H
#include <stdio.h>
-#endif
-
-#ifndef _STRING_H
#include <string.h>
-#endif
+#include <glib.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#ifndef __G_LIB_H__
-#include <glib.h>
-#endif
-
-#ifndef __PROTO_H__
#include "proto.h"
-#endif
-
-#ifndef __DFILTER_H__
#include "dfilter.h"
-#endif
-
-#ifndef __UTIL_H__
#include "util.h"
-#endif
-
#include "dfilter-int.h"
#include "dfilter-grammar.h"
diff --git a/dfilter.h b/dfilter.h
index 54c11478ef..0a0a3e9dec 100644
--- a/dfilter.h
+++ b/dfilter.h
@@ -1,7 +1,7 @@
/* dfilter.h
* Definitions for display filters
*
- * $Id: dfilter.h,v 1.17 2000/08/01 18:10:06 gram Exp $
+ * $Id: dfilter.h,v 1.18 2000/08/11 13:34:40 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -26,9 +26,7 @@
#ifndef __DFILTER_H__
#define __DFILTER_H__
-#ifndef __PROTO_H__
#include "proto.h"
-#endif
/* dfilter_error_msg is NULL if there was no error during dfilter_compile,
* otherwise it points to a displayable error message. */
diff --git a/file.c b/file.c
index f29a181f0c..ee2b442249 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
- * $Id: file.c,v 1.204 2000/08/09 06:18:10 gram Exp $
+ * $Id: file.c,v 1.205 2000/08/11 13:34:20 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -42,17 +42,18 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <sys/stat.h>
#include <errno.h>
-#include <fcntl.h>
#include <signal.h>
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/file.h b/file.h
index 19eb987a10..20f91b12f5 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,7 @@
/* file.h
* Definitions for file structures and routines
*
- * $Id: file.h,v 1.74 2000/08/09 06:18:16 gram Exp $
+ * $Id: file.h,v 1.75 2000/08/11 13:34:30 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -30,27 +30,15 @@
#include <sys/types.h>
#endif
-#ifndef __WTAP_H__
#include "wiretap/wtap.h"
-#endif
#ifdef HAVE_LIBPCAP
-#ifndef lib_pcap_h
#include <pcap.h>
#endif
-#endif
-#ifndef __DFILTER_H__
#include "dfilter.h"
-#endif
-
-#ifndef __COLORS_H__
#include "gtk/colors.h" /* XXX */
-#endif
-
-#ifndef __PRINT_H__
#include "print.h"
-#endif
#include <errno.h>
diff --git a/globals.h b/globals.h
index 265f8af0f8..ce1847a8d0 100644
--- a/globals.h
+++ b/globals.h
@@ -1,7 +1,7 @@
/* globals.h
* Global defines, etc.
*
- * $Id: globals.h,v 1.19 2000/08/03 12:44:21 gram Exp $
+ * $Id: globals.h,v 1.20 2000/08/11 13:34:29 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -26,21 +26,10 @@
#ifndef __GLOBALS_H__
#define __GLOBALS_H__
-#ifndef _STDIO_H_
#include <stdio.h>
-#endif
-
-#ifndef __PACKET_H__
#include "packet.h"
-#endif
-
-#ifndef __FILE_H__
#include "file.h"
-#endif
-
-#ifndef __TIMESTAMP_H__
#include "timestamp.h"
-#endif
#define MIN_PACKET_SIZE 68 /* minimum amount of packet data we can read */
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 8ef9bc45e1..d9317e4534 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
- * $Id: capture_dlg.c,v 1.29 2000/07/20 05:09:56 guy Exp $
+ * $Id: capture_dlg.c,v 1.30 2000/08/11 13:32:58 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -42,11 +42,6 @@
#include <time.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 20818eef0d..674b1e4b97 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,7 +1,7 @@
/* color_dlg.c
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.c,v 1.5 2000/07/20 05:09:56 guy Exp $
+ * $Id: color_dlg.c,v 1.6 2000/08/11 13:33:14 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -33,7 +33,10 @@
#include <string.h>
#include <errno.h>
+
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#include "gtk/main.h"
#include "packet.h"
diff --git a/gtk/colors.c b/gtk/colors.c
index b29315c7cc..ba22942703 100644
--- a/gtk/colors.c
+++ b/gtk/colors.c
@@ -1,7 +1,7 @@
/* colors.c
* Definitions for color structures and routines
*
- * $Id: colors.c,v 1.4 2000/07/20 05:09:58 guy Exp $
+ * $Id: colors.c,v 1.5 2000/08/11 13:33:13 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -34,7 +34,10 @@
#include <string.h>
#include <errno.h>
+
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#include "gtk/main.h"
#include "packet.h"
diff --git a/gtk/colors.h b/gtk/colors.h
index 587d86991f..8294e361b8 100644
--- a/gtk/colors.h
+++ b/gtk/colors.h
@@ -1,7 +1,7 @@
/* colors.h
* Definitions for color structures and routines
*
- * $Id: colors.h,v 1.2 2000/02/12 08:31:48 guy Exp $
+ * $Id: colors.h,v 1.3 2000/08/11 13:33:00 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -25,14 +25,9 @@
#ifndef __COLORS_H__
#define __COLORS_H__
-#ifndef __DFILTER_H__
#include "proto.h"
#include "dfilter.h"
-#endif
-
-#ifndef __GTK_H__
#include <gtk/gtk.h>
-#endif
#define MAXCOLORS 255
#define MAX_COLOR_FILTER_NAME_LEN 33
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index f206310783..97b23082a7 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -1,7 +1,7 @@
/* column_prefs.c
* Dialog box for column preferences
*
- * $Id: column_prefs.c,v 1.1 2000/01/10 01:43:58 guy Exp $
+ * $Id: column_prefs.c,v 1.2 2000/08/11 13:33:04 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -29,17 +29,10 @@
#include <errno.h>
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
-
#include "column_prefs.h"
#include "gtkglobals.h"
-
-#ifndef __PREFS_DLG_H__
#include "prefs_dlg.h"
-#endif
-
#include "prefs.h"
#include "column.h"
diff --git a/gtk/display_opts.c b/gtk/display_opts.c
index 2901695081..f97cb467bd 100644
--- a/gtk/display_opts.c
+++ b/gtk/display_opts.c
@@ -1,7 +1,7 @@
/* display_opts.c
* Routines for packet display windows
*
- * $Id: display_opts.c,v 1.13 2000/07/09 23:22:33 guy Exp $
+ * $Id: display_opts.c,v 1.14 2000/08/11 13:33:09 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -44,19 +44,14 @@
#include <time.h>
-#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
-# include "snprintf.h"
-#endif
-
#ifdef HAVE_SYS_SOCKIO_H
# include <sys/sockio.h>
#endif
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
+
#include "globals.h"
#include "timestamp.h"
#include "packet.h"
diff --git a/gtk/dlg_utils.h b/gtk/dlg_utils.h
index e73fdbc603..351bc7656b 100644
--- a/gtk/dlg_utils.h
+++ b/gtk/dlg_utils.h
@@ -1,7 +1,7 @@
/* dlg_utils.h
* Declarations of utilities to use when constructing dialogs
*
- * $Id: dlg_utils.h,v 1.3 2000/07/05 02:45:39 guy Exp $
+ * $Id: dlg_utils.h,v 1.4 2000/08/11 13:32:57 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -23,6 +23,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __DLG_UTILS_H__
+#define __DLG_UTILS_H__
+
/* Create a dialog box window that belongs to Ethereal's main window. */
GtkWidget *dlg_window_new(void);
@@ -39,3 +42,5 @@ GtkWidget *dlg_radio_button_new_with_label_with_mnemonic(GSList *group,
const gchar *label, GtkAccelGroup *accel_group);
GtkWidget *dlg_check_button_new_with_label_with_mnemonic(const gchar *label,
GtkAccelGroup *accel_group);
+
+#endif
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index f08b23c4d4..6155513817 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -1,7 +1,7 @@
/* file_dlg.c
* Dialog boxes for handling files
*
- * $Id: file_dlg.c,v 1.29 2000/07/31 04:53:40 guy Exp $
+ * $Id: file_dlg.c,v 1.30 2000/08/11 13:33:04 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -37,34 +37,16 @@
#include <string.h>
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
-#ifndef __GTKGLOBALS_H__
#include "gtkglobals.h"
-#endif
-
-#ifndef __KEYS_H__
#include "keys.h"
-#endif
-
#include "filter_prefs.h"
#include "ui_util.h"
-
-#ifndef __DIALOG_H__
#include "simple_dialog.h"
-#endif
-
-#ifndef __MENU_H__
#include "menu.h"
-#endif
-
#include "file_dlg.h"
#include "dlg_utils.h"
-
-#ifndef __UTIL_H__
#include "util.h"
-#endif
static void file_open_ok_cb(GtkWidget *w, GtkFileSelection *fs);
static void file_open_destroy_cb(GtkWidget *win, gpointer user_data);
diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index 425e3c201d..a145059ba1 100644
--- a/gtk/filter_prefs.c
+++ b/gtk/filter_prefs.c
@@ -3,7 +3,7 @@
* (This used to be a notebook page under "Preferences", hence the
* "prefs" in the file name.)
*
- * $Id: filter_prefs.c,v 1.15 2000/08/07 22:35:14 guy Exp $
+ * $Id: filter_prefs.c,v 1.16 2000/08/11 13:33:08 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -33,7 +33,11 @@
#include <stdlib.h>
#include <string.h>
+
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 46645ff2d0..1b03f55578 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -1,7 +1,7 @@
/* find_dlg.c
* Routines for "find frame" window
*
- * $Id: find_dlg.c,v 1.13 2000/07/20 05:09:59 guy Exp $
+ * $Id: find_dlg.c,v 1.14 2000/08/11 13:33:03 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -34,9 +34,7 @@
#include <unistd.h>
#endif
-#ifndef __G_LIB_H__
#include <glib.h>
-#endif
#include "proto.h"
#include "dfilter.h"
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index 93d5ab66f8..56b2d8f7e6 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,6 +1,6 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.c,v 1.3 2000/08/09 05:26:11 gram Exp $
+ * $Id: follow_dlg.c,v 1.4 2000/08/11 13:33:12 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -33,19 +33,20 @@
#include <string.h>
#include <errno.h>
+
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
#ifdef HAVE_IO_H
#include <io.h> /* open/close on win32 */
#endif
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/gtk/follow_dlg.h b/gtk/follow_dlg.h
index 6dd606294e..07fb180eea 100644
--- a/gtk/follow_dlg.h
+++ b/gtk/follow_dlg.h
@@ -1,6 +1,6 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.h,v 1.1 2000/08/03 12:44:37 gram Exp $
+ * $Id: follow_dlg.h,v 1.2 2000/08/11 13:32:57 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
*
*/
+#ifndef __FOLLOW_DLG_H__
+#define __FOLLOW_DLG_H__
+
void follow_stream_cb( GtkWidget *, gpointer);
+#endif
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index 169599f049..b07d443676 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -1,7 +1,7 @@
/* goto_dlg.c
* Routines for "go to frame" window
*
- * $Id: goto_dlg.c,v 1.9 2000/07/20 05:09:59 guy Exp $
+ * $Id: goto_dlg.c,v 1.10 2000/08/11 13:33:03 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -36,9 +36,7 @@
#include <unistd.h>
#endif
-#ifndef __G_LIB_H__
#include <glib.h>
-#endif
#include "proto.h"
#include "dfilter.h"
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index e3f6e32370..cd0213496c 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -1,7 +1,7 @@
/* gui_prefs.c
* Dialog box for GUI preferences
*
- * $Id: gui_prefs.c,v 1.4 2000/02/29 06:24:37 guy Exp $
+ * $Id: gui_prefs.c,v 1.5 2000/08/11 13:33:02 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -29,16 +29,10 @@
#include <errno.h>
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
-
#include "gui_prefs.h"
#include "gtkglobals.h"
-
-#ifndef __PREFS_DLG_H__
#include "prefs_dlg.h"
-#endif
static void scrollbar_menu_item_cb(GtkWidget *w, gpointer data);
static void plist_sel_browse_cb(GtkWidget *w, gpointer data);
diff --git a/gtk/gui_prefs.h b/gtk/gui_prefs.h
index 5447e68302..3520fd24e3 100644
--- a/gtk/gui_prefs.h
+++ b/gtk/gui_prefs.h
@@ -1,7 +1,7 @@
/* gui_prefs.h
* Definitions for GUI preferences window
*
- * $Id: gui_prefs.h,v 1.1 1999/12/16 06:20:16 gram Exp $
+ * $Id: gui_prefs.h,v 1.2 2000/08/11 13:32:58 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -23,9 +23,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __GUI_PREFS_H__
+#define __GUI_PREFS_H__
GtkWidget *gui_prefs_show(void);
void gui_prefs_ok(GtkWidget *w);
void gui_prefs_save(GtkWidget *w);
void gui_prefs_cancel(GtkWidget *w);
void gui_prefs_delete(GtkWidget *w);
+
+#endif
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index 8da3038129..c85ed2408c 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -1,6 +1,6 @@
/* help_dlg.c
*
- * $Id: help_dlg.c,v 1.1 2000/08/08 12:28:50 deniel Exp $
+ * $Id: help_dlg.c,v 1.2 2000/08/11 13:33:11 deniel Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@@ -32,14 +32,12 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/gtk/help_dlg.h b/gtk/help_dlg.h
index b607cfaac4..99c1ed0cbe 100644
--- a/gtk/help_dlg.h
+++ b/gtk/help_dlg.h
@@ -1,6 +1,6 @@
/* help_dlg.h
*
- * $Id: help_dlg.h,v 1.1 2000/08/08 12:28:50 deniel Exp $
+ * $Id: help_dlg.h,v 1.2 2000/08/11 13:32:57 deniel Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@@ -24,4 +24,9 @@
*
*/
+#ifndef __HELP_DLG_H__
+#define __HELP_DLG_H__
+
void help_cb(GtkWidget *, gpointer);
+
+#endif
diff --git a/gtk/main.c b/gtk/main.c
index a39889b5ad..5f923c692a 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.132 2000/08/05 07:02:28 guy Exp $
+ * $Id: main.c,v 1.133 2000/08/11 13:33:06 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -50,8 +50,14 @@
#endif
#include <errno.h>
+
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
#ifdef HAVE_IO_H
#include <io.h> /* open/close on win32 */
@@ -68,11 +74,6 @@
#include <signal.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/gtk/main.h b/gtk/main.h
index f846cfd9bb..fc92f327cd 100644
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -1,7 +1,7 @@
-/* ethereal.h
+/* main.h
* Global defines, etc.
*
- * $Id: main.h,v 1.15 2000/08/03 12:44:39 gram Exp $
+ * $Id: main.h,v 1.16 2000/08/11 13:32:58 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -30,9 +30,7 @@
#include "config.h"
#endif
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
#ifdef WIN32
#define MONO_MEDIUM_FONT "-*-lucida console-medium-*-*-*-*-100-*-*-*-*-*-*"
diff --git a/gtk/packet_win.h b/gtk/packet_win.h
index 53fb1ca013..6be5e7b530 100644
--- a/gtk/packet_win.h
+++ b/gtk/packet_win.h
@@ -3,7 +3,7 @@
*
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet_win.h,v 1.2 2000/03/02 07:05:57 guy Exp $
+ * $Id: packet_win.h,v 1.3 2000/08/11 13:32:57 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,7 +24,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_WIN_H__
+#define __PACKET_WIN_H__
+
extern void new_window_cb(GtkWidget *w);
void set_ptree_sel_browse_packet_wins(gboolean val);
void set_ptree_line_style_packet_wins(gint style);
void set_ptree_expander_style_packet_wins(gint style);
+
+#endif
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c
index a58c223369..e252ec2d72 100644
--- a/gtk/plugins_dlg.c
+++ b/gtk/plugins_dlg.c
@@ -1,7 +1,7 @@
/* plugins_dlg.c
* Dialog boxes for plugins
*
- * $Id: plugins_dlg.c,v 1.15 2000/07/20 05:10:02 guy Exp $
+ * $Id: plugins_dlg.c,v 1.16 2000/08/11 13:33:10 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -28,7 +28,11 @@
#endif
#include <errno.h>
+
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+
#include <stdlib.h>
#include <string.h>
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 1345a9507a..1c8b322038 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
/* prefs_dlg.c
* Routines for handling preferences
*
- * $Id: prefs_dlg.c,v 1.16 2000/07/10 09:18:38 guy Exp $
+ * $Id: prefs_dlg.c,v 1.17 2000/08/11 13:33:05 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -42,7 +42,9 @@
#include <unistd.h>
#endif
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
#include "main.h"
#include "packet.h"
diff --git a/gtk/prefs_dlg.h b/gtk/prefs_dlg.h
index 75b87184cf..94c06237a8 100644
--- a/gtk/prefs_dlg.h
+++ b/gtk/prefs_dlg.h
@@ -1,7 +1,7 @@
/* prefs_dlg.h
* Definitions for preference handling routines
*
- * $Id: prefs_dlg.h,v 1.3 2000/07/05 06:33:02 guy Exp $
+ * $Id: prefs_dlg.h,v 1.4 2000/08/11 13:32:59 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -26,9 +26,7 @@
#ifndef __PREFS_DLG_H__
#define __PREFS_DLG_H__
-#ifndef __PREFS_H__
#include "prefs.h"
-#endif
void prefs_cb(GtkWidget *, gpointer);
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 200c7084b1..d40e9afaf6 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,7 +1,7 @@
/* print_dlg.c
* Dialog boxes for printing
*
- * $Id: print_dlg.c,v 1.19 2000/07/05 02:45:41 guy Exp $
+ * $Id: print_dlg.c,v 1.20 2000/08/11 13:33:01 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -29,26 +29,11 @@
#include <errno.h>
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
-
-#ifndef __KEYS_H__
#include "keys.h"
-#endif
-
-#ifndef __PRINT_H__
#include "print.h"
-#endif
-
-#ifndef __PREFS_DLG_H__
#include "prefs_dlg.h"
-#endif
-
-#ifndef __DIALOG_H__
#include "simple_dialog.h"
-#endif
-
#include "ui_util.h"
#include "dlg_utils.h"
diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index 25a02a4ab6..0e63995f21 100644
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.c
@@ -1,7 +1,7 @@
/* print_prefs.c
* Dialog boxes for preferences for printing
*
- * $Id: print_prefs.c,v 1.5 2000/05/08 07:54:54 guy Exp $
+ * $Id: print_prefs.c,v 1.6 2000/08/11 13:33:01 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -29,28 +29,12 @@
#include <errno.h>
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
-
#include "print_prefs.h"
-
-#ifndef __KEYS_H__
#include "keys.h"
-#endif
-
-#ifndef __PRINT_H__
#include "print.h"
-#endif
-
-#ifndef __PREFS_DLG_H__
#include "prefs_dlg.h"
-#endif
-
-#ifndef __UTIL_H__
#include "util.h"
-#endif
-
#include "ui_util.h"
#include "dlg_utils.h"
diff --git a/gtk/print_prefs.h b/gtk/print_prefs.h
index 5291f121d6..8d0e213ce1 100644
--- a/gtk/print_prefs.h
+++ b/gtk/print_prefs.h
@@ -1,7 +1,7 @@
/* print_prefs.h
* Definitions for print preferences window
*
- * $Id: print_prefs.h,v 1.3 1999/09/10 06:53:32 guy Exp $
+ * $Id: print_prefs.h,v 1.4 2000/08/11 13:32:56 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -23,9 +23,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PRINT_PREFS_H__
+#define __PRINT_PREFS_H__
GtkWidget *printer_prefs_show(void);
void printer_prefs_ok(GtkWidget *w);
void printer_prefs_save(GtkWidget *w);
void printer_prefs_cancel(GtkWidget *w);
void printer_prefs_delete(GtkWidget *w);
+
+#endif
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index abb509a033..22d10a2550 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -1,7 +1,7 @@
/* simple_dialog.c
* Simple message dialog box routines.
*
- * $Id: simple_dialog.c,v 1.4 2000/07/20 05:10:02 guy Exp $
+ * $Id: simple_dialog.c,v 1.5 2000/08/11 13:33:09 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -35,11 +35,6 @@
#include <stdio.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c
index 8f50b2706e..6bbd17680e 100644
--- a/gtk/stream_prefs.c
+++ b/gtk/stream_prefs.c
@@ -1,7 +1,7 @@
/* stream_prefs.c
* Dialog boxes for preferences for the stream window
*
- * $Id: stream_prefs.c,v 1.1 1999/12/02 04:30:15 gerald Exp $
+ * $Id: stream_prefs.c,v 1.2 2000/08/11 13:33:00 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -29,27 +29,12 @@
#include <errno.h>
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
-
#include "stream_prefs.h"
-
-#ifndef __KEYS_H__
#include "keys.h"
-#endif
-
-#ifndef __PRINT_H__
#include "print.h"
-#endif
-
-#ifndef __PREFS_DLG_H__
#include "prefs_dlg.h"
-#endif
-
-#ifndef __UTIL_H__
#include "util.h"
-#endif
static void update_text_color(GtkWidget *, gpointer);
static void update_current_color(GtkWidget *, gpointer);
diff --git a/gtk/stream_prefs.h b/gtk/stream_prefs.h
index 9a306d19cc..e648cc66f1 100644
--- a/gtk/stream_prefs.h
+++ b/gtk/stream_prefs.h
@@ -1,7 +1,7 @@
/* stream_prefs.h
* Definitions for stream preferences window
*
- * $Id: stream_prefs.h,v 1.1 1999/12/02 04:30:15 gerald Exp $
+ * $Id: stream_prefs.h,v 1.2 2000/08/11 13:32:56 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -23,9 +23,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __STREAM_PREFS_H__
+#define __STREAM_PREFS_H__
GtkWidget *stream_prefs_show(void);
void stream_prefs_ok(GtkWidget *w);
void stream_prefs_save(GtkWidget *w);
void stream_prefs_cancel(GtkWidget *w);
void stream_prefs_delete(GtkWidget *w);
+
+#endif
diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index bc7a8c115a..14f3fb6559 100644
--- a/gtk/summary_dlg.c
+++ b/gtk/summary_dlg.c
@@ -1,7 +1,7 @@
/* summary_dlg.c
* Routines for capture file summary window
*
- * $Id: summary_dlg.c,v 1.5 2000/07/05 06:19:27 guy Exp $
+ * $Id: summary_dlg.c,v 1.6 2000/08/11 13:33:08 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -35,11 +35,6 @@
#include <wtap.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/inet_aton.h b/inet_aton.h
index d5734ac51d..3f91ccc149 100644
--- a/inet_aton.h
+++ b/inet_aton.h
@@ -1,6 +1,6 @@
/* inet_aton.h
*
- * $Id: inet_aton.h,v 1.1 2000/07/14 07:11:53 guy Exp $
+ * $Id: inet_aton.h,v 1.2 2000/08/11 13:34:19 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,5 +24,11 @@
/*
* Version of "inet_aton()", for the benefit of OSes that don't have it.
*/
+
+#ifndef __INET_ATON_H__
+#define __INET_ATON_H__
+
struct in_addr;
extern int inet_aton(const char* cp_arg, struct in_addr *addr);
+
+#endif
diff --git a/inet_ntop.c b/inet_ntop.c
index 0fc9883970..04303a46c4 100644
--- a/inet_ntop.c
+++ b/inet_ntop.c
@@ -20,14 +20,16 @@
#endif
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_ntop.c,v 1.3 2000/01/10 17:32:51 gram Exp $";
+static char rcsid[] = "$Id: inet_ntop.c,v 1.4 2000/08/11 13:34:52 deniel Exp $";
#endif /* LIBC_SCCS and not lint */
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
@@ -55,11 +57,6 @@ static char rcsid[] = "$Id: inet_ntop.c,v 1.3 2000/01/10 17:32:51 gram Exp $";
#include <string.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/inet_pton.c b/inet_pton.c
index 038f1cad50..ab4e8b7306 100644
--- a/inet_pton.c
+++ b/inet_pton.c
@@ -20,14 +20,16 @@
#endif
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_pton.c,v 1.3 2000/01/10 17:32:51 gram Exp $";
+static char rcsid[] = "$Id: inet_pton.c,v 1.4 2000/08/11 13:34:52 deniel Exp $";
#endif /* LIBC_SCCS and not lint */
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#ifdef HAVE_WINSOCK_H
#include <winsock.h>
diff --git a/inet_v6defs.h b/inet_v6defs.h
index 2c686ca346..dfbef3e985 100644
--- a/inet_v6defs.h
+++ b/inet_v6defs.h
@@ -1,6 +1,6 @@
/* inet_v6defs.h
*
- * $Id: inet_v6defs.h,v 1.3 2000/07/14 07:11:53 guy Exp $
+ * $Id: inet_v6defs.h,v 1.4 2000/08/11 13:34:19 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -21,6 +21,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __INET_V6DEFS_H__
+#define __INET_V6DEFS_H__
+
/*
* Versions of "inet_pton()" and "inet_ntop()", for the benefit of OSes that
* don't have it.
@@ -45,3 +48,5 @@ extern const char *inet_ntop(int af, const void *src, char *dst,
#ifndef __P
#define __P(args) args
#endif
+
+#endif
diff --git a/ipproto.c b/ipproto.c
index aa3faa054e..370feba602 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,7 +1,7 @@
/* ipproto.c
* Routines for converting IPv4 protocol/v6 nxthdr field into string
*
- * $Id: ipproto.c,v 1.8 2000/05/26 21:54:50 guy Exp $
+ * $Id: ipproto.c,v 1.9 2000/08/11 13:35:31 deniel Exp $
*
* Gilbert Ramirez <gram@xiexie.org>
*
@@ -37,23 +37,16 @@
# include <netdb.h>
#endif
+#include <glib.h>
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#include <glib.h>
-
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
-
#include "packet.h"
#include "etypes.h"
+#include "resolv.h"
#include "packet-ip.h"
#include "packet-ipv6.h"
diff --git a/nlpid.h b/nlpid.h
index cec1e25df0..7f63b4c807 100644
--- a/nlpid.h
+++ b/nlpid.h
@@ -2,7 +2,7 @@
* Definitions of OSI NLPIDs (Network Layer Protocol IDs)
* Laurent Deniel <deniel@worldnet.fr>
*
- * $Id: nlpid.h,v 1.4 2000/04/15 22:11:07 guy Exp $
+ * $Id: nlpid.h,v 1.5 2000/08/11 13:34:19 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,6 +24,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __NLPID_H__
+#define __NLPID_H__
+
/* ISO/IEC TR 9577 NLPID values. */
#define NLPID_NULL 0x00
@@ -45,3 +48,4 @@
extern const value_string nlpid_vals[];
+#endif
diff --git a/oui.h b/oui.h
index 2cc5733e36..89149b641b 100644
--- a/oui.h
+++ b/oui.h
@@ -2,7 +2,7 @@
* Definitions of OUIs
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: oui.h,v 1.6 2000/04/12 20:24:34 gram Exp $
+ * $Id: oui.h,v 1.7 2000/08/11 13:34:18 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,6 +24,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __OUI_H__
+#define __OUI_H__
+
#define OUI_ENCAP_ETHER 0x000000 /* encapsulated Ethernet */
#define OUI_CISCO 0x00000C /* Cisco (future use) */
#define OUI_CISCO_90 0x0000F8 /* Cisco (IOS 9.0 and above?) */
@@ -33,3 +36,5 @@
#define OUI_CABLE_BPDU 0x00E02F /* DOCSIS spanning tree BPDU */
extern const value_string oui_vals[];
+
+#endif
diff --git a/packet-ascend.h b/packet-ascend.h
index 6be7701497..165f5f8bc1 100644
--- a/packet-ascend.h
+++ b/packet-ascend.h
@@ -1,6 +1,6 @@
/* packet-ascend.h
*
- * $Id: packet-ascend.h,v 1.4 2000/05/19 23:06:08 gram Exp $
+ * $Id: packet-ascend.h,v 1.5 2000/08/11 13:34:18 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_ASCEND_H__
+#define __PACKET_ASCEND_H__
+
void dissect_ascend(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-atalk.h b/packet-atalk.h
index 80031c423e..deb7b1e805 100644
--- a/packet-atalk.h
+++ b/packet-atalk.h
@@ -1,7 +1,7 @@
/* packet-atalk.h
* Definitions for Appletalk packet disassembly (DDP, currently).
*
- * $Id: packet-atalk.h,v 1.3 2000/05/28 22:59:18 guy Exp $
+ * $Id: packet-atalk.h,v 1.4 2000/08/11 13:34:17 deniel Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_ATALK_H__
+#define __PACKET_ATALK_H__
+
/*
* Structure used to represent a DDP address; gives the layout of the
* data pointed to by an AT_ATALK "address" structure.
@@ -47,3 +50,4 @@ extern gchar *atalk_addr_to_str(const struct atalk_ddp_addr *addrp);
void dissect_ddp(const u_char *, int, frame_data *, proto_tree *);
+#endif
diff --git a/packet-atm.h b/packet-atm.h
index 5e1e5b5484..cd312d04ba 100644
--- a/packet-atm.h
+++ b/packet-atm.h
@@ -1,6 +1,6 @@
/* packet-atm.h
*
- * $Id: packet-atm.h,v 1.4 2000/05/29 08:57:37 guy Exp $
+ * $Id: packet-atm.h,v 1.5 2000/08/11 13:34:17 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_ATM_H__
+#define __PACKET_ATM_H__
+
void dissect_atm(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-bgp.c b/packet-bgp.c
index f4e548f6d9..87290fe049 100644
--- a/packet-bgp.c
+++ b/packet-bgp.c
@@ -2,7 +2,7 @@
* Routines for BGP packet dissection.
* Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-bgp.c,v 1.24 2000/08/07 03:20:23 guy Exp $
+ * $Id: packet-bgp.c,v 1.25 2000/08/11 13:35:29 deniel Exp $
*
* Supports:
* RFC1771 A Border Gateway Protocol 4 (BGP-4)
@@ -49,25 +49,21 @@
# include <netinet/in.h>
#endif
-#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
-# include "snprintf.h"
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
#endif
#include <string.h>
#include <glib.h>
+
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
+
#include "packet.h"
#include "packet-bgp.h"
#include "packet-ipv6.h"
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
#define TCP_PORT_BGP 179
static const value_string bgptypevals[] = {
diff --git a/packet-bpdu.h b/packet-bpdu.h
index d93f9a59fb..4f00c751c1 100644
--- a/packet-bpdu.h
+++ b/packet-bpdu.h
@@ -1,6 +1,6 @@
/* packet-bpdu.h
*
- * $Id: packet-bpdu.h,v 1.1 2000/02/15 21:02:04 gram Exp $
+ * $Id: packet-bpdu.h,v 1.2 2000/08/11 13:34:17 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_BPDU_H__
+#define __PACKET_BPDU_H__
void dissect_bpdu(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-cdp.h b/packet-cdp.h
index 6781fb5493..ec8185ebe4 100644
--- a/packet-cdp.h
+++ b/packet-cdp.h
@@ -1,6 +1,6 @@
/* packet-cdp.h
*
- * $Id: packet-cdp.h,v 1.1 2000/02/15 21:02:04 gram Exp $
+ * $Id: packet-cdp.h,v 1.2 2000/08/11 13:34:16 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_CDP_H__
+#define __PACKET_CDP_H__
void dissect_cdp(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-cgmp.h b/packet-cgmp.h
index fa22f523f0..de20ba38b6 100644
--- a/packet-cgmp.h
+++ b/packet-cgmp.h
@@ -1,6 +1,6 @@
/* packet-cgmp.h
*
- * $Id: packet-cgmp.h,v 1.1 2000/02/15 21:02:05 gram Exp $
+ * $Id: packet-cgmp.h,v 1.2 2000/08/11 13:34:15 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_CGMP_H__
+#define __PACKET_CGMP_H__
void dissect_cgmp(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-clip.h b/packet-clip.h
index 95e0d8e1f9..eb87f51deb 100644
--- a/packet-clip.h
+++ b/packet-clip.h
@@ -1,6 +1,6 @@
/* packet-clip.h
*
- * $Id: packet-clip.h,v 1.2 2000/05/25 14:55:22 gram Exp $
+ * $Id: packet-clip.h,v 1.3 2000/08/11 13:34:15 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_CLIP_H__
+#define __PACKET_CLIP_H__
+
void capture_clip(const u_char *, packet_counts *);
void dissect_clip(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-ddtp.h b/packet-ddtp.h
index b1ffd21d6e..98c30f805d 100644
--- a/packet-ddtp.h
+++ b/packet-ddtp.h
@@ -3,7 +3,7 @@
* see http://ddt.sourceforge.net/
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-ddtp.h,v 1.2 2000/05/28 17:04:10 oabad Exp $
+ * $Id: packet-ddtp.h,v 1.3 2000/08/11 13:34:14 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -27,6 +27,9 @@
*
*/
+#ifndef __PACKET_DDTP_H__
+#define __PACKET_DDTP_H__
+
#define DDTP_VERSION_ERROR 0
#define DDTP_VERSION_4 1
#define DDTP_VERSION_5 2
@@ -49,3 +52,5 @@
#define DDTP_INVALID_PASSWORD 2
#define DDTP_INVALID_ACCOUNT 3
#define DDTP_INVALID_OPCODE 4
+
+#endif
diff --git a/packet-diameter.h b/packet-diameter.h
index c08ea8900f..ed6c461c49 100644
--- a/packet-diameter.h
+++ b/packet-diameter.h
@@ -1,7 +1,7 @@
/* packet-diameter.h
* Declaration of the DIAMETER dissector.
*
- * $Id: packet-diameter.h,v 1.1 2000/07/30 07:16:03 guy Exp $
+ * $Id: packet-diameter.h,v 1.2 2000/08/11 13:34:13 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -23,5 +23,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_DIAMETER_H__
+#define __PACKET_DIAMETER_H__
+
extern void dissect_diameter(const u_char *pd, int offset, frame_data *fd,
proto_tree *tree);
+
+#endif
diff --git a/packet-eth.h b/packet-eth.h
index 9f9ee660cf..f6a1230046 100644
--- a/packet-eth.h
+++ b/packet-eth.h
@@ -1,6 +1,6 @@
/* packet-eth.h
*
- * $Id: packet-eth.h,v 1.2 2000/05/16 06:21:32 gram Exp $
+ * $Id: packet-eth.h,v 1.3 2000/08/11 13:34:13 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_ETH_H__
+#define __PACKET_ETH_H__
+
void capture_eth(const u_char *, int, packet_counts *);
void dissect_eth(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
+
diff --git a/packet-fddi.h b/packet-fddi.h
index aa452b821e..4f48f5c157 100644
--- a/packet-fddi.h
+++ b/packet-fddi.h
@@ -1,6 +1,6 @@
/* packet-fddi.h
*
- * $Id: packet-fddi.h,v 1.2 2000/05/11 08:15:08 gram Exp $
+ * $Id: packet-fddi.h,v 1.3 2000/08/11 13:34:13 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_FDDI_H__
+#define __PACKET_FDDI_H__
+
void capture_fddi(const u_char *, packet_counts *);
void dissect_fddi(tvbuff_t*, packet_info*, proto_tree*, gboolean bitswapped);
+
+#endif
diff --git a/packet-http.h b/packet-http.h
index d1adc194b4..e9860aa100 100644
--- a/packet-http.h
+++ b/packet-http.h
@@ -1,6 +1,6 @@
/* packet-http.h
*
- * $Id: packet-http.h,v 1.1 2000/02/15 21:02:13 gram Exp $
+ * $Id: packet-http.h,v 1.2 2000/08/11 13:34:12 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_HTTP_H__
+#define __PACKET_HTTP_H__
void dissect_http(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-icmpv6.c b/packet-icmpv6.c
index df92c5b88d..22edc16bbe 100644
--- a/packet-icmpv6.c
+++ b/packet-icmpv6.c
@@ -1,7 +1,7 @@
/* packet-icmpv6.c
* Routines for ICMPv6 packet disassembly
*
- * $Id: packet-icmpv6.c,v 1.18 2000/08/07 03:20:36 guy Exp $
+ * $Id: packet-icmpv6.c,v 1.19 2000/08/11 13:35:27 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -44,16 +44,12 @@
# include <netinet/in.h>
#endif
+#include <glib.h>
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#include <glib.h>
#include "packet.h"
#include "packet-ipv6.h"
#include "packet-ip.h"
diff --git a/packet-icq.c b/packet-icq.c
index 412b80511e..0241af4b75 100644
--- a/packet-icq.c
+++ b/packet-icq.c
@@ -1,7 +1,7 @@
/* packet-icq.c
* Routines for ICQ packet disassembly
*
- * $Id: packet-icq.c,v 1.19 2000/08/07 03:20:38 guy Exp $
+ * $Id: packet-icq.c,v 1.20 2000/08/11 13:35:24 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Johan Feyaerts
@@ -57,11 +57,6 @@
#include <glib.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/packet-ip.c b/packet-ip.c
index e756c05f2f..bd6ebe3c37 100644
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
- * $Id: packet-ip.c,v 1.100 2000/08/07 03:20:40 guy Exp $
+ * $Id: packet-ip.c,v 1.101 2000/08/11 13:35:20 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -38,19 +38,14 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "resolv.h"
-#include "prefs.h"
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
+#include "packet.h"
+#include "resolv.h"
+#include "prefs.h"
#include "etypes.h"
#include "ppptypes.h"
#include "llcsaps.h"
diff --git a/packet-ipp.h b/packet-ipp.h
index 20c9786928..2acac12337 100644
--- a/packet-ipp.h
+++ b/packet-ipp.h
@@ -1,6 +1,6 @@
/* packet-ipp.h
*
- * $Id: packet-ipp.h,v 1.1 2000/02/15 21:02:19 gram Exp $
+ * $Id: packet-ipp.h,v 1.2 2000/08/11 13:34:11 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_IPP_H__
+#define __PACKET_IPP_H__
void dissect_ipp(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-ipsec.h b/packet-ipsec.h
index 64b7f5a4fa..d6f4a0aed2 100644
--- a/packet-ipsec.h
+++ b/packet-ipsec.h
@@ -1,6 +1,6 @@
/* packet-ipsec.h
*
- * $Id: packet-ipsec.h,v 1.3 2000/06/05 03:21:02 gram Exp $
+ * $Id: packet-ipsec.h,v 1.4 2000/08/11 13:34:03 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,6 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_IPSEC_H__
+#define __PACKET_IPSEC_H__
int dissect_ah_old(const u_char *, int, frame_data *, proto_tree *);
void dissect_ah(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-ipx.h b/packet-ipx.h
index 2e0ffbbc16..ae7a0f312b 100644
--- a/packet-ipx.h
+++ b/packet-ipx.h
@@ -2,7 +2,7 @@
* Routines for NetWare's IPX
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-ipx.h,v 1.9 2000/08/07 03:20:45 guy Exp $
+ * $Id: packet-ipx.h,v 1.10 2000/08/11 13:34:11 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -31,6 +31,9 @@
*
*/
+#ifndef __PACKET_IPX_H__
+#define __PACKET_IPX_H__
+
#define IPX_NODE_LEN 6
typedef guint32 IPXNet;
@@ -144,3 +147,4 @@ gchar* ipxnet_to_str_punct(const guint32 ad, char punct);
void capture_ipx(const u_char *, int, packet_counts *);
void dissect_ipx(tvbuff_t *, packet_info *, proto_tree *);
+#endif
diff --git a/packet-isakmp.c b/packet-isakmp.c
index f62d5e3cc5..b63d93562e 100644
--- a/packet-isakmp.c
+++ b/packet-isakmp.c
@@ -3,7 +3,7 @@
* (ISAKMP) (RFC 2408)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-isakmp.c,v 1.24 2000/08/07 03:20:45 guy Exp $
+ * $Id: packet-isakmp.c,v 1.25 2000/08/11 13:35:18 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -40,17 +40,13 @@
#endif
#include <glib.h>
-#include "packet.h"
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
+#include "packet.h"
+
static int proto_isakmp = -1;
static gint ett_isakmp = -1;
diff --git a/packet-isis-clv.c b/packet-isis-clv.c
index 6d0788bc6d..4b36e0f37c 100644
--- a/packet-isis-clv.c
+++ b/packet-isis-clv.c
@@ -1,7 +1,7 @@
/* packet-isis-clv.c
* Common CLV decode routines.
*
- * $Id: packet-isis-clv.c,v 1.7 2000/08/10 14:21:09 deniel Exp $
+ * $Id: packet-isis-clv.c,v 1.8 2000/08/11 13:35:17 deniel Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -34,18 +34,14 @@
# include <sys/types.h>
#endif
+#include <stdio.h>
+#include <string.h>
+#include <glib.h>
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
#include "packet.h"
#include "packet-osi.h"
#include "packet-isis.h"
diff --git a/packet-isl.h b/packet-isl.h
index 6dee5a3a1d..844da04095 100644
--- a/packet-isl.h
+++ b/packet-isl.h
@@ -1,6 +1,6 @@
/* packet-isl.h
*
- * $Id: packet-isl.h,v 1.1 2000/02/15 21:02:28 gram Exp $
+ * $Id: packet-isl.h,v 1.2 2000/08/11 13:34:10 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_ISL_H__
+#define __PACKET_ISL_H__
+
void capture_isl(const u_char *, int, packet_counts *);
void dissect_isl(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-kerberos.h b/packet-kerberos.h
index 473f158207..920f562acb 100644
--- a/packet-kerberos.h
+++ b/packet-kerberos.h
@@ -3,7 +3,7 @@
* Wes Hardaker (c) 2000
* wjhardaker@ucdavis.edu
*
- * $Id: packet-kerberos.h,v 1.1 2000/08/11 03:32:44 guy Exp $
+ * $Id: packet-kerberos.h,v 1.2 2000/08/11 13:34:19 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,6 +24,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
+#ifndef __PACKET_KERBEROS_H__
+#define __PACKET_KERBEROS_H__
+
void dissect_kerberos(const u_char *, int, frame_data *, proto_tree *);
void dissect_PrincipalName(char *title, ASN1_SCK *asn1p, frame_data *fd,
proto_tree *tree, int *offset);
@@ -37,4 +41,5 @@ void dissect_Addresses(char *title, ASN1_SCK *asn1p, frame_data *fd,
proto_tree *tree, int *inoff);
+#endif
diff --git a/packet-lapb.h b/packet-lapb.h
index 8c2d020818..300aba328a 100644
--- a/packet-lapb.h
+++ b/packet-lapb.h
@@ -1,6 +1,6 @@
/* packet-lapb.h
*
- * $Id: packet-lapb.h,v 1.4 2000/05/25 08:45:54 gram Exp $
+ * $Id: packet-lapb.h,v 1.5 2000/08/11 13:34:10 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_LAPB_H__
+#define __PACKET_LAPB_H__
+
void dissect_lapb(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-lapd.h b/packet-lapd.h
index 35da1cc7be..0ff949d123 100644
--- a/packet-lapd.h
+++ b/packet-lapd.h
@@ -1,6 +1,6 @@
/* packet-lapd.h
*
- * $Id: packet-lapd.h,v 1.4 2000/05/31 03:58:54 gram Exp $
+ * $Id: packet-lapd.h,v 1.5 2000/08/11 13:33:59 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_LAPD_H__
+#define __PACKET_LAPD_H__
+
void dissect_lapd(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-ldap.c b/packet-ldap.c
index 8dc04d06e0..e1764ddba8 100644
--- a/packet-ldap.c
+++ b/packet-ldap.c
@@ -1,7 +1,7 @@
/* packet-ldap.c
* Routines for ldap packet dissection
*
- * $Id: packet-ldap.c,v 1.13 2000/08/07 03:20:48 guy Exp $
+ * $Id: packet-ldap.c,v 1.14 2000/08/11 13:35:15 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -56,11 +56,6 @@
#include <glib.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/packet-ldap.h b/packet-ldap.h
index b389b32ca4..46e4b915cf 100644
--- a/packet-ldap.h
+++ b/packet-ldap.h
@@ -1,6 +1,6 @@
/* packet-ldap.h
*
- * $Id: packet-ldap.h,v 1.4 2000/04/08 07:07:28 guy Exp $
+ * $Id: packet-ldap.h,v 1.5 2000/08/11 13:34:09 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,6 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_LDAP_H__
+#define __PACKET_LDAP_H__
+
/*
* These are all APPLICATION types; the value is the type tag.
*/
@@ -72,3 +75,5 @@
#define LDAP_MOD_ADD 0
#define LDAP_MOD_DELETE 1
#define LDAP_MOD_REPLACE 2
+
+#endif
diff --git a/packet-llc.h b/packet-llc.h
index 52e628e2a4..4bff2efbaf 100644
--- a/packet-llc.h
+++ b/packet-llc.h
@@ -1,6 +1,6 @@
/* packet-llc.h
*
- * $Id: packet-llc.h,v 1.2 2000/05/11 22:04:17 gram Exp $
+ * $Id: packet-llc.h,v 1.3 2000/08/11 13:34:08 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_LLC_H__
+#define __PACKET_LLC_H__
+
void capture_llc(const u_char *, int, packet_counts *);
void dissect_llc(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-mip.c b/packet-mip.c
index 66d2a0a712..f804ef8da8 100644
--- a/packet-mip.c
+++ b/packet-mip.c
@@ -2,7 +2,7 @@
* Routines for Mobile IP dissection
* Copyright 2000, Stefan Raab <Stefan.Raab@nextel.com>
*
- * $Id: packet-mip.c,v 1.6 2000/08/07 03:20:51 guy Exp $
+ * $Id: packet-mip.c,v 1.7 2000/08/11 13:35:14 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -38,17 +38,13 @@
# include <netinet/in.h>
#endif
+#include <string.h>
+#include <glib.h>
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#include <string.h>
-#include <glib.h>
#include "packet.h"
/* Initialize the protocol and registered fields */
diff --git a/packet-msproxy.c b/packet-msproxy.c
index 09a97a953e..090afcdaef 100644
--- a/packet-msproxy.c
+++ b/packet-msproxy.c
@@ -2,7 +2,7 @@
* Routines for Microsoft Proxy packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-msproxy.c,v 1.7 2000/08/07 03:20:52 guy Exp $
+ * $Id: packet-msproxy.c,v 1.8 2000/08/11 13:35:11 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -59,6 +59,11 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
+
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
+
#include "packet.h"
#include "resolv.h"
#include "globals.h"
@@ -68,16 +73,6 @@
#include "packet-tcp.h"
#include "packet-udp.h"
-
-#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
-# include "snprintf.h"
-#endif
-
#define CHECK_PACKET_LENGTH(X) if (!BYTES_ARE_IN_FRAME(offset, X)){ \
proto_tree_add_text(tree, NullTVB, offset, 0, "****FRAME TOO SHORT***"); return;}
diff --git a/packet-nbipx.h b/packet-nbipx.h
index 87147781a1..8cae96d91b 100644
--- a/packet-nbipx.h
+++ b/packet-nbipx.h
@@ -1,6 +1,6 @@
/* packet-nbipx.h
*
- * $Id: packet-nbipx.h,v 1.2 2000/05/30 03:35:53 guy Exp $
+ * $Id: packet-nbipx.h,v 1.3 2000/08/11 13:34:08 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_NBIPX_H__
+#define __PACKET_NBIPX_H__
void dissect_nbipx(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-ncp-int.h b/packet-ncp-int.h
index c56f84458a..fe1488d474 100644
--- a/packet-ncp-int.h
+++ b/packet-ncp-int.h
@@ -2,7 +2,7 @@
* Structures and functions for NetWare Core Protocol.
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-ncp-int.h,v 1.1 2000/07/28 20:03:42 gram Exp $
+ * $Id: packet-ncp-int.h,v 1.2 2000/08/11 13:34:06 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,6 +24,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_NCP_INT_H__
+#define __PACKET_NCP_INT_H__
+
typedef struct {
int *hf_ptr;
gint length;
@@ -65,3 +68,5 @@ gboolean ncp_hash_lookup(conversation_t*, guint8 nw_sequence,
extern int proto_ncp;
+
+#endif
diff --git a/packet-netbios.h b/packet-netbios.h
index f0d16ed86e..6a4cdfaf27 100644
--- a/packet-netbios.h
+++ b/packet-netbios.h
@@ -1,11 +1,11 @@
-/* packet-netbios.c
+/* packet-netbios.h
* Declarations of public routines for NetBIOS protocol packet disassembly
* Jeff Foster <foste@woodward.com>
* Copyright 1999 Jeffrey C. Foster
*
* derived from the packet-nbns.c
*
- * $Id: packet-netbios.h,v 1.6 2000/04/17 00:32:41 guy Exp $
+ * $Id: packet-netbios.h,v 1.7 2000/08/11 13:34:05 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -27,6 +27,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_NETBIOS_H__
+#define __PACKET_NETBIOS_H__
+
/* Length of NetBIOS names */
#define NETBIOS_NAME_LEN 16
@@ -38,3 +41,5 @@ extern int get_netbios_name(const u_char *data_ptr, int offset,
extern char *netbios_name_type_descr(int name_type);
extern gboolean netbios_add_name( char* label, const u_char *pd, int offset,
proto_tree *tree);
+
+#endif
diff --git a/packet-ntp.c b/packet-ntp.c
index a9a5f6384b..265315de72 100644
--- a/packet-ntp.c
+++ b/packet-ntp.c
@@ -2,7 +2,7 @@
* Routines for NTP packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-ntp.c,v 1.14 2000/08/07 03:20:57 guy Exp $
+ * $Id: packet-ntp.c,v 1.15 2000/08/11 13:35:09 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -45,11 +45,6 @@
#include <glib.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/packet-null.h b/packet-null.h
index 3dcdd3048c..4323c409ad 100644
--- a/packet-null.h
+++ b/packet-null.h
@@ -1,6 +1,6 @@
/* packet-null.h
*
- * $Id: packet-null.h,v 1.2 2000/05/19 05:18:26 guy Exp $
+ * $Id: packet-null.h,v 1.3 2000/08/11 13:34:05 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_NULL_H__
+#define __PACKET_NULL_H__
+
void capture_null(const u_char *, packet_counts *);
void dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+#endif
diff --git a/packet-ospf.h b/packet-ospf.h
index 3434c241ac..ccf1664563 100644
--- a/packet-ospf.h
+++ b/packet-ospf.h
@@ -1,6 +1,31 @@
-/* packet-ospf.h (c) 1998 Hannes Boehm */
-
-/* $Id: packet-ospf.h,v 1.8 2000/04/16 22:46:21 guy Exp $ */
+/* packet-ospf.h
+ *
+ * $Id: packet-ospf.h,v 1.9 2000/08/11 13:34:04 deniel Exp $
+ *
+ * (c) 1998 Hannes Boehm
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PACKET_OSPF_H__
+#define __PACKET_OSPF_H__
#define OSPF_HEADER_LENGTH 24
@@ -137,3 +162,5 @@ typedef struct _e_ospf_crypto {
guint8 length;
guint32 sequence_num;
} e_ospf_crypto;
+
+#endif
diff --git a/packet-pim.c b/packet-pim.c
index b377aef654..35c50b9cb9 100644
--- a/packet-pim.c
+++ b/packet-pim.c
@@ -2,7 +2,7 @@
* Routines for PIM disassembly
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-pim.c,v 1.15 2000/08/07 03:20:59 guy Exp $
+ * $Id: packet-pim.c,v 1.16 2000/08/11 13:35:08 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -23,8 +23,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -34,16 +36,12 @@
#include <netinet/in.h>
#endif
+#include <glib.h>
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#include <glib.h>
#include "packet.h"
#include "packet-ip.h"
#include "packet-ipv6.h"
diff --git a/packet-portmap.h b/packet-portmap.h
index c630e26d5f..7bdd59f5ad 100644
--- a/packet-portmap.h
+++ b/packet-portmap.h
@@ -1,5 +1,26 @@
-/* packet-portmap.h */
-/* $Id: packet-portmap.h,v 1.3 1999/11/15 14:17:19 nneul Exp $ */
+/* packet-portmap.h
+ *
+ * $Id: packet-portmap.h,v 1.4 2000/08/11 13:34:03 deniel Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
#ifndef PACKET_PORTMAP_H
#define PACKET_PORTMAP_H
diff --git a/packet-ppp.h b/packet-ppp.h
index 7dddd37a2b..ea19df16e0 100644
--- a/packet-ppp.h
+++ b/packet-ppp.h
@@ -1,6 +1,6 @@
/* packet-ppp.h
*
- * $Id: packet-ppp.h,v 1.3 2000/05/25 07:42:25 gram Exp $
+ * $Id: packet-ppp.h,v 1.4 2000/08/11 13:34:03 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,6 +22,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_PPP_H__
+#define __PACKET_PPP_H__
+
void capture_ppp(const u_char *, int, packet_counts *);
void dissect_ppp(tvbuff_t *, packet_info *, proto_tree *);
void dissect_payload_ppp(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-q2931.h b/packet-q2931.h
index a9b9ac863b..3db175d11d 100644
--- a/packet-q2931.h
+++ b/packet-q2931.h
@@ -1,6 +1,6 @@
/* packet-q2931.h
*
- * $Id: packet-q2931.h,v 1.2 2000/05/29 08:57:38 guy Exp $
+ * $Id: packet-q2931.h,v 1.3 2000/08/11 13:34:03 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_Q2931_H__
+#define __PACKET_Q2931_H__
+
void dissect_q2931(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-q931.h b/packet-q931.h
index 2e778ab085..a553f95a53 100644
--- a/packet-q931.h
+++ b/packet-q931.h
@@ -2,7 +2,7 @@
* Declarations of exported routines for Q.931 and Q.2931 frame disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-q931.h,v 1.3 2000/05/29 08:57:40 guy Exp $
+ * $Id: packet-q931.h,v 1.4 2000/08/11 13:34:02 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,6 +24,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_Q931_H__
+#define __PACKET_Q931_H__
+
void dissect_q931(tvbuff_t *, packet_info *, proto_tree *);
extern void dissect_q931_bearer_capability_ie(tvbuff_t *, int, int,
@@ -34,3 +37,5 @@ extern void dissect_q931_high_layer_compat_ie(tvbuff_t *, int, int,
extern void dissect_q931_progress_indicator_ie(tvbuff_t *, int, int,
proto_tree *);
+
+#endif
diff --git a/packet-raw.h b/packet-raw.h
index 12c7835577..fab2607db0 100644
--- a/packet-raw.h
+++ b/packet-raw.h
@@ -1,6 +1,6 @@
/* packet-raw.h
*
- * $Id: packet-raw.h,v 1.2 2000/05/19 21:47:37 gram Exp $
+ * $Id: packet-raw.h,v 1.3 2000/08/11 13:34:02 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_RAW_H__
+#define __PACKET_RAW_H__
+
void capture_raw(const u_char *, packet_counts *);
void dissect_raw(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-rip.h b/packet-rip.h
index 7823b1c9f6..ab47c207d4 100644
--- a/packet-rip.h
+++ b/packet-rip.h
@@ -1,6 +1,31 @@
-/* packet-rip.h (c) 1998 Hannes Boehm */
+/* packet-rip.h
+ *
+ * $Id: packet-rip.h,v 1.6 2000/08/11 13:34:02 deniel Exp $
+ *
+ * (c) 1998 Hannes Boehm
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
-/* $Id: packet-rip.h,v 1.5 2000/04/14 06:17:23 guy Exp $ */
+#ifndef __PACKET_RIP_H__
+#define __PACKET_RIP_H__
#define RIPv1 1
#define RIPv2 2
@@ -33,3 +58,5 @@ typedef union _e_rip_entry {
e_rip_vektor vektor;
e_rip_authentication authentication;
} e_rip_entry;
+
+#endif
diff --git a/packet-ripng.h b/packet-ripng.h
index 642016ad2c..518a147825 100644
--- a/packet-ripng.h
+++ b/packet-ripng.h
@@ -2,7 +2,7 @@
* RIPng definition
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-ripng.h,v 1.3 2000/04/08 07:07:35 guy Exp $
+ * $Id: packet-ripng.h,v 1.4 2000/08/11 13:34:28 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -27,13 +27,8 @@
#ifndef __PACKET_RIPNG_H_DEFINED__
#define __PACKET_RIPNG_H_DEFINED__
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
-
-#ifndef __PACKET_IPV6_H_DEFINED__
#include "packet-ipv6.h"
-#endif
/*
* KAME Header: /cvsroot/kame/kame/kame/kame/route6d/route6d.h,v 1.1.1.1 1999/08/08 23:31:35 itojun Exp
diff --git a/packet-rlogin.c b/packet-rlogin.c
index 5bbec53a04..00633b7cbc 100644
--- a/packet-rlogin.c
+++ b/packet-rlogin.c
@@ -2,7 +2,7 @@
* Routines for unix rlogin packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-rlogin.c,v 1.7 2000/08/07 03:21:04 guy Exp $
+ * $Id: packet-rlogin.c,v 1.8 2000/08/11 13:35:07 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -48,6 +48,11 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
+
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
+
#include "packet.h"
#include "resolv.h"
#include "globals.h"
@@ -56,14 +61,6 @@
#include "packet-tcp.h"
-#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
-# include "snprintf.h"
-#endif
#define CHECK_PACKET_LENGTH(X) if (!BYTES_ARE_IN_FRAME(offset, X)){ \
proto_tree_add_text(tree, NullTVB, offset, 0, "*** FRAME TOO SHORT ***"); \
diff --git a/packet-rpc.h b/packet-rpc.h
index ce6d429971..70a3a1a227 100644
--- a/packet-rpc.h
+++ b/packet-rpc.h
@@ -1,5 +1,28 @@
-/* packet-rpc.h (c) 1999 Uwe Girlich */
-/* $Id: packet-rpc.h,v 1.16 2000/08/08 06:19:51 girlich Exp $ */
+/* packet-rpc.h
+ *
+ * $Id: packet-rpc.h,v 1.17 2000/08/11 13:34:01 deniel Exp $
+ *
+ * (c) 1999 Uwe Girlich
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
#ifndef __PACKET_RPC_H__
#define __PACKET_RPC_H__
diff --git a/packet-rsvp.c b/packet-rsvp.c
index b50e874b9f..3689bc8b89 100644
--- a/packet-rsvp.c
+++ b/packet-rsvp.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-rsvp.c,v 1.25 2000/08/07 03:21:06 guy Exp $
+ * $Id: packet-rsvp.c,v 1.26 2000/08/11 13:35:04 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -61,16 +61,12 @@
# include <netinet/in.h>
#endif
+#include <glib.h>
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#include <glib.h>
#include "packet.h"
#include "packet-ip.h"
#include "packet-ipv6.h"
diff --git a/packet-rtcp.h b/packet-rtcp.h
index 9733898015..6e935367d3 100644
--- a/packet-rtcp.h
+++ b/packet-rtcp.h
@@ -3,7 +3,7 @@
*
* Jason Lango <jal@netapp.com>
*
- * $Id: packet-rtcp.h,v 1.1 2000/04/21 01:45:57 guy Exp $
+ * $Id: packet-rtcp.h,v 1.2 2000/08/11 13:34:01 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -25,4 +25,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_RTCP_H__
+#define __PACKET_RTCP_H__
+
void dissect_rtcp(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-rtp.h b/packet-rtp.h
index 3e5a10931c..8d8ab631bf 100644
--- a/packet-rtp.h
+++ b/packet-rtp.h
@@ -3,7 +3,7 @@
*
* Jason Lango <jal@netapp.com>
*
- * $Id: packet-rtp.h,v 1.1 2000/04/21 01:45:56 guy Exp $
+ * $Id: packet-rtp.h,v 1.2 2000/08/11 13:34:01 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -25,4 +25,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_RTP_H__
+#define __PACKET_RTP_H__
+
void dissect_rtp(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-sctp.c b/packet-sctp.c
index 2fd807552f..8a8918d8d3 100644
--- a/packet-sctp.c
+++ b/packet-sctp.c
@@ -2,7 +2,7 @@
* Routines for Stream Control Transmission Protocol dissection
* Copyright 2000, Michael Txen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-sctp.c,v 1.3 2000/08/07 03:21:09 guy Exp $
+ * $Id: packet-sctp.c,v 1.4 2000/08/11 13:35:00 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -41,19 +41,14 @@
# include <netinet/in.h>
#endif
+#include <string.h>
+#include <glib.h>
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#include <string.h>
-#include <glib.h>
#include "packet.h"
-
#include "packet-ip.h"
/* Initialize the protocol and registered fields */
diff --git a/packet-sdp.h b/packet-sdp.h
index 0a24f10427..bd16acfe1f 100644
--- a/packet-sdp.h
+++ b/packet-sdp.h
@@ -1,6 +1,6 @@
/* packet-sdp.h
*
- * $Id: packet-sdp.h,v 1.1 2000/02/15 21:03:08 gram Exp $
+ * $Id: packet-sdp.h,v 1.2 2000/08/11 13:34:00 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_SDP_H__
+#define __PACKET_SDP_H__
void dissect_sdp(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-smb-common.h b/packet-smb-common.h
index 95fb04961c..7166d134da 100644
--- a/packet-smb-common.h
+++ b/packet-smb-common.h
@@ -2,7 +2,7 @@
* Routines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-smb-common.h,v 1.2 2000/05/11 08:15:45 gram Exp $
+ * $Id: packet-smb-common.h,v 1.3 2000/08/11 13:34:00 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -25,6 +25,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_SMB_COMMON_H__
+#define __PACKET_SMB_COMMON_H__
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -83,3 +86,5 @@ int display_unicode_string( char *Name, const u_char *pd, int offset,
frame_data *fd, proto_tree *tree);
void dissect_smb_unknown( const u_char *pd, int offset, frame_data *fd,
proto_tree *tree);
+
+#endif
diff --git a/packet-smb.h b/packet-smb.h
index 44d298a285..f948d7cfac 100644
--- a/packet-smb.h
+++ b/packet-smb.h
@@ -1,6 +1,6 @@
/* packet-smb.h
*
- * $Id: packet-smb.h,v 1.1 2000/02/15 21:03:09 gram Exp $
+ * $Id: packet-smb.h,v 1.2 2000/08/11 13:33:52 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_SMB_H__
+#define __PACKET_SMB_H__
void dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int max_data);
+
+#endif
diff --git a/packet-sna.h b/packet-sna.h
index aa18ac3b65..bb62aed9ea 100644
--- a/packet-sna.h
+++ b/packet-sna.h
@@ -1,7 +1,7 @@
/* packet-sna.h
* Definitions for SNA dissection.
*
- * $Id: packet-sna.h,v 1.3 2000/04/17 00:32:43 guy Exp $
+ * $Id: packet-sna.h,v 1.4 2000/08/11 13:34:00 deniel Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_SNA_H__
+#define __PACKET_SNA_H__
+
/*
* Structure used to represent an FID Type 4 address; gives the layout of the
* data pointed to by an AT_SNA "address" structure if the size is
@@ -33,3 +36,5 @@ struct sna_fid_type_4_addr {
* Routine to take an SNA FID Type 4 address and generate a string.
*/
extern gchar *sna_fid_type_4_addr_to_str(const struct sna_fid_type_4_addr *addrp);
+
+#endif
diff --git a/packet-snmp.h b/packet-snmp.h
index d0527fcd9e..7b5ef92aad 100644
--- a/packet-snmp.h
+++ b/packet-snmp.h
@@ -2,7 +2,7 @@
* Exported routines for SNMP (simple network management protocol)
* D.Jorand (c) 1998
*
- * $Id: packet-snmp.h,v 1.4 2000/05/30 03:35:55 guy Exp $
+ * $Id: packet-snmp.h,v 1.5 2000/08/11 13:34:00 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,9 +24,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_SNMP_H__
+#define __PACKET_SNMP_H__
+
/*
* Guts of the SNMP dissector - exported for use by protocols such as
* ILMI.
*/
void dissect_snmp_pdu(const u_char *, int, frame_data *, proto_tree *tree,
char *, int, gint);
+
+#endif
diff --git a/packet-socks.c b/packet-socks.c
index 11df2e982c..4f5a2bf8d8 100644
--- a/packet-socks.c
+++ b/packet-socks.c
@@ -2,7 +2,7 @@
* Routines for socks versions 4 &5 packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-socks.c,v 1.8 2000/08/07 03:21:12 guy Exp $
+ * $Id: packet-socks.c,v 1.9 2000/08/11 13:34:59 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -63,6 +63,11 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
+
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
+
#include "packet.h"
#include "resolv.h"
#include "globals.h"
@@ -72,16 +77,6 @@
#include "packet-tcp.h"
#include "packet-udp.h"
-#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
-# include "snprintf.h"
-#endif
-
-
#define CHECK_PACKET_LENGTH(X) if (!BYTES_ARE_IN_FRAME(offset, X)){ \
proto_tree_add_text(tree, NullTVB, offset, 0, "*** FRAME TOO SHORT ***"); \
diff --git a/packet-srvloc.c b/packet-srvloc.c
index 79ee7590e2..8aa75e8d82 100644
--- a/packet-srvloc.c
+++ b/packet-srvloc.c
@@ -6,7 +6,7 @@
* In particular I have not had an opportunity to see how it
* responds to SRVLOC over TCP.
*
- * $Id: packet-srvloc.c,v 1.12 2000/08/07 03:21:13 guy Exp $
+ * $Id: packet-srvloc.c,v 1.13 2000/08/11 13:34:57 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -44,18 +44,14 @@
# include <netinet/in.h>
#endif
+#include <string.h>
+#include <time.h>
+#include <glib.h>
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#include <string.h>
-#include <time.h>
-#include <glib.h>
#include "packet.h"
#include "packet-ipv6.h"
diff --git a/packet-sscop.h b/packet-sscop.h
index 2781ee400b..2a7d91d619 100644
--- a/packet-sscop.h
+++ b/packet-sscop.h
@@ -1,6 +1,6 @@
/* packet-sscop.h
*
- * $Id: packet-sscop.h,v 1.2 2000/05/29 08:57:40 guy Exp $
+ * $Id: packet-sscop.h,v 1.3 2000/08/11 13:33:59 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_SSCOP_H__
+#define __PACKET_SSCOP_H__
+
void dissect_sscop(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-stat.h b/packet-stat.h
index cb871a1442..7e9953d44f 100644
--- a/packet-stat.h
+++ b/packet-stat.h
@@ -1,5 +1,26 @@
-/* packet-stat.h */
-/* $Id: packet-stat.h,v 1.1 1999/11/11 21:22:00 nneul Exp $ */
+/* packet-stat.h
+ *
+ * $Id: packet-stat.h,v 1.2 2000/08/11 13:33:59 deniel Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
#ifndef PACKET_STAT_H
#define PACKET_STAT_H
diff --git a/packet-tcp.c b/packet-tcp.c
index 1cfd0ab604..3b4764c5de 100644
--- a/packet-tcp.c
+++ b/packet-tcp.c
@@ -1,7 +1,7 @@
/* packet-tcp.c
* Routines for TCP packet disassembly
*
- * $Id: packet-tcp.c,v 1.79 2000/08/07 03:21:15 guy Exp $
+ * $Id: packet-tcp.c,v 1.80 2000/08/11 13:34:55 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -37,23 +37,17 @@
#include <stdio.h>
#include <glib.h>
-#include "globals.h"
-#include "resolv.h"
-#include "follow.h"
-#include "prefs.h"
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
+#include "globals.h"
+#include "resolv.h"
+#include "follow.h"
+#include "prefs.h"
#include "plugins.h"
#include "packet-tcp.h"
-
#include "packet-ip.h"
#include "conversation.h"
diff --git a/packet-tcp.h b/packet-tcp.h
index f903a80e5e..69045dead6 100644
--- a/packet-tcp.h
+++ b/packet-tcp.h
@@ -1,6 +1,6 @@
/* packet-tcp.h
*
- * $Id: packet-tcp.h,v 1.4 2000/04/20 07:05:57 guy Exp $
+ * $Id: packet-tcp.h,v 1.5 2000/08/11 13:33:59 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,8 +22,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_TCP_H__
+#define __PACKET_TCP_H__
+
/* Urgent pointer value for the current packet. */
extern guint16 tcp_urgent_pointer;
extern void decode_tcp_ports(const u_char *, int, frame_data *,
proto_tree *, int, int);
+
+#endif
diff --git a/packet-tftp.h b/packet-tftp.h
index 69edadcb56..955acb4153 100644
--- a/packet-tftp.h
+++ b/packet-tftp.h
@@ -1,6 +1,6 @@
/* packet-tftp.h
*
- * $Id: packet-tftp.h,v 1.1 2000/02/15 21:03:18 gram Exp $
+ * $Id: packet-tftp.h,v 1.2 2000/08/11 13:33:58 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_TFTP_H__
+#define __PACKET_TFTP_H__
void dissect_tftp(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-tr.h b/packet-tr.h
index c5e187d478..9cb5283b63 100644
--- a/packet-tr.h
+++ b/packet-tr.h
@@ -1,6 +1,6 @@
/* packet-tr.h
*
- * $Id: packet-tr.h,v 1.2 2000/05/15 06:22:07 gram Exp $
+ * $Id: packet-tr.h,v 1.3 2000/08/11 13:33:58 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_TR_H__
+#define __PACKET_TR_H__
+
void capture_tr(const u_char *, int, packet_counts *);
void dissect_tr(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-trmac.h b/packet-trmac.h
index 6822ec455b..07796aa6ee 100644
--- a/packet-trmac.h
+++ b/packet-trmac.h
@@ -1,6 +1,6 @@
/* packet-trmac.h
*
- * $Id: packet-trmac.h,v 1.2 2000/06/20 03:05:37 gram Exp $
+ * $Id: packet-trmac.h,v 1.3 2000/08/11 13:33:58 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_TRMAC_H__
+#define __PACKET_TRMAC_H__
void dissect_trmac(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-udp.h b/packet-udp.h
index 47ef7207e9..9521d4a0fc 100644
--- a/packet-udp.h
+++ b/packet-udp.h
@@ -1,6 +1,6 @@
/* packet-udp.h
*
- * $Id: packet-udp.h,v 1.3 2000/04/20 07:05:58 guy Exp $
+ * $Id: packet-udp.h,v 1.4 2000/08/11 13:33:58 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_UDP_H__
+#define __PACKET_UDP_H__
+
extern void decode_udp_ports(const u_char *, int, frame_data *,
proto_tree *, int, int);
+
+#endif
diff --git a/packet-v120.h b/packet-v120.h
index fc99d102fe..2bc49e3548 100644
--- a/packet-v120.h
+++ b/packet-v120.h
@@ -1,6 +1,6 @@
/* packet-v120.h
*
- * $Id: packet-v120.h,v 1.4 2000/05/31 03:58:55 gram Exp $
+ * $Id: packet-v120.h,v 1.5 2000/08/11 13:33:57 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_V120_H__
+#define __PACKET_V120_H__
+
void dissect_v120(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-vlan.h b/packet-vlan.h
index b7321e6a15..45ccb0e46e 100644
--- a/packet-vlan.h
+++ b/packet-vlan.h
@@ -1,6 +1,6 @@
/* packet-vlan.h
*
- * $Id: packet-vlan.h,v 1.2 2000/04/16 22:59:37 guy Exp $
+ * $Id: packet-vlan.h,v 1.3 2000/08/11 13:33:57 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_VLAN_H__
+#define __PACKET_VLAN_H__
+
void capture_vlan(const u_char *, int, packet_counts *);
+
+#endif
diff --git a/packet-vtp.h b/packet-vtp.h
index 120af89721..21a9155abf 100644
--- a/packet-vtp.h
+++ b/packet-vtp.h
@@ -1,6 +1,6 @@
/* packet-vtp.h
*
- * $Id: packet-vtp.h,v 1.1 2000/02/15 21:03:27 gram Exp $
+ * $Id: packet-vtp.h,v 1.2 2000/08/11 13:33:57 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,5 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_VTP_H__
+#define __PACKET_VTP_H__
void dissect_vtp(const u_char *, int, frame_data *, proto_tree *);
+
+#endif
diff --git a/packet-x11-declarations.h b/packet-x11-declarations.h
index 538731e80c..5912660610 100644
--- a/packet-x11-declarations.h
+++ b/packet-x11-declarations.h
@@ -1,11 +1,14 @@
/* packet-x11-declarations.h
*
- * $Id: packet-x11-declarations.h,v 1.1 2000/06/12 02:30:33 guy Exp $
+ * $Id: packet-x11-declarations.h,v 1.2 2000/08/11 13:33:54 deniel Exp $
*
* Put there so as to make packet-x11.c lighter. Generated from
* x11-list. See packet-x11.c
*/
+#ifndef __PACKET_X11_DECLARATIONS_H__
+#define __PACKET_X11_DECLARATIONS_H__
+
static int hf_x11_acceleration_denominator = -1;
static int hf_x11_acceleration_numerator = -1;
static int hf_x11_access_mode = -1;
@@ -373,3 +376,5 @@ static int hf_x11_window_value_mask_colormap = -1;
static int hf_x11_window_value_mask_cursor = -1;
static int hf_x11_x = -1;
static int hf_x11_y = -1;
+
+#endif
diff --git a/packet-x11-keysym.h b/packet-x11-keysym.h
index f43d4685f4..90e5ab0c06 100644
--- a/packet-x11-keysym.h
+++ b/packet-x11-keysym.h
@@ -1,10 +1,13 @@
/* packet-x11-keysym.h
*
- * $Id: packet-x11-keysym.h,v 1.1 2000/06/12 02:30:34 guy Exp $
+ * $Id: packet-x11-keysym.h,v 1.2 2000/08/11 13:33:55 deniel Exp $
*
* Put there so as to make packet-x11.c lighter. See packet-x11.c
*/
+#ifndef __PACKET_X11_KEYSYM_H__
+#define __PACKET_X11_KEYSYM_H__
+
static const value_string keysym_vals_source[] = {
{ 0, "NoSymbol" }, { 0x020, "space" }, { 0x021, "!" }, { 0x022, "\"" },
{ 0x023, "#" }, { 0x024, "$" }, { 0x025, "%" }, { 0x026, "&" },
@@ -341,3 +344,5 @@ static const value_string keysym_vals_source[] = {
{ 0xFFEC, "Super_R" }, { 0xFFED, "Hyper_L" }, { 0xFFEE, "Hyper_R" }, { 0xFFFF, "Delete" },
{ 0xFFFFFF, "VoidSymbol" }, { 0, NULL }
};
+
+#endif
diff --git a/packet-x25.h b/packet-x25.h
index cf931426e7..710ed46629 100644
--- a/packet-x25.h
+++ b/packet-x25.h
@@ -1,6 +1,6 @@
/* packet-x25.h
*
- * $Id: packet-x25.h,v 1.6 2000/05/25 21:34:58 oabad Exp $
+ * $Id: packet-x25.h,v 1.7 2000/08/11 13:33:55 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PACKET_X25_H__
+#define __PACKET_X25_H__
+
void dissect_x25(tvbuff_t *, packet_info *, proto_tree *);
+
+#endif
diff --git a/packet-ypbind.h b/packet-ypbind.h
index aac98b3e2f..fca819e06d 100644
--- a/packet-ypbind.h
+++ b/packet-ypbind.h
@@ -1,5 +1,26 @@
-/* packet-ypbind.h */
-/* $Id: packet-ypbind.h,v 1.1 1999/11/10 17:23:54 nneul Exp $ */
+/* packet-ypbind.h
+ *
+ * $Id: packet-ypbind.h,v 1.2 2000/08/11 13:33:53 deniel Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
#ifndef PACKET_YPBIND_H
#define PACKET_YPBIND_H
diff --git a/packet-ypserv.h b/packet-ypserv.h
index 3019991515..5bcebc8ff0 100644
--- a/packet-ypserv.h
+++ b/packet-ypserv.h
@@ -1,5 +1,26 @@
-/* packet-ypserv.h */
-/* $Id: packet-ypserv.h,v 1.1 1999/11/10 17:23:54 nneul Exp $ */
+/* packet-ypserv.h
+ *
+ * $Id: packet-ypserv.h,v 1.2 2000/08/11 13:33:53 deniel Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
#ifndef PACKET_YPSERV_H
#define PACKET_YPSERV_H
diff --git a/packet-ypxfr.h b/packet-ypxfr.h
index d851723562..2fb2470f26 100644
--- a/packet-ypxfr.h
+++ b/packet-ypxfr.h
@@ -1,5 +1,26 @@
-/* packet-ypxfr.h */
-/* $Id: packet-ypxfr.h,v 1.1 1999/11/10 17:23:55 nneul Exp $ */
+/* packet-ypxfr.h
+ *
+ * $Id: packet-ypxfr.h,v 1.2 2000/08/11 13:33:52 deniel Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
#ifndef PACKET_YPXFR_H
#define PACKET_YPXFR_H
diff --git a/packet.c b/packet.c
index a7084e925c..f8904af439 100644
--- a/packet.c
+++ b/packet.c
@@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
- * $Id: packet.c,v 1.97 2000/08/07 03:21:24 guy Exp $
+ * $Id: packet.c,v 1.98 2000/08/11 13:34:33 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -43,7 +43,11 @@
#include <stdio.h>
#include <stdlib.h>
+
+#ifdef HAVE_STDARG_H
#include <stdarg.h>
+#endif
+
#include <string.h>
#include <ctype.h>
#include <time.h>
@@ -86,14 +90,8 @@
#include "packet-v120.h"
#include "packet-vines.h"
-#ifndef __RESOLV_H__
#include "resolv.h"
-#endif
-
-#ifndef __TVBUFF_H__
#include "tvbuff.h"
-#endif
-
#include "plugins.h"
extern capture_file cfile;
diff --git a/packet.h b/packet.h
index a8e0a51c78..85aaaaa395 100644
--- a/packet.h
+++ b/packet.h
@@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet.h,v 1.192 2000/08/10 07:58:43 guy Exp $
+ * $Id: packet.h,v 1.193 2000/08/11 13:34:38 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -27,18 +27,9 @@
#ifndef __PACKET_H__
#define __PACKET_H__
-#ifndef __WTAP_H__
#include "wiretap/wtap.h"
-#endif
-
-#ifndef __PROTO_H__
#include "proto.h"
-#endif
-
-#ifndef __TVBUFF_H__
#include "tvbuff.h"
-#endif
-
/* Pointer versions of ntohs and ntohl. Given a pointer to a member of a
* byte array, returns the value of the two or four bytes at the pointer.
diff --git a/plugins.c b/plugins.c
index 64b27c8efd..9988ff7ba7 100644
--- a/plugins.c
+++ b/plugins.c
@@ -1,7 +1,7 @@
/* plugins.c
* plugin routines
*
- * $Id: plugins.c,v 1.20 2000/08/03 01:54:44 gram Exp $
+ * $Id: plugins.c,v 1.21 2000/08/11 13:34:47 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -43,8 +43,14 @@
#include <string.h>
#include <stdlib.h>
+
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
diff --git a/plugins.h b/plugins.h
index abf1152cd5..cff14e6419 100644
--- a/plugins.h
+++ b/plugins.h
@@ -1,7 +1,7 @@
/* plugins.h
* definitions for plugins structures
*
- * $Id: plugins.h,v 1.6 2000/03/31 21:42:24 oabad Exp $
+ * $Id: plugins.h,v 1.7 2000/08/11 13:34:27 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -36,13 +36,8 @@
#endif
#endif /* HAVE_CONFIG_H */
-#ifndef __DFILTER_H__
#include "dfilter.h"
-#endif
-
-#ifndef __PACKET_H__
#include "packet.h"
-#endif
#ifdef HAVE_WINSOCK_H
#include <winsock.h>
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index 72ed298ecf..db0b52cbae 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -1,7 +1,7 @@
/* plugin_api.h
* Routines for Ethereal plugins.
*
- * $Id: plugin_api.h,v 1.6 2000/05/31 18:32:14 gram Exp $
+ * $Id: plugin_api.h,v 1.7 2000/08/11 13:37:21 deniel Exp $
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@@ -104,10 +104,7 @@
#endif
-#ifndef __PACKET_H__
#include "packet.h"
-#endif
-
#include "dfilter.h"
#include "plugin_table.h"
diff --git a/prefs.c b/prefs.c
index 52436a45d0..f5d85bf525 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.33 2000/08/07 22:31:09 guy Exp $
+ * $Id: prefs.c,v 1.34 2000/08/11 13:34:44 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -44,7 +44,9 @@
#include <unistd.h>
#endif
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
#include "globals.h"
#include "packet.h"
diff --git a/print.h b/print.h
index d47d66936e..23c6757b2b 100644
--- a/print.h
+++ b/print.h
@@ -1,7 +1,7 @@
/* print.h
* Definitions for printing packet analysis trees.
*
- * $Id: print.h,v 1.19 2000/08/03 12:44:21 gram Exp $
+ * $Id: print.h,v 1.20 2000/08/11 13:34:26 deniel Exp $
*
* Gilbert Ramirez <gram@xiexie.org>
*
@@ -28,9 +28,7 @@
#ifndef __PRINT_H__
#define __PRINT_H__
-#ifndef __PACKET_H__
#include "packet.h"
-#endif
#define PR_FMT_TEXT 0
#define PR_FMT_PS 1
diff --git a/proto.c b/proto.c
index cddf2db6ad..404f0b5630 100644
--- a/proto.c
+++ b/proto.c
@@ -1,7 +1,7 @@
/* proto.c
* Routines for protocol tree
*
- * $Id: proto.c,v 1.75 2000/08/10 19:41:45 guy Exp $
+ * $Id: proto.c,v 1.76 2000/08/11 13:35:33 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -31,39 +31,19 @@
# include <sys/types.h>
#endif
-#ifndef _STDIO_H
#include <stdio.h>
-#endif
-
-#ifndef _STRING_H
#include <string.h>
-#endif
-
-#ifndef __G_LIB_H__
#include <glib.h>
-#endif
-#ifndef __PROTO_H__
-#include "proto.h"
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
#endif
-#ifndef __PACKET_H__
#include "packet.h"
-#endif
-
-#ifndef __RESOLV_H__
#include "resolv.h"
-#endif
-
-#ifndef __REGISTER_H__
#include "register.h"
-#endif
-
#include "packet-ipv6.h"
-
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
+#include "proto.h"
#define cVALS(x) (const value_string*)(x)
diff --git a/proto.h b/proto.h
index 8bfc9c6aee..4e3014344e 100644
--- a/proto.h
+++ b/proto.h
@@ -1,7 +1,7 @@
/* proto.h
* Definitions for protocol display
*
- * $Id: proto.h,v 1.38 2000/08/10 16:04:32 deniel Exp $
+ * $Id: proto.h,v 1.39 2000/08/11 13:34:36 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -28,9 +28,7 @@
#define __PROTO_H__
#ifdef HAVE_SYS_TIME_H
-# ifndef _SYS_TIME_H
-# include <sys/time.h>
-# endif
+# include <sys/time.h>
#endif
#ifdef HAVE_STDARG_H
@@ -43,13 +41,8 @@
# include <winsock.h>
#endif
-#ifndef __IPV4_H__
#include "ipv4.h"
-#endif
-
-#ifndef __TVBUFF_H__
#include "tvbuff.h"
-#endif
/* needs glib.h */
typedef GNode proto_tree;
diff --git a/ptvcursor.c b/ptvcursor.c
index 971fc0e0ee..252a54f16e 100644
--- a/ptvcursor.c
+++ b/ptvcursor.c
@@ -3,7 +3,7 @@
* Proto Tree TVBuff cursor
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: ptvcursor.c,v 1.1 2000/07/28 20:03:43 gram Exp $
+ * $Id: ptvcursor.c,v 1.2 2000/08/11 13:34:32 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,9 +24,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __PTVCURSOR_H__
#include "ptvcursor.h"
-#endif
struct ptvcursor {
diff --git a/ptvcursor.h b/ptvcursor.h
index b78a0ae3c2..34471e5bb5 100644
--- a/ptvcursor.h
+++ b/ptvcursor.h
@@ -3,7 +3,7 @@
* Proto Tree TVBuff cursor
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: ptvcursor.h,v 1.1 2000/07/28 20:03:43 gram Exp $
+ * $Id: ptvcursor.h,v 1.2 2000/08/11 13:34:25 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,18 +24,15 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __PTVCURSOR_H__
+#define __PTVCURSOR_H__
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <glib.h>
-
-#ifndef __PACKET_H__
#include "packet.h"
-#endif
-
-#ifndef __PTVCURSOR_H__
-#define __PTVCURSOR_H__
typedef struct ptvcursor ptvcursor_t;
diff --git a/snprintf-imp.h b/snprintf-imp.h
index 245739541e..25bdf85708 100644
--- a/snprintf-imp.h
+++ b/snprintf-imp.h
@@ -69,12 +69,6 @@ Return values:
Alain Magloire: alainm@rcsm.ee.mcgill.ca
*/
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
#include <stdlib.h> /* for atoi() */
#include <ctype.h>
diff --git a/snprintf.c b/snprintf.c
index 0bd8aa95ac..81d0ba1711 100644
--- a/snprintf.c
+++ b/snprintf.c
@@ -44,8 +44,8 @@
# include "config.h"
#endif
-#include "snprintf-imp.h"
#include "snprintf.h"
+#include "snprintf-imp.h"
/*
* Find the nth power of 10
diff --git a/snprintf.h b/snprintf.h
index 62f57789b0..169f4ed7a8 100644
--- a/snprintf.h
+++ b/snprintf.h
@@ -1,3 +1,13 @@
+
+#ifndef __ETHEREAL_SNPRINTF_H__
+#define __ETHEREAL_SNPRINTF_H__
+
+#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
+
extern int vsnprintf(char *string, size_t length, const char * format,
va_list args);
@@ -7,3 +17,5 @@ extern int snprintf(char *string, size_t length, const char * format, ...);
extern int snprintf(char *string, size_t length, const char * format,
int va_alist);
#endif
+
+#endif
diff --git a/strerror.h b/strerror.h
index e76a5bd3ae..e584938e23 100644
--- a/strerror.h
+++ b/strerror.h
@@ -1,6 +1,6 @@
/* strerror.h
*
- * $Id: strerror.h,v 1.1 1999/06/14 21:46:36 guy Exp $
+ * $Id: strerror.h,v 1.2 2000/08/11 13:33:51 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -21,8 +21,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __STRERROR_H__
+#define __STRERROR_H__
+
/*
* Version of "strerror()", for the benefit of OSes that don't have it
* (e.g., SunOS 4.x).
*/
extern char *strerror(int);
+
+#endif
diff --git a/tethereal.c b/tethereal.c
index b0fdc0d837..cebf4b94ff 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
/* tethereal.c
*
- * $Id: tethereal.c,v 1.38 2000/08/03 12:44:21 gram Exp $
+ * $Id: tethereal.c,v 1.39 2000/08/11 13:34:49 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -38,17 +38,22 @@
#endif
#include <errno.h>
+
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
#include <fcntl.h>
+#endif
+
#include <signal.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/tvbuff.c b/tvbuff.c
index c12cfe9cb7..0d723c5cf6 100644
--- a/tvbuff.c
+++ b/tvbuff.c
@@ -9,7 +9,7 @@
* the data of a backing tvbuff, or can be a composite of
* other tvbuffs.
*
- * $Id: tvbuff.c,v 1.6 2000/08/10 07:58:44 guy Exp $
+ * $Id: tvbuff.c,v 1.7 2000/08/11 13:34:31 deniel Exp $
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@xiexie.org>
*
@@ -33,9 +33,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __TVBUFF_H__
#include "tvbuff.h"
-#endif
#include <string.h>
diff --git a/tvbuff.h b/tvbuff.h
index f0b94fe46b..fcfe1eceea 100644
--- a/tvbuff.h
+++ b/tvbuff.h
@@ -9,7 +9,7 @@
* the data of a backing tvbuff, or can be a composite of
* other tvbuffs.
*
- * $Id: tvbuff.h,v 1.6 2000/08/10 07:58:44 guy Exp $
+ * $Id: tvbuff.h,v 1.7 2000/08/11 13:34:24 deniel Exp $
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@xiexie.org>
*
@@ -36,13 +36,8 @@
#ifndef __TVBUFF_H__
#define __TVBUFF_H__
-#ifndef __GLIB_H__
#include <glib.h>
-#endif
-
-#ifndef __EXCEPTIONS_H__
#include "exceptions.h"
-#endif
typedef struct tvbuff tvbuff_t;
diff --git a/util.c b/util.c
index e6a2ce0611..0d8571b998 100644
--- a/util.c
+++ b/util.c
@@ -1,7 +1,7 @@
/* util.c
* Utility routines
*
- * $Id: util.c,v 1.40 2000/07/31 04:53:31 guy Exp $
+ * $Id: util.c,v 1.41 2000/08/11 13:34:53 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -47,11 +47,6 @@
#endif
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
diff --git a/wiretap/ascend.c b/wiretap/ascend.c
index 84fafc2f33..ae66b75f6b 100644
--- a/wiretap/ascend.c
+++ b/wiretap/ascend.c
@@ -1,6 +1,6 @@
/* ascend.c
*
- * $Id: ascend.c,v 1.16 2000/05/19 23:06:47 gram Exp $
+ * $Id: ascend.c,v 1.17 2000/08/11 13:32:37 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -29,7 +29,9 @@
#include "ascend-int.h"
#include "file_wrappers.h"
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/wiretap/ascend.h b/wiretap/ascend.h
index 5b908b9e93..fe732ec9b4 100644
--- a/wiretap/ascend.h
+++ b/wiretap/ascend.h
@@ -1,6 +1,6 @@
/* ascend.h
*
- * $Id: ascend.h,v 1.6 2000/05/18 09:09:24 guy Exp $
+ * $Id: ascend.h,v 1.7 2000/08/11 13:32:35 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,8 +21,13 @@
*
*/
+#ifndef __ASCEND_H__
+#define __ASCEND_H__
+
#define ASCEND_MAX_DATA_ROWS 8
#define ASCEND_MAX_DATA_COLS 16
#define ASCEND_MAX_PKT_LEN (ASCEND_MAX_DATA_ROWS * ASCEND_MAX_DATA_COLS)
int ascend_open(wtap *wth, int *err);
+
+#endif
diff --git a/wiretap/buffer.c b/wiretap/buffer.c
index b513d39377..2ce99c6053 100644
--- a/wiretap/buffer.c
+++ b/wiretap/buffer.c
@@ -1,6 +1,6 @@
/* buffer.c
*
- * $Id: buffer.c,v 1.9 2000/07/31 04:15:58 guy Exp $
+ * $Id: buffer.c,v 1.10 2000/08/11 13:32:37 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -29,7 +29,9 @@
#include <string.h>
#include <glib.h>
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#include "buffer.h"
diff --git a/wiretap/buffer.h b/wiretap/buffer.h
index 5ca1cca239..385e4cb679 100644
--- a/wiretap/buffer.h
+++ b/wiretap/buffer.h
@@ -1,6 +1,6 @@
/* buffer.h
*
- * $Id: buffer.h,v 1.6 2000/07/31 04:15:58 guy Exp $
+ * $Id: buffer.h,v 1.7 2000/08/11 13:32:35 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,6 +21,9 @@
*
*/
+#ifndef __W_BUFFER_H__
+#define __W_BUFFER_H__
+
#define SOME_FUNCTIONS_ARE_DEFINES
#ifdef HAVE_WINSOCK_H
@@ -51,3 +54,5 @@ void buffer_remove_start(Buffer* buffer, unsigned int bytes);
u_char* buffer_start_ptr(Buffer* buffer);
u_char* buffer_end_ptr(Buffer* buffer);
#endif
+
+#endif
diff --git a/wiretap/config.h.win32 b/wiretap/config.h.win32
index 4c3529aca6..f2ba12e4f3 100644
--- a/wiretap/config.h.win32
+++ b/wiretap/config.h.win32
@@ -8,6 +8,15 @@
/* Define if you have the z library (-lz). */
/*#define HAVE_LIBZ 1*/
+/* Define if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
/* Name of package */
#define PACKAGE "libwtap.a"
diff --git a/wiretap/configure.in b/wiretap/configure.in
index 5b3f986c51..2d4334c054 100644
--- a/wiretap/configure.in
+++ b/wiretap/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.21 2000/02/12 08:54:32 guy Exp $
+# $Id: configure.in,v 1.22 2000/08/11 13:32:35 deniel 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
@@ -46,7 +46,7 @@ fi
dnl Checks for header files
AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/time.h netinet/in.h unistd.h)
+AC_CHECK_HEADERS(sys/time.h netinet/in.h unistd.h fcntl.h sys/stat.h sys/types.h)
AC_CANONICAL_HOST
diff --git a/wiretap/csids.h b/wiretap/csids.h
index 1adcf2d058..b40962abee 100644
--- a/wiretap/csids.h
+++ b/wiretap/csids.h
@@ -1,6 +1,6 @@
/* csids.h
*
- * $Id: csids.h,v 1.1 2000/08/08 22:16:42 mhall Exp $
+ * $Id: csids.h,v 1.2 2000/08/11 13:32:35 deniel Exp $
*
* Copyright (c) 2000 by Mike Hall <mlh@io.com>
* Copyright (c) Cisco Systems
@@ -21,4 +21,9 @@
*
*/
+#ifndef __CSIDS_H__
+#define __CSIDS_H__
+
int csids_open(wtap *wth, int *err);
+
+#endif
diff --git a/wiretap/file.c b/wiretap/file.c
index d37d48172a..63649b9590 100644
--- a/wiretap/file.c
+++ b/wiretap/file.c
@@ -1,6 +1,6 @@
/* file.c
*
- * $Id: file.c,v 1.59 2000/08/08 22:16:42 mhall Exp $
+ * $Id: file.c,v 1.60 2000/08/11 13:32:36 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -25,10 +25,17 @@
#endif
#include <stdio.h>
-#include <fcntl.h>
#include <string.h>
#include <stdlib.h>
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
+
#include <errno.h>
#ifdef HAVE_IO_H
diff --git a/wiretap/i4btrace.h b/wiretap/i4btrace.h
index ca5ca7b1cd..9911a6c45e 100644
--- a/wiretap/i4btrace.h
+++ b/wiretap/i4btrace.h
@@ -1,6 +1,6 @@
/* i4btrace.h
*
- * $Id: i4btrace.h,v 1.1 1999/12/12 22:40:09 gram Exp $
+ * $Id: i4btrace.h,v 1.2 2000/08/11 13:32:35 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org>
@@ -21,4 +21,9 @@
*
*/
+#ifndef __I4BTRACE_H__
+#define __I4BTRACE_H__
+
int i4btrace_open(wtap *wth, int *err);
+
+#endif
diff --git a/wiretap/iptrace.h b/wiretap/iptrace.h
index 38c37899a0..f49449319b 100644
--- a/wiretap/iptrace.h
+++ b/wiretap/iptrace.h
@@ -1,6 +1,6 @@
/* iptrace.h
*
- * $Id: iptrace.h,v 1.4 2000/01/22 06:22:38 guy Exp $
+ * $Id: iptrace.h,v 1.5 2000/08/11 13:32:35 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,4 +21,9 @@
*
*/
+#ifndef __IPTRACE_H__
+#define __IPTRACE_H__
+
int iptrace_open(wtap *wth, int *err);
+
+#endif
diff --git a/wiretap/lanalyzer.h b/wiretap/lanalyzer.h
index 443754ae69..e6c6aa3893 100644
--- a/wiretap/lanalyzer.h
+++ b/wiretap/lanalyzer.h
@@ -1,6 +1,6 @@
/* lanalyzer.h
*
- * $Id: lanalyzer.h,v 1.3 2000/01/22 06:22:38 guy Exp $
+ * $Id: lanalyzer.h,v 1.4 2000/08/11 13:32:35 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,4 +21,9 @@
*
*/
+#ifndef __LANALYZER_H__
+#define __LANALYZER_H__
+
int lanalyzer_open(wtap *wth, int *err);
+
+#endif
diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h
index 1e4e409ac0..28b50a8f89 100644
--- a/wiretap/libpcap.h
+++ b/wiretap/libpcap.h
@@ -1,6 +1,6 @@
/* libpcap.h
*
- * $Id: libpcap.h,v 1.8 2000/07/30 16:54:12 oabad Exp $
+ * $Id: libpcap.h,v 1.9 2000/08/11 13:32:35 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,6 +21,9 @@
*
*/
+#ifndef __W_LIBPCAP_H__
+#define __W_LIBPCAP_H__
+
/* Magic numbers in "libpcap" files.
"libpcap" file records are written in the byte order of the host that
@@ -86,3 +89,5 @@ struct pcaprec_ss990915_hdr {
int libpcap_open(wtap *wth, int *err);
gboolean libpcap_dump_open(wtap_dumper *wdh, int *err);
int libpcap_dump_can_write_encap(int filetype, int encap);
+
+#endif
diff --git a/wiretap/netmon.h b/wiretap/netmon.h
index 741e1118fb..859834f68c 100644
--- a/wiretap/netmon.h
+++ b/wiretap/netmon.h
@@ -1,6 +1,6 @@
/* netmon.h
*
- * $Id: netmon.h,v 1.6 2000/01/22 06:22:40 guy Exp $
+ * $Id: netmon.h,v 1.7 2000/08/11 13:32:34 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,6 +21,11 @@
*
*/
+#ifndef __NETMON_H__
+#define __NETMON_H__
+
int netmon_open(wtap *wth, int *err);
gboolean netmon_dump_open(wtap_dumper *wdh, int *err);
int netmon_dump_can_write_encap(int filetype, int encap);
+
+#endif
diff --git a/wiretap/nettl.h b/wiretap/nettl.h
index 5e9fc469f9..397e544d14 100644
--- a/wiretap/nettl.h
+++ b/wiretap/nettl.h
@@ -1,6 +1,6 @@
/* nettl.h
*
- * $Id: nettl.h,v 1.4 2000/02/17 21:08:15 oabad Exp $
+ * $Id: nettl.h,v 1.5 2000/08/11 13:32:34 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,6 +21,9 @@
*
*/
+#ifndef __NETTL_H__
+#define __NETTL_H__
+
#define NETTL_SUBSYS_NS_LS_LOGGING 0x00
#define NETTL_SUBSYS_NS_LS_NFT 0x01
#define NETTL_SUBSYS_NS_LS_LOOPBACK 0x02
@@ -66,3 +69,5 @@
#define NETTL_SUBSYS_EM 0x7C
int nettl_open(wtap *wth, int *err);
+
+#endif
diff --git a/wiretap/netxray.h b/wiretap/netxray.h
index 89397a5b7b..8e3d76738a 100644
--- a/wiretap/netxray.h
+++ b/wiretap/netxray.h
@@ -1,6 +1,6 @@
/* netxray.h
*
- * $Id: netxray.h,v 1.4 2000/01/22 06:22:41 guy Exp $
+ * $Id: netxray.h,v 1.5 2000/08/11 13:32:34 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,6 +21,11 @@
*
*/
+#ifndef __NETXRAY_H__
+#define __NETXRAY_H__
+
int netxray_open(wtap *wth, int *err);
gboolean netxray_dump_open_1_1(wtap_dumper *wdh, int *err);
int netxray_dump_can_write_encap(int filetype, int encap);
+
+#endif
diff --git a/wiretap/ngsniffer.h b/wiretap/ngsniffer.h
index 4d412debed..0dbbc70445 100644
--- a/wiretap/ngsniffer.h
+++ b/wiretap/ngsniffer.h
@@ -1,6 +1,6 @@
/* ngsniffer.h
*
- * $Id: ngsniffer.h,v 1.7 2000/01/22 06:22:43 guy Exp $
+ * $Id: ngsniffer.h,v 1.8 2000/08/11 13:32:34 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,6 +21,11 @@
*
*/
+#ifndef __NGSNIFFER_H__
+#define __NGSNIFFER_H__
+
int ngsniffer_open(wtap *wth, int *err);
gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err);
int ngsniffer_dump_can_write_encap(int filetype, int encap);
+
+#endif
diff --git a/wiretap/radcom.h b/wiretap/radcom.h
index 61ca18b008..f89c03d81c 100644
--- a/wiretap/radcom.h
+++ b/wiretap/radcom.h
@@ -1,6 +1,6 @@
/* radcom.h
*
- * $Id: radcom.h,v 1.4 2000/01/22 06:22:43 guy Exp $
+ * $Id: radcom.h,v 1.5 2000/08/11 13:32:34 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,4 +21,9 @@
*
*/
+#ifndef __RADCOM_H__
+#define __RADCOM_H__
+
int radcom_open(wtap *wth, int *err);
+
+#endif
diff --git a/wiretap/snoop.h b/wiretap/snoop.h
index 31b184868e..5505cf51db 100644
--- a/wiretap/snoop.h
+++ b/wiretap/snoop.h
@@ -1,6 +1,6 @@
/* snoop.h
*
- * $Id: snoop.h,v 1.7 2000/01/22 06:22:44 guy Exp $
+ * $Id: snoop.h,v 1.8 2000/08/11 13:32:34 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,6 +21,11 @@
*
*/
+#ifndef __W_SNOOP_H__
+#define __W_SNOOP_H__
+
int snoop_open(wtap *wth, int *err);
gboolean snoop_dump_open(wtap_dumper *wdh, int *err);
int snoop_dump_can_write_encap(int filetype, int encap);
+
+#endif
diff --git a/wiretap/toshiba.h b/wiretap/toshiba.h
index f4127ba969..bce4dd5be4 100644
--- a/wiretap/toshiba.h
+++ b/wiretap/toshiba.h
@@ -1,6 +1,6 @@
/* toshiba.h
*
- * $Id: toshiba.h,v 1.2 2000/05/18 09:09:48 guy Exp $
+ * $Id: toshiba.h,v 1.3 2000/08/11 13:32:33 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -21,4 +21,9 @@
*
*/
+#ifndef __W_TOSHIBA_H__
+#define __W_TOSHIBA_H__
+
int toshiba_open(wtap *wth, int *err);
+
+#endif
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index e0f04de195..55e652f443 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -1,6 +1,6 @@
/* wtap-int.h
*
- * $Id: wtap-int.h,v 1.5 2000/08/11 07:28:12 guy Exp $
+ * $Id: wtap-int.h,v 1.6 2000/08/11 13:32:36 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -24,8 +24,9 @@
#ifndef __WTAP_INT_H__
#define __WTAP_INT_H__
-
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index f2268ea7da..3b248e9ff1 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1,6 +1,6 @@
/* wtap.h
*
- * $Id: wtap.h,v 1.76 2000/08/08 22:16:42 mhall Exp $
+ * $Id: wtap.h,v 1.77 2000/08/11 13:32:37 deniel Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -132,7 +132,9 @@
*/
#define WTAP_MAX_PACKET_SIZE 65535
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/xdlc.h b/xdlc.h
index ff7312077b..8190cda239 100644
--- a/xdlc.h
+++ b/xdlc.h
@@ -2,7 +2,7 @@
* Define *DLC frame types, and routine to dissect the control field of
* a *DLC frame.
*
- * $Id: xdlc.h,v 1.13 2000/05/31 03:58:56 gram Exp $
+ * $Id: xdlc.h,v 1.14 2000/08/11 13:33:50 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -24,6 +24,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __XDLC_H__
+#define __XDLC_H__
+
/*
* Low-order bits of first (extended) or only (basic) octet of control
* field, specifying the frame type.
@@ -82,3 +85,5 @@ int get_xdlc_control(const u_char *pd, int offset, int is_response,
int dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *xdlc_tree, int hf_xdlc_control, gint ett_xdlc_control,
int is_response, int extended);
+
+#endif