Move the declaration of "etype_vals[]" from "epan/packet.h" to

"etypes.h".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3314 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/packet.h b/epan/packet.h
index d19fafca2394fb55d8008bad4832717a102c11d5..95f1664ba12623a0859bd0a50a3303fc1d721416 100644 (file)
--- 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 f9cd79df6b7d379deb136d467ca97cb5f3fd48d1..647d86ecffcca72ffe2e3b818b982fa72236d887 100644 (file)
--- 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 1f838836ac8c355e2f4fb36258287bb3f4217232..6fac1813dadd63e10d9dd0a49fddac8ea36c77d3 100644 (file)
--- 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 9d1ef8c23b25d418d4e5e4540df89f1b31cc1e17..b38d6c786aa11762b84686f813bf03c8928d83bd 100644 (file)
--- 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 d5f1a8b490ecf6b01dd71995dced1030b8b753ad..2c83d8db737047f4e866458530851518c427d137 100644 (file)
--- 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 076ccd13314d49ffc16ceadd2f200c34838bb3d6..09ed336c05692305b52e0cd840f706ba8fe4b75c 100644 (file)
--- 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 14a6f6b499eed4afb1058ce1eafa8a8c1ce0383e..ce4da4d5300be2dc2bedecd2aa6d51e211a6f939 100644 (file)
--- 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 6def66e4693d06140bc7d57d3381c8e09f7bf3c8..ee8ff83061a3b9cdbcb0426aa61326b48728c768 100644 (file)
--- 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 26896897faefe401a35668e0bcf6f0dd076f1c17..58aef1e002d06a660d9eb92862df7179238c32c1 100644 (file)
--- 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 654eb72d2fcb7f801b46e543007fdb2633e7fa8f..485cf13bb46cb83166aeb7a33da1b64910884aee 100644 (file)
--- 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 d4958926a8d82568bc8292cbdc23564083097c6c..8892b16c89272c120941be81462fea4f080c102a 100644 (file)
--- 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 50566fe3aa65d5654507f4754565472be00f94fa..52076426d4abac583b963cc758df3d051005c1e3 100644 (file)
--- 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 b0fc6ebb3af87c8ec2a084f676f57a7d12a735e1..ff5de6980d7843639000b71ef501b9bb1ff87d30 100644 (file)
--- 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 62ba3fab7c14e72a6e1b5477bce2de51648fc81e..3a8d2df62d1c531f56af2ee09b059a12394bef4e 100644 (file)
--- 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 4a680b5ba0303510b61beec02f42dadcc2b934fc..10b4d78e322558915b2d8465c6d2f9ab58863df0 100644 (file)
--- 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