osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/manuf.tmpl

310 lines
14 KiB
Cheetah
Raw Normal View History

Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
#
Allow the "manuf" file to contain well-known MAC addresses and address ranges specified with a mask, as well as manufacturer OUIs. Match the address range values, as well as MAC addresses and manufacturer OUIs, when translating MAC addresses to names. Have "make-manuf" read a file containing the well-known addresses and append it to the list of OUIs. svn path=/trunk/; revision=6233
2002-09-09 19:38:11 +00:00
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
#
Obscure email addresses and update entries. svn path=/trunk/; revision=7558
2003-04-25 15:04:32 +00:00
# Laurent Deniel <laurent.deniel [AT] free.fr>
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
#
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
# Wireshark - Network traffic analyzer
Rename the main executable to "wireshark", along with more conversions: ethereal.com -> wireshark.org mailing lists and addresses ETHEREAL -> WIRESHARK Man pages Automake/Autoconf names svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
# By Gerald Combs <gerald [AT] wireshark.org>
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
# Copyright 1998 Gerald Combs
#
spdx: more licenses converted. Change-Id: I3861061ec261e63b23621799e020e811ed78a343 Reviewed-on: https://code.wireshark.org/review/26333 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-06 14:31:02 +00:00
# SPDX-License-Identifier: GPL-2.0-or-later
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
#
Credit Michael Patton and the IEEE in the document header. Add URLs to the IEEE data (Michael's was already there). svn path=/trunk/; revision=2701
2000-11-26 19:35:31 +00:00
# The data below has been assembled from the following sources:
#
Migrate make-manuf to Python+CSV. The download links offered by the IEEE at https://standards.ieee.org/products-services/regauth/ are CSV files. Updating the Perl version to support CSV would have required rewriting a significant portion of the script along with either adding a dependency on Text::CSV or writing our own CSV parser. Migrate it to Python, which has a built-in CSV module. Change-Id: I39ba0ec873145f44374ab9f751e8bde51535ca4d Reviewed-on: https://code.wireshark.org/review/29442 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-05 16:46:27 +00:00
# The IEEE public OUI listings available from:
# <http://standards-oui.ieee.org/oui/oui.csv>
# <http://standards-oui.ieee.org/cid/cid.csv>
# <http://standards-oui.ieee.org/iab/iab.csv>
# <http://standards-oui.ieee.org/oui28/mam.csv>
# <http://standards-oui.ieee.org/oui36/oui36.csv>
Credit Michael Patton and the IEEE in the document header. Add URLs to the IEEE data (Michael's was already there). svn path=/trunk/; revision=2701
2000-11-26 19:35:31 +00:00
#
# Michael Patton's "Ethernet Codes Master Page" available from:
From Hadriel Kaplan: The 'make-manuf'perl script gets the IEEE 22-bit OUI and IAB registries, but not OUI-36. patch to get the OUI-36 listings. From me: Update header text in template to list the sources actually used. svn path=/trunk/; revision=48572
2013-03-26 21:53:09 +00:00
# <http://www.cavebear.com/archive/cavebear/Ethernet/Ethernet.txt>
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
# Many people contributed to Michael's list. See the "Acknowledgements"
# section on that page for a complete list.
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
#
Update some comments. svn path=/trunk/; revision=26384
2008-10-08 23:14:47 +00:00
# This is Wireshark 'manuf' file, which started out as a subset of Michael
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
# Patton's list and grew from there. The Wireshark list and Michael's list
# were merged in 2016.
Credit Michael Patton and the IEEE in the document header. Add URLs to the IEEE data (Michael's was already there). svn path=/trunk/; revision=2701
2000-11-26 19:35:31 +00:00
#
ethereal->wireshark svn path=/trunk/; revision=18207
2006-05-22 08:21:22 +00:00
# In the event of data set collisions the Wireshark entries have been given
Credit Michael Patton and the IEEE in the document header. Add URLs to the IEEE data (Michael's was already there). svn path=/trunk/; revision=2701
2000-11-26 19:35:31 +00:00
# precedence, followed by Michael Patton's, followed by the IEEE.
#
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
# This file is in the same format as ethers(4) except that vendor names
ethereal to wireshark svn path=/trunk/; revision=18502
2006-06-17 12:27:56 +00:00
# are truncated to eight characters when used with Wireshark, and
Allow the "manuf" file to contain well-known MAC addresses and address ranges specified with a mask, as well as manufacturer OUIs. Match the address range values, as well as MAC addresses and manufacturer OUIs, when translating MAC addresses to names. Have "make-manuf" read a file containing the well-known addresses and append it to the list of OUIs. svn path=/trunk/; revision=6233
2002-09-09 19:38:11 +00:00
# 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.
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
#
Update some comments. svn path=/trunk/; revision=26384
2008-10-08 23:14:47 +00:00
# You can get the latest version of this file from
Convert Gerrit URLs to GitLab. Convert various code.wireshark.org URLs to their gitlab.com/wireshark/wireshark equivalents. Change-Id: I0150d1bd14208eb451a7de818dce6573363b1d27
2020-08-17 17:30:30 +00:00
# https://gitlab.com/wireshark/wireshark/-/raw/master/manuf
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:00:00 00:00:00 Officially Xerox, but 0:0:0:0:0:0 is more common
00:00:09 Powerpip powerpipes?
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:00:18 WebsterC Webster Computer Corporation # Appletalk/Ethernet Gateway
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:00:1B NovellNo Novell (now Eagle Technology)
00:00:23 AbbAutom ABB Automation AB, Dept. Q
00:00:4F Logicraf Logicraft 386-Ware P.C. Emulator
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:00:5A SkSchnei SK # (Schneider & Koch in Europe and Syskonnect outside of Europe)
00:00:6F MadgeNet Madge Networks Ltd. # Token-ring adapters
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:00:75 BellNort Bell Northern Research (BNR)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:00:77 Interpha Interphase # [Used in other systems, e.g. MIPS, Motorola]
00:00:79 Networth Networth Incorporated # [bought by Compaq, used in Netelligent series]
00:00:7F Linotype Linotype-Hell AG # Linotronic typesetters
00:00:80 CrayComm Cray Communications (formerly Dowty Network Services) # [Also shows as "Harris (3M) (new)" and/or "Imagen(?)" elsewhere]
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:00:83 TadpoleT Tadpole Technology [had Optical Data Systems which is wrong according to both]
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:00:89 CaymanSy Cayman Systems # Gatorbox
00:00:94 AsanteMa Asante # MAC
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:00:A6 NetworkG Network General (internal assignment, not for products)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:00:AA XeroxXer Xerox # Xerox machines
00:00:AC ConwareN Conware Netzpartner # [had Apollo, claimed incorrect]
00:00:B5 Databili Datability # Terminal Servers
00:00:B7 DoveFast Dove # Fastnet
00:00:BB Tri-Data TRI-DATA Systems Inc. # Netway products, 3274 emulators
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:00:C0 WesternD Western Digital now SMC (Std. Microsystems Corp.)
00:00:C6 HpIntell HP Intelligent Networks Operation (formerly Eon Systems)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:00:C9 EmulexTe Emulex # Terminal Servers, Print Servers
00:00:D1 Adaptec Adaptec, Inc. # "Nodem" product
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:00:D7 Dartmout Dartmouth College (NED Router)
00:00:D8 OldNovel old Novell NE1000's (before about 1987?) (also 3Com)
00:00:EE NetworkD Network Designers Limited [also KNX Ltd, a former division]
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:00:F2 SpiderCo Spider Communications # (Montreal, not Spider Systems)
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:00:F3 GandalfD Gandalf Data Ltd. - Canada
00:00:FD HighLeve High Level Hardware (Orion, UK)
00:01:43 Ieee802 IEEE 802
00:01:63 NdcNatio NDC (National Datacomm Corporation)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:02:16 EsiExten ESI (Extended Systems, Inc) # print servers
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:02:88 GlobalVi Global Village (PCcard in Mac portable)
00:04:00 LexmarkP Lexmark (Print Server)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:04:AC IbmPcmci IBM # PCMCIA Ethernet adapter.
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:05:02 ApplePci Apple (PCI bus Macs)
00:06:29 IbmRisc6 IBM RISC6000 system
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:07:0D Cisco251 Cisco # 2511 Token Ring
00:10:07 CiscoSys Cisco Systems # Catalyst 1900
00:10:0D CiscoSys Cisco Systems # Catalyst 2924-XL
00:10:11 CiscoSys Cisco Systems # Cisco 75xx
00:10:1F CiscoSys Cisco Systems # Catalyst 2901
00:10:29 CiscoSys Cisco Systems # Catalyst 5000
00:10:2F CiscoSys Cisco Systems # Cisco 5000
00:10:4B 3com3c90 3Com # 3C905-TX PCI
00:10:5A 3comFast 3Com # Fast Etherlink XL in a Gateway 2000
00:10:60 Billingt Billington # Novell NE200 Compatible
00:10:79 Cisco550 Cisco # 5500 Router
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:10:7A AmbicomW Ambicom (was Tandy?)
00:10:83 Hp-UxE90 HP-UX E 9000/889
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:10:A4 XircomRe Xircom # RealPort 10/100 PC Card
00:10:D7 ArgosyEn Argosy # EN 220 Fast Ethernet PCMCIA
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:20:00 LexmarkP Lexmark (Print Server)
00:20:25 ControlT Control Technology Inc (Industrial Controls and Network Interfaces)
00:20:29 Teleproc TeleProcessing CSU/DSU (now owned by ADC/Kentrox)
00:20:2B AtmlAdva ATML (Advanced Telecommunications Modules, Ltd.)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:20:35 IbmInter IBM (International Business Machines) # mainframes, Etherjet printers
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:20:61 Dynatech Dynatech Communications Inc
00:20:67 NodeRunn Node Runner Inc
00:20:A6 Proxim Proxim Inc
00:20:C5 EagleNe2 Eagle NE2000
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:20:D0 Versalyn Versalynx Corp. # "The One Port" terminal server
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:20:D3 OstOuetS OST (Ouet Standard Telematique)
00:20:E5 ApexData Apex Data
00:20:F6 NetTekKa Net Tek & Karlnet Inc
00:40:01 ZeroOneT Zero One Technology Co Ltd (ZyXEL?)
00:40:0D LannetDa LANNET Data Communications
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:40:10 SonicMac Sonic # Mac Ethernet interfaces
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:40:13 NttDataC NTT Data Communication Systems Corp
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:40:1C AstPenti AST # Pentium/90 PC (emulating AMD EISA card)
00:40:27 SmcMassa SMC Massachusetts # [Had:Sigma (?), maybe the "S"?]
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:40:2A Canoga-P Canoga-Perkins
00:40:2F XlntDesi Xlnt Designs Inc (XDI)
00:40:43 NokiaDat Nokia Data Communications
00:40:4D Telecomm Telecomm Techniques
00:40:54 Thinking Thinking Machines Corporation
00:40:72 AppliedI Applied Innovation
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:40:88 MobuisNu Mobuis # NuBus (Mac) combination video/EtherTalk
00:40:90 AnselCom Ansel Communications # PC NE2000 compatible twisted-pair ethernet cards
00:40:9D Digiboar DigiBoard # Ethernet-ISDN bridges
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:40:A6 CrayRese Cray Research Inc.
00:40:AA ValmetAu Valmet Automation Inc
00:40:AF DigitalP Digital Products, Inc. (DPI).
00:40:C5 MicomCom Micom Communications Corp.
00:40:C8 MilanTec Milan Technology Corp.
00:40:CC SilcomMa Silcom Manufacturing Technology Inc
00:40:EA Plaintre PlainTree Systems Inc
00:40:ED NetworkC Network Controls International Inc
00:40:F0 Micro Micro Systems Inc
00:40:FB CascadeC Cascade Communications Corp.
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:40:FF TelebitC Telebit Corporation # Personal NetBlazer
00:48:54 DigitalS Digital SemiConductor # 21143/2 based 10/100
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
00:4F:49 Realtek
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:4F:4B PineTech Pine Technology Ltd.
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:50:04 3com3c90 3com # 3C90X
Remove more duplicate manuf.tmpl entries. Make a manual pass through manuf.tmpl and remove entries that have either duplicate or more complete IEEE entries. Add an Editorconfig entry for manuf.tmpl.
2021-01-01 17:38:03 +00:00
00:55:00 Xerox Xerox Corporation
Manuf fixups. Remove some entries from manuf.tmpl that are either redundant or less informative that their corresponding IEEE entries. Add a missing '"' to make-manuf.py. Change-Id: Ia69f4529c5fa1b39f1662b94d072c65bd2d969ea Reviewed-on: https://code.wireshark.org/review/29568 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-10 17:23:16 +00:00
00:60:08 3com 3Com # 3Com PCI form factor 3C905 TX board
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:60:09 CiscoCat Cisco # Catalyst 5000 Ethernet switch
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:60:25 ActiveIm Active Imaging Inc.
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:60:30 Villaget VillageTronic # used on Amiga
00:60:3E Cisco100 Cisco # 100Mbps interface
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:60:4E CycleCom Cycle Computer (Sun MotherBoard Replacements)
00:60:67 AcerLan Acer Lan
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:60:70 CiscoRou Cisco # routers (2524 and 4500)
00:60:83 Cisco362 Cisco Systems, Inc. # 3620/3640 routers
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:60:8C 3com1990 3Com (1990 onwards)
00:60:94 AmdPcnet AMD PCNET PCI
00:80:04 AntlowCo Antlow Computers, Ltd.
00:80:09 JupiterO Jupiter Systems (older MX-600 series machines)
00:80:0D Vosswink Vosswinkel FU
00:80:10 Commodor Commodore
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:80:12 ImsImsFa IMS Corp. # IMS failure analysis tester
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:80:13 ThomasCo Thomas Conrad Corp.
00:80:16 WandelGo Wandel & Goltermann
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:80:19 DaynaCom Dayna Communications # "Etherprint" product
00:80:2D Xylogics Xylogics, Inc. # Annex terminal servers
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:80:35 Technolo Technology Works
00:80:37 Ericsson Ericsson Business Comm.
00:80:42 ForceCom Force Computers
00:80:48 CompexUs Compex, used by Commodore and DEC at least
00:80:51 AdcFiber ADC Fibermux
00:80:5A TulipCom Tulip Computers International BV
Remove the OUIs in manuf.tmpl that cause obvious conflicts with IEEE list This allows for less "skipping" when processing the list Bug: 13784 Change-Id: I40fb5d5a82e51238751dd6785502ea259de9bc03 Reviewed-on: https://code.wireshark.org/review/23445 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-09 23:50:52 +00:00
00:80:5C Agilis Agilis
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:80:63 RichardH Richard Hirschmann Gmbh & Co
00:80:6C CegelecP Cegelec Projects Ltd
Remove the OUIs in manuf.tmpl that cause obvious conflicts with IEEE list This allows for less "skipping" when processing the list Bug: 13784 Change-Id: I40fb5d5a82e51238751dd6785502ea259de9bc03 Reviewed-on: https://code.wireshark.org/review/23445 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-09 23:50:52 +00:00
00:80:8A Summit Summit
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:80:8C Netscout Netscout Systems (formerly Frontier Software Development)
00:80:8D Westcove Westcove Technology BV
00:80:9F AlcatelB Alcatel Business Systems
00:80:A1 Microtes Microtest
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:80:A3 Lantroni Lantronix # (see also 0800A3)
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:80:B2 NetNetwo NET (Network Equipment Technologies)
00:80:B6 Themis Themis corporation
00:80:C0 PenrilDa Penril Datability Networks
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:80:C2 Ieee8021 IEEE # 802.1 Committee
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:80:C7 Xircom Xircom, Inc.
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:80:C8 D-LinkAl D-Link # (also Solectek Pocket Adapters, and LinkSys PCMCIA)
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:80:D0 Computer Computer Products International
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:80:D3 ShivaApp Shiva # Appletalk-Ethernet interface
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:80:D4 Chase Chase Limited
00:80:D7 FantumEl Fantum Electronics
00:80:D8 NetworkP Network Peripherals
00:80:DA BruelKja Bruel & Kjaer
Remove the OUIs in manuf.tmpl that cause obvious conflicts with IEEE list This allows for less "skipping" when processing the list Bug: 13784 Change-Id: I40fb5d5a82e51238751dd6785502ea259de9bc03 Reviewed-on: https://code.wireshark.org/review/23445 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-09 23:50:52 +00:00
00:80:E3 Coral Coral
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:80:F4 Telemech Telemechanique Electrique
00:80:F7 ZenithCo Zenith Communications Products
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:90:2B CiscoEth Cisco # Ethernet Switches and Light Streams
00:90:F2 CiscoEth Cisco # Ethernet Switches and Light Streams
00:A0:0C KingmaxT Kingmax Technology Inc. # PCMCIA card
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:A0:40 ApplePci Apple (PCI Mac)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:A0:C9 IntelPro Intel (PRO100B and PRO100+) # [used on Cisco PIX firewall among others]
00:A0:CC Lite-OnU Lite-On # (used by MacSense in Adapter for Mac, also seen in PCs)
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:A0:D2 AlliedTe Allied Telesyn
00:B0:D0 Computer Computer Products International
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:C0:05 Livingst Livingston Enterprises Inc # Portmaster (OEMed by Cayman)
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:C0:09 KtTechno KT Technology (s) Pte Inc
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:C0:0F QnxSoftw QNX Software Systems Ltd. # [also Quantum Software Systems Ltd]
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:C0:12 Netspan Netspan Corp
00:C0:14 Telemati Telematics Calabasas
00:C0:15 NewMedia New Media Corp
00:C0:18 Lanart Lanart Corp
00:C0:1B SocketCo Socket Communications
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:C0:1D GrandJun Grand Junction Networks, Inc. # (Cisco Catalyst also reported)
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:C0:2A OhkuraEl Ohkura Electric Co
00:C0:2F Okuma Okuma Corp
00:C0:33 Telebit Telebit Corporation
00:C0:45 Isolatio Isolation Systems Inc
00:C0:49 UsRoboti US Robotics Total Control (tm) NETServer Card
00:C0:4D Mitec Mitec Ltd
00:C0:60 IdScandi ID Scandinavia A/S
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:C0:63 MorningS Morning Star Technologies Inc # May be miswrite of 0003C6
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:C0:64 GeneralD General Datacomm Ind Inc
00:C0:6A Zahner-E Zahner-Elektrik Gmbh & Co KG
00:C0:74 ToyodaAu Toyoda Automatic Loom Works Ltd
00:C0:7A PrivaBv Priva BV
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:C0:7B AscendCo Ascend Communications # ISDN bridges/routers
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
00:C0:85 Canon
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:C0:95 ZnyxNetw Znyx (Network Appliance); Jupiter Systems (MX-700); Apple (G3) all seen
00:C0:9B Reliance Reliance Comm/Tec, R-Tec Systems Inc
00:C0:C9 BaileyCo Bailey Controls Co
00:C0:D1 ComtreeT Comtree Technology Corporation (EFA also reported)
00:C0:D5 QuancomE Quancom Electronic Gmbh
00:C0:D9 QuinteNe Quinte Network Confidentiality Equipment Inc
00:C0:ED UsArmyEl US Army Electronic Proving Ground
00:C0:EE Kyocera Kyocera Corporation
00:C0:F0 Kingston Kingston Technology Corporation
00:C0:F2 Transiti Transition Engineering Inc
00:C0:FC Asdg ASDG Incorporated
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:DD:00 Ungerman Ungermann-Bass # IBM RT
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:E0:16 Rapid-Ci rapid-city (now a part of bay networks)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:E0:18 AsustekI Asustek # Intel 82558-based Integrated Fast Ethernet for WIM
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
00:E0:29 SmcEther SMC EtherPower II 10/100
00:E0:2C Ast-Buil AST - built into 5166M PC motherboard (win95 id's as Intel)
00:E0:39 Paradyne Paradyne 7112 T1 DSU/CSU
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
00:E0:7D EncoreNe Encore (Netronix?) # 10/100 PCI Fast ethernet card
00:E0:81 TyanComp Tyan Computer Corp. # Onboard Intel 82558 10/100
00:E0:8F CiscoSys Cisco Systems # Catalyst 2900 series
00:E0:A3 CiscoSys Cisco Systems # Catalyst 1924
00:E0:B0 CiscoSys Cisco Systems # Various systems reported
00:E0:B8 AmdPcnet AMD PCNet # in a Gateway 2000
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
01:0E:CF PN-MC PROFINET Multicast
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
02:04:06 BbnInter BBN # internal usage (not registered)
02:20:48 Marconi # At least some 2810 send with locally assigned flag set
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
02:60:60 3com
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
02:60:8C 3comIbmP 3Com # IBM PC; Imagen; Valid; Cisco; Macintosh
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
02:A0:C9 Intel
02:CF:1F CMC
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
02:E0:3B Prominet Prominet Corporation # Gigabit Ethernet Switch
04:88:45 BayNetwo Bay Networks # token ring line card
08:00:05 Symbolic Symbolics # Symbolics LISP machines
08:00:06 SiemensN Siemens Nixdorf # PC clone
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
08:00:0B UnisysAl Unisys also Ascom-Timeplex (former Unisys subsidiary)
08:00:0D IclInter ICL (International Computers, Ltd.)
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
08:00:0E Ncr/At&T
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
08:00:10 At&T[Mis AT&T [misrepresentation of 800010?]
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
08:00:14 ExcelanB Excelan # BBN Butterfly, Masscomp, Silicon Graphics
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
08:00:17 National National Semiconductor Corp. (used to have Network System Corp., wrong NSC)
08:00:22 NbiNothi NBI (Nothing But Initials)
08:00:26 NorskDat Norsk Data (Nord)
08:00:27 PcsCompu PCS Computer Systems GmbH
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
08:00:28 TiExplor TI # Explorer
08:00:2F PrimeCom Prime Computer # Prime 50-Series LHC300
08:00:36 Intergra Intergraph # CAE stations
08:00:66 AgfaPrin AGFA # printers, phototypesetters etc.
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
08:00:75 DdeDanis DDE (Danish Data Elektronik A/S)
08:00:77 TslNowRe TSL (now Retix)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
08:00:7C Vitalink Vitalink # TransLAN III
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
08:00:81 Crosfiel Crosfield Electronics
08:00:83 SeikoDen Seiko Denshi
08:00:86 Imagen/Q Imagen/QMS [Now Konica Minolta]
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
08:00:87 XyplexTe Xyplex # terminal servers
08:00:89 Kinetics Kinetics # AppleTalk-Ethernet interface
08:00:8D Xyvision XyVision # XyVision machines
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
08:00:8E Tandem/S Tandem / Solbourne Computer ?
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
09:00:6A AT&T
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
10:00:90 HP
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
10:00:D4 DEC
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
10:00:E0 AppleA/U Apple A/UX # (modified addresses for licensing)
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
2E:2E:2E LaaLocal LAA (Locally Administered Address) for Meditech Systems
Add make-manuf, a script that: - Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00
3C:00:00 3Com
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
40:00:03 NetWare? Net Ware (?)
make-manuf: Don't print Cavebear skipped - it makes the output unusable. manuf.tmpl: Remove entries that overwrite identical or similar results from IEEE manuf: Rebuild to reflect the changes in manuf.tmpl and add some new IEEE entries. svn path=/trunk/; revision=7447
2003-04-13 13:51:32 +00:00
44:45:53 Microsoft
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
44:46:49 DfiDiamo DFI (Diamond Flower Industries)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
47:54:43 GtcNotRe GTC (Not registered!) # (This number is a multicast!)
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
48:44:53 Hds??? HDS ???
48:4C:00 NetworkS Network Solutions
Merge the CaveBear list into manuf.tmpl. If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-21 18:23:20 +00:00
48:54:E8 Winbond?
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
4C:42:4C Informat Information Modes software modified addresses (not registered?)
52:54:00 RealtekU Realtek (UpTech? also reported)
52:54:4C Novell20 Novell 2000
52:54:AB RealtekA REALTEK (a Realtek 8029 based PCI Card)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
56:58:57 AculabPl Aculab plc # audio bridges
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
80:00:10 At&T[Mis AT&T [misrepresented as 080010? One source claims this is correct]
80:AD:00 CnetTech CNET Technology Inc. (Probably an error, see instead 0080AD)
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
AA:00:00 DecObsol DEC # obsolete
AA:00:01 DecObsol DEC # obsolete
AA:00:02 DecObsol DEC # obsolete
AA:00:03 DecGloba DEC # Global physical address for some DEC machines
AA:00:04 DecLocal DEC # Local logical address for DECNET systems
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
C0:00:00 WesternD Western Digital (may be reversed 00 00 C0?)
Add Perfectek vendor code
2022-09-06 02:20:42 +00:00
DC:87:CB Perfectk Beijing Perfectek Technologies Co., Ltd.
Extract the "long name" out of the manuf file and use it for some resolution Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20 17:33:53 +00:00
E2:0C:0F Kingston Kingston Technologies
manuf.tmpl: mark comments Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-25 22:46:23 +00:00
EC:10:00 EnanceSo Enance Source Co., Ltd. # PC clones(?)