add PROFINET Multicast OUI 01:0E:CF (in addition to the unicast 00:0E:CF)

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

diff --git a/manuf.tmpl b/manuf.tmpl
index 02ae011c7d54657432a721b448792cd49f795467..77c9f7f68bc48f544e22d4becb40b67f3012a10e 100644 (file)
--- a/manuf.tmpl
+++ b/manuf.tmpl
@@ -1,12 +1,12 @@
 # 
 # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
 #
-# $Id: manuf.tmpl,v 1.11 2003/04/08 16:41:59 jmayer Exp $
+# $Id$
 #
-# Laurent Deniel <laurent.deniel@free.fr>
+# Laurent Deniel <laurent.deniel [AT] free.fr>
 #
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@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,14 +33,14 @@
 # <http://www.cavebear.com/CaveBear/Ethernet/>
 # <ftp://ftp.cavebear.com/pub/Ethernet.txt>
 #
-# The Ethereal 'manuf' file, which started out as a subset of Michael
+# The Wireshark 'manuf' file, which started out as a subset of Michael
 # Patton's list and grew from there.
 #
-# In the event of data set collisions the Ethereal entries have been given
+# In the event of data set collisions the Wireshark entries have been given
 # precedence, followed by Michael Patton's, followed by the IEEE.
 #
 # This file is in the same format as ethers(4) except that vendor names
-# are truncated to eight characters when used with Ethereal, and
+# are truncated to eight characters when used with Wireshark, and
 # that well-known MAC addresses need not have a full 6 octets and may
 # have a netmask following them specifying how many bits of the address
 # are relevant (the other bits are wildcards).  Also, either ":", "-",
@@ -48,151 +48,61 @@
 #
 
 00:00:00       00:00:00        # Officially Xerox, but 0:0:0:0:0:0 is more common
-00:00:0e       Fujitsu
-00:00:0f       NeXT
 00:00:10       Hughes
 00:00:11       Tektrnix
-00:00:15       DataPnt         # Datapoint Corporation
-00:00:18       Webster
 00:00:1a       AMD
-00:00:1b       Novell
-00:00:1d       Ctron
 00:00:20       DIAB
 00:00:21       SC&C
-00:00:22       VislTech        # Visual Technology
 00:00:24       Olicom
-00:00:2a       TRW
-00:00:39       Intel
-00:00:3c       Auspex
 00:00:3d       AT&T
-00:00:44       Castell
 00:00:46       ISC-BR
-00:00:48       Epson
-00:00:49       Apricot
 00:00:4b       APT
-00:00:4c       NEC
 00:00:55       AT&T
 00:00:62       Hneywell        # Honeywell
 00:00:63       HP
-00:00:65       NetGenrl        # Network General
 00:00:69       SGI
 00:00:6b       MIPS
 00:00:7a       Ardent
 00:00:7d       Cray
-00:00:81       Synoptcs        # Synoptics
-00:00:87       Hitachi
-00:00:89       Cayman
-00:00:93       Proteon
-00:00:94       Asante
-00:00:95       Sony
-00:00:97       Epoch
-00:00:a0       Sanyo
-00:00:a2       Wellflt         # Wellfleet
 00:00:a3       NAT
-00:00:a4       Acorn
 00:00:a5       CSC
 00:00:a7       NCD
-00:00:a8       Stratus
 00:00:a9       NetSys          # Network Systems
-00:00:aa       Xerox
-00:00:ae       Dassault
-00:00:b0       RND
-00:00:b4       Edimax
 00:00:dd       Gould
 00:00:de       Unigraph
 00:00:e1       Hitachi
-00:00:ed       April
-00:00:f0       Samsung
 00:00:f6       Madge
-00:00:f8       DEC
 00:01:fa       Compaq
 00:02:04       Novell
 00:02:31       Axis
-00:04:00       Lexmark
-00:04:ac       IBM
-00:06:0d       HP
-00:06:29       IBM
 00:07:01       Cisco           # RACAL-DATACOM
-00:07:99       TippingPoint             # TippingPoint Technologies, Inc.
-00:08:c7       Compaq
-00:10:4b       3Com
-00:10:67       Redback
-00:10:a4       Xircom
-00:20:00       Lexmark
-00:20:35       IBM
+00:07:99       TippingPoint            # TippingPoint Technologies, Inc.
+00:10:db       Netscreen               # Now part of Juniper Networks
 00:20:85       3Com
-00:20:af       3Com
 00:40:0b       Cresc
-00:40:8c       Axis
-00:40:a6       Cray
-00:40:c8       Milan
-00:50:56       VMware
-00:50:BA       D-link
-00:60:08       3Com
-00:60:1d       Lucent
-00:60:8c       3Com
-00:60:97       3Com
+# Be able to differentiate between wireless and non-wireless
+00:40:96        Aironet                        # Cisco Systems, Inc.
 00:60:b0       HP
 00:80:0f       SMC
 00:80:1C       Cisco           # NEWPORT SYSTEMS SOLUTIONS
-00:80:24       Kalpana
-00:80:45       Matshta
-00:80:50       Ziatech
-00:80:5a       Tulip
-00:80:5f       Compaq
-00:80:90       Microtek
 00:80:96       HDS
-00:80:9f       Alcatel
 00:80:ad       Telebit
-00:80:c7       Xircom
-00:90:27       Intel
-00:a0:24       3Com
-00:a0:57       ELSA
-00:a0:f9       BinTec                  # BinTec Communications AG
-00:aa:00       Intel
-00:b0:d0       Dell Computer Corp.
-00:c0:4f       Dell
-00:c0:7b       Ascend
-00:c0:95       Znyx            # Network Appliance
 00:e0:98       Trend
-02:60:60       3Com
-02:60:8c       3Com
+01:0e:cf       PN-MC           # PROFINET Multicast
 02:cf:1f       CMC
+02:20:48       Marconi         # At least some 2810 send with locally assigned flag set
 08:00:02       3Com
 08:00:03       ACC
-08:00:07       Apple
 08:00:08       BBN
 08:00:09       HP
-08:00:0a       Nestar
-08:00:0b       Unisys
-08:00:0e       NCR
-08:00:0f       Chipcom
-08:00:0f       SMC
-08:00:11       Tektrnix        # Tektronix
 08:00:1a       DataGenl        # Data General
-08:00:1b       DataGenl
-08:00:1e       Apollo
-08:00:1f       Sharp
-08:00:20       Sun
-08:00:2b       DEC
 08:00:38       Bull
 08:00:3e       Motorola
-08:00:46       Sony
-08:00:47       Sequent
-08:00:5a       IBM
 08:00:69       SGI
-08:00:74       Casio
 08:00:79       SGI
-08:00:87       Xyplex
-08:00:89       Kinetix
-08:00:8b       Pyramid
-08:00:8e       Tandem
 08:00:90       Retix
 09:00:6a       AT&T
-10:00:5a       IBM
 10:00:90       HP
 10:00:d4       DEC
 3C:00:00       3Com
-44:45:53       Micrsoft
-aa:00:03       DEC
-aa:00:04       DEC
+44:45:53       Microsoft