aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-04-29 17:56:49 +0000
committerGuy Harris <guy@alum.mit.edu>2003-04-29 17:56:49 +0000
commitdaeac95d4aca8fc28e30d033b35b0131a680fe4c (patch)
treefb9d1639e0302ad28fdd4e1feade75d467673c7a
parent74e3d695fcc195def1c67453f2e62444c398ca6b (diff)
Don't export "osinl_subdissector_table" or "ppp_subdissector_table" -
have other dissectors that use them fetch them with "find_dissector_table()". svn path=/trunk/; revision=7601
-rw-r--r--packet-fr.c7
-rw-r--r--packet-gtp.c6
-rw-r--r--packet-osi.c4
-rw-r--r--packet-osi.h8
-rw-r--r--packet-ppp.c7
-rw-r--r--packet-ppp.h3
6 files changed, 16 insertions, 19 deletions
diff --git a/packet-fr.c b/packet-fr.c
index 1948e66e2a..0499cb25ba 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.33 2003/01/31 01:02:03 guy Exp $
+ * $Id: packet-fr.c,v 1.34 2003/04/29 17:56:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -45,7 +45,6 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "packet-osi.h"
#include "packet-llc.h"
#include "packet-chdlc.h"
#include "xdlc.h"
@@ -90,6 +89,8 @@ static gint hf_fr_chdlctype = -1;
static dissector_handle_t data_handle;
+static dissector_table_t osinl_subdissector_table;
+
static const true_false_string cmd_string = {
"Command",
"Response"
@@ -432,4 +433,6 @@ void proto_reg_handoff_fr(void)
dissector_add("wtap_encap", WTAP_ENCAP_FRELAY_WITH_PHDR, fr_handle);
dissector_add("gre.proto", GRE_FR, fr_handle);
data_handle = find_dissector("data");
+
+ osinl_subdissector_table = find_dissector_table("osinl");
}
diff --git a/packet-gtp.c b/packet-gtp.c
index bec0f708ce..532318ac7c 100644
--- a/packet-gtp.c
+++ b/packet-gtp.c
@@ -4,7 +4,7 @@
* Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
* Nicolas Balkota <balkota@mac.com>
*
- * $Id: packet-gtp.c,v 1.53 2003/02/07 19:57:19 guy Exp $
+ * $Id: packet-gtp.c,v 1.54 2003/04/29 17:56:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,6 +41,8 @@
#include "packet-ppp.h"
#include "prefs.h"
+static dissector_table_t ppp_subdissector_table;
+
/*
* All data related to GTP v0 (GPRS) uses "gtpv0" or "GTPv0",
* all data related to GTP v1 (UMTS) uses "gtpv1" or "GTPv1",
@@ -5380,6 +5382,8 @@ proto_reg_handoff_gtp(void)
gtpv1_handle = find_dissector("gtpv1");
+ ppp_subdissector_table = find_dissector_table("ppp.protocol");
+
Initialized = TRUE;
} else {
diff --git a/packet-osi.c b/packet-osi.c
index e431a55868..c9782714e2 100644
--- a/packet-osi.c
+++ b/packet-osi.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions
*
- * $Id: packet-osi.c,v 1.59 2003/02/24 19:49:03 guy Exp $
+ * $Id: packet-osi.c,v 1.60 2003/04/29 17:56:48 guy Exp $
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -130,7 +130,7 @@ const value_string nlpid_vals[] = {
{ 0, NULL },
};
-dissector_table_t osinl_subdissector_table;
+static dissector_table_t osinl_subdissector_table;
static dissector_handle_t data_handle;
static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
diff --git a/packet-osi.h b/packet-osi.h
index f7ca6fa04e..427010b61d 100644
--- a/packet-osi.h
+++ b/packet-osi.h
@@ -1,6 +1,6 @@
/* packet-osi.h
*
- * $Id: packet-osi.h,v 1.12 2002/08/28 21:00:24 jmayer Exp $
+ * $Id: packet-osi.h,v 1.13 2003/04/29 17:56:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -75,12 +75,6 @@
#define BIT_16 0x8000
/*
- * Dissector table for NLPIDs for protocols whose packets begin with
- * the NLPID.
- */
-extern dissector_table_t osinl_subdissector_table;
-
-/*
* published API functions
*/
diff --git a/packet-ppp.c b/packet-ppp.c
index aa28fc9a42..04558334ae 100644
--- a/packet-ppp.c
+++ b/packet-ppp.c
@@ -1,7 +1,7 @@
/* packet-ppp.c
* Routines for ppp packet disassembly
*
- * $Id: packet-ppp.c,v 1.109 2003/04/28 04:03:24 gerald Exp $
+ * $Id: packet-ppp.c,v 1.110 2003/04/29 17:56:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -157,10 +157,7 @@ static gint ett_ipv6cp_options = -1;
static gint ett_ipv6cp_if_id_opt = -1;
static gint ett_ipv6cp_compressprot_opt = -1;
-/*
- * Used by the GTP dissector as well.
- */
-dissector_table_t ppp_subdissector_table;
+static dissector_table_t ppp_subdissector_table;
static dissector_handle_t chdlc_handle;
static dissector_handle_t data_handle;
diff --git a/packet-ppp.h b/packet-ppp.h
index 30dd083d80..38922ed71f 100644
--- a/packet-ppp.h
+++ b/packet-ppp.h
@@ -1,6 +1,6 @@
/* packet-ppp.h
*
- * $Id: packet-ppp.h,v 1.12 2002/11/11 19:23:12 guy Exp $
+ * $Id: packet-ppp.h,v 1.13 2003/04/29 17:56:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,7 +32,6 @@ void capture_ppp_hdlc(const guchar *, int, int, packet_counts *);
/*
* Used by the GTP dissector as well.
*/
-extern dissector_table_t ppp_subdissector_table;
extern const value_string ppp_vals[];
#endif