aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2003-11-17 18:23:34 +0000
committerUlf Lamping <ulf.lamping@web.de>2003-11-17 18:23:34 +0000
commit1a209c1d3ead78d934fe95d2f8a4e8516dad1b03 (patch)
tree32f14deb1582d0487530224344a005f7cd2fbbb2
parent02a954efe351b77495326ccb1690576e7ea1a8b4 (diff)
added ETHERTYPE_PROFINET
svn path=/trunk/; revision=8982
-rw-r--r--etypes.h7
-rw-r--r--packet-ethertype.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/etypes.h b/etypes.h
index ca25b129db..c6c5cddfe8 100644
--- a/etypes.h
+++ b/etypes.h
@@ -1,7 +1,7 @@
/* etypes.h
* Defines ethernet packet types, similar to tcpdump's ethertype.h
*
- * $Id: etypes.h,v 1.35 2003/10/08 06:44:15 guy Exp $
+ * $Id: etypes.h,v 1.36 2003/11/17 18:23:34 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,6 +42,7 @@
* RFCs 894, 1042, 826
* tcpdump's ethertype.h
* http://www.cavebear.com/CaveBear/Ethernet/
+ * http://standards.ieee.org/regauth/ethertype/type-pub.html
*/
#ifndef ETHERTYPE_VINES_IP
@@ -199,6 +200,10 @@
#define ETHERTYPE_EAPOL 0x888e /* 802.1x Authentication */
#endif
+#ifndef ETHERTYPE_PROFINET
+#define ETHERTYPE_PROFINET 0x8892 /* PROFIBUS PROFInet protocol */
+#endif
+
#ifndef ETHERTYPE_HYPERSCSI
#define ETHERTYPE_HYPERSCSI 0x889A /* HyperSCSI */
#endif
diff --git a/packet-ethertype.c b/packet-ethertype.c
index 30fb1d2a2e..38aa4e1c87 100644
--- a/packet-ethertype.c
+++ b/packet-ethertype.c
@@ -1,7 +1,7 @@
/* ethertype.c
* Routines for calling the right protocol for the ethertype.
*
- * $Id: packet-ethertype.c,v 1.39 2003/10/08 06:44:15 guy Exp $
+ * $Id: packet-ethertype.c,v 1.40 2003/11/17 18:23:34 ulfl Exp $
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
@@ -83,6 +83,7 @@ const value_string etype_vals[] = {
{ETHERTYPE_CGMP, "Cisco Group Management Protocol" },
{ETHERTYPE_SLOW_PROTOCOLS, "Slow Protocols" },
{ETHERTYPE_RTNET, "RTNET Protocol" },
+ {ETHERTYPE_PROFINET, "PROFInet" },
/*
* NDISWAN on Windows translates Ethernet frames from higher-level