STUN: add TCP specific methods and attribute

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

diff --git a/manuf.tmpl b/manuf.tmpl
index 10f6a7481b3dc1e60519b2348824e05259b603b0..48c532f1225709748fff2a6643d791d7f1935048 100644 (file)
--- a/manuf.tmpl
+++ b/manuf.tmpl
@@ -1,12 +1,10 @@
 # 
 # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
 #
-# $Id$
-#
 # Laurent Deniel <laurent.deniel [AT] free.fr>
 #
 # Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald [AT] ethereal.com>
+# By Gerald Combs <gerald [AT] wireshark.org>
 # Copyright 1998 Gerald Combs
 #
 # This program is free software; you can redistribute it and/or
@@ -21,31 +19,33 @@
 # 
 # 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:
 #
 # The IEEE public OUI listing available from:
-# http://standards.ieee.org/regauth/oui/index.shtml
-# http://standards.ieee.org/regauth/oui/oui.txt
+# <http://standards.ieee.org/develop/regauth/oui/oui.txt>
+# <http://standards.ieee.org/develop/regauth/iab/iab.txt>
+# <http://standards.ieee.org/develop/regauth/oui36/oui36.txt>
 #
 # Michael Patton's "Ethernet Codes Master Page" available from:
-# <http://www.cavebear.com/CaveBear/Ethernet/>
-# <ftp://ftp.cavebear.com/pub/Ethernet.txt>
+# <http://www.cavebear.com/archive/cavebear/Ethernet/Ethernet.txt>
 #
-# The Wireshark 'manuf' file, which started out as a subset of Michael
+# This is 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 ":", "-",
 # or "." can be used to separate the octets.
 #
+# You can get the latest version of this file from
+# https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob_plain;f=manuf;hb=HEAD
 
 00:00:00       00:00:00        # Officially Xerox, but 0:0:0:0:0:0 is more common
 00:00:10       Hughes
@@ -75,9 +75,9 @@
 00:01:fa       Compaq
 00:02:04       Novell
 00:02:31       Axis
-00:06:0d       HP
 00:07:01       Cisco           # RACAL-DATACOM
 00:07:99       TippingPoint            # TippingPoint Technologies, Inc.
+00:10:00       CableLabs
 00:10:db       Netscreen               # Now part of Juniper Networks
 00:20:85       3Com
 00:40:0b       Cresc
@@ -89,6 +89,7 @@
 00:80:96       HDS
 00:80:ad       Telebit
 00:e0:98       Trend
+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