From 0b5791b08d0e8a4aa49719dcaf98c96f31a6aa48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sun, 9 Jul 2023 00:02:15 +0100 Subject: [PATCH] manuf: Drop Cavebear OUI list The cavebear OUI list is hopelessly outdated (last updated 1999?) and our template file mostly contains obsolete or poorly formatted entries, compared to the official IEEE registry. We should rely on the official registry, which is the best and most up-to-date source, despite some minor inconsistencies and glitches. Remove the template file and use the IEEE registry exclusively. --- .editorconfig | 5 - manuf | 526 +++++++++++++++++++------------------------- manuf.tmpl | 309 -------------------------- tools/make-manuf.py | 124 +++++------ 4 files changed, 288 insertions(+), 676 deletions(-) delete mode 100644 manuf.tmpl diff --git a/.editorconfig b/.editorconfig index 2e412b62a3..0d815e2b5a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -65,11 +65,6 @@ indent_size = 4 indent_style = space indent_size = 4 -# manuf -[manuf.tmpl] -indent_style = tab -indent_size = 8 - # C/C++/Objective C [*.{c,cpp,h,m}] indent_style = space diff --git a/manuf b/manuf index 9d2e70f8f5..fb40709460 100644 --- a/manuf +++ b/manuf @@ -1,6 +1,4 @@ # This file was generated by running ./tools/make-manuf.py. -# Don't change it directly, change manuf.tmpl instead. -# # # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses # @@ -21,18 +19,6 @@ # # # -# Michael Patton's "Ethernet Codes Master Page" available from: -# -# Many people contributed to Michael's list. See the "Acknowledgements" -# section on that page for a complete list. -# -# This is Wireshark 'manuf' file, which started out as a subset of Michael -# Patton's list and grew from there. The Wireshark list and Michael's list -# were merged in 2016. -# -# In the event of data set collisions the Wireshark entries have been given -# precedence, followed by Michael Patton's, followed by the IEEE. -# # This file is in the same format as ethers(4) except that vendor names # are truncated to eight characters when used with Wireshark, and # that well-known MAC addresses need not have a full 6 octets and may @@ -43,27 +29,12 @@ # You can get the latest version of this file from # https://gitlab.com/wireshark/wireshark/-/raw/master/manuf -# https://standards-oui.ieee.org/cid/cid.csv: -# Content-Length: 14477 -# Last-Modified: Sun, 09 Jul 2023 16:01:52 GMT -# https://standards-oui.ieee.org/iab/iab.csv: -# Content-Length: 381808 -# Last-Modified: Sun, 09 Jul 2023 16:02:15 GMT -# https://standards-oui.ieee.org/oui/oui.csv: -# Content-Length: 3179120 -# Last-Modified: Sun, 09 Jul 2023 16:02:46 GMT -# https://standards-oui.ieee.org/oui28/mam.csv: -# Content-Length: 538051 -# Last-Modified: Sun, 09 Jul 2023 16:02:21 GMT -# https://standards-oui.ieee.org/oui36/oui36.csv: -# Content-Length: 503215 -# Last-Modified: Sun, 09 Jul 2023 16:02:39 GMT -00:00:00 00:00:00 Officially Xerox, but 0:0:0:0:0:0 is more common +00:00:00 Xerox Xerox Corporation 00:00:01 Xerox Xerox Corporation 00:00:02 Xerox Xerox Corporation 00:00:03 Xerox Xerox Corporation @@ -72,7 +43,7 @@ 00:00:06 Xerox Xerox Corporation 00:00:07 Xerox Xerox Corporation 00:00:08 Xerox Xerox Corporation -00:00:09 Powerpip powerpipes? +00:00:09 Xerox Xerox Corporation 00:00:0A OmronTat Omron Tateisi Electronics Co. 00:00:0B Matrix Matrix Corporation 00:00:0C Cisco Cisco Systems, Inc @@ -87,10 +58,10 @@ 00:00:15 Datapoin Datapoint Corporation 00:00:16 DuPontPi Du Pont Pixel Systems. 00:00:17 Oracle -00:00:18 WebsterC Webster Computer Corporation # Appletalk/Ethernet Gateway +00:00:18 WebsterC Webster Computer Corporation 00:00:19 AppliedD Applied Dynamics International 00:00:1A Advanced Advanced Micro Devices -00:00:1B NovellNo Novell (now Eagle Technology) +00:00:1B Novell Novell, Inc. 00:00:1C BellTech Bell Technologies 00:00:1D Cabletro Cabletron Systems, Inc. 00:00:1E TelsistI Telsist Industria Electronica @@ -98,7 +69,7 @@ 00:00:20 Dataindu Dataindustrier Diab Ab 00:00:21 SuremanC Sureman Comp. & Commun. Corp. 00:00:22 VisualTe Visual Technology Inc. -00:00:23 AbbAutom ABB Automation AB, Dept. Q +00:00:23 AbbIndus Abb Industrial Systems Ab 00:00:24 ConnectA Connect As 00:00:25 Ramtek Ramtek Corp. 00:00:26 Sha-Ken Sha-Ken Co., Ltd. @@ -142,7 +113,7 @@ 00:00:4C NEC NEC Corporation 00:00:4D Dci Dci Corporation 00:00:4E Ampex Ampex Corporation -00:00:4F Logicraf Logicraft 386-Ware P.C. Emulator +00:00:4F Logicraf Logicraft, Inc. 00:00:50 Radisys Radisys Corporation 00:00:51 HobElect Hob Electronic Gmbh & Co. Kg 00:00:52 Intrusio Intrusion.com, Inc. @@ -153,7 +124,7 @@ 00:00:57 Scitex Scitex Corporation Ltd. 00:00:58 RacoreCo Racore Computer Products Inc. 00:00:59 Hellige Hellige GMBH -00:00:5A SkSchnei SK # (Schneider & Koch in Europe and Syskonnect outside of Europe) +00:00:5A SysKonne SysKonnect GmbH 00:00:5B EltecEle Eltec Elektronik Ag 00:00:5C Telemati Telematics International Inc. 00:00:5D CsTeleco Cs Telecom @@ -174,33 +145,33 @@ 00:00:6C Private 00:00:6D CrayComm Cray Communications, Ltd. 00:00:6E Artisoft Artisoft Inc. -00:00:6F MadgeNet Madge Networks Ltd. # Token-ring adapters +00:00:6F Madge Madge Ltd. 00:00:70 Hcl Hcl Limited 00:00:71 Adra Adra Systems Inc. 00:00:72 Miniware Miniware Technology 00:00:73 Siecor Siecor Corporation 00:00:74 Ricoh Ricoh Company Ltd. -00:00:75 BellNort Bell Northern Research (BNR) +00:00:75 NortelNe Nortel Networks 00:00:76 AbekasVi Abekas Video System -00:00:77 Interpha Interphase # [Used in other systems, e.g. MIPS, Motorola] +00:00:77 Interpha Interphase Corporation 00:00:78 Labtam Labtam Limited -00:00:79 Networth Networth Incorporated # [bought by Compaq, used in Netelligent series] +00:00:79 Networth Networth Incorporated 00:00:7A DanaComp Dana Computer Inc. 00:00:7B Research Research Machines 00:00:7C Ampere Ampere Incorporated 00:00:7D Oracle Oracle Corporation 00:00:7E Clustrix Clustrix Corporation -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] +00:00:7F Linotype Linotype-Hell Ag +00:00:80 CrayComm Cray Communications A/S 00:00:81 BayNetwo Bay Networks 00:00:82 LectraSy Lectra Systemes Sa -00:00:83 TadpoleT Tadpole Technology [had Optical Data Systems which is wrong according to both] +00:00:83 TadpoleT Tadpole Technology Plc 00:00:84 Supernet 00:00:85 Canon Canon Inc. 00:00:86 Megahert Megahertz Corporation 00:00:87 Hitachi Hitachi, Ltd. 00:00:88 BrocadeC Brocade Communications Systems LLC -00:00:89 CaymanSy Cayman Systems # Gatorbox +00:00:89 Cayman Cayman Systems Inc. 00:00:8A Datahous Datahouse Information Systems 00:00:8B Infotron 00:00:8C AlloyCom Alloy Computer Products (Australia) Pty Ltd @@ -211,7 +182,7 @@ 00:00:91 Anritsu Anritsu Corporation 00:00:92 CogentDa Cogent Data Technologies 00:00:93 Proteon Proteon Inc. -00:00:94 AsanteMa Asante # MAC +00:00:94 AsanteTe Asante Technologies 00:00:95 SonyTekt Sony Tektronix Corp. 00:00:96 MarconiE Marconi Electronics Ltd. 00:00:97 DellEMC Dell EMC @@ -229,13 +200,13 @@ 00:00:A3 NetworkA Network Application Technology 00:00:A4 AcornCom Acorn Computers Limited 00:00:A5 Tattile Tattile SRL -00:00:A6 NetworkG Network General (internal assignment, not for products) +00:00:A6 NetworkG Network General Corporation 00:00:A7 NetworkC Network Computing Devices Inc. 00:00:A8 StratusT Stratus Technologies 00:00:A9 Network Network Systems Corp. -00:00:AA XeroxXer Xerox # Xerox machines +00:00:AA Xerox Xerox Corporation 00:00:AB LogicMod Logic Modeling Corporation -00:00:AC ConwareN Conware Netzpartner # [had Apollo, claimed incorrect] +00:00:AC ConwareC Conware Computer Consulting 00:00:AD BrukerIn Bruker Instruments Inc. 00:00:AE Dassault Dassault Electronique 00:00:AF Canberra Canberra Industries, Inc. @@ -244,27 +215,27 @@ 00:00:B2 Televide Televideo Systems, Inc. 00:00:B3 Cimlinc Cimlinc Incorporated 00:00:B4 EdimaxTe Edimax Technology Co. Ltd. -00:00:B5 Databili Datability # Terminal Servers +00:00:B5 Databili Datability Software Sys. Inc. 00:00:B6 Micro-Ma Micro-Matic Research -00:00:B7 DoveFast Dove # Fastnet +00:00:B7 DoveComp Dove Computer Corporation 00:00:B8 Seikosha Seikosha Co., Ltd. 00:00:B9 Mcdonnel Mcdonnell Douglas Computer Sys 00:00:BA Siig Siig, Inc. -00:00:BB Tri-Data TRI-DATA Systems Inc. # Netway products, 3274 emulators +00:00:BB Tri-Data 00:00:BC Rockwell Rockwell Automation 00:00:BD RYOSEI RYOSEI, Ltd. 00:00:BE NtiGroup The Nti Group 00:00:BF Symmetri Symmetric Computer Systems -00:00:C0 WesternD Western Digital now SMC (Std. Microsystems Corp.) +00:00:C0 WesternD Western Digital Corporation 00:00:C1 Madge Madge Ltd. 00:00:C2 Informat Information Presentation Tech. 00:00:C3 Harris Harris Corporation 00:00:C4 WatersDi Waters Div. Of Millipore 00:00:C5 ARRISGro ARRIS Group, Inc. -00:00:C6 HpIntell HP Intelligent Networks Operation (formerly Eon Systems) +00:00:C6 Eon Eon Systems 00:00:C7 Arix Arix Corporation 00:00:C8 AltosCom Altos Computer Systems -00:00:C9 EmulexTe Emulex # Terminal Servers, Print Servers +00:00:C9 Emulex Emulex Corporation 00:00:CA ARRISGro ARRIS Group, Inc. 00:00:CB Compu-Sh Compu-Shack Electronic Gmbh 00:00:CC Densan Densan Co., Ltd. @@ -272,14 +243,14 @@ 00:00:CE Megadata Megadata Corp. 00:00:CF HayesMic Hayes Microcomputer Products 00:00:D0 Develcon Develcon Electronics Ltd. -00:00:D1 Adaptec Adaptec, Inc. # "Nodem" product +00:00:D1 Adaptec Adaptec Incorporated 00:00:D2 Sbe Sbe, Inc. 00:00:D3 WangLabo Wang Laboratories Inc. 00:00:D4 PureData Pure Data Ltd. 00:00:D5 Microgno Micrognosis International 00:00:D6 PunchLin Punch Line Holding -00:00:D7 Dartmout Dartmouth College (NED Router) -00:00:D8 OldNovel old Novell NE1000's (before about 1987?) (also 3Com) +00:00:D7 Dartmout Dartmouth College +00:00:D8 Novell Novell, Inc. 00:00:D9 NipponTe Nippon Telegraph & Telephone 00:00:DA Atex 00:00:DB BritishT British Telecommunications plc @@ -301,12 +272,12 @@ 00:00:EB Matsushi Matsushita Comm. Ind. Co. Ltd. 00:00:EC Micropro Microprocess 00:00:ED April -00:00:EE NetworkD Network Designers Limited [also KNX Ltd, a former division] +00:00:EE NetworkD Network Designers, Ltd. 00:00:EF Kti 00:00:F0 SamsungE Samsung Electronics Co.,Ltd 00:00:F1 MagnaCom Magna Computer Corporation -00:00:F2 SpiderCo Spider Communications # (Montreal, not Spider Systems) -00:00:F3 GandalfD Gandalf Data Ltd. - Canada +00:00:F2 SpiderCo Spider Communications +00:00:F3 GandalfD Gandalf Data Limited 00:00:F4 AlliedTe Allied Telesis, Inc. 00:00:F5 DiamondS Diamond Sales Limited 00:00:F6 AppliedM Applied Microsystems Corp. @@ -316,7 +287,7 @@ 00:00:FA Microsag Microsage Computer Systems Inc 00:00:FB RechnerZ Rechner Zur Kommunikation 00:00:FC Meiko -00:00:FD HighLeve High Level Hardware (Orion, UK) +00:00:FD HighLeve High Level Hardware 00:00:FE Annapoli Annapolis Micro Systems, Inc. 00:00:FF CamtecEl Camtec Electronics Ltd. 00:01:00 EquipTra Equip'Trans @@ -386,7 +357,7 @@ 00:01:40 Sendtek Sendtek Corporation 00:01:41 CablePri Cable Print 00:01:42 Cisco Cisco Systems, Inc -00:01:43 Ieee802 IEEE 802 +00:01:43 Cisco Cisco Systems, Inc 00:01:44 DellEMC Dell EMC 00:01:45 Winsyste Winsystems, Inc. 00:01:46 TescoCon Tesco Controls, Inc. @@ -418,7 +389,7 @@ 00:01:60 ELMEX ELMEX Co., LTD. 00:01:61 MetaMach Meta Machine Technology 00:01:62 CygnetTe Cygnet Technologies, Inc. -00:01:63 NdcNatio NDC (National Datacomm Corporation) +00:01:63 Cisco Cisco Systems, Inc 00:01:64 Cisco Cisco Systems, Inc 00:01:65 AirSwitc AirSwitch Corporation 00:01:66 TcGroup Tc Group A/S @@ -597,7 +568,7 @@ 00:02:13 SDEL S.D.E.L. 00:02:14 Dtvro 00:02:15 CotasCom Cotas Computer Technology A/B -00:02:16 EsiExten ESI (Extended Systems, Inc) # print servers +00:02:16 Cisco Cisco Systems, Inc 00:02:17 Cisco Cisco Systems, Inc 00:02:18 Advanced Advanced Scientific Corp 00:02:19 ParalonT Paralon Technologies @@ -711,7 +682,7 @@ 00:02:85 Riversto Riverstone Networks 00:02:86 OccamNet Occam Networks 00:02:87 Adapcom -00:02:88 GlobalVi Global Village (PCcard in Mac portable) +00:02:88 GlobalVi Global Village Communication 00:02:89 DNETechn DNE Technologies 00:02:8A AmbitMic Ambit Microsystems Corporation 00:02:8B VDSL VDSL Systems OY @@ -1087,7 +1058,7 @@ 00:03:FD Cisco Cisco Systems, Inc 00:03:FE Cisco Cisco Systems, Inc 00:03:FF Microsof Microsoft Corporation -00:04:00 LexmarkP Lexmark (Print Server) +00:04:00 LexmarkI Lexmark International, Inc. 00:04:01 OsakiEle Osaki Electric Co., Ltd. 00:04:02 NexsanTe Nexsan Technologies, Ltd. 00:04:03 Nexsi Nexsi Corporation @@ -1259,7 +1230,7 @@ 00:04:A9 SandStre SandStream Technologies, Inc. 00:04:AA Jetstrea Jetstream Communications 00:04:AB Mavenir Mavenir Inc. -00:04:AC IbmPcmci IBM # PCMCIA Ethernet adapter. +00:04:AC IBM IBM Corp 00:04:AD MalibuNe Malibu Networks 00:04:AE Sullair Sullair Corporation 00:04:AF DigitalF Digital Fountain, Inc. @@ -1345,7 +1316,7 @@ 00:04:FF Acronet Acronet Co., Ltd. 00:05:00 Cisco Cisco Systems, Inc 00:05:01 Cisco Cisco Systems, Inc -00:05:02 ApplePci Apple (PCI bus Macs) +00:05:02 Apple Apple, Inc. 00:05:03 Iconag 00:05:04 NarayInf Naray Information & Communication Enterprise 00:05:05 Integrat Systems Integration Solutions, Inc. @@ -1640,7 +1611,7 @@ 00:06:26 MWE MWE GmbH 00:06:27 UniwideT Uniwide Technologies, Inc. 00:06:28 Cisco Cisco Systems, Inc -00:06:29 IbmRisc6 IBM RISC6000 system +00:06:29 IBM IBM Corp 00:06:2A Cisco Cisco Systems, Inc 00:06:2B Intraser Intraserver Technology 00:06:2C BivioNet Bivio Networks @@ -1868,7 +1839,7 @@ 00:07:0A UnicomAu Unicom Automation Co., Ltd. 00:07:0B Novabase Novabase SGPS, SA 00:07:0C SVA-Intr SVA-Intrusion.com Co. Ltd. -00:07:0D Cisco251 Cisco # 2511 Token Ring +00:07:0D Cisco Cisco Systems, Inc 00:07:0E Cisco Cisco Systems, Inc 00:07:0F Fujant Fujant, Inc. 00:07:10 Adax Adax, Inc. @@ -4138,17 +4109,17 @@ 00:10:04 Brantley The Brantley Coile Company,Inc 00:10:05 UecComme Uec Commercial 00:10:06 ThalesCo Thales Contact Solutions Ltd. -00:10:07 CiscoSys Cisco Systems # Catalyst 1900 +00:10:07 Cisco Cisco Systems, Inc 00:10:08 Vienna Vienna Systems Corporation 00:10:09 Horanet 00:10:0A Williams Williams Communications Group 00:10:0B Cisco Cisco Systems, Inc 00:10:0C Ito Ito Co., Ltd. -00:10:0D CiscoSys Cisco Systems # Catalyst 2924-XL +00:10:0D Cisco Cisco Systems, Inc 00:10:0E MicroLin Micro Linear Coporation 00:10:0F Industri Industrial Cpu Systems 00:10:10 Initio Initio Corporation -00:10:11 CiscoSys Cisco Systems # Cisco 75xx +00:10:11 Cisco Cisco Systems, Inc 00:10:12 Processo Processor Systems (I) Pvt Ltd 00:10:13 KontronA Kontron America, Inc. 00:10:14 Cisco Cisco Systems, Inc @@ -4162,7 +4133,7 @@ 00:10:1C OhmTechn Ohm Technologies Intl, Llc 00:10:1D WinbondE Winbond Electronics Corp. 00:10:1E Matsushi Matsushita Electronic Instruments Corp. -00:10:1F CiscoSys Cisco Systems # Catalyst 2901 +00:10:1F Cisco Cisco Systems, Inc 00:10:20 HandHeld Hand Held Products Inc 00:10:21 EncantoN Encanto Networks, Inc. 00:10:22 SatComMe SatCom Media Corporation @@ -4172,13 +4143,13 @@ 00:10:26 Accelera Accelerated Networks, Inc. 00:10:27 L-3Commu L-3 Communications East 00:10:28 Computer Computer Technica, Inc. -00:10:29 CiscoSys Cisco Systems # Catalyst 5000 +00:10:29 Cisco Cisco Systems, Inc 00:10:2A ZfMicros Zf Microsystems, Inc. 00:10:2B UmaxData Umax Data Systems, Inc. 00:10:2C LasatNet Lasat Networks A/S 00:10:2D HitachiS Hitachi Software Engineering 00:10:2E NetworkT Network Systems & Technologies Pvt. Ltd. -00:10:2F CiscoSys Cisco Systems # Cisco 5000 +00:10:2F Cisco Cisco Systems, Inc 00:10:30 EION EION Inc. 00:10:31 Objectiv Objective Communications, Inc. 00:10:32 AltaTech Alta Technology @@ -4206,7 +4177,7 @@ 00:10:48 HtrcAuto Htrc Automation, Inc. 00:10:49 ShoreTel ShoreTel, Inc 00:10:4A Parvus The Parvus Corporation -00:10:4B 3com3c90 3Com # 3C905-TX PCI +00:10:4B 3Com 00:10:4C Teledyne Teledyne LeCroy, Inc 00:10:4D SurtecIn Surtec Industries, Inc. 00:10:4E Ceologic @@ -4221,13 +4192,13 @@ 00:10:57 Rebelcom Rebel.com, Inc. 00:10:58 ArrowPoi ArrowPoint Communications 00:10:59 DiabloRe Diablo Research Co. Llc -00:10:5A 3comFast 3Com # Fast Etherlink XL in a Gateway 2000 +00:10:5A 3Com 00:10:5B NetInsig Net Insight Ab 00:10:5C QuantumD Quantum Designs (H.K.) Ltd. 00:10:5D DraegerM Draeger Medical 00:10:5E SpirentS Spirent plc, Service Assurance Broadband 00:10:5F ZodiacDa Zodiac Data Systems -00:10:60 Billingt Billington # Novell NE200 Compatible +00:10:60 Billiont Billionton Systems, Inc. 00:10:61 Hostlink Hostlink Corp. 00:10:62 NxServer Nx Server, Ilnc. 00:10:63 Starguid Starguide Digital Networks @@ -4252,8 +4223,8 @@ 00:10:76 EUREM EUREM GmbH 00:10:77 SafDrive Saf Drive Systems, Ltd. 00:10:78 NueraCom Nuera Communications, Inc. -00:10:79 Cisco550 Cisco # 5500 Router -00:10:7A AmbicomW Ambicom (was Tandy?) +00:10:79 Cisco Cisco Systems, Inc +00:10:7A AmbiCom AmbiCom, Inc. 00:10:7B Cisco Cisco Systems, Inc 00:10:7C P-Com P-Com, Inc. 00:10:7D AuroraCo Aurora Communications, Ltd. @@ -4262,7 +4233,7 @@ 00:10:80 Metawave Metawave Communications 00:10:81 Dps Dps, Inc. 00:10:82 JnaTelec Jna Telecommunications Limited -00:10:83 Hp-UxE90 HP-UX E 9000/889 +00:10:83 HewlettP Hewlett Packard 00:10:84 K-BotCom K-Bot Communications 00:10:85 PolarisC Polaris Communications, Inc. 00:10:86 ATTOTech ATTO Technology, Inc. @@ -4295,7 +4266,7 @@ 00:10:A1 KendinSe Kendin Semiconductor, Inc. 00:10:A2 Tns 00:10:A3 Omnitron Omnitronix, Inc. -00:10:A4 XircomRe Xircom # RealPort 10/100 PC Card +00:10:A4 Xircom 00:10:A5 OxfordIn Oxford Instruments 00:10:A6 Cisco Cisco Systems, Inc 00:10:A7 UnexTech Unex Technology Corporation @@ -4346,7 +4317,7 @@ 00:10:D4 StorageC Storage Computer Corporation 00:10:D5 ImasdeCa Imasde Canarias, S.A. 00:10:D6 Exelis -00:10:D7 ArgosyEn Argosy # EN 220 Fast Ethernet PCMCIA +00:10:D7 ArgosyRe Argosy Research Inc. 00:10:D8 Calista 00:10:D9 IbmJapan Ibm Japan, Fujisawa Mt+D 00:10:DA Kollmorg Kollmorgen Corp @@ -8428,7 +8399,7 @@ 00:1F:FD IndigoMo Indigo Mobile Technologies Corp. 00:1F:FE HPNSuppl HPN Supply Chain 00:1F:FF Respiron Respironics, Inc. -00:20:00 LexmarkP Lexmark (Print Server) +00:20:00 LexmarkI Lexmark International, Inc. 00:20:01 DspSolut Dsp Solutions, Inc. 00:20:02 Seritech Seritech Enterprise Co., Ltd. 00:20:03 PixelPow Pixel Power Ltd. @@ -8465,13 +8436,13 @@ 00:20:22 NMSCommu NMS Communications 00:20:23 TCTechno T.C. Technologies Pty. Ltd 00:20:24 PacificC Pacific Communication Sciences -00:20:25 ControlT Control Technology Inc (Industrial Controls and Network Interfaces) +00:20:25 ControlT Control Technology, Inc. 00:20:26 Amkly Amkly Systems, Inc. 00:20:27 MingFort Ming Fortune Industry Co., Ltd 00:20:28 WestEgg West Egg Systems, Inc. -00:20:29 Teleproc TeleProcessing CSU/DSU (now owned by ADC/Kentrox) +00:20:29 Teleproc Teleprocessing Products, Inc. 00:20:2A Dzine N.V. Dzine -00:20:2B AtmlAdva ATML (Advanced Telecommunications Modules, Ltd.) +00:20:2B Advanced Advanced Telecommunications Modules, Ltd. 00:20:2C Welltron Welltronix Co., Ltd. 00:20:2D Taiyo Taiyo Corporation 00:20:2E DaystarD Daystar Digital @@ -8481,7 +8452,7 @@ 00:20:32 AlcatelT Alcatel Taisel 00:20:33 SynapseT Synapse Technologies, Inc. 00:20:34 RotecInd Rotec Industrieautomation Gmbh -00:20:35 IbmInter IBM (International Business Machines) # mainframes, Etherjet printers +00:20:35 IBM IBM Corp 00:20:36 BmcSoftw Bmc Software 00:20:37 SeagateT Seagate Technology 00:20:38 VmeMicro Vme Microsystems International Corporation @@ -8525,13 +8496,13 @@ 00:20:5E CastleRo Castle Rock, Inc. 00:20:5F Gammadat Gammadata Computer Gmbh 00:20:60 ALCATELI ALCATEL ITALIA S.p.A. -00:20:61 Dynatech Dynatech Communications Inc +00:20:61 GarrettC GarrettCom, Inc. 00:20:62 Scorpion Scorpion Logic, Ltd. 00:20:63 WiproInf Wipro Infotech Ltd. 00:20:64 ProtecMi Protec Microsystems, Inc. 00:20:65 Supernet Supernet Networking Inc. 00:20:66 GeneralM General Magic, Inc. -00:20:67 NodeRunn Node Runner Inc +00:20:67 Private 00:20:68 Isdyne 00:20:69 Isdn Isdn Systems Corporation 00:20:6A OsakaCom Osaka Computer Corp. @@ -8594,7 +8565,7 @@ 00:20:A3 Harmonic Harmonic, Inc 00:20:A4 Multipoi Multipoint Networks 00:20:A5 ApiEngin Api Engineering -00:20:A6 Proxim Proxim Inc +00:20:A6 ProximWi Proxim Wireless 00:20:A7 Pairgain Pairgain Technologies, Inc. 00:20:A8 SastTech Sast Technology Corp. 00:20:A9 WhiteHor White Horse Industrial @@ -8625,7 +8596,7 @@ 00:20:C2 TexasMem Texas Memory Systems, Inc. 00:20:C3 CounterS Counter Solutions Ltd. 00:20:C4 Inet Inet,Inc. -00:20:C5 EagleNe2 Eagle NE2000 +00:20:C5 EagleTec Eagle Technology 00:20:C6 Nectec 00:20:C7 AKAIProf AKAI Professional M.I. Corp. 00:20:C8 Larscom Larscom Incorporated @@ -8636,10 +8607,10 @@ 00:20:CD HybridNe Hybrid Networks, Inc. 00:20:CE LogicalD Logical Design Group, Inc. 00:20:CF TestMeas Test & Measurement Systems Inc -00:20:D0 Versalyn Versalynx Corp. # "The One Port" terminal server +00:20:D0 Versalyn Versalynx Corporation 00:20:D1 Microcom Microcomputer Systems (M) Sdn. 00:20:D2 RadDataC Rad Data Communications, Ltd. -00:20:D3 OstOuetS OST (Ouet Standard Telematique) +00:20:D3 OstOuest Ost (Ouest Standard Telematiqu 00:20:D4 Cabletro Cabletron Systems, Inc. 00:20:D5 Vipa Vipa Gmbh 00:20:D6 Breezeco Breezecom, Ltd. @@ -8657,7 +8628,7 @@ 00:20:E2 Informat Information Resource Engineering 00:20:E3 McdKenco Mcd Kencom Corporation 00:20:E4 HsingTec Hsing Tech Enterprise Co., Ltd -00:20:E5 ApexData Apex Data +00:20:E5 ApexData Apex Data, Inc. 00:20:E6 Lidkopin Lidkoping Machine Tools Ab 00:20:E7 B&WNucle B&W Nuclear Service Company 00:20:E8 Datatrek Datatrek Corporation @@ -8674,7 +8645,7 @@ 00:20:F3 Raynet Raynet Corporation 00:20:F4 Spectrix Spectrix Corporation 00:20:F5 Pandatel Pandatel Ag -00:20:F6 NetTekKa Net Tek & Karlnet Inc +00:20:F6 NetTekAn Net Tek And Karlnet, Inc. 00:20:F7 Cyberdat Cyberdata Corporation 00:20:F8 CarreraC Carrera Computers, Inc. 00:20:F9 Paralink Paralink Networks, Inc. @@ -10562,7 +10533,7 @@ 00:3E:E1 Apple Apple, Inc. 00:3F:10 Shenzhen Shenzhen GainStrong Technology Co., Ltd. 00:40:00 PciCompo Pci Componentes Da Amzonia Ltd -00:40:01 ZeroOneT Zero One Technology Co Ltd (ZyXEL?) +00:40:01 ZeroOneT Zero One Technology Co. Ltd. 00:40:02 Perle Perle Systems Limited 00:40:03 EmersonP Emerson Process Management Power & Water Solutions, Inc. 00:40:04 Icm Icm Co. Ltd. @@ -10574,13 +10545,13 @@ 00:40:0A PivotalT Pivotal Technologies, Inc. 00:40:0B Cisco Cisco Systems, Inc 00:40:0C GeneralM General Micro Systems, Inc. -00:40:0D LannetDa LANNET Data Communications +00:40:0D LannetDa Lannet Data Communications,Ltd 00:40:0E Memotec Memotec, Inc. 00:40:0F DatacomT Datacom Technologies -00:40:10 SonicMac Sonic # Mac Ethernet interfaces +00:40:10 Sonic Sonic Systems, Inc. 00:40:11 AndoverC Andover Controls Corporation 00:40:12 Windata Windata, Inc. -00:40:13 NttDataC NTT Data Communication Systems Corp +00:40:13 NttDataC Ntt Data Comm. Systems Corp. 00:40:14 Comsoft Comsoft Gmbh 00:40:15 AscomInf Ascom Infrasys Ag 00:40:16 ADC-Glob ADC - Global Connectivity Solutions Division @@ -10589,7 +10560,7 @@ 00:40:19 Aeon Aeon Systems, Inc. 00:40:1A FujiElec Fuji Electric Co., Ltd. 00:40:1B Printer Printer Systems Corp. -00:40:1C AstPenti AST # Pentium/90 PC (emulating AMD EISA card) +00:40:1C AstResea Ast Research, Inc. 00:40:1D Invisibl Invisible Software, Inc. 00:40:1E Icc 00:40:1F Colorgra Colorgraph Ltd @@ -10600,15 +10571,15 @@ 00:40:24 Compac Compac Inc. 00:40:25 Molecula Molecular Dynamics 00:40:26 Buffalo Buffalo.Inc -00:40:27 SmcMassa SMC Massachusetts # [Had:Sigma (?), maybe the "S"?] +00:40:27 SmcMassa Smc Massachusetts, Inc. 00:40:28 Netcomm Netcomm Limited 00:40:29 Compex -00:40:2A Canoga-P Canoga-Perkins +00:40:2A CanogaPe Canoga Perkins Corporation 00:40:2B TrigemCo Trigem Computer, Inc. 00:40:2C IsisDist Isis Distributed Systems, Inc. 00:40:2D HarrisAd Harris Adacom Corporation 00:40:2E Precisio Precision Software, Inc. -00:40:2F XlntDesi Xlnt Designs Inc (XDI) +00:40:2F XlntDesi Xlnt Designs Inc. 00:40:30 GkComput Gk Computer 00:40:31 KokusaiE Kokusai Electric Co., Ltd 00:40:32 DigitalC Digital Communications @@ -10628,7 +10599,7 @@ 00:40:40 RingAcce Ring Access, Inc. 00:40:41 Fujikura Fujikura Ltd. 00:40:42 NAT N.A.T. Gmbh -00:40:43 NokiaDat Nokia Data Communications +00:40:43 NokiaSie Nokia Siemens Networks GmbH & Co. KG. 00:40:44 QnixComp Qnix Computer Co., Ltd. 00:40:45 Twinhead Twinhead Corporation 00:40:46 UdcResea Udc Research Limited @@ -10638,14 +10609,14 @@ 00:40:4A WestAust West Australian Department 00:40:4B MapleCom Maple Computer Systems 00:40:4C Hypertec Hypertec Pty Ltd. -00:40:4D Telecomm Telecomm Techniques +00:40:4D Telecomm Telecommunications Techniques 00:40:4E Fluent Fluent, Inc. 00:40:4F SpaceNav Space & Naval Warfare Systems 00:40:50 Ironics Ironics, Incorporated 00:40:51 Garbeean Garbee and Garbee 00:40:52 StarTech Star Technologies, Inc. 00:40:53 AmproCom Ampro Computers -00:40:54 Thinking Thinking Machines Corporation +00:40:54 Connecti Connection Machines Services 00:40:55 Metronix Metronix Gmbh 00:40:56 McmJapan Mcm Japan Ltd. 00:40:57 Lockheed Lockheed - Sanders @@ -10675,7 +10646,7 @@ 00:40:6F SyncRese Sync Research Inc. 00:40:70 Interwar Interware Co., Ltd. 00:40:71 AtmCompu Atm Computer Gmbh -00:40:72 AppliedI Applied Innovation +00:40:72 AppliedI Applied Innovation Inc. 00:40:73 BassAsso Bass Associates 00:40:74 CableAnd Cable And Wireless 00:40:75 Tattile Tattile SRL @@ -10697,7 +10668,7 @@ 00:40:85 SaabInst Saab Instruments Ab 00:40:86 MichelsK Michels & Kleberhoff Computer 00:40:87 Ubitrex Ubitrex Corporation -00:40:88 MobuisNu Mobuis # NuBus (Mac) combination video/EtherTalk +00:40:88 MobiusTe Mobius Technologies, Inc. 00:40:89 Meidensh Meidensha Corporation 00:40:8A TpsTelep Tps Teleprocessing Sys. Gmbh 00:40:8B Raylan Raylan Corporation @@ -10705,7 +10676,7 @@ 00:40:8D Goodyear The Goodyear Tire & Rubber Co. 00:40:8E Tattile Tattile SRL 00:40:8F Wm-DataM Wm-Data Minfo Ab -00:40:90 AnselCom Ansel Communications # PC NE2000 compatible twisted-pair ethernet cards +00:40:90 AnselCom Ansel Communications 00:40:91 ProcompI Procomp Industria Eletronica 00:40:92 AspCompu Asp Computer Products, Inc. 00:40:93 PaxdataN Paxdata Networks Ltd. @@ -10718,7 +10689,7 @@ 00:40:9A NetworkE Network Express, Inc. 00:40:9B HalCompu Hal Computer Systems Inc. 00:40:9C Transwar Transware -00:40:9D Digiboar DigiBoard # Ethernet-ISDN bridges +00:40:9D DigiBoar DigiBoard 00:40:9E Concurre Concurrent Technologies Ltd. 00:40:9F Telco Telco Systems, Inc. 00:40:A0 Goldstar Goldstar Co., Ltd. @@ -10727,16 +10698,16 @@ 00:40:A3 Microuni Microunity Systems Engineering 00:40:A4 RoseElec Rose Electronics 00:40:A5 Clinicom Clinicomp Intl. -00:40:A6 CrayRese Cray Research Inc. +00:40:A6 Cray Cray, Inc. 00:40:A7 ItautecP Itautec Philco S.A. 00:40:A8 ImfInter Imf International Ltd. 00:40:A9 Datacom Datacom Inc. -00:40:AA ValmetAu Valmet Automation Inc +00:40:AA ValmetAu Valmet Automation 00:40:AB RolandDg Roland Dg Corporation 00:40:AC SuperWor Super Workstation, Inc. 00:40:AD SmaRegel Sma Regelsysteme Gmbh 00:40:AE DeltaCon Delta Controls, Inc. -00:40:AF DigitalP Digital Products, Inc. (DPI). +00:40:AF DigitalP Digital Products, Inc. 00:40:B0 BytexEng Bytex Corporation, Engineering 00:40:B1 Codonics Codonics Inc. 00:40:B2 Systemfo Systemforschung @@ -10758,14 +10729,14 @@ 00:40:C2 AppliedC Applied Computing Devices 00:40:C3 FischerA Fischer And Porter Co. 00:40:C4 KinkeiSy Kinkei System Corporation -00:40:C5 MicomCom Micom Communications Corp. +00:40:C5 MicomCom Micom Communications Inc. 00:40:C6 Fibernet Fibernet Research, Inc. 00:40:C7 RubyTech Ruby Tech Corporation -00:40:C8 MilanTec Milan Technology Corp. +00:40:C8 MilanTec Milan Technology Corporation 00:40:C9 Ncube 00:40:CA FirstInt First Internat'L Computer, Inc 00:40:CB LanwanTe Lanwan Technologies -00:40:CC SilcomMa Silcom Manufacturing Technology Inc +00:40:CC SilcomMa Silcom Manuf'G Technology Inc. 00:40:CD TeraMicr Tera Microsystems, Inc. 00:40:CE Net-Sour Net-Source, Inc. 00:40:CF Strawber Strawberry Tree, Inc. @@ -10795,13 +10766,13 @@ 00:40:E7 ArnosIns Arnos Instruments & Computer 00:40:E8 CharlesR Charles River Data Systems,Inc 00:40:E9 Accord Accord Systems, Inc. -00:40:EA Plaintre PlainTree Systems Inc +00:40:EA PlainTre Plain Tree Systems Inc 00:40:EB MartinMa Martin Marietta Corporation 00:40:EC MikasaSy Mikasa System Engineering -00:40:ED NetworkC Network Controls International Inc +00:40:ED NetworkC Network Controls Int'Natl Inc. 00:40:EE Optimem 00:40:EF Hypercom Hypercom, Inc. -00:40:F0 Micro Micro Systems Inc +00:40:F0 MicroBra MicroBrain,Inc. 00:40:F1 ChuoElec Chuo Electronics Co., Ltd. 00:40:F2 JanichKl Janich & Klass Computertechnik 00:40:F3 Netcor @@ -10812,11 +10783,11 @@ 00:40:F8 Systemha Systemhaus Discom 00:40:F9 Combinet 00:40:FA Microboa Microboards, Inc. -00:40:FB CascadeC Cascade Communications Corp. +00:40:FB CascadeC Cascade Communications 00:40:FC IbrCompu Ibr Computer Technik Gmbh 00:40:FD Lxe 00:40:FE SymplexC Symplex Communications -00:40:FF TelebitC Telebit Corporation # Personal NetBlazer +00:40:FF Telebit Telebit Corporation 00:41:0E CloudNet Cloud Network Technology Singapore Pte. Ltd. 00:41:B4 WuxiZhon Wuxi Zhongxing Optoelectronics Technology Co.,Ltd. 00:41:D2 Cisco Cisco Systems, Inc @@ -10830,20 +10801,17 @@ 00:45:1D Cisco Cisco Systems, Inc 00:45:E2 CyberTAN CyberTAN Technology Inc. 00:46:4B HuaweiTe Huawei Technologies Co.,Ltd -00:48:54 DigitalS Digital SemiConductor # 21143/2 based 10/100 00:4A:77 zte zte corporation 00:4B:F3 Shenzhen Shenzhen Mercury Communication Technologies Co.,Ltd. 00:4D:32 AndonHea Andon Health Co.,Ltd. 00:4E:01 Dell Dell Inc. 00:4E:35 HewlettP Hewlett Packard Enterprise 00:4F:1A HuaweiTe Huawei Technologies Co.,Ltd -00:4F:49 Realtek -00:4F:4B PineTech Pine Technology Ltd. 00:50:00 NexoComm Nexo Communications, Inc. 00:50:01 Yamashit Yamashita Systems Corp. 00:50:02 Omnisec Omnisec Ag 00:50:03 Xrite Xrite Inc -00:50:04 3com3c90 3com # 3C90X +00:50:04 3Com 00:50:06 Tac Tac Ab 00:50:07 SiemensT Siemens Telecommunication Systems Limited 00:50:08 TivaMicr Tiva Microcomputer Corp. (Tmc) @@ -15174,7 +15142,6 @@ 00:54:9F Avaya Avaya Inc 00:54:AF Continen Continental Automotive Systems Inc. 00:54:BD Swelaser Swelaser AB -00:55:00 Xerox Xerox Corporation 00:55:B1 Shanghai Shanghai Baud Data Communication Co.,Ltd. 00:55:DA IEEERegi IEEE Registration Authority 00:55:DA:00:00:00/28 ShinkoTe Shinko Technos co.,ltd. @@ -15225,8 +15192,8 @@ 00:60:05 Feedback Feedback Data Ltd. 00:60:06 Sotec Sotec Co., Ltd 00:60:07 AcresGam Acres Gaming, Inc. -00:60:08 3com 3Com # 3Com PCI form factor 3C905 TX board -00:60:09 CiscoCat Cisco # Catalyst 5000 Ethernet switch +00:60:08 3Com +00:60:09 Cisco Cisco Systems, Inc 00:60:0A SordComp Sord Computer Corporation 00:60:0B LOGWARE LOGWARE GmbH 00:60:0C Eurotech Eurotech Inc. @@ -15254,7 +15221,7 @@ 00:60:22 Vicom Vicom Systems, Inc. 00:60:23 PericomS Pericom Semiconductor Corp. 00:60:24 Gradient Gradient Technologies, Inc. -00:60:25 ActiveIm Active Imaging Inc. +00:60:25 ActiveIm Active Imaging Plc 00:60:26 VIKINGMo VIKING Modular Solutions 00:60:27 Superior Superior Modular Products 00:60:28 Macrovis Macrovision Corporation @@ -15265,7 +15232,7 @@ 00:60:2D AlertonT Alerton Technologies, Inc. 00:60:2E Cyclades Cyclades Corporation 00:60:2F Cisco Cisco Systems, Inc -00:60:30 Villaget VillageTronic # used on Amiga +00:60:30 VillageT Village Tronic Entwicklung 00:60:31 Hrk Hrk Systems 00:60:32 I-Cube I-Cube, Inc. 00:60:33 AcuityIm Acuity Imaging, Inc. @@ -15279,7 +15246,7 @@ 00:60:3B AMTEC AMTEC spa 00:60:3C Hagiwara Hagiwara Sys-Com Co., Ltd. 00:60:3D 3Cx -00:60:3E Cisco100 Cisco # 100Mbps interface +00:60:3E Cisco Cisco Systems, Inc 00:60:3F Patapsco Patapsco Designs 00:60:40 Netro Netro Corp. 00:60:41 Yokogawa Yokogawa Digital Computer Corporation @@ -15295,7 +15262,7 @@ 00:60:4B Safe-com Safe-com GmbH & Co. KG 00:60:4C Sagemcom Sagemcom Broadband SAS 00:60:4D MmcNetwo Mmc Networks, Inc. -00:60:4E CycleCom Cycle Computer (Sun MotherBoard Replacements) +00:60:4E CycleCom Cycle Computer Corporation, Inc. 00:60:4F Tattile Tattile SRL 00:60:50 Internix Internix Inc. 00:60:51 QualityS Quality Semiconductor @@ -15320,7 +15287,7 @@ 00:60:64 Netcomm Netcomm Limited 00:60:65 B&RIndus B&R Industrial Automation GmbH 00:60:66 LACROIXT LACROIX Trafic -00:60:67 AcerLan Acer Lan +00:60:67 AcerNetx Acer Netxus Inc. 00:60:68 Dialogic Dialogic Corporation 00:60:69 BrocadeC Brocade Communications Systems LLC 00:60:6A Mitsubis Mitsubishi Wireless Communications. Inc. @@ -15329,7 +15296,7 @@ 00:60:6D DigitalE Digital Equipment Corp. 00:60:6E DavicomS Davicom Semiconductor, Inc. 00:60:6F ClarionA Clarion Corporation Of America -00:60:70 CiscoRou Cisco # routers (2524 and 4500) +00:60:70 Cisco Cisco Systems, Inc 00:60:71 MidasLab Midas Lab, Inc. 00:60:72 VxlInstr Vxl Instruments, Limited 00:60:73 Redcreek Redcreek Communications, Inc. @@ -15348,7 +15315,7 @@ 00:60:80 Microtro Microtronix Datacom Ltd. 00:60:81 TvComInt Tv/Com International 00:60:82 Novalink Novalink Technologies, Inc. -00:60:83 Cisco362 Cisco Systems, Inc. # 3620/3640 routers +00:60:83 Cisco Cisco Systems, Inc 00:60:84 DigitalV Digital Video 00:60:85 StorageC Storage Concepts 00:60:86 LogicRep Logic Replacement Tech. Ltd. @@ -15357,7 +15324,7 @@ 00:60:89 Xata 00:60:8A CitadelC Citadel Computer 00:60:8B ConferTe ConferTech International -00:60:8C 3com1990 3Com (1990 onwards) +00:60:8C 3Com 00:60:8D Unipulse Unipulse Corp. 00:60:8E HEELECTR HE ELECTRONICS, TECHNOLOGIE & SYSTEMTECHNIK GmbH 00:60:8F TekramTe Tekram Technology Co., Ltd. @@ -15365,7 +15332,7 @@ 00:60:91 FirstPac First Pacific Networks, Inc. 00:60:92 MicroSys Micro/Sys, Inc. 00:60:93 Varian -00:60:94 AmdPcnet AMD PCNET PCI +00:60:94 IBM IBM Corp 00:60:95 Accu-Tim Accu-Time Systems, Inc. 00:60:96 TSMicrot T.S. Microtech Inc. 00:60:97 3Com @@ -15549,28 +15516,28 @@ 00:80:01 Periphon Periphonics Corporation 00:80:02 Satelcom Satelcom (Uk) Ltd 00:80:03 HytecEle Hytec Electronics Ltd. -00:80:04 AntlowCo Antlow Computers, Ltd. +00:80:04 AntlowCo Antlow Communications, Ltd. 00:80:05 CactusCo Cactus Computer Inc. 00:80:06 Compuadd Compuadd Corporation 00:80:07 DlogNc-S Dlog Nc-Systeme 00:80:08 Dynatech Dynatech Computer Systems -00:80:09 JupiterO Jupiter Systems (older MX-600 series machines) +00:80:09 Jupiter Jupiter Systems, Inc. 00:80:0A JapanCom Japan Computer Corp. 00:80:0B Csk Csk Corporation 00:80:0C Videcom Videcom Limited -00:80:0D Vosswink Vosswinkel FU +00:80:0D Vosswink Vosswinkel F.U. 00:80:0E Atlantix Atlantix Corporation 00:80:0F Standard Standard Microsystems -00:80:10 Commodor Commodore +00:80:10 Commodor Commodore International 00:80:11 DigitalI Digital Systems Int'L. Inc. -00:80:12 ImsImsFa IMS Corp. # IMS failure analysis tester -00:80:13 ThomasCo Thomas Conrad Corp. +00:80:12 Integrat Integrated Measurement Systems +00:80:13 Thomas-C Thomas-Conrad Corporation 00:80:14 Esprit Esprit Systems 00:80:15 Seiko Seiko Systems, Inc. -00:80:16 WandelGo Wandel & Goltermann +00:80:16 WandelAn Wandel And Goltermann 00:80:17 Pfu Pfu Limited 00:80:18 KobeStee Kobe Steel, Ltd. -00:80:19 DaynaCom Dayna Communications # "Etherprint" product +00:80:19 DaynaCom Dayna Communications, Inc. 00:80:1A BellAtla Bell Atlantic 00:80:1B KodiakTe Kodiak Technology 00:80:1C NewportS Newport Systems Solutions @@ -15590,7 +15557,7 @@ 00:80:2A TestSimu Test Systems & Simulations Inc 00:80:2B Integrat Integrated Marketing Co 00:80:2C SageGrou The Sage Group Plc -00:80:2D Xylogics Xylogics, Inc. # Annex terminal servers +00:80:2D Xylogics Xylogics Inc 00:80:2E CastleRo Castle Rock Computing 00:80:2F National National Instruments Corp. 00:80:30 NexusEle Nexus Electronics @@ -15598,9 +15565,9 @@ 00:80:32 Access Access Co., Ltd. 00:80:33 EMSAviat EMS Aviation, Inc. 00:80:34 SmtGoupi Smt Goupil -00:80:35 Technolo Technology Works +00:80:35 Technolo Technology Works, Inc. 00:80:36 ReflexMa Reflex Manufacturing Systems -00:80:37 Ericsson Ericsson Business Comm. +00:80:37 Ericsson Ericsson Group 00:80:38 DataRese Data Research & Applications 00:80:39 AlcatelS Alcatel Stc Australia 00:80:3A Varitype Varityper, Inc. @@ -15611,13 +15578,13 @@ 00:80:3F Tatung Tatung Company 00:80:40 JohnFluk John Fluke Manufacturing Co. 00:80:41 VebKombi Veb Kombinat Robotron -00:80:42 ForceCom Force Computers +00:80:42 ArtesynE Artesyn Embedded Technologies 00:80:43 Networld Networld, Inc. 00:80:44 SystechC Systech Computer Corp. 00:80:45 Matsushi Matsushita Electric Ind. Co 00:80:46 Tattile Tattile SRL 00:80:47 In-Net In-Net Corp. -00:80:48 CompexUs Compex, used by Commodore and DEC at least +00:80:48 Compex Compex Incorporated 00:80:49 NissinEl Nissin Electric Co., Ltd. 00:80:4A Pro-Log 00:80:4B EagleTec Eagle Technologies Pty.Ltd. @@ -15626,7 +15593,7 @@ 00:80:4E ApexComp Apex Computer Company 00:80:4F DaikinIn Daikin Industries, Ltd. 00:80:50 Ziatech Ziatech Corporation -00:80:51 AdcFiber ADC Fibermux +00:80:51 Fibermux 00:80:52 Technica Technically Elite Concepts 00:80:53 Intellic Intellicom, Inc. 00:80:54 Frontier Frontier Technologies Corp. @@ -15635,16 +15602,16 @@ 00:80:57 Adsoft Adsoft, Ltd. 00:80:58 Printer Printer Systems Corp. 00:80:59 StanleyE Stanley Electric Co., Ltd -00:80:5A TulipCom Tulip Computers International BV +00:80:5A TulipCom Tulip Computers Internat'L B.V 00:80:5B Condor Condor Systems, Inc. -00:80:5C Agilis Agilis +00:80:5C Agilis Agilis Corporation 00:80:5D Canstar 00:80:5E LsiLogic Lsi Logic Corporation 00:80:5F HewlettP Hewlett Packard 00:80:60 NetworkI Network Interface Corporation 00:80:61 Litton Litton Systems, Inc. 00:80:62 Interfac Interface Co. -00:80:63 RichardH Richard Hirschmann Gmbh & Co +00:80:63 Hirschma Hirschmann Automation and Control GmbH 00:80:64 WyseTech Wyse Technology Llc 00:80:65 Cybergra Cybergraphic Systems Pty Ltd. 00:80:66 ArcomCon Arcom Control Systems, Ltd. @@ -15653,7 +15620,7 @@ 00:80:69 Computon Computone Systems 00:80:6A EriEmpac Eri (Empac Research Inc.) 00:80:6B SchmidTe Schmid Telecommunication -00:80:6C CegelecP Cegelec Projects Ltd +00:80:6C SecureSe Secure Systems & Services 00:80:6D Century Century Systems Corp. 00:80:6E NipponSt Nippon Steel Corporation 00:80:6F Onelan Onelan Ltd. @@ -15683,10 +15650,10 @@ 00:80:87 OkiElect Oki Electric Industry Co., Ltd 00:80:88 VictorJa Victor Company Of Japan, Ltd. 00:80:89 Tecnetic Tecnetics (Pty) Ltd. -00:80:8A Summit Summit +00:80:8A SummitMi Summit Microsystems Corp. 00:80:8B Dacoll Dacoll Limited -00:80:8C Netscout Netscout Systems (formerly Frontier Software Development) -00:80:8D Westcove Westcove Technology BV +00:80:8C Netscout Netscout Systems Inc +00:80:8D Westcoas Westcoast Technology B.V. 00:80:8E Radstone Radstone Technology 00:80:8F CItohEle C. Itoh Electronics, Inc. 00:80:90 Microtek Microtek International, Inc. @@ -15704,11 +15671,11 @@ 00:80:9C Luxcom Luxcom, Inc. 00:80:9D Commscra Commscraft Ltd. 00:80:9E Datus Datus Gmbh -00:80:9F AlcatelB Alcatel Business Systems +00:80:9F ALEInter ALE International 00:80:A0 HewlettP Hewlett Packard -00:80:A1 Microtes Microtest +00:80:A1 Microtes Microtest, Inc. 00:80:A2 Creative Creative Electronic Systems -00:80:A3 Lantroni Lantronix # (see also 0800A3) +00:80:A3 Lantroni Lantronix 00:80:A4 LibertyE Liberty Electronics 00:80:A5 SpeedInt Speed International 00:80:A6 Republic Republic Technology, Inc. @@ -15723,11 +15690,11 @@ 00:80:AF Allumer Allumer Co., Ltd. 00:80:B0 Advanced Advanced Information 00:80:B1 Softcom Softcom A/S -00:80:B2 NetNetwo NET (Network Equipment Technologies) +00:80:B2 NetworkE Network Equipment Technologies 00:80:B3 AvalData Aval Data Corporation 00:80:B4 Sophia Sophia Systems 00:80:B5 UnitedNe United Networks Inc. -00:80:B6 Themis Themis corporation +00:80:B6 Mercury– Mercury Systems – Trusted Mission Solutions, Inc. 00:80:B7 StellarC Stellar Computer 00:80:B8 DMGMORID DMG MORI Digital Co., LTD 00:80:B9 ArcheTec Arche Technoligies Inc. @@ -15737,15 +15704,15 @@ 00:80:BD Furukawa The Furukawa Electric Co., Ltd 00:80:BE AriesRes Aries Research 00:80:BF TakaokaE Takaoka Electric Mfg. Co. Ltd. -00:80:C0 PenrilDa Penril Datability Networks +00:80:C0 PenrilDa Penril Datacomm 00:80:C1 Lanex Lanex Corporation -00:80:C2 Ieee8021 IEEE # 802.1 Committee +00:80:C2 IEEE8021 IEEE 802.1 Chair 00:80:C3 BiccInfo Bicc Information Systems & Svc 00:80:C4 Document Document Technologies, Inc. 00:80:C5 Novellco Novellco De Mexico 00:80:C6 National National Datacomm Corporation -00:80:C7 Xircom Xircom, Inc. -00:80:C8 D-LinkAl D-Link # (also Solectek Pocket Adapters, and LinkSys PCMCIA) +00:80:C7 Xircom +00:80:C8 D-Link D-Link Systems, Inc. 00:80:C9 AlbertaM Alberta Microelectronic Centre 00:80:CA NetcomRe Netcom Research Incorporated 00:80:CB FalcoDat Falco Data Products @@ -15753,17 +15720,17 @@ 00:80:CD Micronic Micronics Computer, Inc. 00:80:CE Broadcas Broadcast Television Systems 00:80:CF Embedded Embedded Performance Inc. -00:80:D0 Computer Computer Products International +00:80:D0 Computer Computer Peripherals, Inc. 00:80:D1 Kimtron Kimtron Corporation 00:80:D2 Shinniho Shinnihondenko Co., Ltd. -00:80:D3 ShivaApp Shiva # Appletalk-Ethernet interface -00:80:D4 Chase Chase Limited +00:80:D3 Shiva Shiva Corp. +00:80:D4 ChaseRes Chase Research Ltd. 00:80:D5 CadreTec Cadre Technologies 00:80:D6 Nuvotech Nuvotech, Inc. -00:80:D7 FantumEl Fantum Electronics -00:80:D8 NetworkP Network Peripherals +00:80:D7 FantumEn Fantum Engineering +00:80:D8 NetworkP Network Peripherals Inc. 00:80:D9 EMKElekt EMK Elektronik GmbH & Co. KG -00:80:DA BruelKja Bruel & Kjaer +00:80:DA Hottinge Hottinger Brüel & Kjær A/S 00:80:DB Graphon Graphon Corporation 00:80:DC PickerIn Picker International 00:80:DD GmxGimix Gmx Inc/Gimix @@ -15772,7 +15739,7 @@ 00:80:E0 Xtp Xtp Systems, Inc. 00:80:E1 STMicroe STMicroelectronics SRL 00:80:E2 TDI T.D.I. Co., Ltd. -00:80:E3 Coral Coral +00:80:E3 CoralNet Coral Network Corporation 00:80:E4 Northwes Northwest Digital Systems, Inc 00:80:E5 NetApp 00:80:E6 PeerNetw Peer Networks, Inc. @@ -15789,10 +15756,10 @@ 00:80:F1 Opus Opus Systems 00:80:F2 Raycom Raycom Systems Inc 00:80:F3 SunElect Sun Electronics Corp. -00:80:F4 Telemech Telemechanique Electrique +00:80:F4 Telemeca Telemecanique Electrique 00:80:F5 Quantel Quantel Ltd 00:80:F6 SynergyM Synergy Microsystems -00:80:F7 ZenithCo Zenith Communications Products +00:80:F7 ZenithEl Zenith Electronics Corporation 00:80:F8 Mizar Mizar, Inc. 00:80:F9 Heurikon Heurikon Corporation 00:80:FA Rwt Rwt Gmbh @@ -15867,7 +15834,7 @@ 00:90:28 NipponSi Nippon Signal Co., Ltd. 00:90:29 Crypto Crypto Ag 00:90:2A Communic Communication Devices, Inc. -00:90:2B CiscoEth Cisco # Ethernet Switches and Light Streams +00:90:2B Cisco Cisco Systems, Inc 00:90:2C DataCont Data & Control Equipment Ltd. 00:90:2D DataElec Data Electronics (Aust.) Pty, Ltd. 00:90:2E Namco Namco Limited @@ -16066,7 +16033,7 @@ 00:90:EF Integrix Integrix, Inc. 00:90:F0 Harmonic Harmonic Video Systems Ltd. 00:90:F1 SeagateC Seagate Cloud Systems Inc -00:90:F2 CiscoEth Cisco # Ethernet Switches and Light Streams +00:90:F2 Cisco Cisco Systems, Inc 00:90:F3 AspectCo Aspect Communications 00:90:F4 Lightnin Lightning Instrumentation 00:90:F5 Clevo Clevo Co. @@ -16115,7 +16082,7 @@ 00:A0:09 Whitetre Whitetree Network 00:A0:0A Airspan 00:A0:0B Computex Computex Co., Ltd. -00:A0:0C KingmaxT Kingmax Technology Inc. # PCMCIA card +00:A0:0C KingmaxT Kingmax Technology, Inc. 00:A0:0D PandaPro The Panda Project 00:A0:0E Netscout Netscout Systems Inc 00:A0:0F Broadban Broadband Technologies @@ -16167,7 +16134,7 @@ 00:A0:3D Opto-22 00:A0:3E AtmForum Atm Forum 00:A0:3F Computer Computer Society Microprocessor & Microprocessor Standards C -00:A0:40 ApplePci Apple (PCI Mac) +00:A0:40 Apple Apple, Inc. 00:A0:41 Inficon 00:A0:42 SpurProd Spur Products Corp. 00:A0:43 American American Technology Labs, Inc. @@ -16304,16 +16271,16 @@ 00:A0:C6 Qualcomm Qualcomm Inc. 00:A0:C7 TadiranT Tadiran Telecommunications 00:A0:C8 Adtran Adtran Inc -00:A0:C9 IntelPro Intel (PRO100B and PRO100+) # [used on Cisco PIX firewall among others] +00:A0:C9 Intel Intel Corporation 00:A0:CA FujitsuD Fujitsu Denso Ltd. 00:A0:CB ArkTelec Ark Telecommunications, Inc. -00:A0:CC Lite-OnU Lite-On # (used by MacSense in Adapter for Mac, also seen in PCs) +00:A0:CC Lite-OnC Lite-On Communications, Inc. 00:A0:CD DRJOHANN DR. JOHANNES HEIDENHAIN GmbH 00:A0:CE Ecessa 00:A0:CF Sotas Sotas, Inc. 00:A0:D0 TenXTech Ten X Technology, Inc. 00:A0:D1 Inventec Inventec Corporation -00:A0:D2 AlliedTe Allied Telesyn +00:A0:D2 AlliedTe Allied Telesis International Corporation 00:A0:D3 InstemCo Instem Computer Systems, Ltd. 00:A0:D4 Radiolan Radiolan, Inc. 00:A0:D5 SierraWi Sierra Wireless, ULC @@ -16418,7 +16385,7 @@ 00:B0:C2 Cisco Cisco Systems, Inc 00:B0:C7 TellabsO Tellabs Operations, Inc. 00:B0:CE ViverisT Viveris Technologies -00:B0:D0 Computer Computer Products International +00:B0:D0 Dell Dell Inc. 00:B0:DB Nextcell Nextcell, Inc. 00:B0:DF Starboar Starboard Storage Systems 00:B0:E1 Cisco Cisco Systems, Inc @@ -16474,31 +16441,31 @@ 00:C0:02 Sercomm Sercomm Corporation. 00:C0:03 Globalne Globalnet Communications 00:C0:04 JapanBus Japan Business Computer Co.Ltd -00:C0:05 Livingst Livingston Enterprises Inc # Portmaster (OEMed by Cayman) +00:C0:05 Livingst Livingston Enterprises, Inc. 00:C0:06 NipponAv Nippon Avionics Co., Ltd. 00:C0:07 Pinnacle Pinnacle Data Systems, Inc. 00:C0:08 Seco Seco Srl -00:C0:09 KtTechno KT Technology (s) Pte Inc +00:C0:09 KtTechno Kt Technology (S) Pte Ltd 00:C0:0A MicroCra Micro Craft 00:C0:0B Norcontr Norcontrol A.S. 00:C0:0C ReliaTec Relia Technolgies 00:C0:0D Advanced Advanced Logic Research, Inc. 00:C0:0E Psitech Psitech, Inc. -00:C0:0F QnxSoftw QNX Software Systems Ltd. # [also Quantum Software Systems Ltd] +00:C0:0F QuantumS Quantum Software Systems Ltd. 00:C0:10 Hirakawa Hirakawa Hewtech Corp. 00:C0:11 Interact Interactive Computing Devices -00:C0:12 Netspan Netspan Corp +00:C0:12 Netspan Netspan Corporation 00:C0:13 Netrix -00:C0:14 Telemati Telematics Calabasas -00:C0:15 NewMedia New Media Corp +00:C0:14 Telemati Telematics Calabasas Int'L,Inc +00:C0:15 NewMedia New Media Corporation 00:C0:16 Electron Electronic Theatre Controls 00:C0:17 NetAlly -00:C0:18 Lanart Lanart Corp +00:C0:18 Lanart Lanart Corporation 00:C0:19 LeapTech Leap Technology, Inc. 00:C0:1A Corometr Corometrics Medical Systems -00:C0:1B SocketCo Socket Communications +00:C0:1B SocketCo Socket Communications, Inc. 00:C0:1C Interlin Interlink Communications Ltd. -00:C0:1D GrandJun Grand Junction Networks, Inc. # (Cisco Catalyst also reported) +00:C0:1D GrandJun Grand Junction Networks, Inc. 00:C0:1E LaFranca La Francaise Des Jeux 00:C0:1F SERCEL S.E.R.C.E.L. 00:C0:20 ArcoElec Arco Electronic, Control Ltd. @@ -16511,16 +16478,16 @@ 00:C0:27 Cipher Cipher Systems, Inc. 00:C0:28 Jasco Jasco Corporation 00:C0:29 NexansDe Nexans Deutschland GmbH - ANS -00:C0:2A OhkuraEl Ohkura Electric Co +00:C0:2A OhkuraEl Ohkura Electric Co., Ltd. 00:C0:2B GerloffG Gerloff Gesellschaft Fur 00:C0:2C CentrumC Centrum Communications, Inc. 00:C0:2D FujiPhot Fuji Photo Film Co., Ltd. 00:C0:2E Netwiz -00:C0:2F Okuma Okuma Corp +00:C0:2F Okuma Okuma Corporation 00:C0:30 Integrat Integrated Engineering B. V. 00:C0:31 DesignRe Design Research Systems, Inc. 00:C0:32 I-Cubed I-Cubed Limited -00:C0:33 Telebit Telebit Corporation +00:C0:33 TelebitC Telebit Communications Aps 00:C0:34 Transact Transaction Network 00:C0:35 Quintar Quintar Company 00:C0:36 RaytechE Raytech Electronic Corp. @@ -16538,15 +16505,15 @@ 00:C0:42 Datalux Datalux Corp. 00:C0:43 Strataco Stratacom 00:C0:44 Emcom Emcom Corporation -00:C0:45 Isolatio Isolation Systems Inc +00:C0:45 Isolatio Isolation Systems, Ltd. 00:C0:46 BlueChip Blue Chip Technology Ltd 00:C0:47 Unimicro Unimicro Systems, Inc. 00:C0:48 BayTechn Bay Technical Associates -00:C0:49 UsRoboti US Robotics Total Control (tm) NETServer Card +00:C0:49 USRoboti U.S. Robotics, Inc. 00:C0:4A Group200 Group 2000 Ag 00:C0:4B Creative Creative Microsystems 00:C0:4C Departme Department Of Foreign Affairs -00:C0:4D Mitec Mitec Ltd +00:C0:4D Mitec Mitec, Inc. 00:C0:4E Comtrol Comtrol Corporation 00:C0:4F Dell Dell Inc. 00:C0:50 ToyoDenk Toyo Denki Seizo K.K. @@ -16565,17 +16532,17 @@ 00:C0:5D L&NTechn L&N Technologies 00:C0:5E Vari-Lit Vari-Lite, Inc. 00:C0:5F Fine-Pal Fine-Pal Company Limited -00:C0:60 IdScandi ID Scandinavia A/S +00:C0:60 IdScandi Id Scandinavia As 00:C0:61 Solectek Solectek Corporation 00:C0:62 ImpulseT Impulse Technology -00:C0:63 MorningS Morning Star Technologies Inc # May be miswrite of 0003C6 -00:C0:64 GeneralD General Datacomm Ind Inc +00:C0:63 MorningS Morning Star Technologies, Inc +00:C0:64 GeneralD General Datacomm LLC 00:C0:65 ScopeCom Scope Communications, Inc. 00:C0:66 Docupoin Docupoint, Inc. 00:C0:67 UnitedBa United Barcode Industries 00:C0:68 HMEClear HME Clear-Com LTD. 00:C0:69 Axxceler Axxcelera Broadband Wireless -00:C0:6A Zahner-E Zahner-Elektrik Gmbh & Co KG +00:C0:6A Zahner-E Zahner-Elektrik Ingeborg Zahner-Schiller GmbH & Co. KG. 00:C0:6B OsiPlus Osi Plus Corporation 00:C0:6C SvecComp Svec Computer Corp. 00:C0:6D BocaRese Boca Research, Inc. @@ -16585,14 +16552,14 @@ 00:C0:71 AreanexC Areanex Communications, Inc. 00:C0:72 Knx Knx Ltd. 00:C0:73 Xedia Xedia Corporation -00:C0:74 ToyodaAu Toyoda Automatic Loom Works Ltd +00:C0:74 ToyodaAu Toyoda Automatic Loom 00:C0:75 Xante Xante Corporation 00:C0:76 I-DataIn I-Data International A-S 00:C0:77 DaewooTe Daewoo Telecom Ltd. 00:C0:78 Computer Computer Systems Engineering 00:C0:79 Fonsys Fonsys Co.,Ltd. -00:C0:7A PrivaBv Priva BV -00:C0:7B AscendCo Ascend Communications # ISDN bridges/routers +00:C0:7A Priva Priva B.V. +00:C0:7B AscendCo Ascend Communications, Inc. 00:C0:7C Hightech Hightech Information 00:C0:7D RiscDeve Risc Developments Ltd. 00:C0:7E KubotaEl Kubota Corporation Electronic @@ -16602,7 +16569,7 @@ 00:C0:82 MoorePro Moore Products Co. 00:C0:83 TraceMou Trace Mountain Products, Inc. 00:C0:84 DataLink Data Link Corp. Ltd. -00:C0:85 Canon +00:C0:85 Electron Electronics For Imaging, Inc. 00:C0:86 Lynk The Lynk Corporation 00:C0:87 UunetTec Uunet Technologies, Inc. 00:C0:88 EkfElekt Ekf Elektronik Gmbh @@ -16618,13 +16585,13 @@ 00:C0:92 MennenMe Mennen Medical Inc. 00:C0:93 AltaRese Alta Research Corp. 00:C0:94 Vmx Vmx Inc. -00:C0:95 ZnyxNetw Znyx (Network Appliance); Jupiter Systems (MX-700); Apple (G3) all seen +00:C0:95 ZNYXNetw ZNYX Networks, Inc. 00:C0:96 Tamura Tamura Corporation 00:C0:97 Archipel Archipel Sa 00:C0:98 ChuntexE Chuntex Electronic Co., Ltd. 00:C0:99 YoshikiI Yoshiki Industrial Co.,Ltd. 00:C0:9A Photonic Photonics Corporation -00:C0:9B Reliance Reliance Comm/Tec, R-Tec Systems Inc +00:C0:9B TellabsE Tellabs Enterprise, Inc. 00:C0:9C HiokiEE Hioki E.E. Corporation 00:C0:9D Distribu Distributed Systems Int'L, Inc 00:C0:9E CacheCom Cache Computers, Inc. @@ -16670,7 +16637,7 @@ 00:C0:C6 Personal Personal Media Corp. 00:C0:C7 Sparktru Sparktrum Microsystems, Inc. 00:C0:C8 MicroByt Micro Byte Pty. Ltd. -00:C0:C9 BaileyCo Bailey Controls Co +00:C0:C9 ElsagBai Elsag Bailey Process 00:C0:CA Alfa Alfa, Inc. 00:C0:CB ControlT Control Technology Corporation 00:C0:CC Telescie Telesciences Co Systems, Inc. @@ -16678,15 +16645,15 @@ 00:C0:CE CeiEngin Cei Systems & Engineering Pte 00:C0:CF ImatranV Imatran Voima Oy 00:C0:D0 RatocSys Ratoc System Inc. -00:C0:D1 ComtreeT Comtree Technology Corporation (EFA also reported) +00:C0:D1 ComtreeT Comtree Technology Corporation 00:C0:D2 Syntelle Syntellect, Inc. 00:C0:D3 OlympusI Olympus Image Systems, Inc. 00:C0:D4 AxonNetw Axon Networks, Inc. -00:C0:D5 QuancomE Quancom Electronic Gmbh +00:C0:D5 Werbeage Werbeagentur Jürgen Siebert 00:C0:D6 J1 J1 Systems, Inc. 00:C0:D7 TaiwanTr Taiwan Trading Center Dba 00:C0:D8 Universa Universal Data Systems -00:C0:D9 QuinteNe Quinte Network Confidentiality Equipment Inc +00:C0:D9 QuinteNe Quinte Network Confidentiality 00:C0:DA Nice Nice Systems Ltd. 00:C0:DB IpcPte Ipc Corporation (Pte) Ltd. 00:C0:DC EosTechn Eos Technologies, Inc. @@ -16706,12 +16673,12 @@ 00:C0:EA ArrayTec Array Technology Ltd. 00:C0:EB SehCompu Seh Computertechnik Gmbh 00:C0:EC DauphinT Dauphin Technology -00:C0:ED UsArmyEl US Army Electronic Proving Ground -00:C0:EE Kyocera Kyocera Corporation +00:C0:ED UsArmyEl Us Army Electronic +00:C0:EE KYOCERAD KYOCERA Display Corporation 00:C0:EF Abit Abit Corporation -00:C0:F0 Kingston Kingston Technology Corporation +00:C0:F0 Kingston Kingston Technology Company, Inc. 00:C0:F1 ShinkoEl Shinko Electric Co., Ltd. -00:C0:F2 Transiti Transition Engineering Inc +00:C0:F2 Transiti Transition Networks 00:C0:F3 NetworkC Network Communications Corp. 00:C0:F4 Interlin Interlink System Co., Ltd. 00:C0:F5 Metacomp Metacomp, Inc. @@ -16721,7 +16688,7 @@ 00:C0:F9 ArtesynE Artesyn Embedded Technologies 00:C0:FA CanaryCo Canary Communications, Inc. 00:C0:FB Advanced Advanced Technology Labs -00:C0:FC Asdg ASDG Incorporated +00:C0:FC ElasticR Elastic Reality, Inc. 00:C0:FD Prosum 00:C0:FE AptecCom Aptec Computer Systems, Inc. 00:C0:FF SeagateC Seagate Cloud Systems Inc @@ -17028,7 +16995,7 @@ 00:DB:70 Apple Apple, Inc. 00:DB:DF IntelCor Intel Corporate 00:DC:B2 ExtremeN Extreme Networks, Inc. -00:DD:00 Ungerman Ungermann-Bass # IBM RT +00:DD:00 Ungerman Ungermann-Bass Inc. 00:DD:01 Ungerman Ungermann-Bass Inc. 00:DD:02 Ungerman Ungermann-Bass Inc. 00:DD:03 Ungerman Ungermann-Bass Inc. @@ -17070,9 +17037,9 @@ 00:E0:13 EasternE Eastern Electronic Co., Ltd. 00:E0:14 Cisco Cisco Systems, Inc 00:E0:15 Heiwa Heiwa Corporation -00:E0:16 Rapid-Ci rapid-city (now a part of bay networks) +00:E0:16 RapidCit Rapid City Communications 00:E0:17 EXXACT EXXACT GmbH -00:E0:18 AsustekI Asustek # Intel 82558-based Integrated Fast Ethernet for WIM +00:E0:18 ASUSTekC ASUSTek COMPUTER INC. 00:E0:19 IngGiord Ing. Giordano Elettronica 00:E0:1A Comtec Comtec Systems. Co., Ltd. 00:E0:1B SphereCo Sphere Communications, Inc. @@ -17089,10 +17056,10 @@ 00:E0:26 RedlakeM Redlake MASD LLC 00:E0:27 Dux Dux, Inc. 00:E0:28 Aptix Aptix Corporation -00:E0:29 SmcEther SMC EtherPower II 10/100 +00:E0:29 Standard Standard Microsystems Corp. 00:E0:2A Tandberg Tandberg Television As 00:E0:2B ExtremeN Extreme Networks, Inc. -00:E0:2C Ast-Buil AST - built into 5166M PC motherboard (win95 id's as Intel) +00:E0:2C AstCompu Ast Computer 00:E0:2D InnoMedi InnoMediaLogic, Inc. 00:E0:2E SpcElect Spc Electronics Corporation 00:E0:2F McnsHold Mcns Holdings, L.P. @@ -17105,7 +17072,7 @@ 00:E0:36 Pioneer Pioneer Corporation 00:E0:37 Century Century Corporation 00:E0:38 Proxima Proxima Corporation -00:E0:39 Paradyne Paradyne 7112 T1 DSU/CSU +00:E0:39 Paradyne Paradyne Corp. 00:E0:3A Cabletro Cabletron Systems, Inc. 00:E0:3B Prominet Prominet Corporation 00:E0:3C AdvanSys @@ -17173,11 +17140,11 @@ 00:E0:7A Mikrodid Mikrodidakt Ab 00:E0:7B BayNetwo Bay Networks 00:E0:7C Mettler- Mettler-Toledo, Inc. -00:E0:7D EncoreNe Encore (Netronix?) # 10/100 PCI Fast ethernet card +00:E0:7D Netronix Netronix, Inc. 00:E0:7E WaltDisn Walt Disney Imagineering 00:E0:7F LOGISTIS LOGISTISTEM s.r.l. 00:E0:80 ControlR Control Resources Corporation -00:E0:81 TyanComp Tyan Computer Corp. # Onboard Intel 82558 10/100 +00:E0:81 TyanComp Tyan Computer Corp. 00:E0:82 Anerma 00:E0:83 JatoTech Jato Technologies, Inc. 00:E0:84 Compulit Compulite R&D @@ -17191,7 +17158,7 @@ 00:E0:8C Neoparad Neoparadigm Labs, Inc. 00:E0:8D Pressure Pressure Systems, Inc. 00:E0:8E Utstarco Utstarcom -00:E0:8F CiscoSys Cisco Systems # Catalyst 2900 series +00:E0:8F Cisco Cisco Systems, Inc 00:E0:90 BeckmanL Beckman Lab. Automation Div. 00:E0:91 LGElectr LG Electronics 00:E0:92 Admtek Admtek Incorporated @@ -17211,7 +17178,7 @@ 00:E0:A0 Wiltron Wiltron Co. 00:E0:A1 HIMAPAUL HIMA PAUL HILDEBRANDT GmbH Co. KG 00:E0:A2 Microsla Microslate Inc. -00:E0:A3 CiscoSys Cisco Systems # Catalyst 1924 +00:E0:A3 Cisco Cisco Systems, Inc 00:E0:A4 ESAOTE ESAOTE S.p.A. 00:E0:A5 ComCoreS ComCore Semiconductor, Inc. 00:E0:A6 TelogyNe Telogy Networks, Inc. @@ -17224,7 +17191,7 @@ 00:E0:AD EesTechn Ees Technology, Ltd. 00:E0:AE Xaqti Xaqti Corporation 00:E0:AF GeneralD General Dynamics Information Systems -00:E0:B0 CiscoSys Cisco Systems # Various systems reported +00:E0:B0 Cisco Cisco Systems, Inc 00:E0:B1 Alcatel- Alcatel-Lucent Enterprise 00:E0:B2 TelmaxCo Telmax Communications Corp. 00:E0:B3 EtherWAN EtherWAN Systems, Inc. @@ -17232,7 +17199,7 @@ 00:E0:B5 ArdentCo Ardent Communications Corp. 00:E0:B6 EntradaN Entrada Networks 00:E0:B7 Cosworth Cosworth Electronics Ltd -00:E0:B8 AmdPcnet AMD PCNet # in a Gateway 2000 +00:E0:B8 Gateway2 Gateway 2000 00:E0:B9 Byas Byas Systems 00:E0:BA BERGHOFA BERGHOF AUTOMATIONSTECHNIK GmbH 00:E0:BB Nbx Nbx Corporation @@ -17362,25 +17329,18 @@ 00:FD:45 HewlettP Hewlett Packard Enterprise 00:FD:4C Nevatec 00:FE:C8 Cisco Cisco Systems, Inc -01:0E:CF PN-MC PROFINET Multicast -02:04:06 BbnInter BBN # internal usage (not registered) 02:07:01 Racal-Da Racal-Datacom 02:1C:7C Perq Perq Systems Corporation -02:20:48 Marconi # At least some 2810 send with locally assigned flag set -02:60:60 3com 02:60:86 LogicRep Logic Replacement Tech. Ltd. -02:60:8C 3comIbmP 3Com # IBM PC; Imagen; Valid; Cisco; Macintosh +02:60:8C 3Com 02:70:01 Racal-Da Racal-Datacom 02:70:B0 MA-ComCo M/A-Com Inc. Companies 02:70:B3 DataReca Data Recall Ltd. 02:9D:8E CardiacR Cardiac Recorders, Inc. -02:A0:C9 Intel 02:AA:3C Olivetti Olivetti Telecomm Spa (Olteco) 02:BB:01 Octothor Octothorpe Corp. 02:C0:8C 3Com 02:CF:1C Communic Communication Machinery Corporation -02:CF:1F CMC -02:E0:3B Prominet Prominet Corporation # Gigabit Ethernet Switch 02:E6:D3 NixdorfC Nixdorf Computer Corp. 04:00:67 StanleyB Stanley Black & Decker 04:02:1F HuaweiTe Huawei Technologies Co.,Ltd @@ -17582,7 +17542,6 @@ 04:84:8A 7InovaTe 7Inova Technology Limited 04:86:80 QuectelW Quectel Wireless Solutions Co.,Ltd. 04:87:27 SiliconL Silicon Laboratories -04:88:45 BayNetwo Bay Networks # token ring line card 04:88:5F HuaweiTe Huawei Technologies Co.,Ltd 04:88:8C Eifelwer Eifelwerk Butler Systeme GmbH 04:88:E2 BeatsEle Beats Electronics LLC @@ -17814,25 +17773,24 @@ 08:00:02 BridgeCo Bridge Communications Inc. 08:00:03 Advanced Advanced Computer Comm. 08:00:04 Cromemco Cromemco Incorporated -08:00:05 Symbolic Symbolics # Symbolics LISP machines -08:00:06 SiemensN Siemens Nixdorf # PC clone +08:00:05 Symbolic Symbolics Inc. +08:00:06 Siemens Siemens Ag 08:00:07 Apple Apple, Inc. 08:00:08 BoltBera Bolt Beranek And Newman Inc. 08:00:09 HewlettP Hewlett Packard 08:00:0A Nestar Nestar Systems Incorporated -08:00:0B UnisysAl Unisys also Ascom-Timeplex (former Unisys subsidiary) +08:00:0B Unisys Unisys Corporation 08:00:0C MiklynDe Miklyn Development Co. -08:00:0D IclInter ICL (International Computers, Ltd.) -08:00:0E Ncr/At&T +08:00:0D Internat International Computers, Ltd +08:00:0E Ncr Ncr Corporation 08:00:0F Mitel Mitel Corporation -08:00:10 At&T[Mis AT&T [misrepresentation of 800010?] 08:00:11 Tektroni Tektronix Inc. 08:00:12 BellAtla Bell Atlantic Integrated Syst. 08:00:13 Exxon -08:00:14 ExcelanB Excelan # BBN Butterfly, Masscomp, Silicon Graphics +08:00:14 Excelan 08:00:15 StcBusin Stc Business Systems 08:00:16 Barriste Barrister Info Sys Corp -08:00:17 National National Semiconductor Corp. (used to have Network System Corp., wrong NSC) +08:00:17 National National Semiconductor 08:00:18 PirelliF Pirelli Focom Networks 08:00:19 GeneralE General Electric Corporation 08:00:1A Tiara10N Tiara/ 10Net @@ -17843,27 +17801,27 @@ 08:00:1F Sharp Sharp Corporation 08:00:20 Oracle Oracle Corporation 08:00:21 3M 3M Company -08:00:22 NbiNothi NBI (Nothing But Initials) +08:00:22 Nbi Nbi Inc. 08:00:23 Panasoni Panasonic Communications Co., Ltd. 08:00:24 10NetCom 10Net Communications/Dca 08:00:25 ControlD Control Data -08:00:26 NorskDat Norsk Data (Nord) -08:00:27 PcsCompu PCS Computer Systems GmbH -08:00:28 TiExplor TI # Explorer +08:00:26 NorskDat Norsk Data A.S. +08:00:27 PCSSyste PCS Systemtechnik GmbH +08:00:28 TexasIns Texas Instruments 08:00:29 Megatek Megatek Corporation 08:00:2A MosaicTe Mosaic Technologies Inc. 08:00:2B DigitalE Digital Equipment Corporation 08:00:2C BrittonL Britton Lee Inc. 08:00:2D Lan-Tec Lan-Tec Inc. 08:00:2E Metaphor Metaphor Computer Systems -08:00:2F PrimeCom Prime Computer # Prime 50-Series LHC300 +08:00:2F PrimeCom Prime Computer Inc. 08:00:30 NetworkR Network Research Corporation 08:00:31 LittleMa Little Machines Inc. 08:00:32 Tigan Tigan Incorporated 08:00:33 BauschLo Bausch & Lomb 08:00:34 Filenet Filenet Corporation 08:00:35 Microfiv Microfive Corporation -08:00:36 Intergra Intergraph # CAE stations +08:00:36 Intergra Intergraph Corporation 08:00:37 FUJIFILM FUJIFILM Business Innovation Corp. 08:00:38 BullS Bull S.A.S. 08:00:39 Spider Spider Systems Limited @@ -17910,7 +17868,7 @@ 08:00:63 Plessey 08:00:64 Sitasys Sitasys AG 08:00:65 Genrad Genrad Inc. -08:00:66 AgfaPrin AGFA # printers, phototypesetters etc. +08:00:66 Agfa Agfa Corporation 08:00:67 ComDesig ComDesign 08:00:68 RidgeCom Ridge Computers 08:00:69 SiliconG Silicon Graphics @@ -17925,31 +17883,31 @@ 08:00:72 XeroxUni Xerox Corp Univ Grant Program 08:00:73 Tecmar Tecmar Inc. 08:00:74 CasioCom Casio Computer Co. Ltd. -08:00:75 DdeDanis DDE (Danish Data Elektronik A/S) +08:00:75 DanskDat Dansk Data Electronik 08:00:76 PcLanTec Pc Lan Technologies -08:00:77 TslNowRe TSL (now Retix) +08:00:77 TslCommu Tsl Communications Ltd. 08:00:78 Accell Accell Corporation 08:00:79 DroidWor The Droid Works 08:00:7A Indata 08:00:7B SanyoEle Sanyo Electric Co. Ltd. -08:00:7C Vitalink Vitalink # TransLAN III +08:00:7C Vitalink Vitalink Communications Corp. 08:00:7E Amalgama Amalgamated Wireless(Aus) Ltd 08:00:7F Carnegie Carnegie-Mellon University 08:00:80 AesData Aes Data Inc. -08:00:81 Crosfiel Crosfield Electronics +08:00:81 Astech Astech Inc. 08:00:82 VeritasS Veritas Software -08:00:83 SeikoDen Seiko Denshi +08:00:83 SeikoIns Seiko Instruments Inc. 08:00:84 TomenEle Tomen Electronics Corp. 08:00:85 Elxsi -08:00:86 Imagen/Q Imagen/QMS [Now Konica Minolta] -08:00:87 XyplexTe Xyplex # terminal servers +08:00:86 KonicaMi Konica Minolta Holdings, Inc. +08:00:87 Xyplex Xyplex, Inc. 08:00:88 BrocadeC Brocade Communications Systems LLC -08:00:89 Kinetics Kinetics # AppleTalk-Ethernet interface +08:00:89 Kinetics 08:00:8A PerfTech PerfTech, Inc. 08:00:8B PyramidT Pyramid Technology Corp. 08:00:8C NetworkR Network Research Corporation -08:00:8D Xyvision XyVision # XyVision machines -08:00:8E Tandem/S Tandem / Solbourne Computer ? +08:00:8D Xyvision Xyvision Inc. +08:00:8E TandemCo Tandem Computers 08:00:8F Chipcom Chipcom Corporation 08:00:90 Sonoma Sonoma Systems 08:01:0F SichuanT Sichuan Tianyi Comheart Telecom Co.,LTD @@ -18322,7 +18280,6 @@ 08:FD:0E SamsungE Samsung Electronics Co.,Ltd 08:FF:24 Shenzhen Shenzhen Skyworth Digital Technology CO., Ltd 08:FF:44 Apple Apple, Inc. -09:00:6A AT&T 0A:2A:33 Digistor 0A:36:1C Smardii 0A:87:36 IEEE1901 IEEE 1901 Working Group @@ -18748,9 +18705,6 @@ 10:00:00 Private 10:00:20 Apple Apple, Inc. 10:00:5A IBM IBM Corp -10:00:90 HP -10:00:D4 DEC -10:00:E0 AppleA/U Apple A/UX # (modified addresses for licensing) 10:00:E8 National National Semiconductor 10:00:FD LaonPeop LaonPeople 10:01:77 HuaweiTe Huawei Technologies Co.,Ltd @@ -22087,7 +22041,6 @@ 2C:FE:E2 QingdaoH Qingdao Hisense Communications Co.,Ltd. 2C:FF:65 OkiElect Oki Electric Industry Co., Ltd. 2C:FF:EE vivoMobi vivo Mobile Communication Co., Ltd. -2E:2E:2E LaaLocal LAA (Locally Administered Address) for Meditech Systems 30:03:C8 CloudNet Cloud Network Technology Singapore Pte. Ltd. 30:04:5C Shenzhen Shenzhen SuperElectron Technology Co.,Ltd. 30:05:05 IntelCor Intel Corporate @@ -23377,7 +23330,6 @@ 3A:BA:37 Cirrent 3A:CF:C5 Quicklin Quickline AG 3A:F5:21 SingleDi Single Digits -3C:00:00 3Com 3C:01:EF Sony Sony Corporation 3C:02:68 Infinera Infinera, Inc. 3C:02:B1 Creation Creation Technologies LP @@ -23793,7 +23745,6 @@ 3C:FD:FE IntelCor Intel Corporate 3C:FE:AC Cisco Cisco Systems, Inc 3C:FF:D8 HuaweiTe Huawei Technologies Co.,Ltd -40:00:03 NetWare? Net Ware (?) 40:00:E0 DerekSha Derek(Shaoguan)Limited 40:01:07 Arista Arista Corp 40:01:7A Cisco Cisco Systems, Inc @@ -24792,9 +24743,7 @@ 44:42:01 AmazonTe Amazon Technologies Inc. 44:42:2F Testop Testop Co.,Ltd. 44:44:50 OttoQ -44:45:53 Microsoft 44:45:6F Shenzhen Shenzhen Onega Technology Co.,Ltd -44:46:49 DfiDiamo DFI (Diamond Flower Industries) 44:46:87 RealmeCh Realme Chongqing MobileTelecommunications Corp Ltd 44:47:CC Hangzhou Hangzhou Hikvision Digital Technology Co.,Ltd. 44:48:91 HDMILice HDMI Licensing, LLC @@ -25080,7 +25029,6 @@ 44:FD:A3 Everysig Everysight LTD. 44:FE:3B Arcadyan Arcadyan Corporation 44:FF:BA zte zte corporation -47:54:43 GtcNotRe GTC (Not registered!) # (This number is a multicast!) 48:00:31 HuaweiTe Huawei Technologies Co.,Ltd 48:00:33 VantivaU Vantiva USA LLC 48:00:7D DtsElekt Dts Elektronik San. Tic. Ltd. Sti. @@ -25178,7 +25126,6 @@ 48:43:5A HuaweiTe Huawei Technologies Co.,Ltd 48:43:7C Apple Apple, Inc. 48:43:DD AmazonTe Amazon Technologies Inc. -48:44:53 Hds??? HDS ??? 48:44:87 CiscoSPV Cisco SPVTG 48:44:F7 SamsungE Samsung Electronics Co.,Ltd 48:45:20 IntelCor Intel Corporate @@ -25193,7 +25140,6 @@ 48:4A:E9 HewlettP Hewlett Packard Enterprise 48:4B:AA Apple Apple, Inc. 48:4B:D4 VantivaU Vantiva USA LLC -48:4C:00 NetworkS Network Solutions 48:4C:29 HuaweiTe Huawei Technologies Co.,Ltd 48:4C:86 HuaweiDe Huawei Device Co., Ltd. 48:4D:7E Dell Dell Inc. @@ -25206,7 +25152,6 @@ 48:51:D0 JiangsuX Jiangsu Xinsheng Intelligent Technology Co., Ltd. 48:52:61 Soreel 48:54:15 NetRules Net Rules Tecnologia Eireli -48:54:E8 Winbond? 48:55:19 Espressi Espressif Inc. 48:55:41 Iskratel Iskratel d.o.o. 48:55:5C WuQiTech Wu Qi Technologies,Inc. @@ -25562,7 +25507,6 @@ 4C:3F:D3 TexasIns Texas Instruments 4C:40:88 SanshinE Sanshin Electronics Co.,Ltd. 4C:42:1E Cisco Cisco Systems, Inc -4C:42:4C Informat Information Modes software modified addresses (not registered?) 4C:43:41 Calix Calix Inc. 4C:44:5B IntelCor Intel Corporate 4C:45:76 ChinaMob China Mobile(Hangzhou) Information Technology Co.,Ltd. @@ -26370,9 +26314,6 @@ 50:FF:99:C0:00:00/28 Goetting Goetting KG 50:FF:99:D0:00:00/28 Shenzhen Shenzhen Haipengxin Electronic Co., Ltd. 50:FF:99:E0:00:00/28 Informa Informa LLC -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) 54:02:37 Teltroni Teltronic AG 54:02:95 HuaweiTe Huawei Technologies Co.,Ltd 54:03:84 Hongkong Hongkong Nano IC Technologies Co., Ltd @@ -26749,7 +26690,6 @@ 54:FD:BF ScheidtB Scheidt & Bachmann GmbH 54:FF:82 DavitSol Davit Solution co. 54:FF:CF MopriaAl Mopria Alliance -56:58:57 AculabPl Aculab plc # audio bridges 58:00:32 Genexis Genexis B.V. 58:00:BB JuniperN Juniper Networks 58:00:E3 LiteonTe Liteon Technology Corporation @@ -35000,7 +34940,7 @@ 7C:FF:4D AVMAudio AVM Audiovisuelles Marketing und Computersysteme GmbH 7C:FF:62 HuizhouS Huizhou Super Electron Technology Co.,Ltd. 80:00:0B IntelCor Intel Corporate -80:00:10 At&T[Mis AT&T [misrepresented as 080010? One source claims this is correct] +80:00:10 At&T 80:00:6E Apple Apple, Inc. 80:01:5C Synaptic Synaptics, Inc 80:01:84 HTC HTC Corporation @@ -35263,7 +35203,6 @@ 80:AC:7C SichuanA Sichuan AI-Link Technology Co., Ltd. 80:AC:AC JuniperN Juniper Networks 80:AC:C8 PhyplusM Phyplus Microelectronics Limited -80:AD:00 CnetTech CNET Technology Inc. (Probably an error, see instead 0080AD) 80:AD:16 XiaomiCo Xiaomi Communications Co Ltd 80:AD:67 KasdaNet Kasda Networks Inc 80:AF:CA Shenzhen Shenzhen Cudy Technology Co., Ltd. @@ -40815,11 +40754,11 @@ A8:FB:70 WiseSecL WiseSec L.t.d A8:FC:B7 Consolid Consolidated Resource Imaging A8:FE:9D Apple Apple, Inc. A8:FF:BA HuaweiTe Huawei Technologies Co.,Ltd -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 +AA:00:00 DigitalE Digital Equipment Corporation +AA:00:01 DigitalE Digital Equipment Corporation +AA:00:02 DigitalE Digital Equipment Corporation +AA:00:03 DigitalE Digital Equipment Corporation +AA:00:04 DigitalE Digital Equipment Corporation AA:0F:85 Yamaichi Yamaichi Electronics AA:14:6B IronWiFi AA:34:D4 CDVIWire CDVI Wireless SpA @@ -42744,7 +42683,6 @@ BC:FF:21 SmartCod Smart Code(shenzhen)Technology Co.,Ltd BC:FF:4D Espressi Espressif Inc. BC:FF:AC Topcon Topcon Corporation BC:FF:EB Motorola Motorola Mobility LLC, a Lenovo Company -C0:00:00 WesternD Western Digital (may be reversed 00 00 C0?) C0:02:8D WINSTARD WINSTAR Display CO.,Ltd C0:03:80 JuniperN Juniper Networks C0:05:C2 ARRISGro ARRIS Group, Inc. @@ -45930,7 +45868,7 @@ DC:82:F6 iPort DC:84:E9 Shenzhen Shenzhen Qihoo Intelligent Technology Co.,Ltd DC:85:DE AzureWav AzureWave Technology Inc. DC:86:D8 Apple Apple, Inc. -DC:87:CB Perfectk Beijing Perfectek Technologies Co., Ltd. +DC:87:CB BeijingP Beijing Perfectek Technologies Co., Ltd. DC:89:83 SamsungE Samsung Electronics Co.,Ltd DC:8B:28 IntelCor Intel Corporate DC:8C:1B vivoMobi vivo Mobile Communication Co., Ltd. @@ -46510,7 +46448,6 @@ E0:F9:BE Cloudena Cloudena Corp. E0:FA:EC Platansp Platan sp. z o.o. sp. k. E0:FF:F1 TexasIns Texas Instruments E0:FF:F7 Softiron Softiron Inc. -E2:0C:0F Kingston Kingston Technologies E4:02:9B IntelCor Intel Corporate E4:04:39 TomTomSo TomTom Software Ltd E4:05:F8 Bytedanc Bytedance @@ -47290,7 +47227,6 @@ EC:0D:9A Mellanox Mellanox Technologies, Inc. EC:0D:E4 AmazonTe Amazon Technologies Inc. EC:0E:C4 HonHaiPr Hon Hai Precision Ind. Co.,Ltd. EC:0E:D6 ItechIns Itech Instruments Sas -EC:10:00 EnanceSo Enance Source Co., Ltd. # PC clones(?) EC:10:7B SamsungE Samsung Electronics Co.,Ltd EC:11:20 FloDesig FloDesign Wind Turbine Corporation EC:11:27 TexasIns Texas Instruments diff --git a/manuf.tmpl b/manuf.tmpl deleted file mode 100644 index e857b426a0..0000000000 --- a/manuf.tmpl +++ /dev/null @@ -1,309 +0,0 @@ -# -# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses -# -# Laurent Deniel -# -# Wireshark - Network traffic analyzer -# By Gerald Combs -# Copyright 1998 Gerald Combs -# -# SPDX-License-Identifier: GPL-2.0-or-later -# -# The data below has been assembled from the following sources: -# -# The IEEE public OUI listings available from: -# -# -# -# -# -# -# Michael Patton's "Ethernet Codes Master Page" available from: -# -# Many people contributed to Michael's list. See the "Acknowledgements" -# section on that page for a complete list. -# -# This is Wireshark 'manuf' file, which started out as a subset of Michael -# Patton's list and grew from there. The Wireshark list and Michael's list -# were merged in 2016. -# -# In the event of data set collisions the Wireshark entries have been given -# precedence, followed by Michael Patton's, followed by the IEEE. -# -# This file is in the same format as ethers(4) except that vendor names -# are truncated to eight characters when used with Wireshark, and -# that well-known MAC addresses need not have a full 6 octets and may -# have a netmask following them specifying how many bits of the address -# are relevant (the other bits are wildcards). Also, either ":", "-", -# or "." can be used to separate the octets. -# -# You can get the latest version of this file from -# https://gitlab.com/wireshark/wireshark/-/raw/master/manuf - - -00:00:00 00:00:00 Officially Xerox, but 0:0:0:0:0:0 is more common -00:00:09 Powerpip powerpipes? -00:00:18 WebsterC Webster Computer Corporation # Appletalk/Ethernet Gateway -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 -00:00:5A SkSchnei SK # (Schneider & Koch in Europe and Syskonnect outside of Europe) -00:00:6F MadgeNet Madge Networks Ltd. # Token-ring adapters -00:00:75 BellNort Bell Northern Research (BNR) -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] -00:00:83 TadpoleT Tadpole Technology [had Optical Data Systems which is wrong according to both] -00:00:89 CaymanSy Cayman Systems # Gatorbox -00:00:94 AsanteMa Asante # MAC -00:00:A6 NetworkG Network General (internal assignment, not for products) -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 -00:00:C0 WesternD Western Digital now SMC (Std. Microsystems Corp.) -00:00:C6 HpIntell HP Intelligent Networks Operation (formerly Eon Systems) -00:00:C9 EmulexTe Emulex # Terminal Servers, Print Servers -00:00:D1 Adaptec Adaptec, Inc. # "Nodem" product -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] -00:00:F2 SpiderCo Spider Communications # (Montreal, not Spider Systems) -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) -00:02:16 EsiExten ESI (Extended Systems, Inc) # print servers -00:02:88 GlobalVi Global Village (PCcard in Mac portable) -00:04:00 LexmarkP Lexmark (Print Server) -00:04:AC IbmPcmci IBM # PCMCIA Ethernet adapter. -00:05:02 ApplePci Apple (PCI bus Macs) -00:06:29 IbmRisc6 IBM RISC6000 system -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 -00:10:7A AmbicomW Ambicom (was Tandy?) -00:10:83 Hp-UxE90 HP-UX E 9000/889 -00:10:A4 XircomRe Xircom # RealPort 10/100 PC Card -00:10:D7 ArgosyEn Argosy # EN 220 Fast Ethernet PCMCIA -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.) -00:20:35 IbmInter IBM (International Business Machines) # mainframes, Etherjet printers -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 -00:20:D0 Versalyn Versalynx Corp. # "The One Port" terminal server -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 -00:40:10 SonicMac Sonic # Mac Ethernet interfaces -00:40:13 NttDataC NTT Data Communication Systems Corp -00:40:1C AstPenti AST # Pentium/90 PC (emulating AMD EISA card) -00:40:27 SmcMassa SMC Massachusetts # [Had:Sigma (?), maybe the "S"?] -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 -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 -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. -00:40:FF TelebitC Telebit Corporation # Personal NetBlazer -00:48:54 DigitalS Digital SemiConductor # 21143/2 based 10/100 -00:4F:49 Realtek -00:4F:4B PineTech Pine Technology Ltd. -00:50:04 3com3c90 3com # 3C90X -00:55:00 Xerox Xerox Corporation -00:60:08 3com 3Com # 3Com PCI form factor 3C905 TX board -00:60:09 CiscoCat Cisco # Catalyst 5000 Ethernet switch -00:60:25 ActiveIm Active Imaging Inc. -00:60:30 Villaget VillageTronic # used on Amiga -00:60:3E Cisco100 Cisco # 100Mbps interface -00:60:4E CycleCom Cycle Computer (Sun MotherBoard Replacements) -00:60:67 AcerLan Acer Lan -00:60:70 CiscoRou Cisco # routers (2524 and 4500) -00:60:83 Cisco362 Cisco Systems, Inc. # 3620/3640 routers -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 -00:80:12 ImsImsFa IMS Corp. # IMS failure analysis tester -00:80:13 ThomasCo Thomas Conrad Corp. -00:80:16 WandelGo Wandel & Goltermann -00:80:19 DaynaCom Dayna Communications # "Etherprint" product -00:80:2D Xylogics Xylogics, Inc. # Annex terminal servers -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 -00:80:5C Agilis Agilis -00:80:63 RichardH Richard Hirschmann Gmbh & Co -00:80:6C CegelecP Cegelec Projects Ltd -00:80:8A Summit Summit -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 -00:80:A3 Lantroni Lantronix # (see also 0800A3) -00:80:B2 NetNetwo NET (Network Equipment Technologies) -00:80:B6 Themis Themis corporation -00:80:C0 PenrilDa Penril Datability Networks -00:80:C2 Ieee8021 IEEE # 802.1 Committee -00:80:C7 Xircom Xircom, Inc. -00:80:C8 D-LinkAl D-Link # (also Solectek Pocket Adapters, and LinkSys PCMCIA) -00:80:D0 Computer Computer Products International -00:80:D3 ShivaApp Shiva # Appletalk-Ethernet interface -00:80:D4 Chase Chase Limited -00:80:D7 FantumEl Fantum Electronics -00:80:D8 NetworkP Network Peripherals -00:80:DA BruelKja Bruel & Kjaer -00:80:E3 Coral Coral -00:80:F4 Telemech Telemechanique Electrique -00:80:F7 ZenithCo Zenith Communications Products -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 -00:A0:40 ApplePci Apple (PCI Mac) -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) -00:A0:D2 AlliedTe Allied Telesyn -00:B0:D0 Computer Computer Products International -00:C0:05 Livingst Livingston Enterprises Inc # Portmaster (OEMed by Cayman) -00:C0:09 KtTechno KT Technology (s) Pte Inc -00:C0:0F QnxSoftw QNX Software Systems Ltd. # [also Quantum Software Systems Ltd] -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 -00:C0:1D GrandJun Grand Junction Networks, Inc. # (Cisco Catalyst also reported) -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 -00:C0:63 MorningS Morning Star Technologies Inc # May be miswrite of 0003C6 -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 -00:C0:7B AscendCo Ascend Communications # ISDN bridges/routers -00:C0:85 Canon -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 -00:DD:00 Ungerman Ungermann-Bass # IBM RT -00:E0:16 Rapid-Ci rapid-city (now a part of bay networks) -00:E0:18 AsustekI Asustek # Intel 82558-based Integrated Fast Ethernet for WIM -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 -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 -01:0E:CF PN-MC PROFINET Multicast -02:04:06 BbnInter BBN # internal usage (not registered) -02:20:48 Marconi # At least some 2810 send with locally assigned flag set -02:60:60 3com -02:60:8C 3comIbmP 3Com # IBM PC; Imagen; Valid; Cisco; Macintosh -02:A0:C9 Intel -02:CF:1F CMC -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 -08:00:0B UnisysAl Unisys also Ascom-Timeplex (former Unisys subsidiary) -08:00:0D IclInter ICL (International Computers, Ltd.) -08:00:0E Ncr/At&T -08:00:10 At&T[Mis AT&T [misrepresentation of 800010?] -08:00:14 ExcelanB Excelan # BBN Butterfly, Masscomp, Silicon Graphics -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 -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. -08:00:75 DdeDanis DDE (Danish Data Elektronik A/S) -08:00:77 TslNowRe TSL (now Retix) -08:00:7C Vitalink Vitalink # TransLAN III -08:00:81 Crosfiel Crosfield Electronics -08:00:83 SeikoDen Seiko Denshi -08:00:86 Imagen/Q Imagen/QMS [Now Konica Minolta] -08:00:87 XyplexTe Xyplex # terminal servers -08:00:89 Kinetics Kinetics # AppleTalk-Ethernet interface -08:00:8D Xyvision XyVision # XyVision machines -08:00:8E Tandem/S Tandem / Solbourne Computer ? -09:00:6A AT&T -10:00:90 HP -10:00:D4 DEC -10:00:E0 AppleA/U Apple A/UX # (modified addresses for licensing) -2E:2E:2E LaaLocal LAA (Locally Administered Address) for Meditech Systems -3C:00:00 3Com -40:00:03 NetWare? Net Ware (?) -44:45:53 Microsoft -44:46:49 DfiDiamo DFI (Diamond Flower Industries) -47:54:43 GtcNotRe GTC (Not registered!) # (This number is a multicast!) -48:44:53 Hds??? HDS ??? -48:4C:00 NetworkS Network Solutions -48:54:E8 Winbond? -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) -56:58:57 AculabPl Aculab plc # audio bridges -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) -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 -C0:00:00 WesternD Western Digital (may be reversed 00 00 C0?) -DC:87:CB Perfectk Beijing Perfectek Technologies Co., Ltd. -E2:0C:0F Kingston Kingston Technologies -EC:10:00 EnanceSo Enance Source Co., Ltd. # PC clones(?) diff --git a/tools/make-manuf.py b/tools/make-manuf.py index 2611fb859e..3ac557c968 100755 --- a/tools/make-manuf.py +++ b/tools/make-manuf.py @@ -8,15 +8,7 @@ '''Update the "manuf" file. Make-manuf creates a file containing ethernet OUIs and their company -IDs. It merges the databases at IEEE with entries in our template file. -Our file in turn contains entries from -http://www.cavebear.com/archive/cavebear/Ethernet/Ethernet.txt along -with our own. - -The script reads the comments at the top of "manuf.tmpl" and writes them -to "manuf". It then joins the manufacturer listing in "manuf.tmpl" with -the listing in "oui.txt", "iab.txt", etc, with the entries in -"manuf.tmpl" taking precedence. +IDs from the databases at IEEE. ''' import csv @@ -47,15 +39,24 @@ def open_url(url): str in Python 3 and bytes in Python 2 in order to be compatibile with csv.reader. ''' - req_headers = { 'User-Agent': 'Wireshark make-manuf' } - try: - req = urllib.request.Request(url, headers=req_headers) - response = urllib.request.urlopen(req) - body = response.read().decode('UTF-8', 'replace') - except Exception: - exit_msg('Error opening ' + url) - return (body, dict(response.info())) + if len(sys.argv) > 1: + url_path = os.path.join(sys.argv[1], url[1]) + url_fd = open(url_path) + body = url_fd.read() + url_fd.close() + else: + url_path = '/'.join(url) + + req_headers = { 'User-Agent': 'Wireshark make-manuf' } + try: + req = urllib.request.Request(url_path, headers=req_headers) + response = urllib.request.urlopen(req) + body = response.read().decode('UTF-8', 'replace') + except Exception: + exit_msg('Error opening ' + url_path) + + return body # These are applied after punctuation has been removed. # More examples at https://en.wikipedia.org/wiki/Incorporation_(business) @@ -181,49 +182,22 @@ def prefix_to_oui(prefix): def main(): this_dir = os.path.dirname(__file__) - template_path = os.path.join(this_dir, '..', 'manuf.tmpl') manuf_path = os.path.join(this_dir, '..', 'manuf') - header_l = [] - in_header = True ieee_d = { - 'OUI': { 'url': "https://standards-oui.ieee.org/oui/oui.csv", 'min_entries': 1000 }, - 'CID': { 'url': "https://standards-oui.ieee.org/cid/cid.csv", 'min_entries': 75 }, - 'IAB': { 'url': "https://standards-oui.ieee.org/iab/iab.csv", 'min_entries': 1000 }, - 'OUI28': { 'url': "https://standards-oui.ieee.org/oui28/mam.csv", 'min_entries': 1000 }, - 'OUI36': { 'url': "https://standards-oui.ieee.org/oui36/oui36.csv", 'min_entries': 1000 }, + 'OUI': { 'url': ["https://standards-oui.ieee.org/oui/", "oui.csv"], 'min_entries': 1000 }, + 'CID': { 'url': ["https://standards-oui.ieee.org/cid/", "cid.csv"], 'min_entries': 75 }, + 'IAB': { 'url': ["https://standards-oui.ieee.org/iab/", "iab.csv"], 'min_entries': 1000 }, + 'OUI28': { 'url': ["https://standards-oui.ieee.org/oui28/", "mam.csv"], 'min_entries': 1000 }, + 'OUI36': { 'url': ["https://standards-oui.ieee.org/oui36/", "oui36.csv"], 'min_entries': 1000 }, } oui_d = {} - hp = "[0-9a-fA-F]{2}" - manuf_re = re.compile(r'^({}:{}:{})\s+(\S.*)$'.format(hp, hp, hp)) min_total = 35000; # 35830 as of 2018-09-05 - tmpl_added = 0 total_added = 0 - # Write out the header and populate the OUI list with our entries. - - try: - tmpl_fd = io.open(template_path, 'r', encoding='UTF-8') - except Exception: - exit_msg("Couldn't open template file for reading ({}) ".format(template_path)) - for tmpl_line in tmpl_fd: - tmpl_line = tmpl_line.strip() - m = manuf_re.match(tmpl_line) - if not m and in_header: - header_l.append(tmpl_line) - elif m: - in_header = False - oui = m.group(1).upper() - oui_d[oui] = m.group(2) - tmpl_added += 1 - tmpl_fd.close() - - total_added += tmpl_added - # Add IEEE entries from each of their databases - ieee_db_l = list(ieee_d.keys()) - ieee_db_l.sort() + ieee_db_l = ['OUI', 'OUI28', 'OUI36', 'CID', 'IAB'] for db in ieee_db_l: db_url = ieee_d[db]['url'] @@ -231,10 +205,8 @@ def main(): ieee_d[db]['added'] = 0 ieee_d[db]['total'] = 0 print('Merging {} data from {}'.format(db, db_url)) - (body, response_d) = open_url(db_url) + body = open_url(db_url) ieee_csv = csv.reader(body.splitlines()) - ieee_d[db]['last-modified'] = response_d['Last-Modified'] - ieee_d[db]['length'] = response_d['Content-Length'] # Pop the title row. next(ieee_csv) @@ -247,14 +219,6 @@ def main(): manuf = html.unescape(manuf) if oui in oui_d: action = 'Skipping' - try: - manuf_stripped = re.findall('[a-z]+', manuf.lower()) - tmpl_manuf_stripped = re.findall('[a-z]+', oui_d[oui].split('\t')[-1].strip().lower()) - if manuf_stripped == tmpl_manuf_stripped: - action = 'Skipping duplicate' - except IndexError: - pass - print('{} - {} IEEE "{}" in favor of "{}"'.format(oui, action, manuf, oui_d[oui])) ieee_d[db]['skipped'] += 1 else: @@ -277,15 +241,42 @@ def main(): exit_msg("Couldn't open manuf file for reading ({}) ".format(manuf_path)) manuf_fd.write("# This file was generated by running ./tools/make-manuf.py.\n") - manuf_fd.write("# Don't change it directly, change manuf.tmpl instead.\n#\n") - manuf_fd.write('\n'.join(header_l)) + manuf_fd.write( +'''# +# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses +# +# Laurent Deniel +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# Copyright 1998 Gerald Combs +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# The data below has been assembled from the following sources: +# +# The IEEE public OUI listings available from: +# +# +# +# +# +# +# This file is in the same format as ethers(4) except that vendor names +# are truncated to eight characters when used with Wireshark, and +# that well-known MAC addresses need not have a full 6 octets and may +# have a netmask following them specifying how many bits of the address +# are relevant (the other bits are wildcards). Also, either ":", "-", +# or "." can be used to separate the octets. +# +# You can get the latest version of this file from +# https://gitlab.com/wireshark/wireshark/-/raw/master/manuf + +''') for db in ieee_db_l: manuf_fd.write( '''\ -# {url}: -# Content-Length: {length} -# Last-Modified: {last-modified} '''.format( **ieee_d[db])) @@ -296,7 +287,6 @@ def main(): manuf_fd.close() - print('{:<20}: {}'.format('Original entries', tmpl_added)) for db in ieee_d: print('{:<20}: {}'.format('IEEE ' + db + ' added', ieee_d[db]['added'])) print('{:<20}: {}'.format('Total added', total_added))