Move the xDLC helper routines into epan.

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

diff --git a/Makefile.common b/Makefile.common
index b254e53034e5c01d439109312532b3ec75e31126..0c43779fbf539703892d2c9bb977cbf6f9e37fe5 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -58,7 +58,6 @@ DISSECTOR_SUPPORT_INCLUDES =  \
        t35.h   \
        tap.h   \
        x264_prt_id.h   \
-       xdlc.h  \
        xmlstub.h
 
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.

diff --git a/epan/Makefile.common b/epan/Makefile.common
index 18c558024b051800626074626c9694833f68e98d..994de14fdf6af1b1aa5016a5d20b9d6b2f11aa66 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -58,7 +58,8 @@ LIBETHEREAL_SRC =             \
        timestamp.c             \
        to_str.c                \
        tvbuff.c                \
-       value_string.c
+       value_string.c          \
+       xdlc.c
 
 LIBETHEREAL_INCLUDES =                 \
        addr_and_mask.h         \
@@ -106,7 +107,8 @@ LIBETHEREAL_INCLUDES =              \
        timestamp.h             \
        to_str.h                \
        tvbuff.h                \
-       value_string.h
+       value_string.h          \
+       xdlc.h
 
 # dissector helpers (needed from the dissectors, but not a dissector itself)
 DISSECTOR_SUPPORT_SRC =        \
@@ -121,6 +123,5 @@ DISSECTOR_SUPPORT_SRC =     \
        ../req_resp_hdrs.c      \
        ../t35.c        \
        ../tap.c        \
-       ../xdlc.c       \
        ../xmlstub.c
 

diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 619c1bb1e179f74397d26a957a14ea7b4beb69e2..a8c8f0eec60d2582c4f285a47aac1962cc9860f5 100644 (file)
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -48,7 +48,7 @@
 #include <epan/prefs.h>
 #include "packet-llc.h"
 #include "packet-chdlc.h"
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include "etypes.h"
 #include "oui.h"
 #include "nlpid.h"

diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index 3a14dbb9c36e6d61e385ec4db7f88089dddac6f8..8a461e028babad7b201a551aca200be66ddc2bc2 100644 (file)
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include "etypes.h"
 #include "llcsaps.h"
 #include "packet-hpext.h"

diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index 0b010e50735e8576557ef0b14cce84794f795775..b208b755258f95394dc12b07523b331ba61b88a5 100644 (file)
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 static int proto_lapb = -1;
 static int hf_lapb_address = -1;

diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index d766047ef8244caf7ab6a6ef3daec2355826a7a9..328f5d273f74268e9ab2374c5dbc6ae8d961ff1d 100644 (file)
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 #include "lapd_sapi.h"
 

diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index 6d488c446db1080ce2ab9f39e8b997ae1d5ef818..e7f1b21a2e02e1452ee3067c4364f67f92770445 100644 (file)
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "oui.h"
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include "etypes.h"
 #include "llcsaps.h"
 #include "bridged_pids.h"

diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index 12a6e2c140e042d71f141bb74f2c8a2ed1294d7a..79b6848b7170811097c064c80cf224a8507d3adc 100644 (file)
--- a/epan/dissectors/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 /*
  * See

diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c
index b47668fc2a2b885ccc31ffbbeb0f4c931e9f44dc..571355c710265ace05dd41500b92b2fdb36a6d91 100644 (file)
--- a/epan/dissectors/packet-v120.c
+++ b/epan/dissectors/packet-v120.c
@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 static int proto_v120 = -1;
 static int hf_v120_address = -1;

diff --git a/epan/plugins.c b/epan/plugins.c
index aaf852dfeb0b501e874c558af6806f69f785394d..1e9f9c9575b69aba82535b10370534d9985db762 100644 (file)
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -72,7 +72,7 @@
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtcp.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include <epan/crc16.h>
 #include "report_err.h"
 #include "plugins/plugin_table.h"

diff --git a/xdlc.c b/epan/xdlc.c
similarity index 99%
rename from xdlc.c
rename to epan/xdlc.c
index 9d3a4d7b9f2bbb17095922874fda19b9dd1eb855..1cef001f9c61f7820d8470a20e9034f353e5984b 100644 (file)
--- a/xdlc.c
+++ b/epan/xdlc.c
@@ -32,7 +32,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 const value_string ftype_vals[] = {
     { XDLC_I, "Information frame" },

diff --git a/xdlc.h b/epan/xdlc.h
similarity index 100%
rename from xdlc.h
rename to epan/xdlc.h

diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index 8330bf6dbecd8725899c3a2d7a269814cc3f392a..90f1694e4a29deec66a6ce5f813e3479f9bc29d4 100644 (file)
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -58,7 +58,7 @@
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtcp.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include <epan/crc16.h>
 #include "epan/except.h"
 #include "epan/filesystem.h"

diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c
index ebf4074cd604f43797229c4e5ac13834aeb88779..80bb9a7c33f2a55053fde0664691d7d9342826b1 100644 (file)
--- a/plugins/plugin_api_list.c
+++ b/plugins/plugin_api_list.c
@@ -43,7 +43,7 @@
 #include <epan/dissectors/packet-rtcp.h>
 #include "tap.h"
 #include "asn1.h"
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include <epan/crc16.h>
 
 gint check_col(column_info*, gint);