osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
72,793 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

586 Commits

Author SHA1 Message Date
Gerald Combs bc600962e2 Manuf fixups. 
Remove some entries from manuf.tmpl that are either redundant or less
informative that their corresponding IEEE entries. Add a missing '"' to
make-manuf.py.

Change-Id: Ia69f4529c5fa1b39f1662b94d072c65bd2d969ea
Reviewed-on: https://code.wireshark.org/review/29568
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-09-10 17:38:03 +00:00
Gerald Combs aba5c65f4d make-manuf.py: Skip the title row of each .csv file. 
Change-Id: I88a4b3da6b75d4891dc3b3e5b8ceb1233e038932
Reviewed-on: https://code.wireshark.org/review/29470
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-09-07 17:23:53 +00:00
Gerald Combs a1fac65d8e Migrate make-manuf to Python+CSV. 
The download links offered by the IEEE at
https://standards.ieee.org/products-services/regauth/ are CSV files.
Updating the Perl version to support CSV would have required rewriting a
significant portion of the script along with either adding a dependency
on Text::CSV or writing our own CSV parser.

Migrate it to Python, which has a built-in CSV module.

Change-Id: I39ba0ec873145f44374ab9f751e8bde51535ca4d
Reviewed-on: https://code.wireshark.org/review/29442
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2018-09-07 04:01:44 +00:00
Gerald Combs aef6223409 [Automatic update for 2018-08-19] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Iaec2f34b94bfec3b4203daad7ec7bfd10b1a8ae7
Reviewed-on: https://code.wireshark.org/review/29191
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-08-19 16:42:36 +00:00
Gerald Combs 5535b4f307 [Automatic update for 2018-08-12] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I76f688cbe75475ef5282fa09a5b5d58609b12eb3
Reviewed-on: https://code.wireshark.org/review/29105
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-08-12 08:15:41 +00:00
Gerald Combs ef15155bbf [Automatic update for 2018-08-05] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ida5bdebe06ea1dd9dcb9cc2f29601c81c8cf27bd
Reviewed-on: https://code.wireshark.org/review/28968
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-08-05 08:17:16 +00:00
Gerald Combs 75dc29bc10 [Automatic update for 2018-07-29] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ifc25c5ee60d7c9e09ced92c45107e4ceba6c929f
Reviewed-on: https://code.wireshark.org/review/28877
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-07-29 08:17:42 +00:00
Gerald Combs 60d7288f1d [Automatic update for 2018-07-22] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I386568a4e2e38a0977bedcdc98af61c3bdd6405c
Reviewed-on: https://code.wireshark.org/review/28792
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-07-22 08:15:08 +00:00
Gerald Combs 599ee9f08c [Automatic update for 2018-07-15] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ie42a61986a8001c57d04e62ba09f4c13e03d295f
Reviewed-on: https://code.wireshark.org/review/28704
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-07-15 08:15:04 +00:00
Gerald Combs 0e043692ec [Automatic update for 2018-07-08] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ice44cde2e4894d9709c4460baa823777fbe2b5f8
Reviewed-on: https://code.wireshark.org/review/28653
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-07-08 08:15:18 +00:00
Gerald Combs 1e94202b0e [Automatic update for 2018-06-24] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I72dd2309fb948662e58b0c5373aa1abd27f3b146
Reviewed-on: https://code.wireshark.org/review/28406
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-06-24 08:15:52 +00:00
Gerald Combs 21a02e29de [Automatic update for 2018-06-17] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Iff1e25720254f07647efeb166178c5e6ea1c4234
Reviewed-on: https://code.wireshark.org/review/28305
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-06-17 08:15:03 +00:00
Gerald Combs e0b8837d9a [Automatic update for 2018-06-10] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I11da626692a0aedff9e58256e0e326fd1cb33123
Reviewed-on: https://code.wireshark.org/review/28190
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-06-10 08:16:13 +00:00
Gerald Combs f5faa1e12d [Automatic update for 2018-06-03] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ie1c560eb53d3791443f1798b32ba819816896523
Reviewed-on: https://code.wireshark.org/review/27977
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-06-03 08:16:40 +00:00
Gerald Combs af24816568 [Automatic update for 2018-05-27] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I6603cc4dd62ff1db23efa4374437ce9ebf7a81c8
Reviewed-on: https://code.wireshark.org/review/27840
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-05-27 08:16:34 +00:00
Gerald Combs 0afa145a4b [Automatic update for 2018-05-20] 
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ied42aaad58b11ec1796d6c14c4981b8d54258769
Reviewed-on: https://code.wireshark.org/review/27665
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2018-05-20 08:17:39 +00:00
Gerald Combs 5b385f3a4d [Automatic update for 2018-05-13] 
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-13 08:16:30 +00:00
Gerald Combs a834d3794d [Automatic update for 2018-05-06] 
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-05-06 08:15:41 +00:00
Gerald Combs 7669961214 [Automatic update for 2018-04-29] 
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-29 08:17:13 +00:00
Gerald Combs 194fcdcd80 [Automatic update for 2018-04-22] 
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-22 08:20:41 +00:00
Gerald Combs 1ab40c87ea [Automatic update for 2018-04-15] 
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-15 16:19:41 +00:00
Gerald Combs 432c3b2859 [Automatic update for 2018-04-08] 
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-08 08:15:51 +00:00
Adam Wujek 410799aa0f manuf: Overwrite entry for OUI 08:00:30 
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-06 03:14:47 +00:00
Gerald Combs 7ee07493cb [Automatic update for 2018-04-01] 
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-04-01 15:46:26 +00:00
Gerald Combs fddc96073a [Automatic update for 2018-03-25] 
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-25 16:06:09 +00:00
Gerald Combs d9541236a3 [Automatic update for 2018-03-18] 
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-18 08:11:48 +00:00
Gerald Combs 55573495c8 [Automatic update for 2018-03-11] 
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-11 08:19:57 +00:00
Dario Lombardo 8a5385b9c9 More licenses converted to SPDX. 
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-07 13:35:49 +00:00
Gerald Combs 0fcfc634dd [Automatic update for 2018-03-04] 
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-03-04 08:18:31 +00:00
Gerald Combs d7e1970cbe [Automatic update for 2018-02-25] 
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-25 08:19:36 +00:00
Gerald Combs 632c6261ca [Automatic update for 2018-02-18] 
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-18 08:15:54 +00:00
Gerald Combs fa258523a9 [Automatic update for 2018-02-11] 
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-11 10:27:15 +00:00
Gerald Combs ffc200ade3 [Automatic update for 2018-02-04] 
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-02-04 08:14:37 +00:00
Gerald Combs 10b9472659 [Automatic update for 2018-01-28] 
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-28 08:18:37 +00:00
Gerald Combs 5242dd48b4 [Automatic update for 2018-01-21] 
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-21 08:18:44 +00:00
Gerald Combs 7bf0620eb5 [Automatic update for 2018-01-14] 
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-14 08:16:05 +00:00
Gerald Combs f5f6ceeb66 [Automatic update for 2018-01-07] 
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>
 2018-01-07 08:16:08 +00:00
