X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=wka.tmpl;h=0dd9c1aaf0168ad9b6b38e449ce4f0a6cf05c3aa;hb=e20e338a9e728beca597fed348993825c7de38c7;hp=97cc21d30981d45359abe25af42ef4d6e6a4e92e;hpb=5aea051727036565048d37efd4ea04981696fd03;p=metze%2Fwireshark%2Fwip.git

diff --git a/wka.tmpl b/wka.tmpl
index 97cc21d309..0dd9c1aaf0 100644
--- 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
@@ -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,13 +33,21 @@
 # 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
@@ -49,16 +57,36 @@
 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
+#
+# 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
+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
@@ -133,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
@@ -187,8 +216,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