Allow the "manuf" file to contain well-known MAC addresses and address

ranges specified with a mask, as well as manufacturer OUIs.  Match the
address range values, as well as MAC addresses and manufacturer OUIs,
when translating MAC addresses to names.

Have "make-manuf" read a file containing the well-known addresses and
append it to the list of OUIs.

svn path=/trunk/; revision=6233

1 files changed, 256 insertions, 15 deletions

diff --git a/manuf b/manuf
index 43e8ba5afc..e92341d5f2 100644
--- a/manuf
+++ b/manuf
@@ -1,7 +1,7 @@
 # 
-# /etc/manuf - Ethernet vendor codes 
+# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
 #
-# $Id: manuf,v 1.18 2002/08/03 23:09:24 jmayer Exp $
+# $Id: manuf,v 1.19 2002/09/09 19:38:09 guy Exp $
 #
 # Laurent Deniel <deniel@worldnet.fr>
 #
@@ -39,10 +39,12 @@
 # In the event of data set collisions the Ethereal entries have been given
 # precedence, followed by Michael Patton's, followed by the IEEE.
 #
-#
-#
 # This file is in the same format as ethers(4) except that vendor names
-# are truncated to eight characters when used with Ethereal.
+# are truncated to eight characters when used with Ethereal, 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.
 #
 
 00:00:00	00:00:00	# Officially Xerox, but 0:0:0:0:0:0 is more common
@@ -185,7 +187,7 @@
 00:00:89	Cayman
 00:00:8A	DATAHOUSE INFORMATION SYSTEMS
 00:00:8B	INFOTRON
-00:00:8C	ALLOY COMPUTER PRODUCTS, INC.
+00:00:8C	Alloy Computer Products (Australia) Pty Ltd
 00:00:8D	VERDIX CORPORATION
 00:00:8E	SOLBOURNE COMPUTER, INC.
 00:00:8F	RAYTHEON COMPANY
@@ -250,7 +252,7 @@
 00:00:CA	APPLITEK
 00:00:CB	COMPU-SHACK ELECTRONIC GMBH
 00:00:CC	DENSAN CO., LTD.
-00:00:CD	Centrecom Systems, Ltd.
+00:00:CD	Allied Telesyn Research Ltd.
 00:00:CE	MEGADATA CORP.
 00:00:CF	HAYES MICROCOMPUTER PRODUCTS
 00:00:D0	DEVELCON ELECTRONICS LTD.
@@ -908,7 +910,7 @@
 00:03:5C	Saint Song Corp.
 00:03:5D	Bosung Hi-Net Co., Ltd.
 00:03:5E	Metropolitan Area Networks, Inc.
-00:03:5F	Schuehle Mess - und. Kontrollsysteme
+00:03:5F	Prueftechnik Condition Monitoring GmbH & Co. KG
 00:03:60	PAC Interactive Technology, Inc.
 00:03:61	Widcomm, Inc.
 00:03:62	Vodtel Communications, Inc.
@@ -1395,7 +1397,7 @@
 00:05:43	IQ Wireless GmbH
 00:05:44	Valley Technologies, Inc.
 00:05:45	Internet Photonics
-00:05:46	KDD Network Systems Co., Ltd.
+00:05:46	K-Solutions Inc.
 00:05:47	Starent Networks
 00:05:48	Disco Corporation
 00:05:49	Salira Optical Network Systems
@@ -1743,7 +1745,7 @@
 00:06:9F	Kuokoa Networks
 00:06:A0	Mx Imaging
 00:06:A1	Celsian Technologies, Inc.
-00:06:A2	Transilica, Inc.
+00:06:A2	Microtune, Inc.
 00:06:A3	Bitran Corporation
 00:06:A4	INNOWELL Corp.
 00:06:A5	PINON Corp.
@@ -2790,7 +2792,7 @@
 00:0A:DD	InSciTek Microsystems, Inc.
 00:0A:DE	Happy Communication Co., Ltd.
 00:0A:DF	Gennum Corporation
-00:0A:E0	Fujitsu Software Technologies Corp
+00:0A:E0	Fujitsu Softek
 00:0A:E1	EG Technology
 00:0A:E2	Binatone Electronics International, Ltd
 00:0A:E3	YANG MEI TECHNOLOGY CO., LTD
