aboutsummaryrefslogtreecommitdiffstats
path: root/manuf
AgeCommit message (Collapse)AuthorFilesLines
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>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 04:25:09 +0000