From 3e8d9074ed44d960e7b04c517e52b68d51f6b949 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sun, 12 May 2019 08:34:26 +0000 Subject: [Automatic update for 2019-05-12] Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ibfaff1cfc4974aae825bd177d8b94be177529255 Reviewed-on: https://code.wireshark.org/review/33162 Reviewed-by: Gerald Combs --- AUTHORS | 2 ++ NEWS | 7 ++++--- enterprises.tsv | 28 ++++++++++++++++++++++++++-- epan/dissectors/usb.c | 33 +++++++++++++++++++++++++++++++++ services | 1 + 5 files changed, 66 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index c78e417ea9..fbb2574e0b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4331,6 +4331,7 @@ Laurenz Kamp Lee Mitchell Lee Serin Lev Stipakov +LoSmX Loganaden Velvindron Lorenzo Vannucci Lotte Steenbrink @@ -4416,6 +4417,7 @@ Moraney Jalil Moshe Kaplan Nathan Cole Nathaniel Clark +Neels Hofmeyr Neil Ostroff Niall Dugera Nick Bedbury diff --git a/NEWS b/NEWS index 11107557da..5bd2955525 100644 --- a/NEWS +++ b/NEWS @@ -27,8 +27,9 @@ Wireshark 3.1.0 Release Notes New Protocol Support - Distributed Replicated Block Device (DRBD) and evolved Common Public - Radio Interface (eCPRI) + Distributed Replicated Block Device (DRBD), evolved Common Public + Radio Interface (eCPRI), and GSM/3GPP CBSP (Cell Broadcast Service + Protocol) Updated Protocol Support @@ -73,7 +74,7 @@ Wireshark 3.1.0 Release Notes A complete FAQ is available on the Wireshark web site[8]. - Last updated 2019-05-05 08:18:35 UTC + Last updated 2019-05-12 08:17:58 UTC References diff --git a/enterprises.tsv b/enterprises.tsv index 221fc38acb..d068d6809c 100644 --- a/enterprises.tsv +++ b/enterprises.tsv @@ -5,7 +5,7 @@ # The format used here is: # Where SPACE can be any sequence of spaces and tabs. # -# (last updated 2019-05-05) +# (last updated 2019-05-12) 0 Reserved 1 NxNetworks @@ -13463,7 +13463,7 @@ 13595 EMKA electronic AG 13596 Fachhochschule Bingen 13597 FEIS, University of Hertfordshire -13598 General Dynamics Canada +13598 General Dynamics Mission Systems Canada # formerly 'General Dynamics Canada' 13599 Golden Triangle Online 13600 greenmokey.net 13601 Hwa Chong Junior College @@ -53698,3 +53698,27 @@ 53887 Web Sensing LLC 53888 Beijing Changyang Technology Co.,Ltd. 53889 Richpower New Energy +53890 Trilogysystem +53891 Identify3D +53892 NTT DATA SMS Corporation +53893 Teijin Aramid +53894 WVP Health Authority EHR Team +53895 Qulsar, Inc +53896 Jane Street Group, LLC +53897 BG Klinikum Unfallkrankenhaus Berlin gGmbH +53898 FAIRSHELL +53899 National bank of Slovakia +53900 bcsner.com +53901 Wivity Inc. +53902 Arbala Systems +53903 Q-Net Security, LLC +53904 Observatoire Astronomique de Strasbourg +53905 Agile Workspace Ltd +53906 Alaska Permanent Fund Corporation +53907 Command Alkon +53908 North America Fuel Systems Remanufacturing LLC +53909 Thrall Software LLC +53910 Eaton Energy Automation Solutions (EAS) Division +53911 Shenzhen Channlink Technology Co.,Ltd +53912 Hi-Tech LLC LTD +53913 GETSmart Analytics Inc. diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index cb8d1602ba..cadfc3df81 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -40,6 +40,7 @@ static const value_string usb_vendors_vals[] = { { 0x0053, "Planex" }, { 0x0078, "Microntek" }, { 0x0079, "DragonRise Inc." }, + { 0x0080, "Assmann Electronic GmbH" }, { 0x0085, "Boeye Technology Co., Ltd." }, { 0x0105, "Trust International B.V." }, { 0x0127, "IBP" }, @@ -2923,6 +2924,7 @@ static const value_string usb_vendors_vals[] = { { 0x2dcf, "Dialog Semiconductor" }, { 0x2fb2, "Fujitsu, Ltd" }, { 0x3016, "Boundary Devices, LLC" }, + { 0x30a4, "Blues Wireless" }, { 0x30ee, "Fujitsu Connected Technologies Limited" }, { 0x3125, "Eagletron" }, { 0x3136, "Navini Networks" }, @@ -3056,6 +3058,7 @@ static const value_string usb_products_vals[] = { { 0x0079181b, "Venom Arcade Joystick" }, { 0x00791843, "Mayflash GameCube Controller Adapter" }, { 0x00791844, "Mayflash GameCube Controller" }, + { 0x0080a001, "Digitus DA-71114 SATA" }, { 0x00850600, "eBook Reader" }, { 0x0105145f, "NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]" }, { 0x01270002, "HDM Interface" }, @@ -3472,6 +3475,7 @@ static const value_string usb_products_vals[] = { { 0x03f03517, "LaserJet 3390" }, { 0x03f03602, "PhotoSmart 1315" }, { 0x03f03611, "PSC 2410 PhotoSmart" }, + { 0x03f03612, "Officejet Pro 8000 A809" }, { 0x03f03617, "Color LaserJet 2605" }, { 0x03f03711, "PSC 2500" }, { 0x03f03717, "EWS UPD" }, @@ -3676,7 +3680,9 @@ static const value_string usb_products_vals[] = { { 0x03f09207, "HD-4110 Webcam" }, { 0x03f09302, "PhotoSmart R930 series" }, { 0x03f09402, "PhotoSmart R837" }, + { 0x03f0942a, "LaserJet Pro M12a" }, { 0x03f09502, "PhotoSmart R840 series" }, + { 0x03f0952a, "LaserJet Pro M12w" }, { 0x03f09602, "HP PhotoSmart M737" }, { 0x03f09702, "HP PhotoSmart R742" }, { 0x03f09802, "PhotoSmart Mz60 series" }, @@ -3788,6 +3794,7 @@ static const value_string usb_products_vals[] = { { 0x04038070, "7 Port Hub" }, { 0x04038140, "Vehicle Explorer Interface" }, { 0x04038210, "MGTimer - MGCC (Vic) Timing System" }, + { 0x04038348, "FT232BM [SIENNA Serial Interface]" }, { 0x04038370, "7 Port Hub" }, { 0x04038371, "PS/2 Keyboard And Mouse" }, { 0x04038372, "FT8U100AX Serial Port" }, @@ -4160,6 +4167,7 @@ static const value_string usb_products_vals[] = { { 0x040b6533, "Speed-Link Competition Pro" }, { 0x040b6543, "Manhattan Magnetic Card Strip Reader" }, { 0x040d3184, "VNT VT6656 USB-802.11 Wireless LAN Adapter" }, + { 0x040d340f, "Audinst HUD-mx2" }, { 0x040d6205, "USB 2.0 Card Reader" }, { 0x04110001, "LUA-TX Ethernet [pegasus]" }, { 0x04110005, "LUA-TX Ethernet" }, @@ -4531,6 +4539,7 @@ static const value_string usb_products_vals[] = { { 0x042103a4, "C5 (Storage mode)" }, { 0x042103c0, "C7-00 (Mass storage mode)" }, { 0x042103c1, "Nokia C7" }, + { 0x042103c2, "Sim" }, { 0x042103cd, "Nokia C7 (ID2)" }, { 0x042103d1, "N950" }, { 0x042103d2, "Nokia N950" }, @@ -4921,6 +4930,7 @@ static const value_string usb_products_vals[] = { { 0x044fb326, "Gamepad GP XID" }, { 0x044fb351, "F16 MFD 1" }, { 0x044fb352, "F16 MFD 2" }, + { 0x044fb365, "UbiSoft UbiConnect" }, { 0x044fb603, "force feedback Wheel" }, { 0x044fb605, "force feedback Racing Wheel" }, { 0x044fb651, "Ferrari GT Rumble Force Wheel" }, @@ -7373,6 +7383,8 @@ static const value_string usb_products_vals[] = { { 0x04b46506, "CY4603" }, { 0x04b4650a, "CY4613" }, { 0x04b46560, "CY7C65640 USB-2.0 \"TetraHub\"" }, + { 0x04b46570, "Unprogrammed CY7C65632/34 hub HX2VL" }, + { 0x04b46572, "Unprogrammed CY7C65642 hub" }, { 0x04b46830, "CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI" }, { 0x04b46831, "Storage Adapter ISD-300LP (CY)" }, { 0x04b47417, "Wireless PC Lock/Ultra Mouse" }, @@ -8456,6 +8468,7 @@ static const value_string usb_products_vals[] = { { 0x04f2b5ce, "Integrated Camera" }, { 0x04f2b5cf, "Integrated IR Camera" }, { 0x04f2b5db, "HP Webcam" }, + { 0x04f2b604, "Integrated Camera (1280x720@30)" }, { 0x04f3000a, "Touchscreen" }, { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" }, { 0x04f3016f, "Touchscreen" }, @@ -9285,6 +9298,7 @@ static const value_string usb_products_vals[] = { { 0x05463304, "a500 Digital Camera" }, { 0x0546dccf, "Sound Vision Stream Driver" }, { 0x05470001, "ICSI Bluetooth Device" }, + { 0x05470080, "I3SYSTEM HYUNY" }, { 0x05471002, "Python2 WDM Encoder" }, { 0x05471006, "Hantek DSO-2100 UF" }, { 0x05472131, "AN2131 EZUSB Microcontroller" }, @@ -9878,9 +9892,27 @@ static const value_string usb_products_vals[] = { { 0x056e0079, "Laser mouse M-D21DL" }, { 0x056e007b, "Laser mouse M-D20DR" }, { 0x056e007c, "Laser Bluetooth mouse M-BT5BL" }, + { 0x056e007e, "Option mouse M-M8UR" }, + { 0x056e007f, "Option mouse M-M9UR" }, + { 0x056e0081, "Option mouse M-DY6DR" }, + { 0x056e0082, "Laser mouse M-D22DR" }, + { 0x056e0088, "Micro Grast2 Bit M-BG3DL" }, + { 0x056e0089, "Micro Grast2 Pop M-PG3DL" }, + { 0x056e008c, "M-NE3DL Mouse" }, + { 0x056e008d, "ORIME M-NE4DR" }, + { 0x056e008f, "M-BT8BL Bluetooth Mouse" }, + { 0x056e0092, "Wireless BlueLED Mouse (M-BL2DB)" }, + { 0x056e009c, "IR Mouse M-IR02DR" }, + { 0x056e009d, "IR Mouse M-IR03DR" }, + { 0x056e009f, "BlueLED Mouse M-HS1DB" }, + { 0x056e00a1, "IR Mouse M-IR05DR" }, + { 0x056e00a4, "Blue LED Mouse M-BL06DB" }, + { 0x056e00a5, "M-NV1BR Bluetooth Mouse" }, + { 0x056e00a7, "Blue LED Mouse M-BL08DB" }, { 0x056e2003, "JC-U3613M" }, { 0x056e2004, "JC-U3613M" }, { 0x056e200c, "LD-USB/TX" }, + { 0x056e2012, "JC-U4013S Gamepad" }, { 0x056e4002, "Laneed 100Mbps Ethernet LD-USB/TX [pegasus]" }, { 0x056e4005, "LD-USBL/TX" }, { 0x056e400b, "LD-USB/TX" }, @@ -20046,6 +20078,7 @@ static const value_string usb_products_vals[] = { { 0x2c7c0435, "AG35 LTE modem" }, { 0x2dcfc952, "Audio Class 2.0 Devices" }, { 0x30160001, "Nitrogen Bootloader" }, + { 0x30a40001, "Notecard" }, { 0x30ee1001, "F-01L" }, { 0x31250001, "TrackerPod Camera Stand" }, { 0x3195f190, "MSO-19" }, diff --git a/services b/services index c4b47fb6c9..b7139cbce2 100644 --- a/services +++ b/services @@ -5450,6 +5450,7 @@ sphinxql 9306/tcp # Sphinx search server (MySQL listener) sphinxapi 9312/tcp # Sphinx search server secure-ts 9318/tcp/udp # PKIX TimeStamp over TLS guibase 9321/tcp/udp +gnmi-gnoi 9339/tcp # gRPC Network Mgmt/Operations Interface mpidcmgr 9343/tcp/udp # MpIdcMgr mphlpdmc 9344/tcp/udp # Mphlpdmc rancher 9345/tcp # Rancher Agent -- cgit v1.2.3