@@ -2801,6 +2803,91 @@
 00:0A:E8	Cathay Roxus Information Technology Co. LTD
 00:0A:E9	AirVast Technology Inc.
 00:0A:EA	ADAM ELEKTRONIK LTD.STI.
+00:0A:EB	Shenzhen Tp-link Technology Co; Ltd.
+00:0A:EC	Koatsu Gas Kogyo Co., Ltd.
+00:0A:ED	HARTING Vending G.m.b.H. & CO KG
+00:0A:EE	GCD Hard- & Software GmbH
+00:0A:EF	OTRUM ASA
+00:0A:F0	SHIN-OH ELECTRONICS CO., LTD. R&D
+00:0A:F1	Clarity Design, Inc.
+00:0A:F2	NeoAxiom Corp.
+00:0A:F3	Cisco Systems
+00:0A:F4	Cisco Systems
+00:0A:F5	Airgo Networks, Inc.
+00:0A:F6	Computer Process Controls
+00:0A:F7	Broadcom Corp.
+00:0A:F8	American Telecare Inc.
+00:0A:F9	PRIVATE
+00:0A:FA	Traverse Technologies Australia
+00:0A:FB	Ambri Limited
+00:0A:FC	Core Tec Communications, LLC
+00:0A:FD	VIking Electronic Services
+00:0A:FE	NovaPal Ltd
+00:0A:FF	Kilchherr Elektronik AG
+00:0B:00	FUJIAN START COMPUTER EQUIPMENT CO.,LTD
+00:0B:01	DAIICHI ELECTRONICS CO., LTD.
+00:0B:02	Dallmeier electronic
+00:0B:03	Taekwang Industrial Co., Ltd
+00:0B:04	Volktek Corporation
+00:0B:05	Pacific Broadband Networks
+00:0B:06	Motorola BCS
+00:0B:07	Voxpath Networks
+00:0B:08	Pillar Data Systems
+00:0B:09	Ifoundry Systems Singapore
+00:0B:0A	dBm Optics
+00:0B:0B	Corrent Corporation
+00:0B:0C	Agile Systems Inc.
+00:0B:0D	Air2U, Inc.
+00:0B:0E	Trapeze Networks
+00:0B:0F	Nyquist Industrial Control BV
+00:0B:10	11wave Technonlogy Co.,Ltd
+00:0B:11	HIMEJI ABC TRADING CO.,LTD.
+00:0B:12	PRIVATE
+00:0B:13	ZETRON INC
+00:0B:14	ViewSonic Corporation
+00:0B:15	Platypus Technology
+00:0B:16	Communication Machinery Corporation
+00:0B:17	MKS Instruments
+00:0B:18	PRIVATE
+00:0B:19	Vernier Networks, Inc.
+00:0B:1A	Teltone Corporation
+00:0B:1B	Systronix, Inc.
+00:0B:1C	PRIVATE
+00:0B:1D	LayerZero Power Systems, Inc.
+00:0B:1E	KAPPA opto-electronics GmbH
+00:0B:1F	I CON Computer Co.
+00:0B:20	Hirata corporation
+00:0B:21	G-Star Communications Inc.
+00:0B:22	Environmental Systems and Services
+00:0B:23	Efficient Networks, Inc.
+00:0B:24	AirLogic
+00:0B:25	Aeluros
+00:0B:26	Wetek Corporation
+00:0B:27	Scion Corporation
+00:0B:28	Quatech Inc.
+00:0B:29	LG Industrial Systems Co.,Ltd.
+00:0B:2A	HOWTEL Co., Ltd.
+00:0B:2B	HOSTNET CORPORATION
+00:0B:2C	Eiki Industrial Co. Ltd.
+00:0B:2D	Danfoss Inc.
+00:0B:2E	Cal-Comp Electronics (Thailand) Public Company Limited Taipe
+00:0B:2F	bplan GmbH
+00:0B:30	Beijing Gongye Science & Technology Co.,Ltd
+00:0B:31	Yantai ZhiYang Scientific and technology industry CO., LTD
+00:0B:32	VORMETRIC, INC.
+00:0B:33	Vivato
+00:0B:34	ShangHai Broadband Technologies CO.LTD
+00:0B:35	Quad Bit System co., Ltd.
+00:0B:36	Productivity Systems, Inc.
+00:0B:37	MANUFACTURE DES MONTRES ROLEX SA
+00:0B:38	Knuerr AG
+00:0B:39	Keisoku Giken Co.,Ltd.
+00:0B:3A	Fortel DTV, Inc.
+00:0B:3B	devolo AG
+00:0B:3C	Cygnal Integrated Products, Inc.
+00:0B:3D	CONTAL OK Ltd.
+00:0B:3E	BittWare, Inc
+00:0B:3F	Anthology Solutions Inc.
 00:10:00	CABLE TELEVISION LABORATIES, INC.
 00:10:01	MCK COMMUNICATIONS
 00:10:02	ACTIA
