Move the definition of MAX_NUM_COLOR_CONVERSATION_COLORS.

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

diff --git a/wka.tmpl b/wka.tmpl
index 4423a3ebf958d05aacf6196181491507ea11e39e..4a5cb5012aead0e546acc1abf9fc706aedfa9903 100644 (file)
--- a/wka.tmpl
+++ b/wka.tmpl
@@ -1,8 +1,6 @@
 #
 # Well-known addresses.
 #
-# $Id$
-#
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald [AT] wireshark.org>
 # Copyright 1998 Gerald Combs
@@ -19,7 +17,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:
 #
@@ -62,10 +60,25 @@
 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-11-1E-00-00-05      EPLv2_AMNI
 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)
@@ -76,8 +89,23 @@
 01-80-C2-00-00-10      Bridge-Management
 01-80-C2-00-00-11      Load-Server
 01-80-C2-00-00-12      Loadable-Device
+01-80-C2-00-00-13      IEEE-1905.1-Control
 01-80-C2-00-00-14      ISIS-all-level-1-IS's
 01-80-C2-00-00-15      ISIS-all-level-2-IS's
+01-80-C2-00-00-18      IEEE-802.1B-All-Manager-Stations
+01-80-C2-00-00-19      IEEE-802.11aa-groupcast-with-retries
+01-80-C2-00-00-1A      IEEE-802.1B-All-Agent-Stations
+01-80-C2-00-00-1B      ESIS-all-multicast-capable-ES's
+01-80-C2-00-00-1C      ESIS-all-multicast-announcements
+01-80-C2-00-00-1D      ESIS-all-multicast-capable-IS's
+01-80-C2-00-00-1E      Token-Ring-all-DTR-Concentrators
+01-80-C2-00-00-30/45   OAM-Multicast-DA-Class-1
+01-80-C2-00-00-38/45   OAM-Multicast-DA-Class-2
+01-80-C2-00-00-40      All-RBridges
+01-80-C2-00-00-41      All-IS-IS-RBridges
+01-80-C2-00-00-42      All-Egress-RBridges
+01-80-C2-00-00-45      TRILL-End-Stations
+01-80-C2-00-00-46      All-Edge-RBridges
 01-80-C2-00-01-00      FDDI-RMT-Directed-Beacon
 01-80-C2-00-01-10      FDDI-status-report-frame
 01-DD-00-FF-FF-FF      Ungermann-Bass-boot-me-requests