Commit graph

18 commits

Author SHA1 Message Date
Michael Mann
274bbd5fab Extract the "long name" out of the manuf file and use it for some resolution
Some places (like MAC resolution) want to keep a fixed length, but for places
that want to display "full organization name", save the long name that is
treated as a comment in the manuf file.

Have make-manuf convert companies with all caps to mixed case so we're not
screaming the company name at the user.

Convert the manuf.tmpl to be tab delimited without a comment for the "long name"
so it can match the format now created by make-manuf.

Remove uint_get_manuf_name as it was unnecessary.

Bug: 3666
Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b
Reviewed-on: https://code.wireshark.org/review/23150
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-24 05:00:06 +00:00
João Valverde
14d94e174a Put the well-known addresses into a separate file from OUIs
Having two distinct logical concepts (OUI and Well Known Address)
concatenated to a single "manuf" file is needlessly obfuscating
the WKA feature.

Have a distinct "wka" file instead and just skip the cat.

Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8
Reviewed-on: https://code.wireshark.org/review/22742
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-23 17:14:19 +00:00
Brandon Enochs
1b02cb9b70 Added IEEE CID support to the make-manuf script. These prefixes are commonly used in IEEE 802.11 MAC address randomization.
Change-Id: I94ed29d31c81df0e4f514d7c354073182c116f75
Reviewed-on: https://code.wireshark.org/review/21737
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25 23:14:10 +00:00
Gerald Combs
7a6610fc99 make-manuf: Add more sanity checks.
Increase the number of minimum entries required in each IAB / OUI file
to 1000. Add a minimum total entry count. Add total counts to the
output. Trim whitespace so that we pass the pre-commit hook.

Re-run make-manuf to fix the mass removal in g3ab0137.

Change-Id: I6f924969c1b494f2e0b62570a459e99ba5c1b02f
Reviewed-on: https://code.wireshark.org/review/18030
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-02 19:05:46 +00:00
Gerald Combs
f062341540 Merge the CaveBear list into manuf.tmpl.
If the following lines at the top of "Ethernet.txt" are anything to go
by

----
$Revision: 2.83 $
$Date: 1999/03/09 11:36:19 $
$Author: map $
$Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $
----

we've been fetching the same list over and over for quite some time.  Go
ahead and merge the CaveBear list with manuf.tmpl and stop fetching it
remotely.

Fixup the way we split the lines we get from the IEEE while we're here,
otherwise we log carriage returns in the middle of lines.

The following CaveBear lines were skipped during the merge:

Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c
00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes"
00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix"
00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD"
00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB"
00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C"
00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom"
00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T"
00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR"
00:00:4B - Skipping CaveBear "APT	-ICL also reported" in favor of "APT"
00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T"
00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei               # SK	(Schneider & Koch in Europe and Syskonnect outside of Europe)"
00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell	# Honeywell"
00:00:63 - Skipping CaveBear "Hewlett-Packard		LanProbe" in favor of "HP"
00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI"
00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS"
00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent"
00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc		[Also Harris (3M) (old)]" in favor of "Cray"
00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT"
00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC"
00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD)	X-terminals" in favor of "NCD"
00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys		# Network Systems"
00:00:DD - Skipping CaveBear "Gould" in favor of "Gould"
00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph"
00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi"
00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge"
00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq"
00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell"
00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco		# RACAL-DATACOM"
00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com"
00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc"
00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet		# Cisco Systems, Inc."
00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP"
00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC"
00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco		# NEWPORT SYSTEMS SOLUTIONS"
00:80:96 - Skipping CaveBear "HDS (Human Designed Systems)	X terminals" in favor of "HDS"
00:80:AD - Skipping CaveBear "CNet Technology			Used by Telebit (among others)" in favor of "Telebit"
00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco"
00:E0:98 - Skipping CaveBear "Linksys				PCMCIA card" in favor of "Trend"
02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan               # Interlan [now Racal-InterLAN]	DEC (UNIBUS or QBUS), Apollo, Cisco"
02:CF:1F - Skipping CaveBear "CMC				Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC"
08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com"
08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC"
08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN"
08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP"
08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl	# Data General"
08:00:38 - Skipping CaveBear "Bull" in favor of "Bull"
08:00:3E - Skipping CaveBear "Motorola			VME bus processor modules" in favor of "Motorola"
08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI"
08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI"
08:00:90 - Skipping CaveBear "Retix, Inc.			Bridges" in favor of "Retix"
09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T"
10:00:90 - Skipping CaveBear "Hewlett-Packard			Advisor products" in favor of "HP"
10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC"
3C:00:00 - Skipping CaveBear "3Com				dual function (V.34 modem + Ethernet) card" in favor of "3Com"
44:45:53 - Skipping CaveBear "Microsoft			(Windows95 internal "adapters")" in favor of "Microsoft"
Reviewed-on: https://code.wireshark.org/review/17212
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-22 04:46:52 +00:00
Gerald Combs
71398e26f7 Add OUI-28 to make-manuf.
Change-Id: I95b9a4422dab6efbc2d94be49aba5f42784ff3e8
Reviewed-on: https://code.wireshark.org/review/11064
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16 18:43:20 +00:00
Jeff Morriss
82e2865739 Remove $Id$ and other Subversion leftovers from the tools.
There are a few things in here which could still use attention.

