diff options
| -rw-r--r-- | epan/addr_resolv.c | 17 | ||||
| -rw-r--r-- | manuf.tmpl | 242 |
2 files changed, 132 insertions, 127 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 45014d1d09..1826321eec 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -1111,8 +1111,17 @@ parse_ether_line(char *line, ether_t *eth, unsigned int *mask, gchar *cp; - if ((cp = strchr(line, '#'))) + line = g_strstrip(line); + if (line[0] == '\0' || line[0] == '#') + return -1; + + if ((cp = strchr(line, '#'))) { + cp--; + while (g_ascii_isspace(*cp)) { + cp--; + } *cp = '\0'; + } if ((cp = strtok(line, " \t")) == NULL) return -1; @@ -1125,12 +1134,8 @@ parse_ether_line(char *line, ether_t *eth, unsigned int *mask, g_strlcpy(eth->name, cp, MAXNAMELEN); - if ((cp = strtok(NULL, "\t")) != NULL) + if ((cp = strtok(NULL, "")) != NULL) { - /* Remove access whitespace */ - while (g_ascii_isspace(*cp)) - cp++; - g_strlcpy(eth->longname, cp, MAXNAMELEN); } else { /* Make the long name the short name */ diff --git a/manuf.tmpl b/manuf.tmpl index 3ee5a3f55f..6991093d6b 100644 --- a/manuf.tmpl +++ b/manuf.tmpl @@ -61,10 +61,10 @@ 00:00:10 Hughes 00:00:11 Tektrnix 00:00:15 Datapoin Datapoint Corporation -00:00:18 WebsterC Webster Computer Corporation Appletalk/Ethernet Gateway +00:00:18 WebsterC Webster Computer Corporation # Appletalk/Ethernet Gateway 00:00:1A AMD 00:00:1B NovellNo Novell (now Eagle Technology) -00:00:1C JdrMicro JDR Microdevices generic, NE2000 drivers +00:00:1C JdrMicro JDR Microdevices # generic, NE2000 drivers 00:00:1D Cabletro Cabletron 00:00:1F Cryptall Cryptall Communications Corp. 00:00:20 DIAB @@ -77,14 +77,14 @@ 00:00:2C Nrc-Netw NRC - Network Resources Corporation - MultiGate Hub1+, Hub2, etc 00:00:32 GptReass GPT Limited (reassigned from GEC Computers Ltd) 00:00:37 OxfordMe Oxford Metrics Ltd -00:00:3B Hyundai/ Hyundai/Axil Sun clones +00:00:3B Hyundai/ Hyundai/Axil # Sun clones 00:00:3C Auspex 00:00:3D AT&T 00:00:3F Syntrex Syntrex Inc 00:00:44 Castelle 00:00:46 ISC-BR 00:00:48 Epson -00:00:49 Apricot Apricot Ltd. +00:00:49 Apricot Apricot Ltd. 00:00:4B APT 00:00:4C Nec NEC Corporation 00:00:4F Logicraf Logicraft 386-Ware P.C. Emulator @@ -92,7 +92,7 @@ 00:00:52 OpticalD Optical Data Systems 00:00:55 AT&T 00:00:58 RacoreCo Racore Computer Products Inc -00:00:5A SkSchnei SK (Schneider & Koch in Europe and Syskonnect outside of Europe) +00:00:5A SkSchnei SK # (Schneider & Koch in Europe and Syskonnect outside of Europe) 00:00:5B Eltec 00:00:5D Rce 00:00:5E USDepart U.S. Department of Defense (IANA) @@ -108,29 +108,29 @@ 00:00:6B MIPS 00:00:6D Case 00:00:6E Artisoft Artisoft, Inc. -00:00:6F MadgeNet Madge Networks Ltd. Token-ring adapters +00:00:6F MadgeNet Madge Networks Ltd. # Token-ring adapters 00:00:73 Dupont 00:00:75 BellNort Bell Northern Research (BNR) -00:00:77 Interpha Interphase [Used in other systems, e.g. MIPS, Motorola] +00:00:77 Interpha Interphase # [Used in other systems, e.g. MIPS, Motorola] 00:00:78 LabtamAu Labtam Australia -00:00:79 Networth Networth Incorporated [bought by Compaq, used in Netelligent series] +00:00:79 Networth Networth Incorporated # [bought by Compaq, used in Netelligent series] 00:00:7A Ardent 00:00:7B Research Research Machines 00:00:7D Cray 00:00:7E Netframe NetFRAME multiprocessor network servers -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 # Linotronic typesetters +00:00:80 CrayComm Cray Communications (formerly Dowty Network Services) # [Also shows as "Harris (3M) (new)" and/or "Imagen(?)" elsewhere] 00:00:81 Synoptic Synoptics 00:00:83 TadpoleT Tadpole Technology [had Optical Data Systems which is wrong according to both] 00:00:84 Aquila?A Aquila (?), ADI Systems Inc.(?) 00:00:86 GatewayC Gateway Communications Inc. (then Megahertz & now 3com) 00:00:87 Hitachi -00:00:89 CaymanSy Cayman Systems Gatorbox +00:00:89 CaymanSy Cayman Systems # Gatorbox 00:00:8A Datahous Datahouse Information Systems 00:00:8E Solbourn Solbourne(?), Jupiter(?) (I've had confirming mail on Solbourne) 00:00:92 UnisysCo Unisys, Cogent (both reported) 00:00:93 Proteon -00:00:94 AsanteMa Asante MAC +00:00:94 AsanteMa Asante # MAC 00:00:95 Sony/Tek Sony/Tektronix 00:00:97 Epoch 00:00:98 CrossCom Cross Com @@ -145,30 +145,30 @@ 00:00:A7 NCD 00:00:A8 StratusC Stratus Computer, Inc. 00:00:A9 NetSys Network Systems -00:00:AA XeroxXer Xerox Xerox machines -00:00:AC ConwareN Conware Netzpartner [had Apollo, claimed incorrect] +00:00:AA XeroxXer Xerox # Xerox machines +00:00:AC ConwareN Conware Netzpartner # [had Apollo, claimed incorrect] 00:00:AE Dassault Dassault Automatismes et Telecommunications -00:00:AF NuclearD Nuclear Data Acquisition Interface Modules (AIM) +00:00:AF NuclearD Nuclear Data # Acquisition Interface Modules (AIM) 00:00:B0 RndRadNe RND (RAD Network Devices) 00:00:B1 AlphaMic Alpha Microsystems Inc. 00:00:B3 Cimlinc 00:00:B4 Edimax -00:00:B5 Databili Datability Terminal Servers +00:00:B5 Databili Datability # Terminal Servers 00:00:B6 Micro-Ma Micro-matic Research -00:00:B7 DoveFast Dove Fastnet -00:00:BB Tri-Data TRI-DATA Systems Inc. Netway products, 3274 emulators +00:00:B7 DoveFast Dove # Fastnet +00:00:BB Tri-Data TRI-DATA Systems Inc. # Netway products, 3274 emulators 00:00:BC Allen-Br Allen-Bradley 00:00:C0 WesternD Western Digital now SMC (Std. Microsystems Corp.) 00:00:C1 Olicom Olicom A/S 00:00:C5 Farallon Farallon Computing Inc 00:00:C6 HpIntell HP Intelligent Networks Operation (formerly Eon Systems) 00:00:C8 Altos -00:00:C9 EmulexTe Emulex Terminal Servers, Print Servers +00:00:C9 EmulexTe Emulex # Terminal Servers, Print Servers 00:00:CA LancityC LANcity Cable Modems (now owned by BayNetworks) 00:00:CC Densan Densan Co., Ltd. 00:00:CD Industri Industrial Research Limited 00:00:D0 Develcon Develcon Electronics, Ltd. -00:00:D1 Adaptec Adaptec, Inc. "Nodem" product +00:00:D1 Adaptec Adaptec, Inc. # "Nodem" product 00:00:D2 Sbe SBE Inc 00:00:D3 WangLabs Wang Labs 00:00:D4 Puredata @@ -185,9 +185,9 @@ 00:00:E9 Isicad ISICAD, Inc. 00:00:ED April 00:00:EE NetworkD Network Designers Limited [also KNX Ltd, a former division] -00:00:EF AlantecN Alantec (now owned by ForeSystems) +00:00:EF AlantecN Alantec # (now owned by ForeSystems) 00:00:F0 Samsung -00:00:F2 SpiderCo Spider Communications (Montreal, not Spider Systems) +00:00:F2 SpiderCo Spider Communications # (Montreal, not Spider Systems) 00:00:F3 GandalfD Gandalf Data Ltd. - Canada 00:00:F4 AlliedTe Allied Telesis, Inc. 00:00:F6 Madge @@ -195,52 +195,52 @@ 00:00:FB RechnerZ Rechner zur Kommunikation 00:00:FD HighLeve High Level Hardware (Orion, UK) 00:00:FF CamtecEl Camtec Electronics (UK) Ltd. -00:01:02 BbnBoltB BBN (Bolt Beranek and Newman, Inc.) internal usage (not registered) +00:01:02 BbnBoltB BBN (Bolt Beranek and Newman, Inc.) # internal usage (not registered) 00:01:43 Ieee802 IEEE 802 00:01:50 Megahert Megahertz (now 3com) modem 00:01:63 NdcNatio NDC (National Datacomm Corporation) -00:01:68 W&GWande W&G (Wandel & Goltermann) [incorrect according to W&G] +00:01:68 W&GWande W&G (Wandel & Goltermann) # [incorrect according to W&G] 00:01:C8 ThomasCo Thomas Conrad Corp. 00:01:FA Compaq 00:02:04 Novell 00:02:05 Hamilton Hamilton (Sparc Clones) -00:02:16 EsiExten ESI (Extended Systems, Inc) print servers +00:02:16 EsiExten ESI (Extended Systems, Inc) # print servers 00:02:31 Axis 00:02:88 GlobalVi Global Village (PCcard in Mac portable) 00:03:C6 MorningS Morning Star Technologies Inc 00:04:00 LexmarkP Lexmark (Print Server) -00:04:AC IbmPcmci IBM PCMCIA Ethernet adapter. +00:04:AC IbmPcmci IBM # PCMCIA Ethernet adapter. 00:05:02 ApplePci Apple (PCI bus Macs) 00:05:9A Powercom PowerComputing (Mac clone) -00:05:A8 Powercom PowerComputing Mac clones -00:06:0D Hewlett- Hewlett-Packard JetDirect token-ring interfaces +00:05:A8 Powercom PowerComputing # Mac clones +00:06:0D Hewlett- Hewlett-Packard # JetDirect token-ring interfaces 00:06:29 IbmRisc6 IBM RISC6000 system 00:06:7C Cisco 00:06:C1 Cisco 00:07:01 Cisco RACAL-DATACOM -00:07:0D Cisco251 Cisco 2511 Token Ring -00:07:99 TippingPoint TippingPoint Technologies, Inc. +00:07:0D Cisco251 Cisco # 2511 Token Ring +00:07:99 TippingPoint TippingPoint Technologies, Inc. 00:08:52 Technica Technically Elite Concepts 00:08:55 Fermilab 00:08:C7 Compaq 00:10:00 CableLabs -00:10:07 CiscoSys Cisco Systems Catalyst 1900 +00:10:07 CiscoSys Cisco Systems # Catalyst 1900 00:10:0B Cisco Cisco Systems -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: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:7B Cisco Cisco Systems 00:10:83 Hp-UxE90 HP-UX E 9000/889 -00:10:A4 XircomRe Xircom RealPort 10/100 PC Card +00:10:A4 XircomRe Xircom # RealPort 10/100 PC Card 00:10:A6 Cisco -00:10:D7 ArgosyEn Argosy EN 220 Fast Ethernet PCMCIA +00:10:D7 ArgosyEn Argosy # EN 220 Fast Ethernet PCMCIA 00:10:DB Netscreen Now part of Juniper Networks 00:10:F6 Cisco 00:17:00 Kabel @@ -256,7 +256,7 @@ 00:20:28 Bloomber Bloomberg 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:35 IbmInter IBM (International Business Machines) # mainframes, Etherjet printers 00:20:36 BmcSoftw BMC Software 00:20:42 Datametr Datametrics Corp 00:20:45 Solcom SolCom Systems Limited @@ -283,7 +283,7 @@ 00:20:B9 Metricom Metricom, Inc. 00:20:C5 EagleNe2 Eagle NE2000 00:20:C6 Nectec -00:20:D0 Versalyn Versalynx Corp. "The One Port" terminal server +00:20:D0 Versalyn Versalynx Corp. # "The One Port" terminal server 00:20:D2 RadDataC RAD Data Communications Ltd 00:20:D3 OstOuetS OST (Ouet Standard Telematique) 00:20:D8 Netwave @@ -301,19 +301,19 @@ 00:40:0B Cresc 00:40:0C GeneralM General Micro Systems, Inc. 00:40:0D LannetDa LANNET Data Communications -00:40:10 SonicMac Sonic Mac Ethernet interfaces +00:40:10 SonicMac Sonic # Mac Ethernet interfaces 00:40:11 Faciliti Facilities Andover Environmental Controllers 00:40:13 NttDataC NTT Data Communication Systems Corp 00:40:14 Comsoft Comsoft Gmbh 00:40:15 Ascom 00:40:17 XcdXjet- XCd XJet - HP printer server card -00:40:1C AstPenti AST Pentium/90 PC (emulating AMD EISA card) +00:40:1C AstPenti AST # Pentium/90 PC (emulating AMD EISA card) 00:40:1F Colorgra Colorgraph Ltd 00:40:20 Pilkingt Pilkington Communication 00:40:23 Logic Logic Corporation 00:40:25 Molecula Molecular Dynamics 00:40:26 Melco Melco Inc -00:40:27 SmcMassa SMC Massachusetts [Had:Sigma (?), maybe the "S"?] +00:40:27 SmcMassa SMC Massachusetts # [Had:Sigma (?), maybe the "S"?] 00:40:28 Netcomm 00:40:2A Canoga-P Canoga-Perkins 00:40:2B Trigem @@ -332,7 +332,7 @@ 00:40:4F SpaceNav Space & Naval Warfare Systems 00:40:50 Ironics Ironics, Incorporated 00:40:52 StarTech Star Technologies Inc -00:40:53 Datum[Ba Datum [Bancomm Division] TymServe 2000 +00:40:53 Datum[Ba Datum [Bancomm Division] # TymServe 2000 00:40:54 Thinking Thinking Machines Corporation 00:40:57 Lockheed Lockheed-Sanders 00:40:59 YoshidaK Yoshida Kogyo K.K. @@ -354,20 +354,20 @@ 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 MobuisNu Mobuis # NuBus (Mac) combination video/EtherTalk 00:40:8A TpsTelep TPS Teleprocessing Sys. Gmbh 00:40:8C AxisComm Axis Communications AB 00:40:8E Cxr/Digi CXR/Digilog 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 # PC NE2000 compatible twisted-pair ethernet cards 00:40:91 ProcompI Procomp Industria Eletronica 00:40:92 AspCompu ASP Computer Products, Inc. 00:40:94 Shograph Shographics Inc -00:40:95 EagleTec Eagle Technologies [UMC also reported] +00:40:95 EagleTec Eagle Technologies # [UMC also reported] 00:40:96 Aironet Cisco Systems, Inc. 00:40:9A NetworkE Network Express Inc 00:40:9C Transwar Transware -00:40:9D Digiboar DigiBoard Ethernet-ISDN bridges +00:40:9D Digiboar DigiBoard # Ethernet-ISDN bridges 00:40:9E Concurre Concurrent Technologies Ltd. 00:40:9F Lancast/ Lancast/Casat Technology Inc 00:40:A4 RoseElec Rose Electronics @@ -414,32 +414,32 @@ 00:40:FA Microboa Microboards Inc 00:40:FB CascadeC Cascade Communications Corp. 00:40:FD Lxe -00:40:FF TelebitC Telebit Corporation Personal NetBlazer -00:48:54 DigitalS Digital SemiConductor 21143/2 based 10/100 +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:50:04 3com3c90 3com # 3C90X 00:50:0F Cisco 00:50:4D RepotecG Repotec Group -00:50:4E UmcUm900 UMC UM9008 NE2000-compatible ISA Card for PC +00:50:4E UmcUm900 UMC # UM9008 NE2000-compatible ISA Card for PC 00:50:50 Cisco 00:50:69 Pixstrea PixStream Incorporated 00:50:BD Cisco 00:50:E2 Cisco 00:55:00 Xerox -00:60:08 3com3com 3Com 3Com PCI form factor 3C905 TX board -00:60:09 CiscoCat Cisco Catalyst 5000 Ethernet switch +00:60:08 3com3com 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:2F Cisco -00:60:30 Villaget VillageTronic used on Amiga -00:60:3E Cisco100 Cisco 100Mbps interface +00:60:30 Villaget VillageTronic # used on Amiga +00:60:3E Cisco100 Cisco # 100Mbps interface 00:60:47 Cisco 00:60:4E CycleCom Cycle Computer (Sun MotherBoard Replacements) -00:60:52 RealtekR Realtek (RTL 8029 == PCI NE2000) +00:60:52 RealtekR Realtek # (RTL 8029 == PCI NE2000) 00:60:5C Cisco 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: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:60:97 3com @@ -455,12 +455,12 @@ 00:80:0D Vosswink Vosswinkel FU 00:80:0F SMC 00:80:10 Commodor Commodore -00:80:12 ImsImsFa IMS Corp. IMS failure analysis tester +00:80:12 ImsImsFa IMS Corp. # IMS failure analysis tester 00:80:13 ThomasCo Thomas Conrad Corp. 00:80:15 Seiko Seiko Systems Inc 00:80:16 WandelGo Wandel & Goltermann 00:80:17 Pfu -00:80:19 DaynaCom Dayna Communications "Etherprint" product +00:80:19 DaynaCom Dayna Communications # "Etherprint" product 00:80:1A BellAtla Bell Atlantic 00:80:1B KodiakTe Kodiak Technology 00:80:1C Cisco NEWPORT SYSTEMS SOLUTIONS @@ -471,7 +471,7 @@ 00:80:29 Microdyn Microdyne Corporation 00:80:2A TestSimu Test Systems & Simulations Inc 00:80:2C SageGrou The Sage Group PLC -00:80:2D Xylogics Xylogics, Inc. Annex terminal servers +00:80:2D Xylogics Xylogics, Inc. # Annex terminal servers 00:80:2E Plexcom Plexcom, Inc. 00:80:33 Formatio Formation (?) 00:80:34 Smt-Goup SMT-Goupil @@ -535,7 +535,7 @@ 00:80:9D Datacraf Datacraft Manufactur'g Pty Ltd 00:80:9F AlcatelB Alcatel Business Systems 00:80:A1 Microtes Microtest -00:80:A3 Lantroni Lantronix (see also 0800A3) +00:80:A3 Lantroni Lantronix # (see also 0800A3) 00:80:A6 Republic Republic Technology Inc 00:80:A7 Measurex Measurex Corp 00:80:AD Telebit @@ -546,14 +546,14 @@ 00:80:B6 Themis Themis corporation 00:80:BA Speciali Specialix (Asia) Pte Ltd 00:80:C0 PenrilDa Penril Datability Networks -00:80:C2 Ieee8021 IEEE 802.1 Committee +00:80:C2 Ieee8021 IEEE # 802.1 Committee 00:80:C6 Soho 00:80:C7 Xircom Xircom, Inc. -00:80:C8 D-LinkAl D-Link (also Solectek Pocket Adapters, and LinkSys PCMCIA) +00:80:C8 D-LinkAl D-Link # (also Solectek Pocket Adapters, and LinkSys PCMCIA) 00:80:C9 AlbertaM Alberta Microelectronic Centre 00:80:CE Broadcas Broadcast Television Systems 00:80:D0 Computer Computer Products International -00:80:D3 ShivaApp Shiva Appletalk-Ethernet interface +00:80:D3 ShivaApp Shiva # Appletalk-Ethernet interface 00:80:D4 Chase Chase Limited 00:80:D6 AppleMac Apple Mac Portable(?) 00:80:D7 FantumEl Fantum Electronics @@ -573,25 +573,25 @@ 00:80:FE AzureTec Azure Technologies Inc 00:90:04 3com 00:90:27 Intel -00:90:2B CiscoEth Cisco Ethernet Switches and Light Streams +00:90:2B CiscoEth Cisco # Ethernet Switches and Light Streams 00:90:86 Cisco 00:90:92 Cisco 00:90:AB Cisco 00:90:B1 Cisco -00:90:F2 CiscoEth Cisco Ethernet Switches and Light Streams -00:A0:00 BayNetwo Bay Networks Ethernet switch -00:A0:0C KingmaxT Kingmax Technology Inc. PCMCIA card +00:90:F2 CiscoEth Cisco # Ethernet Switches and Light Streams +00:A0:00 BayNetwo Bay Networks # Ethernet switch +00:A0:0C KingmaxT Kingmax Technology Inc. # PCMCIA card 00:A0:24 3com 00:A0:40 ApplePci Apple (PCI Mac) -00:A0:4B SonicEth Sonic Systems Inc. EtherFE 10/100 PCI for Mac or PC +00:A0:4B SonicEth Sonic Systems Inc. # EtherFE 10/100 PCI for Mac or PC 00:A0:73 Com21 00:A0:83 Intel -00:A0:92 Intermat Intermate International [LAN printer interfaces] +00:A0:92 Intermat Intermate International # [LAN printer interfaces] 00:A0:AE NetworkP Network Peripherals, Inc. 00:A0:C8 Adtran Adtran, Inc. -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:D1 National National Semiconductor [COMPAQ Docking Station] +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:D1 National National Semiconductor # [COMPAQ Docking Station] 00:A0:D2 AlliedTe Allied Telesyn 00:AA:00 Intel 00:B0:D0 Computer Computer Products International @@ -600,7 +600,7 @@ 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 # Portmaster (OEMed by Cayman) 00:C0:06 NipponAv Nippon Avionics Co Ltd 00:C0:07 Pinnacle Pinnacle Data Systems Inc 00:C0:08 SecoSrl Seco SRL @@ -610,7 +610,7 @@ 00:C0:0C ArkPcTec ARK PC Technology, Inc. 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 QnxSoftw QNX Software Systems Ltd. # [also Quantum Software Systems Ltd] 00:C0:11 Interact Interactive Computing Devices 00:C0:12 Netspan Netspan Corp 00:C0:13 Netrix @@ -622,7 +622,7 @@ 00:C0:1A Corometr Corometrics Medical Systems 00:C0:1B SocketCo Socket Communications 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. # (Cisco Catalyst also reported) 00:C0:1F SERCEL S.E.R.C.E.L. 00:C0:20 ArcoElec Arco Electronic, Control Ltd. 00:C0:21 Netexpre Netexpress @@ -677,7 +677,7 @@ 00:C0:5E Vari-Lit Vari-Lite Inc 00:C0:60 IdScandi ID Scandinavia A/S 00:C0:61 Solectek Solectek Corporation -00:C0:63 MorningS Morning Star Technologies Inc May be miswrite of 0003C6 +00:C0:63 MorningS Morning Star Technologies Inc # May be miswrite of 0003C6 00:C0:64 GeneralD General Datacomm Ind Inc 00:C0:65 ScopeCom Scope Communications Inc 00:C0:66 Docupoin Docupoint, Inc. @@ -700,7 +700,7 @@ 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:7B AscendCo Ascend Communications # ISDN bridges/routers 00:C0:7D RiscDeve RISC Developments Ltd 00:C0:7F NuponCom Nupon Computing Corp 00:C0:80 Netstar Netstar Inc @@ -807,50 +807,50 @@ 00:C0:FC Asdg ASDG Incorporated 00:C0:FD Prosum 00:C0:FF BoxHill Box Hill Systems Corporation -00:DD:00 Ungerman Ungermann-Bass IBM RT +00:DD:00 Ungerman Ungermann-Bass # IBM RT 00:DD:01 Ungerman Ungermann-Bass 00:DD:08 Ungerman Ungermann-Bass 00:E0:11 Uniden Uniden Corporation 00:E0:14 Cisco 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:18 AsustekI Asustek # Intel 82558-based Integrated Fast Ethernet for WIM 00:E0:1E Cisco 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:34 Cisco 00:E0:39 Paradyne Paradyne 7112 T1 DSU/CSU 00:E0:4F Cisco -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:7D EncoreNe Encore (Netronix?) # 10/100 PCI Fast ethernet card +00:E0:81 TyanComp Tyan Computer Corp. # Onboard Intel 82558 10/100 00:E0:83 JatoTech Jato Technologies, Inc. -00:E0:8F CiscoSys Cisco Systems Catalyst 2900 series +00:E0:8F CiscoSys Cisco Systems # Catalyst 2900 series 00:E0:98 Trend -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 +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 00:E0:C5 BcomElec BCOM Electronics Inc. 00:E0:ED NewLink New Link 00:E0:F7 Cisco 00:E0:F9 Cisco 00:E0:FE Cisco 01:0E:CF PN-MC PROFINET Multicast -02:04:06 BbnInter BBN internal usage (not registered) -02:07:01 Interlan Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco -02:20:48 Marconi At least some 2810 send with locally assigned flag set +02:04:06 BbnInter BBN # internal usage (not registered) +02:07:01 Interlan Interlan [now Racal-InterLAN] # DEC (UNIBUS or QBUS), Apollo, Cisco +02:20:48 Marconi # At least some 2810 send with locally assigned flag set 02:60:60 3com 02:60:86 Satelcom Satelcom MegaPac (UK) -02:60:8C 3comIbmP 3Com IBM PC; Imagen; Valid; Cisco; Macintosh +02:60:8C 3comIbmP 3Com # IBM PC; Imagen; Valid; Cisco; Macintosh 02:A0:C9 Intel 02:AA:3C Olivetti 02:CF:1F CMC -02:E0:3B Prominet Prominet Corporation Gigabit Ethernet Switch -02:E6:D3 BtiBus-T BTI (Bus-Tech, Inc.) IBM Mainframes -04:88:45 BayNetwo Bay Networks token ring line card +02:E0:3B Prominet Prominet Corporation # Gigabit Ethernet Switch +02:E6:D3 BtiBus-T BTI (Bus-Tech, Inc.) # IBM Mainframes +04:88:45 BayNetwo Bay Networks # token ring line card 08:00:01 Computer Computer Vision 08:00:02 3Com 08:00:03 ACC -08:00:05 Symbolic Symbolics Symbolics LISP machines -08:00:06 SiemensN Siemens Nixdorf PC clone +08:00:05 Symbolic Symbolics # Symbolics LISP machines +08:00:06 SiemensN Siemens Nixdorf # PC clone 08:00:07 Apple 08:00:08 BBN 08:00:09 HP @@ -861,7 +861,7 @@ 08:00:0F SmcStand SMC (Standard Microsystems Corp.) 08:00:10 At&T[Mis AT&T [misrepresentation of 800010?] 08:00:11 Tektroni Tektronix, Inc. -08:00:14 ExcelanB Excelan BBN Butterfly, Masscomp, Silicon Graphics +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:1A DataGenl Data General 08:00:1B DataGene Data General @@ -873,13 +873,13 @@ 08:00:25 Cdc 08:00:26 NorskDat Norsk Data (Nord) 08:00:27 PcsCompu PCS Computer Systems GmbH -08:00:28 TiExplor TI Explorer +08:00:28 TiExplor TI # Explorer 08:00:2B Dec 08:00:2E Metaphor -08:00:2F PrimeCom Prime Computer Prime 50-Series LHC300 +08:00:2F PrimeCom Prime Computer # Prime 50-Series LHC300 08:00:30 Cern 08:00:32 Tigan -08:00:36 Intergra Intergraph CAE stations +08:00:36 Intergra Intergraph # CAE stations 08:00:37 FujiXero Fuji Xerox 08:00:38 Bull 08:00:39 Spider Spider Systems @@ -894,13 +894,13 @@ 08:00:48 Eurother Eurotherm Gauging Systems 08:00:49 Univatio Univation 08:00:4C Encore -08:00:4E Bicc[3co BICC [3com bought BICC, so may appear on 3com equipment as well] +08:00:4E Bicc[3co BICC # [3com bought BICC, so may appear on 3com equipment as well] 08:00:51 Experdat Experdata 08:00:56 Stanford Stanford University 08:00:57 EvansSut Evans & Sutherland (?) -08:00:58 ???Decsy ??? DECsystem-20 +08:00:58 ???Decsy ??? # DECsystem-20 08:00:5A Ibm -08:00:66 AgfaPrin AGFA printers, phototypesetters etc. +08:00:66 AgfaPrin AGFA # printers, phototypesetters etc. 08:00:67 Comdesig Comdesign 08:00:68 Ridge 08:00:69 SGI @@ -911,16 +911,16 @@ 08:00:75 DdeDanis DDE (Danish Data Elektronik A/S) 08:00:77 TslNowRe TSL (now Retix) 08:00:79 SGI -08:00:7C Vitalink Vitalink TransLAN III +08:00:7C Vitalink Vitalink # TransLAN III 08:00:80 Xios 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:87 XyplexTe Xyplex # terminal servers 08:00:88 Mcdata McDATA Corporation -08:00:89 Kinetics Kinetics AppleTalk-Ethernet interface +08:00:89 Kinetics Kinetics # AppleTalk-Ethernet interface 08:00:8B Pyramid -08:00:8D Xyvision XyVision XyVision machines +08:00:8D Xyvision XyVision # XyVision machines 08:00:8E Tandem/S Tandem / Solbourne Computer ? 08:00:8F Chipcom Chipcom Corp. 08:00:90 Retix @@ -928,13 +928,13 @@ 10:00:5A Ibm 10:00:90 HP 10:00:D4 DEC -10:00:E0 AppleA/U Apple A/UX (modified addresses for licensing) +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!) +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? @@ -942,14 +942,14 @@ 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 +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 +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?) E2:0C:0F Kingston Kingston Technologies -EC:10:00 EnanceSo Enance Source Co., Ltd. PC clones(?) +EC:10:00 EnanceSo Enance Source Co., Ltd. # PC clones(?) |