Gerald Combs f930710585 [Automatic update for 2017-12-31] 
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-31 08:16:15 +00:00
Gerald Combs c7ce426f84 [Automatic update for 2017-12-24] 
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-24 08:10:41 +00:00
Gerald Combs f37e759f41 [Automatic update for 2017-12-17] 
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-17 08:17:00 +00:00
Gerald Combs 91548948bb [Automatic update for 2017-12-10] 
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-10 08:16:52 +00:00
Gerald Combs 114c989fb3 [Automatic update for 2017-12-03] 
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-12-03 16:56:48 +00:00
Gerald Combs 9b7ad9c20e [Automatic update for 2017-11-26] 
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-26 08:16:20 +00:00
Gerald Combs 1b79315aac [Automatic update for 2017-11-19] 
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-19 08:17:16 +00:00
Gerald Combs 5bd8fb4131 [Automatic update for 2017-11-12] 
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-12 08:11:18 +00:00
Gerald Combs aed3e66672 [Automatic update for 2017-11-05] 
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-11-05 08:16:13 +00:00
Gerald Combs 930f634515 [Automatic update for 2017-10-29] 
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-29 08:18:13 +00:00
Gerald Combs ce3ce9e70e [Automatic update for 2017-10-22] 
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-10-22 17:06:16 +00:00
Michael Mann 9bc8307867 Remove the OUIs in manuf.tmpl that cause obvious conflicts with IEEE list 
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-09-11 10:27:29 +00:00
Michael Mann 274bbd5fab Extract the "long name" out of the manuf file and use it for some resolution 
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-24 05:00:06 +00:00