@@ -3684,7 +3771,7 @@
 00:40:6F	SYNC RESEARCH INC.
 00:40:70	INTERWARE CO., LTD.
 00:40:71	ATM COMPUTER GMBH
-00:40:72	APPLIED INNOVATION, INC.
+00:40:72	Applied Innovation Inc.
 00:40:73	BASS ASSOCIATES
 00:40:74	CABLE AND WIRELESS
 00:40:75	M-TRADE (UK) LTD
@@ -4177,7 +4264,7 @@
 00:60:68	EICON TECHNOLOGY CORPORATION
 00:60:69	BROCADE COMMUNICATIONS SYSTEMS, Inc.
 00:60:6A	MITSUBISHI WIRELESS COMMUNICATIONS. INC.
-00:60:6B	AICHI ELECTRONICS CO., LTD.
+00:60:6B	Synclayer Inc.
 00:60:6C	ARESCOM
 00:60:6D	DIGITAL EQUIPMENT CORP.
 00:60:6E	DAVICOM SEMICONDUCTOR, INC.
@@ -4191,7 +4278,7 @@
 00:60:76	SCHLUMBERGER TECHNOLOGIES RETAIL PETROLEUM SYSTEMS
 00:60:77	PRISA NETWORKS
 00:60:78	POWER MEASUREMENT LTD.
-00:60:79	WAVEPHORE NETWORKS, INC.
+00:60:79	Mainstream Data, Inc.
 00:60:7A	DVS GmbH
 00:60:7B	FORE SYSTEMS, INC.
 00:60:7C	WaveAccess, Ltd.
@@ -4697,7 +4784,7 @@
 00:90:6E	PRAXON, INC.
 00:90:6F	Cisco
 00:90:70	NEO NETWORKS, INC.
-00:90:71	BADGER TECHNOLOGY, INC.
+00:90:71	Applied Innovation Inc.
 00:90:72	SIMRAD AS
 00:90:73	GAIO TECHNOLOGY
 00:90:74	ARGON NETWORKS, INC.
@@ -6124,3 +6211,157 @@ AC:DE:48	PRIVATE
 C0:00:00	Western Digital (may be reversed 00 00 C0?)
 E2:0C:0F	Kingston Technologies
 EC:10:00	Enance Source Co., Ltd.	PC clones(?)