Don't regenerate anything now.

Change-Id: I283c224d3523212144707fca3d6265916cb11792
Reviewed-on: https://code.wireshark.org/review/205
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-14 01:35:57 +00:00
Gerald Combs
870635c248 The IEEE OUI, IAB, and OUI-36 lists currently redirect to
http://standards.ieee.org/regauthmaint.html, which says

IEEE Registration Authority Services will be unavailable from Friday, December 27th through Monday, December 30th

As a result the manuf file got clobbered. Revert the manuf file to
its non-clobbered state and add sanity checks to make-manuf. Add a
note about the impending addition of OUI-28.

svn path=/trunk/; revision=54485
2013-12-29 17:28:12 +00:00
Gerald Combs
d75dbf9aff Fix a typo.
svn path=/trunk/; revision=48865
2013-04-15 23:16:20 +00:00
Gerald Combs
3954ab4c69 More indentation fixes.
svn path=/trunk/; revision=48864
2013-04-15 23:04:16 +00:00
Gerald Combs
cd7796a6ef Handle the IEEE's new! improved! two-space indentation.
svn path=/trunk/; revision=48856
2013-04-15 19:10:15 +00:00
Jaap Keuter
ae85ba7c58 From Hadriel Kaplan:
The 'make-manuf'perl script gets the IEEE 22-bit OUI and IAB registries, but not OUI-36.
patch to get the OUI-36 listings.

From me:
Update header text in template to list the sources actually used.

svn path=/trunk/; revision=48572
2013-03-26 21:53:09 +00:00
Gerald Combs
d5b3acebd1 Send a useful User-Agent header.
svn path=/trunk/; revision=42522
2012-05-09 19:17:48 +00:00
Gerald Combs
ed76c1bd38 Switch to UTF-8 for remote encodings to match what the IEEE SA is
almost-but-not-quite sending. Add a link to a page with common character 
encoding errors.

svn path=/trunk/; revision=42363
2012-04-30 21:32:51 +00:00
Gerald Combs
01c4764ea2 Update the IEEE OUI and IAB URLs.
svn path=/trunk/; revision=42349
2012-04-30 15:40:39 +00:00
Gerald Combs
959135b215 Enable proxies in make-manuf and make-sminmpec.pl as well.
svn path=/trunk/; revision=38864
2011-09-02 16:07:36 +00:00
Chris Maynard
aade2d70af Update cavebear link.
svn path=/trunk/; revision=38378
2011-08-06 15:05:08 +00:00
Gerald Combs
0bf5fcd6b3 Move make-manuf to the tools directory.
svn path=/trunk/; revision=35130
2010-12-06 18:30:14 +00:00
Renamed from make-manuf (Browse further)