summaryrefslogtreecommitdiff
path: root/manuf
AgeCommit message (Collapse)AuthorFilesLines
2016-09-04[Automatic update for 2016-09-04]Gerald Combs1-8/+66
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I11d066907492642f5baaa38a79b8bcd086a579c4 Reviewed-on: https://code.wireshark.org/review/17484 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-28[Automatic update for 2016-08-28]Gerald Combs1-10/+71
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic4d32253800cb94d52c817f1cd40179d878323cb Reviewed-on: https://code.wireshark.org/review/17358 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-22Merge the CaveBear list into manuf.tmpl.Gerald Combs1-4782/+4833
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-14[Automatic update for 2016-08-14]Gerald Combs1-11/+54
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: If8420fce59c29f34d667fde83513030703600aba Reviewed-on: https://code.wireshark.org/review/17049 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-07[Automatic update for 2016-08-07]Gerald Combs1-3/+62
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I538e387ddbd546f62fd73381fc068b09dad61822 Reviewed-on: https://code.wireshark.org/review/16941 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-31[Automatic update for 2016-07-31]Gerald Combs1-4/+41
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia414edeaf04efafd0b5eb2e899dbc69d5b42f07d Reviewed-on: https://code.wireshark.org/review/16807 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-24[Automatic update for 2016-07-24]Gerald Combs1-7/+46
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9a88b1d2ac3fd54cd2b7bfbb652ba504db81df65 Reviewed-on: https://code.wireshark.org/review/16626 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-17[Automatic update for 2016-07-17]Gerald Combs1-2/+49
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I0ca539cf81e1708a6ea8eafbdf91488086e9ee2d Reviewed-on: https://code.wireshark.org/review/16513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-10[Automatic update for 2016-07-10]Gerald Combs1-15/+80
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9d1c7b06a449a3b0dc02dd99f33c4e7634e2d1c0 Reviewed-on: https://code.wireshark.org/review/16368 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-03[Automatic update for 2016-07-03]Gerald Combs1-5/+66
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie8e9bf51a9c25c6693597ba1109c221a111e3b58 Reviewed-on: https://code.wireshark.org/review/16264 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-26[Automatic update for 2016-06-26]Gerald Combs1-1/+57
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id5cc1bbd3d7f899e48ae9c2de48613ef0366cc29 Reviewed-on: https://code.wireshark.org/review/16142 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-19[Automatic update for 2016-06-19]Gerald Combs1-2/+36
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Idd2d53a32188f2e607351da874b1a68a4811ed57 Reviewed-on: https://code.wireshark.org/review/16014 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-12[Automatic update for 2016-06-12]Gerald Combs1-61/+109
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I14deff6b9a13a51d66ebdea361686822583b07c0 Reviewed-on: https://code.wireshark.org/review/15843 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-06Fix a mac collision in wka.tmpl.Joerg Mayer1-0/+6
Change-Id: Ic85f552f6f8bf094c03c613d9068abfccbec0597 Reviewed-on: https://code.wireshark.org/review/15753 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-05[Automatic update for 2016-06-05]Gerald Combs1-1/+40
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I2048c007b7700f1074caed6b0c208aabcb525ed8 Reviewed-on: https://code.wireshark.org/review/15733 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-29[Automatic update for 2016-05-29]Gerald Combs1-147/+201
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id13bada7b6b5e5c9e697967e22c687d2f64e5329 Reviewed-on: https://code.wireshark.org/review/15605 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-22[Automatic update for 2016-05-22]Gerald Combs1-27/+74
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I6ac498e507c71fd917eb0cfc3c4330a4c0ffcb64 Reviewed-on: https://code.wireshark.org/review/15527 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-15[Automatic update for 2016-05-15]Gerald Combs1-4/+53
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I877a3018c81dc557453bf1e423c84578da47d74b Reviewed-on: https://code.wireshark.org/review/15429 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-07manuf: Add well-known MAC entries for DOCSIS and regenerate fileDominic Chen1-2/+52
DOCSIS has a few well-known MAC entries defined in ANSI SCTE 22-1 with the prefix 01-E0-2F. Currently, this gets munged by manuf_name_lookup() to 00-E0-2F and the vendor "McnsHold", which is incorrect. Change-Id: Ib5888d2545fcfbcadf4dd918dd2639de8f7b81b4 Reviewed-on: https://code.wireshark.org/review/15278 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-01[Automatic update for 2016-05-01]Gerald Combs1-71/+129
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icfa09469ffc84943f9e54eae10f60001a3790694 Reviewed-on: https://code.wireshark.org/review/15206 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-24[Automatic update for 2016-04-24]Gerald Combs1-115/+171
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id3a7e3cf248df0c1c0159b4bf1d1a01e3f83efb9 Reviewed-on: https://code.wireshark.org/review/15074 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-17[Automatic update for 2016-04-17]Gerald Combs1-54/+109
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3e8de1dcb6cc8fbbe04a68a6488bc8c11d353972 Reviewed-on: https://code.wireshark.org/review/14951 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-10[Automatic update for 2016-04-10]Gerald Combs1-107/+158
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ibb63f9cb5cacb3b25f2038912a53d170be9cdaee Reviewed-on: https://code.wireshark.org/review/14876 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-03[Automatic update for 2016-04-03]Gerald Combs1-23/+67
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I454d61dea623c65dbe425c8ad3f354452ce0c6a5 Reviewed-on: https://code.wireshark.org/review/14793 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-27[Automatic update for 2016-03-27]Gerald Combs1-32/+99
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I19f4ffca89acbd207cafe1f29f14aba293b068f4 Reviewed-on: https://code.wireshark.org/review/14650 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-20[Automatic update for 2016-03-20]Gerald Combs1-4/+50
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I1c1b5c902782d9250eab3341ff56e09f79c4c0e3 Reviewed-on: https://code.wireshark.org/review/14532 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-13[Automatic update for 2016-03-13]Gerald Combs1-4/+51
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id764cddac44715977f4abbd1f55bfc961a1973a4 Reviewed-on: https://code.wireshark.org/review/14443 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-06[Automatic update for 2016-03-06]Gerald Combs1-3/+107
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ibd8571b495bc8170a5f77f7461d86a9a02c8b0b4 Reviewed-on: https://code.wireshark.org/review/14364 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-21[Automatic update for 2016-02-21]Gerald Combs1-124/+389
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I80f7d5b45ef26dc4fb1ca34d549acfb2c0a54bcf Reviewed-on: https://code.wireshark.org/review/14054 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-10[Automatic update for 2016-01-10]Gerald Combs1-18/+80
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I2087677da0b09293ff156e39acbdbab8486262f4 Reviewed-on: https://code.wireshark.org/review/13167 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-27[Automatic update for 2015-12-27]Gerald Combs1-0/+37
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ib19b36e9bc2d5c8cdbbeb3291b32f4291e619851 Reviewed-on: https://code.wireshark.org/review/12876 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-20[Automatic update for 2015-12-20]Gerald Combs1-3/+57
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I888e6e56894ab3226ad32e8f1d5e3d351cfcd8d8 Reviewed-on: https://code.wireshark.org/review/12747 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-13[Automatic update for 2015-12-13]Gerald Combs1-1/+38
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I690eec9b47df9bbc770773f8c7a8e1c4b4ef5415 Reviewed-on: https://code.wireshark.org/review/12588 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-06[Automatic update for 2015-12-06]Gerald Combs1-3/+69
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I70fd3f5a9f8f53ea6a086b521c8f05d33815516f Reviewed-on: https://code.wireshark.org/review/12450 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-29[Automatic update for 2015-11-29]Gerald Combs1-23/+145
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id342a0bfe0bea352813c19adae67fb41806eb7d3 Reviewed-on: https://code.wireshark.org/review/12284 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-15[Automatic update for 2015-11-15]Gerald Combs1-145/+216
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I7a2eaecb6f24992cb3023919c8bd8af2c15192c3 Reviewed-on: https://code.wireshark.org/review/11838 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-01[Automatic update for 2015-11-01]Gerald Combs1-210/+296
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I2ed2f09a178a8c4a455d0ad8be90cf79d235e621 Reviewed-on: https://code.wireshark.org/review/11477 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-25[Automatic update for 2015-10-25]Gerald Combs1-1/+16
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I84cf4d6acbcadc10c3d0f404cdcc7024ddee6ec5 Reviewed-on: https://code.wireshark.org/review/11264 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-18[Automatic update for 2015-10-18]Gerald Combs1-142/+170
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I717ca04b801731df4433ed94f285b33ccb4d15c1 Reviewed-on: https://code.wireshark.org/review/11129 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16Add OUI-28 to make-manuf.Gerald Combs1-26/+801
Change-Id: I95b9a4422dab6efbc2d94be49aba5f42784ff3e8 Reviewed-on: https://code.wireshark.org/review/11064 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-11[Automatic update for 2015-10-11]Gerald Combs1-202/+220
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic021a6b14deb368b9b6ee77995291c92de75426d Reviewed-on: https://code.wireshark.org/review/10936 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-04[Automatic update for 2015-10-04]Gerald Combs1-17/+43
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ieb909c2aea62525b763cab6765704093c7fea706 Reviewed-on: https://code.wireshark.org/review/10782 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-27[Automatic update for 2015-09-27]Gerald Combs1-22/+90
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia290c7a187630547265bfd014c18e2523a36842b Reviewed-on: https://code.wireshark.org/review/10660 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-20[Automatic update for 2015-09-20]Gerald Combs1-9/+30
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ifcdb1c02406189085bda58bc7db10829e3fae2c0 Reviewed-on: https://code.wireshark.org/review/10580 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-13[Automatic update for 2015-09-13]Gerald Combs1-1/+31
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I0c7a8d1ad41d5509c35f110aa50b7b86aa5a73c4 Reviewed-on: https://code.wireshark.org/review/10514 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-06[Automatic update for 2015-09-06]Gerald Combs1-1461/+1510
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: If1cc31f1cd036c536a8a8bb9d9094bdb7c9f6f07 Reviewed-on: https://code.wireshark.org/review/10403 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-30[Automatic update for 2015-08-30]Gerald Combs1-8265/+8372
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I37400bf1fac15fcd5f2946913b96184b1828f091 Reviewed-on: https://code.wireshark.org/review/10317 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-16[Automatic update for 2015-08-16]Gerald Combs1-1/+34
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Idb8a2cff075a1ffe5e3cd1d6f4d3fb1b6c357cdb Reviewed-on: https://code.wireshark.org/review/10055 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-09[Automatic update for 2015-08-09]Gerald Combs1-3/+28
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I14806e32e93b7f189ccc68834afa4645bda3e1aa Reviewed-on: https://code.wireshark.org/review/9942 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-02[Automatic update for 2015-08-02]Gerald Combs1-2/+38
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I1c6b1044870e93459bcf4743f00be68ff8ce8ff6 Reviewed-on: https://code.wireshark.org/review/9851 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-20 17:01:51 +0000