osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Ethercat plugin 

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

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

svn path=/trunk/; revision=23174
This commit is contained in:
Anders Broman 2007-10-14 15:45:24 +00:00
parent 3238f6b87a
commit c644b82279
6 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/packet-ethertype.c
View File

@ -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" },

4
epan/etypes.h
View File

@ -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

1
packaging/nsis/Makefile.nmake
View File

@ -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 \

1
packaging/nsis/wireshark.nsi
View File

@ -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"

1
plugins/Makefile.am
View File

@ -28,6 +28,7 @@ SUBDIRS = \
ciscosm \
docsis \
enttec \
ethercat \
giop \
gryphon \
irda \

16
plugins/Makefile.nmake
View File

@ -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