Follow up to rev 34073: Since "-b files:0" is no longer necessary to

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

diff --git a/wka.tmpl b/wka.tmpl
index eb9fef69d59cb7bf5f96d116d9c9e79ced937f9f..4423a3ebf958d05aacf6196181491507ea11e39e 100644 (file)
--- a/wka.tmpl
+++ b/wka.tmpl
@@ -3,8 +3,8 @@
 #
 # $Id$
 #
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald [AT] ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald [AT] wireshark.org>
 # Copyright 1998 Gerald Combs
 #
 # This program is free software; you can redistribute it and/or
@@ -33,29 +33,46 @@
 # 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
-00-E0-2B-00-00-01      Extreme-EAPS-Source
+# Extreme Encapsulation Protocol (basically EDP renamed)
+00-E0-2B-00-00-01      Extreme-EEP
 00-E0-2B-00-00-02      Extreme-ESRP-Client
-00-E0-2B-00-00-04      Extreme-EAPSv1
+00-E0-2B-00-00-04      Extreme-EAPS
+00-E0-2B-00-00-06      Extreme-EAPS-SL
 00-E0-2B-00-00-08      Extreme-ESRP-Master
-01-00-0C-CC-CC-CC      CDP/VTP
+01-00-0C-00-00/40      ISL-Frame
+01-00-0C-CC-CC-CC      CDP/VTP/DTP/PAgP/UDLD
+01-00-0C-CC-CC-CD      PVST+
+01-00-0C-CD-CD-CD      STP-UplinkFast
+01-00-0C-CD-CD-CE      VLAN-bridge
+01-00-0C-CD-CD-D0      GBPT
 01-00-0C-DD-DD-DD      CGMP
 01-00-10-00-00-20      Hughes-Lan-Systems-Terminal-Server-S/W-download
 01-00-10-FF-FF-20      Hughes-Lan-Systems-Terminal-Server-S/W-request
 01-00-1D-00-00-00      Cabletron-PC-OV-PC-discover-(on-demand)
+01-00-1D-00-00-05      Cabletron-PVST-BPDU
+01-00-1D-00-00-06      Cabletron-QCSTP-BPDU
 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-5E-00-00-12      IETF-VRRP
-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
+01-11-1E-00-00-01      EPLv2_SoC
+01-11-1E-00-00-02      EPLv2_PRes
+01-11-1E-00-00-03      EPLv2_SoA
+01-11-1E-00-00-04      EPLv2_ASnd
 01-20-25/25            Control-Technology-Inc's-Industrial-Ctrl-Proto.
 01-80-24-00-00-00      Kalpana-Etherswitch-every-60-seconds
 01-80-C2-00-00-00/44   Spanning-tree-(for-bridges)
 01-80-C2-00-00-02      Slow-Protocols
+01-80-C2-00-00-03      Nearest customer bridge
+01-80-C2-00-00-0E      LLDP_Multicast
+01-80-C2-00-00-0F      Nearest non-TPMR bridge
 01-80-C2-00-00-10      Bridge-Management
 01-80-C2-00-00-11      Load-Server
 01-80-C2-00-00-12      Loadable-Device
@@ -65,9 +82,43 @@
 01-80-C2-00-01-10      FDDI-status-report-frame
 01-DD-00-FF-FF-FF      Ungermann-Bass-boot-me-requests
 01-DD-01-00-00-00      Ungermann-Bass-Spanning-Tree
+01-E0-52-CC-CC-CC      Foundry-DP
+# Microsoft Network Load Balancing (NLB)
 # Actually, 02-01-virtualip to 02-20-virtualip will be used from server to rest-of-world
 # 02-bf-virtualip will be used from rest-of-world to server
-02-BF-00-00-00-00/16   MS-Loadbalancing
+02-BF-00-00-00-00/16   MS-NLB-VirtServer
+02-01-00-00-00-00/16   MS-NLB-PhysServer-01
+02-02-00-00-00-00/16   MS-NLB-PhysServer-02
+02-03-00-00-00-00/16   MS-NLB-PhysServer-03
+02-04-00-00-00-00/16   MS-NLB-PhysServer-04
+02-05-00-00-00-00/16   MS-NLB-PhysServer-05
+02-06-00-00-00-00/16   MS-NLB-PhysServer-06
+02-07-00-00-00-00/16   MS-NLB-PhysServer-07
+02-08-00-00-00-00/16   MS-NLB-PhysServer-08
+02-09-00-00-00-00/16   MS-NLB-PhysServer-09
+02-0a-00-00-00-00/16   MS-NLB-PhysServer-10
+02-0b-00-00-00-00/16   MS-NLB-PhysServer-11
+02-0c-00-00-00-00/16   MS-NLB-PhysServer-12
+02-0d-00-00-00-00/16   MS-NLB-PhysServer-13
+02-0e-00-00-00-00/16   MS-NLB-PhysServer-14
+02-0f-00-00-00-00/16   MS-NLB-PhysServer-15
+02-10-00-00-00-00/16   MS-NLB-PhysServer-16
+02-11-00-00-00-00/16   MS-NLB-PhysServer-17
+02-12-00-00-00-00/16   MS-NLB-PhysServer-18
+02-13-00-00-00-00/16   MS-NLB-PhysServer-19
+02-14-00-00-00-00/16   MS-NLB-PhysServer-20
+02-15-00-00-00-00/16   MS-NLB-PhysServer-21
+02-16-00-00-00-00/16   MS-NLB-PhysServer-22
+02-17-00-00-00-00/16   MS-NLB-PhysServer-23
+02-18-00-00-00-00/16   MS-NLB-PhysServer-24
+02-19-00-00-00-00/16   MS-NLB-PhysServer-25
+02-1a-00-00-00-00/16   MS-NLB-PhysServer-26
+02-1b-00-00-00-00/16   MS-NLB-PhysServer-27
+02-1c-00-00-00-00/16   MS-NLB-PhysServer-28
+02-1d-00-00-00-00/16   MS-NLB-PhysServer-29
+02-1e-00-00-00-00/16   MS-NLB-PhysServer-30
+02-1f-00-00-00-00/16   MS-NLB-PhysServer-31
+02-20-00-00-00-00/16   MS-NLB-PhysServer-32
 
 #       [ The following block of addresses (03-...) are used by various ]
 #       [ standards.  Some (marked [TR?]) are suspected of only being   ]
@@ -96,9 +147,10 @@
 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-Loadbalancing-Multicast
+03-BF-00-00-00-00/16   MS-NLB-VirtServer-Multicast
 09-00-07-00-00-00/40   AppleTalk-Zone-multicast-addresses
                        # only goes through 09-00-07-00-00-FC?
 09-00-07-FF-FF-FF      AppleTalk-broadcast-address
@@ -150,8 +202,12 @@
 09-00-7C-05-00-02      Vitalink-Network-Validation-Message
 09-00-87-80-FF-FF      Xyplex-Terminal-Servers
 09-00-87-90-FF-FF      Xyplex-Terminal-Servers
+0C-00-0C-00-00/40      ISL-Frame
 0D-1E-15-BA-DD-06      HP
-33-33-00-00-00-00/16   IPv6-Neighbor-Discovery
+20-52-45-43-56-00/40   Receive
+20-53-45-4E-44-00/40   Send
+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