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

543 Commits

Author SHA1 Message Date
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
Gerald Combs edc63f5ef7 [Automatic update for 2017-08-20] 
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-20 08:07:25 +00:00
Gerald Combs f2a3a705e6 [Automatic update for 2017-08-13] 
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-13 08:11:00 +00:00
Gerald Combs 912542f7be [Automatic update for 2017-08-06] 
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-08-06 08:08:09 +00:00
João Valverde 14d94e174a Put the well-known addresses into a separate file from OUIs 
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-23 17:14:19 +00:00
Gerald Combs 87e7bc811c [Automatic update for 2017-07-16] 
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-07-16 17:05:26 +00:00
Gerald Combs 5f7902d165 [Automatic update for 2017-06-25] 
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-25 08:09:35 +00:00
Gerald Combs 1247693a99 [Automatic update for 2017-06-18] 
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-18 08:11:08 +00:00
Gerald Combs 1cf57230b7 [Automatic update for 2017-06-11] 
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-11 08:11:14 +00:00
Gerald Combs 916f1a6cf0 [Automatic update for 2017-06-04] 
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-06-04 08:09:33 +00:00
Gerald Combs 1ab6604958 [Automatic update for 2017-05-28] 
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-28 08:14:25 +00:00
Gerald Combs 333711430a [Automatic update for 2017-05-21] 
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-21 08:15:14 +00:00
Gerald Combs d8df8415af [Automatic update for 2017-05-14] 
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-14 08:14:09 +00:00
Gerald Combs 2aa3adf559 [Automatic update for 2017-05-07] 
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-05-07 15:19:29 +00:00
Gerald Combs 5de615c0a7 [Automatic update for 2017-04-30] 
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-30 15:16:57 +00:00
Gerald Combs 69762f5d1c [Automatic update for 2017-04-23] 
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-23 15:17:54 +00:00
Gerald Combs b2219bbccb [Automatic update for 2017-04-16] 
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-16 15:17:00 +00:00
Gerald Combs 05c501373d [Automatic update for 2017-04-09] 
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-09 17:00:54 +00:00
Gerald Combs 522532643f [Automatic update for 2017-04-02] 
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-04-02 15:14:44 +00:00
Gerald Combs 2d31c2a93d [Automatic update for 2017-03-26] 
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-26 15:13:47 +00:00
Gerald Combs 5f789e3fe3 [Automatic update for 2017-03-12] 
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-12 15:12:38 +00:00
Gerald Combs 509488b3bd [Automatic update for 2017-03-05] 
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-03-05 17:03:16 +00:00
Gerald Combs d8e16b79da [Automatic update for 2017-02-26] 
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-26 16:11:56 +00:00
Gerald Combs ef20188bf6 [Automatic update for 2017-02-19] 
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-19 16:12:11 +00:00
Gerald Combs 6550b10422 [Automatic update for 2017-02-12] 
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-12 16:12:32 +00:00
Gerald Combs e35c21c644 [Automatic update for 2017-02-05] 
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-02-05 16:12:05 +00:00
Gerald Combs 4aa8d58911 [Automatic update for 2017-01-29] 
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-29 16:10:51 +00:00
Gerald Combs 73d3f7965e [Automatic update for 2017-01-22] 
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-22 16:11:59 +00:00
Gerald Combs ffa239950a [Automatic update for 2017-01-08] 
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>
 2017-01-08 16:14:21 +00:00
Gerald Combs 730b2ed14c [Automatic update for 2016-12-25] 
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-25 16:35:24 +00:00
Gerald Combs 527eefa513 [Automatic update for 2016-12-18] 
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-18 16:13:27 +00:00
David Barrera 862905da1b Change spaces to tab for recent wka entries 
Commit 66549a9cac 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-13 07:34:59 +00:00
Gerald Combs 035fbe21f9 [Automatic update for 2016-12-11] 
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-11 16:12:43 +00:00
Gerald Combs 054455683b [Automatic update for 2016-12-04] 
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-12-04 16:13:27 +00:00
Gerald Combs 99aacf8612 [Automatic update for 2016-11-27] 
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-27 16:14:12 +00:00
Gerald Combs 88f65ca075 [Automatic update for 2016-11-20] 
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-20 16:12:13 +00:00
Gerald Combs 67e1ed5252 [Automatic update for 2016-11-13] 
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-13 17:40:31 +00:00
Gerald Combs 991cbe81c1 [Automatic update for 2016-11-06] 
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-11-06 16:13:43 +00:00
Gerald Combs e3b751f79e [Automatic update for 2016-10-30] 
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-30 15:12:46 +00:00
Gerald Combs b240082cf4 [Automatic update for 2016-10-16] 
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-16 15:11:55 +00:00
Gerald Combs 83df30ee53 [Automatic update for 2016-10-09] 
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-09 15:12:30 +00:00
Gerald Combs 7a6610fc99 make-manuf: Add more sanity checks. 
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 19:05:46 +00:00
Gerald Combs 3ab0137533 [Automatic update for 2016-10-02] 
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-10-02 15:10:47 +00:00
Gerald Combs fce2531169 [Automatic update for 2016-09-25] 
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-25 15:14:17 +00:00