+
+#
+# Well-known addresses.
+#
+# $Id: manuf,v 1.19 2002/09/09 19:38:09 guy Exp $
+#
+# Ethereal - Network traffic analyzer
+# By Gerald Combs <gerald@ethereal.com>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The data below has been assembled from the following sources:
+#
+# Michael Patton's "Ethernet Codes Master Page" available from:
+# <http://www.cavebear.com/CaveBear/Ethernet/>
+# <ftp://ftp.cavebear.com/pub/Ethernet.txt>
+#
+00-00-0C-07-AC/40	All-HSRP-routers
+00-00-5E-00-01/40	IETF-VRRP-virtual-router-VRID
+01-00-0C-CC-CC-CC	CDP/VTP
+01-00-0C-DD-DD-DD	CGMP
+01-00-10-00-00-20	Hughes-Lan-Systems-Terminal-Server-S/W-download
+01-00-10-FF-FF-20	Hughes-Lan-Systems-Terminal-Server-S/W-request
+01-00-1D-00-00-00	Cabletron-PC-OV-PC-discover-(on-demand)
+01-00-1D-42-00-00	Cabletron-PC-OV-Bridge-discover-(on-demand)
+01-00-1D-52-00-00	Cabletron-PC-OV-MMAC-discover-(on-demand)
+01-00-3C		Auspex-Systems-(Serverguard)
+01-00-5E-00-00-12	IETF-VRRP
+01-00-81-00-00-00	Synoptics-Network-Management
+01-00-81-00-00-02	Synoptics-Network-Management
+01-00-81-00-01-00	Bay-Networks-(Synoptics)-autodiscovery
+01-00-81-00-01-01	Bay-Networks-(Synoptics)-autodiscovery
+01-20-25/25		Control-Technology-Inc's-Industrial-Ctrl-Proto.
+01-80-24-00-00-00	Kalpana-Etherswitch-every-60-seconds
+01-80-C2-00-00-00/44	Spanning-tree-(for-bridges)
+01-80-C2-00-00-10	Bridge-Management
+01-80-C2-00-00-11	Load-Server
+01-80-C2-00-00-12	Loadable-Device
+01-80-C2-00-00-14	ISIS-all-level-1-IS's
+01-80-C2-00-00-15	ISIS-all-level-2-IS's
+01-80-C2-00-01-00	FDDI-RMT-Directed-Beacon
+01-80-C2-00-01-10	FDDI-status-report-frame
+01-DD-00-FF-FF-FF	Ungermann-Bass-boot-me-requests
+01-DD-01-00-00-00	Ungermann-Bass-Spanning-Tree
+
+#       [ The following block of addresses (03-...) are used by various ]
+#       [ standards.  Some (marked [TR?]) are suspected of only being   ]
+#       [ used on Token Ring for group addresses of Token Ring specific ]
+#       [ functions, reference ISO 8802-5:1995 aka. IEEE 802.5:1995 for ]
+#       [ some info.  These in the Ethernet order for this list.  On    ]
+#       [ Token Ring they appear reversed.  They should never appear on ]
+#       [ Ethernet.  Others, not so marked, are normal reports (may be  ]
+#       [ seen on either).
+03-00-00-00-00-01	NETBIOS-# [TR?]
+03-00-00-00-00-02	Locate-Directory-Server # [TR?]
+03-00-00-00-00-04	Synchronous-Bandwidth-Manager-# [TR?]
+03-00-00-00-00-08	Configuration-Report-Server-# [TR?]
+03-00-00-00-00-10	Ring-Error-Monitor-# [TR?]
+03-00-00-00-00-10	(OS/2-1.3-EE+Communications-Manager)
+03-00-00-00-00-20	Network-Server-Heartbeat-# [TR?]
+03-00-00-00-00-40	(OS/2-1.3-EE+Communications-Manager)
+03-00-00-00-00-80	Active-Monitor # [TR?]
+03-00-00-00-01-00	OSI-All-IS-Token-Ring-Multicast
+03-00-00-00-02-00	OSI-All-ES-Token-Ring-Multicast
+03-00-00-00-04-00	LAN-Manager # [TR?]
+03-00-00-00-08-00	Ring-Wiring-Concentrator # [TR?]
+03-00-00-00-10-00	LAN-Gateway # [TR?]
+03-00-00-00-20-00	Ring-Authorization-Server # [TR?]
+03-00-00-00-40-00	IMPL-Server # [TR?]
+03-00-00-00-80-00	Bridge # [TR?]
+03-00-00-20-00-00	IP-Token-Ring-Multicast (RFC1469)
+03-00-00-80-00-00	Discovery-Client
+03-00-FF-FF-FF-FF	All-Stations-Address
+09-00-07-00-00-00/40	AppleTalk-Zone-multicast-addresses
+			# only goes through 09-00-07-00-00-FC?
+09-00-07-FF-FF-FF	AppleTalk-broadcast-address
+09-00-09-00-00-01	HP-Probe
+09-00-09-00-00-04	HP-DTC
+09-00-0D-00-00-00/24	ICL-Oslan-Multicast
+09-00-0D-02-00-00	ICL-Oslan-Service-discover-only-on-boot
+09-00-0D-02-0A-38	ICL-Oslan-Service-discover-only-on-boot
+09-00-0D-02-0A-39	ICL-Oslan-Service-discover-only-on-boot
+09-00-0D-02-0A-3C	ICL-Oslan-Service-discover-only-on-boot
+09-00-0D-02-FF-FF	ICL-Oslan-Service-discover-only-on-boot
+09-00-0D-09-00-00	ICL-Oslan-Service-discover-as-required
+09-00-1E-00-00-00	Apollo-DOMAIN
+09-00-2B-00-00-00	DEC-MUMPS?
+09-00-2B-00-00-01	DEC-DSM/DDP
+09-00-2B-00-00-02	DEC-VAXELN?
+09-00-2B-00-00-03	DEC-Lanbridge-Traffic-Monitor-(LTM)
+09-00-2B-00-00-04	DEC-MAP-(or-OSI?)-End-System-Hello?
+09-00-2B-00-00-05	DEC-MAP-(or-OSI?)-Intermediate-System-Hello?
+09-00-2B-00-00-06	DEC-CSMA/CD-Encryption?
+09-00-2B-00-00-07	DEC-NetBios-Emulator?
+09-00-2B-00-00-0F	DEC-Local-Area-Transport-(LAT)
+09-00-2B-00-00-10/44	DEC-Experimental
+09-00-2B-01-00-00	DEC-LanBridge-Copy-packets-(All-bridges)
+09-00-2B-01-00-01	DEC-LanBridge-Hello-packets-(All-local-bridges)
+09-00-2B-02-00-00	DEC-DNA-Level-2-Routing-Layer-routers?
+09-00-2B-02-01-00	DEC-DNA-Naming-Service-Advertisement?
+09-00-2B-02-01-01	DEC-DNA-Naming-Service-Solicitation?
+09-00-2B-02-01-09	DEC-Availability-Manager-for-Distributed-Systems-DECamds
+09-00-2B-02-01-02	DEC-Distributed-Time-Service
+09-00-2B-03-00-00/32	DEC-default-filtering-by-bridges?
+09-00-2B-04-00-00	DEC-Local-Area-System-Transport-(LAST)?
+09-00-2B-23-00-00	DEC-Argonaut-Console?
+09-00-4C-00-00-00	BICC-802.1-management
+09-00-4C-00-00-02	BICC-802.1-management
+09-00-4C-00-00-06	BICC-Local-bridge-STA-802.1(D)-Rev6
+09-00-4C-00-00-0C	BICC-Remote-bridge-STA-802.1(D)-Rev8
+09-00-4C-00-00-0F	BICC-Remote-bridge-ADAPTIVE-ROUTING
+09-00-56-FF-00-00/32	Stanford-V-Kernel,-version-6.0
+09-00-6A-00-01-00	TOP-NetBIOS.
+09-00-77-00-00-00	Retix-Bridge-Local-Management-System
+09-00-77-00-00-01	Retix-spanning-tree-bridges
+09-00-77-00-00-02	Retix-Bridge-Adaptive-routing
+09-00-7C-01-00-01	Vitalink-DLS-Multicast
+09-00-7C-01-00-03	Vitalink-DLS-Inlink
+09-00-7C-01-00-04	Vitalink-DLS-and-non-DLS-Multicast
+09-00-7C-02-00-05	Vitalink-diagnostics
+09-00-7C-05-00-01	Vitalink-gateway?
+09-00-7C-05-00-02	Vitalink-Network-Validation-Message
+09-00-87-80-FF-FF	Xyplex-Terminal-Servers
+09-00-87-90-FF-FF	Xyplex-Terminal-Servers
+0D-1E-15-BA-DD-06	HP
+33-33-00-00-00-00/16	IPv6-Neighbor-Discovery
+AA-00-03-00-00-00/32	DEC-UNA	
+AA-00-03-01-00-00/32	DEC-PROM-AA
+AA-00-03-03-00-00/32	DEC-NI20
+AB-00-00-01-00-00	DEC-MOP-Dump/Load-Assistance
+AB-00-00-02-00-00	DEC-MOP-Remote-Console
+AB-00-00-03-00-00	DECNET-Phase-IV-end-node-Hello-packets
+AB-00-00-04-00-00	DECNET-Phase-IV-Router-Hello-packets
+AB-00-03-00-00-00	DEC-Local-Area-Transport-(LAT)-old
+AB-00-04-01-00-00/32	DEC-Local-Area-VAX-Cluster-groups-SCA
+CF-00-00-00-00-00	Ethernet-Configuration-Test-protocol-(Loopback)
+FF-FF-00-60-00-04	Lantastic
+FF-FF-00-40-00-01	Lantastic
+FF-FF-01-E0-00-04	Lantastic
+
+FF-FF-FF-FF-FF-FF	Broadcast