Ethercat plugin

Author :
Richard Kuemmel <r.kuemmel[AT]beckhoff.de>

Updates and bugfixes:
Peter Johansson <peterjohansson73[AT]gmail.com>

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

diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 66913350368240989990a08c49fee3bb2af54ce0..0943ca43541579246b8be34433d74e94d557178b 100644 (file)
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -102,6 +102,7 @@ const value_string etype_vals[] = {
     {ETHERTYPE_CDMA2000_A10_UBS,       "CDMA2000 A10 Unstructured byte stream" },
     {ETHERTYPE_PROFINET,                       "PROFINET"                      },
     {ETHERTYPE_AOE,                                    "ATA over Ethernet"             },
+    {ETHERTYPE_ECATF,                                  "EtherCAT frame" },
     {ETHERTYPE_TELKONET,                       "Telkonet powerline"    },
     {ETHERTYPE_EPL_V2,                         "ETHERNET Powerlink v2"                 },
     {ETHERTYPE_CSM_ENCAPS,                     "CSM_ENCAPS Protocol"             },

diff --git a/epan/etypes.h b/epan/etypes.h
index d85d026daa81522db826c3830bea52fa1e187176..1898b29c01d3b85e90132d696444894bf6f90566 100644 (file)
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -286,6 +286,10 @@
 #define ETHERTYPE_AOE           0x88A2
 #endif
 
+#ifndef ETHERTYPE_ECATF
+#define ETHERTYPE_ECATF 0x88A4 /* Ethernet type for EtherCAT frames */
+#endif
+
 #ifndef ETHERTYPE_IEEE_802_1AD
 #define ETHERTYPE_IEEE_802_1AD  0x88A8 /* IEEE 802.1ad Provider Bridge, Q-in-Q */
 #endif

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index ab3f174b765d4afff70ebbe5c304c91bc52bb1cd..f1c18711b2e2cbe2d34fc3c8896222428c61d8c8 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -69,6 +69,7 @@ PLUGINS= \
        ../../plugins/ciscosm/ciscosm.dll \
        ../../plugins/docsis/docsis.dll \
        ../../plugins/enttec/enttec.dll \
+       ../../plugins/ethercat/ethercat.dll \
        ../../plugins/giop/coseventcomm.dll \
        ../../plugins/giop/cosnaming.dll \
        ../../plugins/giop/parlay.dll \

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 6e3f953cf9df5fc1f7cfe8c68d849376010571fc..7c8bd335730477a76132ed0b76e71e14fb1ee5f2 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -759,6 +759,7 @@ File "..\..\plugins\asn1\asn1.dll"
 File "..\..\plugins\ciscosm\ciscosm.dll"
 File "..\..\plugins\docsis\docsis.dll"
 File "..\..\plugins\enttec\enttec.dll"
+File "..\..\plugins\ethercat\ethercat.dll"
 File "..\..\plugins\giop\coseventcomm.dll"
 File "..\..\plugins\giop\cosnaming.dll"
 File "..\..\plugins\giop\parlay.dll"

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 6bce8a4d3f31f3a1ca9511e740aafd2ba55fa208..004fc18a5e3cb9392218a6a0a281fdbe53f172c7 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -28,6 +28,7 @@ SUBDIRS = \
        ciscosm \
        docsis \
        enttec \
+       ethercat \
        giop \
        gryphon \
        irda \

diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 385f2decd010d690123e9fcc5f55f8b9c3b1d763..539f38fcba7204de4b4e3539cca73641650bc359 100644 (file)
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -14,6 +14,7 @@ all: \
        custom \
        docsis \
        enttec \
+       ethercat \
        giop \
        gryphon \
        irda \
@@ -69,6 +70,11 @@ enttec::
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd .. 
 
+ethercat::
+       cd ethercat
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+       cd .. 
+
 giop::
        cd giop
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
@@ -189,6 +195,9 @@ clean:
        cd enttec
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
+       cd ethercat
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ..
        cd giop
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
@@ -270,6 +279,9 @@ distclean: clean
        cd enttec
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ..
+       cd ethercat
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+       cd ..
        cd giop
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ..
@@ -351,6 +363,9 @@ maintainer-clean: distclean
        cd enttec
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
        cd ..
+       cd ethercat
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ..
        cd giop
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
        cd ..
@@ -425,6 +440,7 @@ install-plugins:
        xcopy ciscosm\*.dll $(VERSION) /d
        xcopy docsis\*.dll $(VERSION) /d
        xcopy enttec\*.dll $(VERSION) /d
+       xcopy ethercat\*.dll $(VERSION) /d
        xcopy giop\*.dll $(VERSION) /d
        xcopy gryphon\*.dll $(VERSION) /d
        xcopy irda\*.dll $(VERSION) /d