summaryrefslogtreecommitdiff
path: root/manuf.tmpl
AgeCommit message (Collapse)AuthorFilesLines
2017-06-20Manuf: Konica Minolta updates.Gerald Combs1-2/+1
Correct a couple of entries related to Konica Minolta. Change-Id: I3acea1cf7ab1ad9be5d1b367a1015f5205b9e80b Reviewed-on: https://code.wireshark.org/review/22268 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-22Merge the CaveBear list into manuf.tmpl.Gerald Combs1-33/+880
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>
2014-04-21Add short name for CableLabs.Philip Rosenberg-Watt1-0/+1
Change-Id: I474c03a1a40586a14cdec2196ee3ebc89eedd8ab Reviewed-on: https://code.wireshark.org/review/1236 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-21Update the "latest version" URL in manuf/manuf.tmpl.Gerald Combs1-1/+1
Regenerate manuf. I *really* wish Gitweb URLs were less ugly. Change-Id: I51eabe1a028999859499466a9369106f465dec80 Reviewed-on: https://code.wireshark.org/review/300 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2013-03-26From Hadriel Kaplan:Jaap Keuter1-4/+4
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
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2008-10-08Update some comments.Gerald Combs1-1/+3
svn path=/trunk/; revision=26384
2007-07-31add PROFINET Multicast OUI 01:0E:CF (in addition to the unicast 00:0E:CF)Ulf Lamping1-0/+1
svn path=/trunk/; revision=22433
2006-12-05Update to current IEEE and remove fixed entry for 00-06-0D (bug 1256)Jörg Mayer1-1/+0
svn path=/trunk/; revision=20048
2006-06-17ethereal to wiresharkRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=18502
2006-05-31Rename the main executable to "wireshark", along with more conversions:Gerald Combs1-1/+1
ethereal.com -> wireshark.org mailing lists and addresses ETHEREAL -> WIRESHARK Man pages Automake/Autoconf names svn path=/trunk/; revision=18271
2006-05-22ethereal->wiresharkRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=18207
2006-05-22ethereal->wireshark updatesRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=18206
2006-05-21name changeRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=18197
2005-12-09Whitespace changeJörg Mayer1-1/+1
svn path=/trunk/; revision=16740
2005-11-16Graeme Hewson: Continue to use the old Netscreen name - it makes itJörg Mayer1-0/+1
easier to identify the Juniper firewall products. svn path=/trunk/; revision=16513
2005-08-27Rename Cisco (00:40:96) back to AironetJörg Mayer1-1/+3
svn path=/trunk/; revision=15565
2005-03-16IEEE is correct about 00:00:39Jörg Mayer1-1/+0
svn path=/trunk/; revision=13767
2005-03-06- Modify make-manuf to add a message to manuf how to modify itJörg Mayer1-2/+0
(aka: don't modify manuf, change manuf.tmpl and wka.tmpl instead) - Remove OUI 08:00:0F from manuf.tmpl, the IEEE provides the correct value by now. - Regenerate manuf svn path=/trunk/; revision=13608
2004-12-20At least in some cases some Marconi 2810 send packets withJörg Mayer1-0/+1
the locally assigned flag set. Update manuf, while I'm at it. svn path=/trunk/; revision=12789
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2003-04-29Tiny updateJörg Mayer1-2/+1
svn path=/trunk/; revision=7606
2003-04-25Obscure email addresses and update entries.Gerald Combs1-3/+3
svn path=/trunk/; revision=7558
2003-04-13make-manuf:Jörg Mayer1-92/+2
Don't print Cavebear skipped - it makes the output unusable. manuf.tmpl: Remove entries that overwrite identical or similar results from IEEE manuf: Rebuild to reflect the changes in manuf.tmpl and add some new IEEE entries. svn path=/trunk/; revision=7447
2003-04-08make-manuf:Jörg Mayer1-176/+3
Sometimes printed a \n too much manuf.tmpl: Remove most manual Mappings to Cisco because that's what gets used anyway (all except Racal and Newpoint) manuf: Update to represent changes in make-manuf, manuf.tmpl and IEEE svn path=/trunk/; revision=7422
2003-03-05Remove 00:40:96 from manuf.tmpl (Aironet, Ciron).Jörg Mayer1-3/+1
svn path=/trunk/; revision=7288
2003-01-26Update my email address in various places since my old one no longer worksLaurent Deniel1-2/+2
svn path=/trunk/; revision=7003
2002-12-12Remove an errant space from the name "TippingPoint Technologies, Inc."Gerald Combs1-1/+2
svn path=/trunk/; revision=6782
2002-09-09Allow the "manuf" file to contain well-known MAC addresses and addressGuy Harris1-5/+7
ranges specified with a mask, as well as manufacturer OUIs. Match the address range values, as well as MAC addresses and manufacturer OUIs, when translating MAC addresses to names. Have "make-manuf" read a file containing the well-known addresses and append it to the list of OUIs. svn path=/trunk/; revision=6233
2002-08-03I still have to see a case when a MAC address starting with 0:0:0Jörg Mayer1-1/+2
actually means Xerox, but 0:0:0:0:0:0 can be found quite often. svn path=/trunk/; revision=5934
2002-03-14From Andrew Feren: put all of Cisco's OUIs into manuf.tmpl.Guy Harris1-1/+147
svn path=/trunk/; revision=4945
2002-01-30manuf: Periodic updates from "make-manuf".Gerald Combs1-1/+2
manuf.tmpl: Update 00:B0:D0 as per http://www.ethereal.com/lists/ethereal-cvs/200201/msg00048.html so that make-manuf won't clobber the fix. svn path=/trunk/; revision=4633
2001-10-07From Joerg Mayer: a patch to add 00:40:96 as an OUI for Aironet wirelessGuy Harris1-5/+3
devices (which are now Cisco wireless devices, as Cisco bought Aironet). This overrides the out-of-date assignment of 00:40:96 to Telesystems SLW in the cavebear.com file (Telesystems SLW were bought by Telxon, who then apparently spun off their RF division, plus Telesystems, as Aironet). svn path=/trunk/; revision=4006
2000-11-26Credit Michael Patton and the IEEE in the document header. Add URLs to theGerald Combs1-2/+17
IEEE data (Michael's was already there). svn path=/trunk/; revision=2701
2000-11-23Add make-manuf, a script that:Gerald Combs1-0/+209
- Reads our current 'manuf' file header and contents - Fetches OUI information from the IEEE and CaveBear - Merges the OUI information, with our entries taking precedence, then CaveBear's, then the IEEE. - Dumps eveything into the 'manuf' file. svn path=/trunk/; revision=2700
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-05 10:27:01 +0000