aboutsummaryrefslogtreecommitdiffstats
path: root/manuf
AgeCommit message (Collapse)AuthorFilesLines
2018-05-13[Automatic update for 2018-05-13]Gerald Combs1-10/+61
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Icf753ad9d075f2dd0688f0f58ce73d5e283dc10c Reviewed-on: https://code.wireshark.org/review/27486 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-06[Automatic update for 2018-05-06]Gerald Combs1-2/+44
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Idea7c88121649417e332099b0cb71042c809735a Reviewed-on: https://code.wireshark.org/review/27372 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-29[Automatic update for 2018-04-29]Gerald Combs1-16/+58
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I9a2b34c7c2b9749d779f43bbe4fda15150ca2dfc Reviewed-on: https://code.wireshark.org/review/27199 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-22[Automatic update for 2018-04-22]Gerald Combs1-14/+69
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I0769900c468b88eb19304e697d2faecddaeb4b11 Reviewed-on: https://code.wireshark.org/review/27072 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-15[Automatic update for 2018-04-15]Gerald Combs1-5/+60
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I50b0c7211bfde3e0a17b4580e18fa423ab8fbdf1 Reviewed-on: https://code.wireshark.org/review/26953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-08[Automatic update for 2018-04-08]Gerald Combs1-3/+43
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I85850833928dcf94e44957943c55126369c20905 Reviewed-on: https://code.wireshark.org/review/26799 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-06manuf: Overwrite entry for OUI 08:00:30Adam Wujek1-1/+1
In the official file with OUIs (http://standards-oui.ieee.org/oui/oui.txt or https://regauth.standards.ieee.org/standards-ra-web/pub/view.html) there are 3 organizations/companies assigned to the same OUI: -CERN -NETWORK RESEARCH CORPORATION -ROYAL MELBOURNE INST OF TECH Bug: 14578 Change-Id: Iac609c88a9c7d0fa2198489e694b24668b4d023a Signed-off-by: Adam Wujek <adam.wujek@cern.ch> Reviewed-on: https://code.wireshark.org/review/26750 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-01[Automatic update for 2018-04-01]Gerald Combs1-6/+45
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I0db4c4cd78549ffca3f55a94de5279c7ad131647 Reviewed-on: https://code.wireshark.org/review/26699 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-25[Automatic update for 2018-03-25]Gerald Combs1-0/+35
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie7d9f2b00222e5ed4e05b5c3fc9100ad26e65084 Reviewed-on: https://code.wireshark.org/review/26635 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-18[Automatic update for 2018-03-18]Gerald Combs1-62/+120
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I9424882cb781156d38c634b91defcd45cd3f4743 Reviewed-on: https://code.wireshark.org/review/26528 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-11[Automatic update for 2018-03-11]Gerald Combs1-3/+40
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Iac7e2b50ed60639dde90946632811753288110d6 Reviewed-on: https://code.wireshark.org/review/26421 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-07More licenses converted to SPDX.Dario Lombardo1-13/+1
Change-Id: Id4f987dcdacf06622d70263f4659a4400e30dc39 Reviewed-on: https://code.wireshark.org/review/26332 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-04[Automatic update for 2018-03-04]Gerald Combs1-1/+54
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I95feebf818e68804d287e011f4c6ee2cd244b2f3 Reviewed-on: https://code.wireshark.org/review/26254 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-25[Automatic update for 2018-02-25]Gerald Combs1-15/+42
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I543fa77cb9f26353fe3ea64f5e236d540d971a90 Reviewed-on: https://code.wireshark.org/review/26091 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-18[Automatic update for 2018-02-18]Gerald Combs1-28/+76
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I5b5b729c83aa7017454b7c7d8230415e1834587f Reviewed-on: https://code.wireshark.org/review/25862 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-11[Automatic update for 2018-02-11]Gerald Combs1-0/+61
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I1d8d8ecda65cb10240b7897399b32fb2c173003f Reviewed-on: https://code.wireshark.org/review/25727 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-04[Automatic update for 2018-02-04]Gerald Combs1-6/+55
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I66df4a62ae7fb7c986130fec01359ebb7b00d71f Reviewed-on: https://code.wireshark.org/review/25590 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-28[Automatic update for 2018-01-28]Gerald Combs1-2/+48
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I0b47c83ca6e62a24043fb5d546141e3e9af1e7b8 Reviewed-on: https://code.wireshark.org/review/25493 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-21[Automatic update for 2018-01-21]Gerald Combs1-3/+60
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I60c7bef36988fd487d9088880b1d27818723f0b7 Reviewed-on: https://code.wireshark.org/review/25404 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-14[Automatic update for 2018-01-14]Gerald Combs1-16/+326
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie096b93a5c9476d763fb6677d0d9ab54c3c4744c Reviewed-on: https://code.wireshark.org/review/25306 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-07[Automatic update for 2018-01-07]Gerald Combs1-224/+10
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I65801bc1440f64c28ee003e23be2ca528bc1adc8 Reviewed-on: https://code.wireshark.org/review/25178 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-31[Automatic update for 2017-12-31]Gerald Combs1-4/+60
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I38b0274b93baf3e2d307827f04960f4bf7407842 Reviewed-on: https://code.wireshark.org/review/25080 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-24[Automatic update for 2017-12-24]Gerald Combs1-29/+135
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ia4acffe0372de93476cb677b1859509cec39216a Reviewed-on: https://code.wireshark.org/review/24974 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-17[Automatic update for 2017-12-17]Gerald Combs1-26/+23
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ideac9831381dbf6411af0e1d8bfa4fef6a1d7769 Reviewed-on: https://code.wireshark.org/review/24867 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-10[Automatic update for 2017-12-10]Gerald Combs1-0/+50
Update manuf, services enterprise numbers, translations, and other items. Change-Id: If3becbd6b66f0a7a49a80c4ff2dc2a2a6015fa16 Reviewed-on: https://code.wireshark.org/review/24752 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-03[Automatic update for 2017-12-03]Gerald Combs1-5/+64
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I4a3a5f62e5024a4df19c12296ddd67012c9ff5c7 Reviewed-on: https://code.wireshark.org/review/24683 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-26[Automatic update for 2017-11-26]Gerald Combs1-9/+47
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I2963633f86a87209eca574db52663ebbe732f9d9 Reviewed-on: https://code.wireshark.org/review/24590 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-19[Automatic update for 2017-11-19]Gerald Combs1-2/+52
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I52c4830ef81733156fa4ce0de65330c8aacd8932 Reviewed-on: https://code.wireshark.org/review/24487 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-12[Automatic update for 2017-11-12]Gerald Combs1-1/+47
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I18adb8aceae2a8962697284087d43e3b30d133f1 Reviewed-on: https://code.wireshark.org/review/24371 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-05[Automatic update for 2017-11-05]Gerald Combs1-3/+64
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I4abb96429b1ad8c6d78a129efd453f3019669f4f Reviewed-on: https://code.wireshark.org/review/24245 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-29[Automatic update for 2017-10-29]Gerald Combs1-0/+47
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ia316bd89a4a8d08237b0e5eb9f0036dc5a6bad61 Reviewed-on: https://code.wireshark.org/review/24157 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-22[Automatic update for 2017-10-22]Gerald Combs1-26/+317
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I973703f2a82c96e47ec15512e223766404a6d3a1 Reviewed-on: https://code.wireshark.org/review/24021 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-11Remove the OUIs in manuf.tmpl that cause obvious conflicts with IEEE listMichael Mann1-294/+414
This allows for less "skipping" when processing the list Bug: 13784 Change-Id: I40fb5d5a82e51238751dd6785502ea259de9bc03 Reviewed-on: https://code.wireshark.org/review/23445 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-24Extract the "long name" out of the manuf file and use it for some resolutionMichael Mann1-30523/+30538
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-20[Automatic update for 2017-08-20]Gerald Combs1-6/+55
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I676dc2814760f711a3d3b8b4979ef8a0077e26a1 Reviewed-on: https://code.wireshark.org/review/23141 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-13[Automatic update for 2017-08-13]Gerald Combs1-0/+51
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie0e554e42e96a8b8f8c8ce7f4a9ea615276b49fb Reviewed-on: https://code.wireshark.org/review/23056 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-06[Automatic update for 2017-08-06]Gerald Combs1-17/+173
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie6f7676ccde9337cb479e448884b0240e3fd238c Reviewed-on: https://code.wireshark.org/review/22961 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-23Put the well-known addresses into a separate file from OUIsJoão Valverde1-265/+1
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-16[Automatic update for 2017-07-16]Gerald Combs1-4/+152
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I01c07ea17d54e5518659abac5cd3c8c9ddfea5e6 Reviewed-on: https://code.wireshark.org/review/22647 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-25[Automatic update for 2017-06-25]Gerald Combs1-4/+40
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I6febcb360b1b3e5e761086d422050e6ec95d5c45 Reviewed-on: https://code.wireshark.org/review/22384 Reviewed-by: Gerald Combs <gerald@wireshark.org>
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>