aboutsummaryrefslogtreecommitdiffstats
path: root/manuf
AgeCommit message (Collapse)AuthorFilesLines
2017-06-18[Automatic update for 2017-06-18]Gerald Combs1-2/+27
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9a55ca147bd4e42b9caded98294597acfad99909 Reviewed-on: https://code.wireshark.org/review/22203 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-11[Automatic update for 2017-06-11]Gerald Combs1-6/+57
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia8c543f56fc9d09e78174d76144577a99359cc39 Reviewed-on: https://code.wireshark.org/review/22067 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-04[Automatic update for 2017-06-04]Gerald Combs1-0/+39
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I95d3c8d0ce5c4215730d461f00812d48fd697892 Reviewed-on: https://code.wireshark.org/review/21932 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-05-28[Automatic update for 2017-05-28]Gerald Combs1-3/+105
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Iac064b8029219fcd67a92db28a3209659113a978 Reviewed-on: https://code.wireshark.org/review/21772 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-05-21[Automatic update for 2017-05-21]Gerald Combs1-15/+66
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I4a0774a6aa3ecb101b7ca0a87571544dc936012d Reviewed-on: https://code.wireshark.org/review/21723 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-05-14[Automatic update for 2017-05-14]Gerald Combs1-1/+75
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia7833dc62cb4f4687da664b66eba6c5f31437f9a Reviewed-on: https://code.wireshark.org/review/21630 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-05-07[Automatic update for 2017-05-07]Gerald Combs1-18/+53
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Iae34b6ae74e4b6f891756732107aa1fdfa9ffa51 Reviewed-on: https://code.wireshark.org/review/21541 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-30[Automatic update for 2017-04-30]Gerald Combs1-19/+86
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I491517d8801f9b5d3d3084102ed35b418460e4b6 Reviewed-on: https://code.wireshark.org/review/21427 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-23[Automatic update for 2017-04-23]Gerald Combs1-8/+67
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: If8e6efa61c4c2808c51c585b0c61fd76a321c3fd Reviewed-on: https://code.wireshark.org/review/21298 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-16[Automatic update for 2017-04-16]Gerald Combs1-0/+58
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I8165b1b2db0f81049a88dd17163a4367f04f83cc Reviewed-on: https://code.wireshark.org/review/21142 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-09[Automatic update for 2017-04-09]Gerald Combs1-4/+38
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I147cbfa4c9cca70ad581d2e3c149473afd243086 Reviewed-on: https://code.wireshark.org/review/20978 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-02[Automatic update for 2017-04-02]Gerald Combs1-16/+79
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9e722e963dcf7437feb98a3176e6c507d86a9485 Reviewed-on: https://code.wireshark.org/review/20848 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-03-26[Automatic update for 2017-03-26]Gerald Combs1-14/+129
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I284e7960d0ad30e715a9afc42e4248f2a19f8fa7 Reviewed-on: https://code.wireshark.org/review/20716 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-03-12[Automatic update for 2017-03-12]Gerald Combs1-0/+31
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I5718e7c7df8061f81eb01973f504ebbb0cfe1e44 Reviewed-on: https://code.wireshark.org/review/20511 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-03-05[Automatic update for 2017-03-05]Gerald Combs1-3/+42
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I074b964d75082adc6ab216514c36abf3d54c6a0a Reviewed-on: https://code.wireshark.org/review/20395 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-26[Automatic update for 2017-02-26]Gerald Combs1-0/+52
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3094033ff26c1d8da5abcc22a25e4075f6bc087f Reviewed-on: https://code.wireshark.org/review/20285 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-19[Automatic update for 2017-02-19]Gerald Combs1-9/+61
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I2796bfe2a186adfe14adaf09c0fef65e765c474a Reviewed-on: https://code.wireshark.org/review/20183 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-12[Automatic update for 2017-02-12]Gerald Combs1-0/+53
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I84ecfdd35a8f2935f950f72c01a69b70a6a80c07 Reviewed-on: https://code.wireshark.org/review/20070 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-05[Automatic update for 2017-02-05]Gerald Combs1-9/+50
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic3553d0e987fc7c0eafbe42a517f46212d137edc Reviewed-on: https://code.wireshark.org/review/19959 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-29[Automatic update for 2017-01-29]Gerald Combs1-5/+46
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I4a55af48f03ec5940c2a5fd902a57c7b06ac0e37 Reviewed-on: https://code.wireshark.org/review/19839 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-22[Automatic update for 2017-01-22]Gerald Combs1-4/+90
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I75ec9ed3b0ef02d18dee79f629291e7bc1c81467 Reviewed-on: https://code.wireshark.org/review/19726 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-08[Automatic update for 2017-01-08]Gerald Combs1-3/+68
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I91668647c50e78b29bbb28f2348dc8e52c3a66c5 Reviewed-on: https://code.wireshark.org/review/19585 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-25[Automatic update for 2016-12-25]Gerald Combs1-3/+61
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I8fd8115fdfd4623bdf94602b6fd55a724e09cec3 Reviewed-on: https://code.wireshark.org/review/19429 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-18[Automatic update for 2016-12-18]Gerald Combs1-7/+52
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3c720c31d7ddfbef001bda47eca49ab4804e8e74 Reviewed-on: https://code.wireshark.org/review/19332 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-13Change spaces to tab for recent wka entriesDavid Barrera1-3/+3
Commit 66549a9cacb29abdbb2c6fdaaf8235c4f34f6a13 added 3 new entries to wka.tmpl, but used spaces instead of the default tab separator. This inconsistency causes external tools that expect tabs in the manuf file to behave unexpectedly. The manuf file was re-generated after the fix to wka.tmpl. Change-Id: I79bceac649e0fc29b3502fc2e074dcd513f29ff5 Reviewed-on: https://code.wireshark.org/review/19217 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-11[Automatic update for 2016-12-11]Gerald Combs1-0/+38
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie1a890ea3d5cfab844bc486806303e0ea4417ec3 Reviewed-on: https://code.wireshark.org/review/19203 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-04[Automatic update for 2016-12-04]Gerald Combs1-7/+94
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icad3ffb6cbd570b0b8a2c650d3c11a3c9bed536f Reviewed-on: https://code.wireshark.org/review/19066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-27[Automatic update for 2016-11-27]Gerald Combs1-3/+31
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3dae07ff98d80f02d1aaf7408e81faf6614d7058 Reviewed-on: https://code.wireshark.org/review/18964 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-20[Automatic update for 2016-11-20]Gerald Combs1-0/+40
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I037cbaa9226ddf6630ae95865da7f67920592295 Reviewed-on: https://code.wireshark.org/review/18896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-13[Automatic update for 2016-11-13]Gerald Combs1-8/+57
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I83298430701c25aaba15cc5db02603bacd6d196a Reviewed-on: https://code.wireshark.org/review/18798 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-06[Automatic update for 2016-11-06]Gerald Combs1-2/+59
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia867e3b78363ba806ab99dd8da321f5f48c279cc Reviewed-on: https://code.wireshark.org/review/18691 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-30[Automatic update for 2016-10-30]Gerald Combs1-13/+109
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I192e3989204931901b9890366860abdfddf990a4 Reviewed-on: https://code.wireshark.org/review/18577 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-16[Automatic update for 2016-10-16]Gerald Combs1-4/+43
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I016f035d04c44a68163ea0670e27fa454f4ba660 Reviewed-on: https://code.wireshark.org/review/18217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-09[Automatic update for 2016-10-09]Gerald Combs1-5/+58
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I84adcfee2652783d1b3b7d7e3ff9b209f8b23d96 Reviewed-on: https://code.wireshark.org/review/18130 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-02make-manuf: Add more sanity checks.Gerald Combs1-4554/+19841
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[Automatic update for 2016-10-02]Gerald Combs1-15279/+42
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ice97c38ca24c22c72e6bc63a4329c8131d0146f2 Reviewed-on: https://code.wireshark.org/review/18020 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-25[Automatic update for 2016-09-25]Gerald Combs1-4/+48
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie3096d67f82b93b751640e063ebe231fc235f83f Reviewed-on: https://code.wireshark.org/review/17917 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-18[Automatic update for 2016-09-18]Gerald Combs1-5/+68
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I1fb3ac4b7bd4f44dfcf7b40b28b0b2aa89ca4d3e Reviewed-on: https://code.wireshark.org/review/17778 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-11[Automatic update for 2016-09-11]Gerald Combs1-4/+45
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I29e1c1ae96c686a2c97609e939c2c35845d2d9ee Reviewed-on: https://code.wireshark.org/review/17640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
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>