From Michael Mann:

Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005

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

diff --git a/Makefile.am b/Makefile.am
index a73c459f697d23a995fb03e37d373e1d6c84d52f..6ddc6ea72c371b22b930d919cbb424ab6f26ea84 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -282,7 +282,6 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
        -dlopen plugins/giop/cosnaming.la \
        -dlopen plugins/giop/coseventcomm.la \
        -dlopen plugins/gryphon/gryphon.la \
-       -dlopen plugins/interlink/interlink.la \
        -dlopen plugins/irda/irda.la \
        -dlopen plugins/m2m/m2m.la \
        -dlopen plugins/mate/mate.la \

diff --git a/configure.in b/configure.in
index 3d2072648bcbd9fa28cac1b8d180337758902456..d5fc646331213ecdf733b8bea1cca6f4b539d48d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2028,7 +2028,6 @@ AC_OUTPUT(
   plugins/ethercat/Makefile
   plugins/giop/Makefile
   plugins/gryphon/Makefile
-  plugins/interlink/Makefile
   plugins/irda/Makefile
   plugins/m2m/Makefile
   plugins/mate/Makefile

diff --git a/plugins/interlink/packet-interlink.c b/epan/dissectors/packet-interlink.c
similarity index 100%
rename from plugins/interlink/packet-interlink.c
rename to epan/dissectors/packet-interlink.c

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index e6271733756c95a39f31aa3a99a33cd985ab05d4..6885ab62d2d731d6a98433dadedd77996209e9c0 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -52,7 +52,6 @@ PLUGINS= \
        ../../plugins/giop/parlay.dll \
        ../../plugins/giop/tango.dll \
        ../../plugins/gryphon/gryphon.dll \
-       ../../plugins/interlink/interlink.dll \
        ../../plugins/irda/irda.dll \
        ../../plugins/m2m/m2m.dll \
        ../../plugins/mate/mate.dll \

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index fca68ee38d44c9f117885b21f7c568a892d5ea96..1a904f992bfcbc671f3a08d2c2acb54bef8ff63d 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -913,7 +913,6 @@ File "..\..\plugins\giop\cosnaming.dll"
 File "..\..\plugins\giop\parlay.dll"
 File "..\..\plugins\giop\tango.dll"
 File "..\..\plugins\gryphon\gryphon.dll"
-File "..\..\plugins\interlink\interlink.dll"
 File "..\..\plugins\irda\irda.dll"
 File "..\..\plugins\m2m\m2m.dll"
 File "..\..\plugins\opcua\opcua.dll"

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index babd2d17cd31de99aac950ba75e2368c3c5c9976..309b940a00356d0fdc851a0419a0f9b167e2dddb 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -28,7 +28,6 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \
        ethercat \
        giop \
        gryphon \
-       interlink \
        irda \
        m2m \
        mate \

diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index f7a34acbfe687d25dfef261c605fb871df5b3ee9..b0fb6796457a1ecba7f1b559f9f4ba386fb31662 100644 (file)
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -12,7 +12,6 @@ PLUGIN_LIST = \
        ethercat    \
        giop        \
        gryphon     \
-       interlink   \
        irda        \
        m2m         \
        mate        \