diff options
author | Gerald Combs <gerald@wireshark.org> | 2016-11-06 08:12:57 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2016-11-06 16:13:43 +0000 |
commit | 991cbe81c137d73b919a75a6c751f3e402d5acc9 (patch) | |
tree | 9d3194bb275b8454f266673f450d40894721f803 /epan | |
parent | 686282083420f26a4e4584053fadbba568ef534f (diff) |
[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>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/usb.c | 9 | ||||
-rw-r--r-- | epan/enterprise-numbers | 150 | ||||
-rw-r--r-- | epan/sminmpec.c | 34 |
3 files changed, 185 insertions, 8 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index f2579fdf66..9952918a5a 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -2879,6 +2879,7 @@ static const value_string usb_vendors_vals[] = { { 0x2676, "Basler AG" }, { 0x2730, "Citizen" }, { 0x2735, "DigitalWay" }, + { 0x273f, "Hughski Limited" }, { 0x2770, "NHJ, Ltd" }, { 0x27b8, "ThingM" }, { 0x2821, "ASUSTek Computer Inc." }, @@ -5597,7 +5598,7 @@ static const value_string usb_products_vals[] = { { 0x046dc20c, "WingMan Precision" }, { 0x046dc20d, "WingMan Attack 2" }, { 0x046dc20e, "WingMan Formula GP" }, - { 0x046dc211, "iTouch Cordless Receiver" }, + { 0x046dc211, "iTouch Cordless Reciever" }, { 0x046dc212, "WingMan Extreme Digital 3D" }, { 0x046dc213, "J-UH16 (Freedom 2.4 Cordless Joystick)" }, { 0x046dc214, "ATK3 (Attack III Joystick)" }, @@ -18812,6 +18813,12 @@ static const value_string usb_products_vals[] = { { 0x27351042, "MPIO FY670" }, { 0x27351043, "HCT HMD-180A" }, { 0x27351044, "HCT HMD-180A" }, + { 0x273f1000, "ColorHug bootloader" }, + { 0x273f1001, "ColorHug" }, + { 0x273f1002, "ColorHug+" }, + { 0x273f1003, "ColorHug+ Bootloader" }, + { 0x273f1004, "ColorHug2" }, + { 0x273f1005, "ColorHug2 bootloader" }, { 0x27700a01, "ScanJet 4600 series" }, { 0x2770905c, "Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35" }, { 0x27709060, "A130" }, diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers index da796144c8..02559f7920 100644 --- a/epan/enterprise-numbers +++ b/epan/enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2016-10-29) +(last updated 2016-11-06) SMI Network Management Private Enterprise Codes: @@ -12687,8 +12687,8 @@ Decimal retter&silis.lu 3170 InterWorking Labs, Inc. - Michael Kirkham - mikek&iwl.com + Karl Auerbach + karl&iwl.com 3171 Ikon Systems, Inc. Vincent French @@ -122888,8 +122888,8 @@ Decentralization / Helenic Public Administra d.lutz&smartoptics.com 30827 RIZ ODASILJACI d.d. - Ivan Kaselj - ivan.kaselj&riz.hr + Zvonimir Lucić + zvonimir.lucic&riz.hr 30828 Colfax Corporation Christoph Jandek @@ -180493,8 +180493,8 @@ Decentralization / Helenic Public Administra tim.dyce&oist.jp 45228 Lumagate AB - Tim Nilimaa-Svärd - tim.nilimaa-svard&lumagate.com + Tobias Wold + tobias.wold&lumagate.com 45229 nyantec UG (haftungsbeschränkt) Mikael Voss @@ -194847,6 +194847,142 @@ Decentralization / Helenic Public Administra Boxholms Skogar AB Peter Wallin peter.wallin&boxskog.se +48817 + Rödins Trä AB + Lars Svensson + lars.svensson&rodinstra.se +48818 + WELLTRON ELECTRONICS CO., LTD. + Peter Lee + plp456&welltron.com.tw +48819 + Techno Mathematical + Yasuo Suzuki + suzuki-ya&tmath.co.jp +48820 + VoiSmart S.r.l. + Matteo Brancaleoni + mbrancaleoni&voismart.it +48821 + Haroutioun Shahinian, MD, PA + Haroutioun Shahinian + hsscancer.onc1&yahoo.com +48822 + Interfax - Corporate Information Disclosure Center LLC + Serafima Gorbatova + dc2&e-disclosure.ru +48823 + MAIF + Alice MILANOVA + alice.milanova&maif.fr +48824 + Ponce Hematology Oncology + Vanessa Alvarez + mokin&flatiron.com +48825 + Smurfit Kappa Kraftliner Piteå Aktiebolag + Nicklas Norén + Nicklas.Noren&smurfitkappa.se +48826 + Gabriel Domenech 21st Century Oncology + George Moore + gmoore&flatiron.com +48827 + KGSS + Chris Pavona + chris.pavona&kgssinc.com +48828 + Bollore + LEFEBVRE Francois + francois.lefebvre&bollore.com +48829 + INSYS Therapeutics, Inc. + Adam Brumm + abrumm&insysrx.com +48830 + Green Charge Networks, LLC + Bryan Chow + bchow&greencharge.net +48831 + Clarive Software + Ricardo Martinez + ricardo&clarive.com +48832 + Assense Software Solutions + Tsen Yang Kwong + tsen.kwong&assense.com +48833 + Veas Inc. + Jorge Luis Gandulfo + jorge&veas.tv +48834 + WS Technology GmbH + Thomas Fröhlich + thomas.froehlich&waysense.eu +48835 + Pico Systems Co., Ltd. + Makoto Ito + makoto&picosystems.net +48836 + Evada Technology (Shenzhen) Co.,Ltd + Lin Zhou + zh_zhuanyong&hotmail.com +48837 + FUJIAN NEBULA BIG DATA APPLICATION SERVICE CO.,LTD + 钟军 (Zhang Jun) + zhangzhangwen&xrjiot.com +48838 + Nesodden Kommune + Tobias Wold + tobias.wold&lumagate.com +48839 + Sömlös AB + Stefhan Stjärnås + stefhan&stjarnas.com +48840 + stij.net + Stijn Adriaensens + stijn.adriaensens&gmail.com +48841 + LevelUP Solutions Pty Ltd + Brendon Allen + brendon.allen&levelup.solutions +48842 + Spiral Software Ltd + Dan Martinelli + dmartinelli&spiralsoft.com +48843 + LBS Bayerische Landesbausparkasse + Alexander Eller + alexander.eller&lbs-bayern.de +48844 + Unmanned Innovation D.B.A Airware + Ash Smolenski + it&airware.com +48845 + August Schell + Olavo da Rocha + olavo.rocha&augustschell.com +48846 + WE + Dan Kuzmicki + dan.kuzmicki&we.org +48847 + Reputronix + Jean Claude Lemoyne + jclaude.lz&gmail.com +48848 + FORTUNA GAME a.s. + Vojtech Kotous + kotous.vojtech&ifortuna.cz +48849 + Marcus Seidel Beteiligungs GmbH Businessangels.de + Janko Richter + j.richter&adcell.de +48850 + Logi-Concept Computers + Sylvain Girouard + sylvain38&bell.net End of Document diff --git a/epan/sminmpec.c b/epan/sminmpec.c index d8dcf34f03..ab40c78d32 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -48837,6 +48837,40 @@ const value_string sminmpec_values[] = { { 48814, "Max Planck Institute for Polymer Research" }, { 48815, "ProsiebenSat.1 Digital GmbH" }, { 48816, "Boxholms Skogar AB" }, + { 48817, "R\0303\0266dins Tr\0303\0244 AB" }, + { 48818, "WELLTRON ELECTRONICS CO., LTD." }, + { 48819, "Techno Mathematical" }, + { 48820, "VoiSmart S.r.l." }, + { 48821, "Haroutioun Shahinian, MD, PA" }, + { 48822, "Interfax - Corporate Information Disclosure Center LLC" }, + { 48823, "MAIF" }, + { 48824, "Ponce Hematology Oncology" }, + { 48825, "Smurfit Kappa Kraftliner Pite\0303\0245 Aktiebolag" }, + { 48826, "Gabriel Domenech 21st Century Oncology" }, + { 48827, "KGSS" }, + { 48828, "Bollore" }, + { 48829, "INSYS Therapeutics, Inc." }, + { 48830, "Green Charge Networks, LLC" }, + { 48831, "Clarive Software" }, + { 48832, "Assense Software Solutions" }, + { 48833, "Veas Inc." }, + { 48834, "WS Technology GmbH" }, + { 48835, "Pico Systems Co., Ltd." }, + { 48836, "Evada Technology (Shenzhen) Co.,Ltd" }, + { 48837, "FUJIAN NEBULA BIG DATA APPLICATION SERVICE CO.,LTD" }, + { 48838, "Nesodden Kommune" }, + { 48839, "S\0303\0266ml\0303\0266s AB" }, + { 48840, "stij.net" }, + { 48841, "LevelUP Solutions Pty Ltd" }, + { 48842, "Spiral Software Ltd" }, + { 48843, "LBS Bayerische Landesbausparkasse" }, + { 48844, "Unmanned Innovation D.B.A Airware" }, + { 48845, "August Schell" }, + { 48846, "WE" }, + { 48847, "Reputronix" }, + { 48848, "FORTUNA GAME a.s." }, + { 48849, "Marcus Seidel Beteiligungs GmbH Businessangels.de" }, + { 48850, "Logi-Concept Computers" }, { 0, NULL} }; |