change all file offsets from long to gint64 so we can - theoretically - handle files...

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

diff --git a/manuf.tmpl b/manuf.tmpl
index ef1597c3adebfc48f3649c93e85d0d8cf75cd385..416339aa754470e1d3676d999cb20d8711a55787 100644 (file)
--- a/manuf.tmpl
+++ b/manuf.tmpl
@@ -5,8 +5,8 @@
 #
 # Laurent Deniel <laurent.deniel [AT] free.fr>
 #
-# 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,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 ":", "-",
@@ -54,7 +54,6 @@
 00:00:20       DIAB
 00:00:21       SC&C
 00:00:24       Olicom
-00:00:39       Intel
 00:00:3d       AT&T
 00:00:46       ISC-BR
 00:00:4b       APT
@@ -78,9 +77,12 @@
 00:02:31       Axis
 00:06:0d       HP
 00:07:01       Cisco           # RACAL-DATACOM
-00:07:99       TippingPoint             # TippingPoint Technologies, Inc.
+00:07:99       TippingPoint            # TippingPoint Technologies, Inc.
+00:10:db       Netscreen               # Now part of Juniper Networks
 00:20:85       3Com
 00:40:0b       Cresc
+# 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