sec_vt_header: dissect cont_id + opnum

[metze/wireshark/wip.git] / wka.tmpl

diff --git a/wka.tmpl b/wka.tmpl
index 2d53e193bd1c4e5f8e3c09b598e9a43850a78830..0dd9c1aaf0168ad9b6b38e449ce4f0a6cf05c3aa 100644 (file)
--- a/wka.tmpl
+++ b/wka.tmpl
@@ -19,7 +19,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # The data below has been assembled from the following sources:
 #
@@ -33,7 +33,7 @@
 # White Paper
 #
 00-00-0C-07-AC/40      All-HSRP-routers
-00-00-5E-00-01/40      IETF-VRRP-virtual-router-VRID
+00-00-5E-00-01/40      IETF-VRRP-VRID
 00-BF-00-00-00-00/16   MS-NLB-VirtServer
 00-E0-2B-00-00-00      Extreme-EDP
 # Extreme Encapsulation Protocol (basically EDP renamed)
@@ -57,10 +57,25 @@
 01-00-1D-42-00-00      Cabletron-PC-OV-Bridge-discover-(on-demand)
 01-00-1D-52-00-00      Cabletron-PC-OV-MMAC-discover-(on-demand)
 01-00-3C               Auspex-Systems-(Serverguard)
-01-00-81-00-00-00      Synoptics-Network-Management
-01-00-81-00-00-02      Synoptics-Network-Management
-01-00-81-00-01-00      Bay-Networks-(Synoptics)-autodiscovery
-01-00-81-00-01-01      Bay-Networks-(Synoptics)-autodiscovery
+01-00-5E/25            IPv4mcast
+01-00-81-00-00-00      Nortel-Network-Management
+01-00-81-00-00-02      Nortel-Network-Management
+01-00-81-00-01-00      Nortel-autodiscovery
+01-00-81-00-01-01      Nortel-autodiscovery
+#
+# As per
+#
+#      http://www.t11.org/ftp/t11/pub/fc/bb-5/08-334v0.pdf
+#
+# Broadcom "donated" one of their OUIs, 00-10-18, for use for
+# Fibre Channel over Ethernet, so we add entries for the
+# addresses in that document and a group of addresses for all
+# otherwise unlisted 01-10-18-XX-XX-XX addresses.
+#
+01-10-18-01-00-00      All-FCoE-MACs
+01-10-18-01-00-01      All-ENode-MACs
+01-10-18-01-00-02      All-FCF-MACs
+01-10-18-00-00-00/24   FCoE-group
 01-11-1E-00-00-01      EPLv2_SoC
 01-11-1E-00-00-02      EPLv2_PRes
 01-11-1E-00-00-03      EPLv2_SoA
@@ -146,6 +161,7 @@
 03-00-00-00-80-00      Bridge # [TR?]
 03-00-00-20-00-00      IP-Token-Ring-Multicast (RFC1469)
 03-00-00-80-00-00      Discovery-Client
+03-00-0C-00-00/40      ISL-Frame [TR?]
 03-00-C7-00-00-EE      HP (Compaq) ProLiant NIC teaming
 03-00-FF-FF-FF-FF      All-Stations-Address
 03-BF-00-00-00-00/16   MS-NLB-VirtServer-Multicast
@@ -204,7 +220,8 @@
 0D-1E-15-BA-DD-06      HP
 20-52-45-43-56-00/40   Receive
 20-53-45-4E-44-00/40   Send
-33-33-00-00-00-00/16   IPv6-Neighbor-Discovery
+33-33-00-00-00-00      IPv6-Neighbor-Discovery
+33-33-00-00-00-00/16   IPv6mcast
 AA-00-03-00-00-00/32   DEC-UNA 
 AA-00-03-01-00-00/32   DEC-PROM-AA
 AA-00-03-03-00-00/32   DEC-NI20