From dragonlinux:

Add QNX OS VER 6's qnet ethernet protocol number.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3934

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

diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index de0ccee3ea0c5f75d24e18b701d51767ef8f5882..843aec0153c58781d26c0df261c72807fca91858 100644 (file)
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -75,6 +75,10 @@ const value_string etype_vals[] = {
     {ETHERTYPE_ISMP,                                   "Cabletron Interswitch Message Protocol" },
     {ETHERTYPE_ISMP_TBFLOOD,                   "Cabletron SFVLAN 1.8 Tag-Based Flood" },
                                /* for ISMP, see RFC 2641, RFC 2642, RFC 2643 */
+    {ETHERTYPE_QNX_QNET6,                              "QNX 6 QNET protocol"           },
+                               /* In www.iana.org/assignments/ethernet-numbers, 8203-8205 description is Quantum Software. 
+                                * Now the company is called QNX Software Systems.
+                                */ 
     {ETHERTYPE_PPPOED,                                 "PPPoE Discovery"               },
     {ETHERTYPE_PPPOES,                                 "PPPoE Session"                 },
     {ETHERTYPE_INTEL_ANS,                              "Intel ANS probe"               },

diff --git a/epan/etypes.h b/epan/etypes.h
index ba1e9d11cf37cae8e9dfb6f9c85c0a544006907b..84e265c21e0bcda80d97c857eee5fedd303e8233 100644 (file)
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -210,6 +210,10 @@
 #define ETHERTYPE_ISMP_TBFLOOD 0x81ff  /* Cabletron Interswitch Message Protocol */
 #endif
 
+#ifndef ETHERTYPE_QNX_QNET6
+#define ETHERTYPE_QNX_QNET6    0x8204  /* 0x8204 QNX QNET/LWL4 for QNX6 OS; 0x8203 for QNX4 OS QNET */
+#endif
+
 #ifndef ETHERTYPE_IPv6
 #define ETHERTYPE_IPv6         0x86dd
 #endif