aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/packet.h3
-rw-r--r--etypes.h6
-rw-r--r--packet-eth.c4
-rw-r--r--packet-fr.c3
-rw-r--r--packet-gre.c6
-rw-r--r--packet-ieee80211.c4
-rw-r--r--packet-ipv6.c8
-rw-r--r--packet-ipx.c8
-rw-r--r--packet-mpls.c5
-rw-r--r--packet-null.c4
-rw-r--r--packet-pppoe.c4
-rw-r--r--packet-q2931.c3
-rw-r--r--packet-rsvp.c3
-rw-r--r--packet-sll.c3
-rw-r--r--packet-vines.c6
15 files changed, 34 insertions, 36 deletions
diff --git a/epan/packet.h b/epan/packet.h
index d19fafca23..95f1664ba1 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet.h,v 1.31 2001/04/17 06:29:14 guy Exp $
+ * $Id: packet.h,v 1.32 2001/04/17 06:43:21 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -241,6 +241,5 @@ void capture_ethertype(guint16 etype, int offset,
void ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_ethertype,
packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree,
int etype_id, int trailer_id);
-extern const value_string etype_vals[];
#endif /* packet.h */
diff --git a/etypes.h b/etypes.h
index f9cd79df6b..647d86ecff 100644
--- a/etypes.h
+++ b/etypes.h
@@ -1,7 +1,7 @@
/* etypes.h
* Defines ethernet packet types, similar to tcpdump's ethertype.h
*
- * $Id: etypes.h,v 1.17 2001/04/03 05:42:11 guy Exp $
+ * $Id: etypes.h,v 1.18 2001/04/17 06:43:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -168,6 +168,6 @@
#define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */
#endif
-#endif /* etypes.h */
-
+extern const value_string etype_vals[];
+#endif /* etypes.h */
diff --git a/packet-eth.c b/packet-eth.c
index 1f838836ac..6fac1813da 100644
--- a/packet-eth.c
+++ b/packet-eth.c
@@ -1,7 +1,7 @@
/* packet-eth.c
* Routines for ethernet packet disassembly
*
- * $Id: packet-eth.c,v 1.63 2001/04/03 05:42:11 guy Exp $
+ * $Id: packet-eth.c,v 1.64 2001/04/17 06:43:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -41,8 +41,6 @@
#include "packet-isl.h"
#include "packet-llc.h"
-extern const value_string etype_vals[];
-
/* protocols and header fields */
static int proto_eth = -1;
static int hf_eth_dst = -1;
diff --git a/packet-fr.c b/packet-fr.c
index 9d1ef8c23b..b38d6c786a 100644
--- a/packet-fr.c
+++ b/packet-fr.c
@@ -3,7 +3,7 @@
*
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-fr.c,v 1.16 2001/03/31 10:35:54 guy Exp $
+ * $Id: packet-fr.c,v 1.17 2001/04/17 06:43:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -53,6 +53,7 @@
#include "packet-llc.h"
#include "packet-chdlc.h"
#include "xdlc.h"
+#include "etypes.h"
#include "oui.h"
#include "nlpid.h"
#include "greproto.h"
diff --git a/packet-gre.c b/packet-gre.c
index d5f1a8b490..2c83d8db73 100644
--- a/packet-gre.c
+++ b/packet-gre.c
@@ -2,7 +2,7 @@
* Routines for the Generic Routing Encapsulation (GRE) protocol
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-gre.c,v 1.40 2001/04/03 05:42:11 guy Exp $
+ * $Id: packet-gre.c,v 1.41 2001/04/17 06:43:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -36,13 +36,13 @@
#include <netinet/in.h>
#endif
#include <glib.h>
-#include "etypes.h"
-#include "greproto.h"
#include "packet.h"
#include "packet-ip.h"
#include "packet-ipx.h"
#include "packet-wccp.h"
#include "in_cksum.h"
+#include "etypes.h"
+#include "greproto.h"
static int proto_gre = -1;
static int hf_gre_proto = -1;
diff --git a/packet-ieee80211.c b/packet-ieee80211.c
index 076ccd1331..09ed336c05 100644
--- a/packet-ieee80211.c
+++ b/packet-ieee80211.c
@@ -3,7 +3,7 @@
* Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
*
- * $Id: packet-ieee80211.c,v 1.15 2001/03/15 05:39:04 guy Exp $
+ * $Id: packet-ieee80211.c,v 1.16 2001/04/17 06:43:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -54,10 +54,10 @@
#include <glib.h>
#include "bitswap.h"
#include "proto.h"
-#include "etypes.h"
#include "packet.h"
#include "packet-llc.h"
#include "packet-ieee80211.h"
+#include "etypes.h"
/* ************************************************************************* */
/* Miscellaneous Constants */
diff --git a/packet-ipv6.c b/packet-ipv6.c
index 14a6f6b499..ce4da4d530 100644
--- a/packet-ipv6.c
+++ b/packet-ipv6.c
@@ -1,7 +1,7 @@
/* packet-ipv6.c
* Routines for IPv6 packet disassembly
*
- * $Id: packet-ipv6.c,v 1.52 2001/04/17 06:29:12 guy Exp $
+ * $Id: packet-ipv6.c,v 1.53 2001/04/17 06:43:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -44,9 +44,6 @@
#include <string.h>
#include <stdio.h>
#include <glib.h>
-#include "etypes.h"
-#include "ppptypes.h"
-#include "aftypes.h"
#include "packet.h"
#include "packet-ip.h"
#include "packet-ipsec.h"
@@ -55,6 +52,9 @@
#include "packet-udp.h"
#include "resolv.h"
#include "ipproto.h"
+#include "etypes.h"
+#include "ppptypes.h"
+#include "aftypes.h"
/*
* NOTE: ipv6.nxt is not very useful as we will have chained header.
diff --git a/packet-ipx.c b/packet-ipx.c
index 6def66e469..ee8ff83061 100644
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -2,7 +2,7 @@
* Routines for NetWare's IPX
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-ipx.c,v 1.82 2001/04/15 07:36:52 guy Exp $
+ * $Id: packet-ipx.c,v 1.83 2001/04/17 06:43:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -35,13 +35,13 @@
#include <stdio.h>
#include <string.h>
#include <glib.h>
+#include "packet.h"
+#include "packet-ipx.h"
+#include "resolv.h"
#include "etypes.h"
#include "ppptypes.h"
#include "llcsaps.h"
#include "aftypes.h"
-#include "packet.h"
-#include "packet-ipx.h"
-#include "resolv.h"
/* The information in this module (IPX, SPX, NCP) comes from:
NetWare LAN Analysis, Second Edition
diff --git a/packet-mpls.c b/packet-mpls.c
index 26896897fa..58aef1e002 100644
--- a/packet-mpls.c
+++ b/packet-mpls.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-mpls.c,v 1.17 2001/01/25 06:14:14 guy Exp $
+ * $Id: packet-mpls.c,v 1.18 2001/04/17 06:43:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -43,11 +43,10 @@
#endif
#include <glib.h>
-#include "etypes.h"
#include "packet.h"
#include "packet-ip.h"
#include "ppptypes.h"
-#include "packet-ppp.h"
+#include "etypes.h"
static gint proto_mpls = -1;
diff --git a/packet-null.c b/packet-null.c
index 654eb72d2f..485cf13bb4 100644
--- a/packet-null.c
+++ b/packet-null.c
@@ -1,7 +1,7 @@
/* packet-null.c
* Routines for null packet disassembly
*
- * $Id: packet-null.c,v 1.43 2001/03/30 06:15:47 guy Exp $
+ * $Id: packet-null.c,v 1.44 2001/04/17 06:43:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -52,8 +52,6 @@
static dissector_table_t null_dissector_table;
-extern const value_string etype_vals[];
-
/* protocols and header fields */
static int proto_null = -1;
static int hf_null_etype = -1;
diff --git a/packet-pppoe.c b/packet-pppoe.c
index d4958926a8..8892b16c89 100644
--- a/packet-pppoe.c
+++ b/packet-pppoe.c
@@ -1,7 +1,7 @@
/* packet-pppoe.c
* Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516)
*
- * $Id: packet-pppoe.c,v 1.17 2001/03/30 06:10:54 guy Exp $
+ * $Id: packet-pppoe.c,v 1.18 2001/04/17 06:43:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -32,9 +32,9 @@
#endif
#include <glib.h>
-#include "etypes.h"
#include "packet.h"
#include "strutil.h"
+#include "etypes.h"
static int proto_pppoed = -1;
diff --git a/packet-q2931.c b/packet-q2931.c
index 50566fe3aa..52076426d4 100644
--- a/packet-q2931.c
+++ b/packet-q2931.c
@@ -2,7 +2,7 @@
* Routines for Q.2931 frame disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-q2931.c,v 1.14 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-q2931.c,v 1.15 2001/04/17 06:43:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -38,6 +38,7 @@
#include "packet.h"
#include "oui.h"
#include "nlpid.h"
+#include "etypes.h"
#include "packet-q931.h"
#include "packet-arp.h"
diff --git a/packet-rsvp.c b/packet-rsvp.c
index b0fc6ebb3a..ff5de6980d 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.35 2001/02/04 09:37:28 guy Exp $
+ * $Id: packet-rsvp.c,v 1.36 2001/04/17 06:43:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -72,6 +72,7 @@
#include "packet-ip.h"
#include "packet-ipv6.h"
#include "ieee-float.h"
+#include "etypes.h"
static int proto_rsvp = -1;
diff --git a/packet-sll.c b/packet-sll.c
index 62ba3fab7c..3a8d2df62d 100644
--- a/packet-sll.c
+++ b/packet-sll.c
@@ -1,7 +1,7 @@
/* packet-sll.c
* Routines for disassembly of packets from Linux "cooked mode" captures
*
- * $Id: packet-sll.c,v 1.8 2001/03/13 21:34:23 gram Exp $
+ * $Id: packet-sll.c,v 1.9 2001/04/17 06:43:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -38,6 +38,7 @@
#include "packet-ipx.h"
#include "packet-llc.h"
#include "resolv.h"
+#include "etypes.h"
static int proto_sll = -1;
static int hf_sll_pkttype = -1;
diff --git a/packet-vines.c b/packet-vines.c
index 4a680b5ba0..10b4d78e32 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
/* packet-vines.c
* Routines for Banyan VINES protocol packet disassembly
*
- * $Id: packet-vines.c,v 1.28 2001/04/17 00:46:03 guy Exp $
+ * $Id: packet-vines.c,v 1.29 2001/04/17 06:43:19 guy Exp $
*
* Don Lafontaine <lafont02@cn.ca>
*
@@ -40,11 +40,11 @@
#include <string.h>
#include <glib.h>
-#include "etypes.h"
-#include "ppptypes.h"
#include "packet.h"
#include "packet-vines.h"
#include "packet-ip.h"
+#include "etypes.h"
+#include "ppptypes.h"
#define UDP_PORT_VINES 573
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 21:07:43 +0000