diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-05-26 14:03:39 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-05-26 14:03:39 +0000 |
commit | 08b5086b0f820ce42a68da0d1268ad50a8795260 (patch) | |
tree | 280df797d63ce34c475cbd0c05fc30b511366b05 | |
parent | 5bc22a25df02c19a2414bcf3c5ea3446cf96c7ef (diff) | |
download | wireshark-08b5086b0f820ce42a68da0d1268ad50a8795260.tar.gz |
[Automatic manuf, services and enterprise-numbers update for 2013-05-26]
svn path=/trunk/; revision=49585
-rw-r--r-- | epan/dissectors/usb.c | 2 | ||||
-rw-r--r-- | manuf | 23 | ||||
-rw-r--r-- | services | 27 |
3 files changed, 39 insertions, 13 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index 093705f095..5904d28467 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -11983,6 +11983,8 @@ static const value_string usb_products_vals[] = { { 0x09557030, "Tegra 3 (recovery mode)" }, { 0x095570a9, "nVidia CM9-Adam" }, { 0x09557100, "Notion Ink Adam" }, + { 0x0955b400, "SHIELD (debug)" }, + { 0x0955b401, "SHIELD" }, { 0x09570200, "E-Video DC-350 Camera" }, { 0x09570202, "E-Video DC-350 Camera" }, { 0x09570518, "82357B GPIB Interface" }, @@ -17258,6 +17258,7 @@ 08:86:3B BelkinIn # Belkin International, Inc. 08:8D:C8 RyowaEle # Ryowa Electronics Co.,Ltd 08:8F:2C HillsSou # Hills Sound Vision & Lighting +08:96:D7 Avm # AVM GmbH 08:9E:01 QuantaCo # QUANTA COMPUTER INC. 08:9F:97 LeroyAut # LEROY AUTOMATION 08:A1:2B Shenzhen # ShenZhen EZL Technology Co., Ltd @@ -17281,6 +17282,7 @@ 08:EB:74 Humax 08:EB:ED WorldEli # World Elite Technology Co.,LTD 08:ED:B9 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. +08:EF:3B McsLogic # MCS Logic Inc. 08:F1:B7 Towerstr # Towerstream Corpration 08:F2:F4 NetOnePa # Net One Partners Co.,Ltd. 08:F6:F8 GetEngin # GET Engineering @@ -17860,6 +17862,7 @@ 24:EE:3A ChengduY # Chengdu Yingji Electronic Hi-tech Co Ltd 24:F0:FF Ght # GHT Co., Ltd. 24:F2:DD RadiantZ # Radiant Zemax LLC +24:F5:AA SamsungE # Samsung Electronics Co.,LTD 24:FD:52 LiteonTe # Liteon Technology Corporation 28:04:E0 FermaxEl # FERMAX ELECTRONICA S.A.U. 28:06:1E NingboGl # NINGBO GLOBAL USEFUL ELECTRIC CO.,LTD @@ -17917,6 +17920,7 @@ 28:BA:18 NextnavL # NextNav, LLC 28:BE:9B Technico # Technicolor USA Inc. 28:C0:DA JuniperN # Juniper Networks +28:C6:71 YotaDevi # Yota Devices OY 28:C6:8E Netgear # NETGEAR INC., 28:C7:18 Altierre 28:C9:14 Taimag # Taimag Corporation @@ -18655,6 +18659,14 @@ 40:D8:55:0F:B0:00/36 InfomacS # InfoMac Sp. z o. o. Sp. k. 40:D8:55:0F:C0:00/36 EumigInd # eumig industrie-tv GmbH 40:D8:55:0F:D0:00/36 Monogram # MONOGRAM technologies ltd +40:D8:55:0F:E0:00/36 CytechTe # Cytech Technology Pte Ltd +40:D8:55:0F:F0:00/36 YuyamaMf # YUYAMA MFG.CO.,LTD. +40:D8:55:10:00:00/36 TaskSist # TASK SISTEMAS DE COMPUTACAO S.A. +40:D8:55:10:10:00/36 EPGElett # e.p.g. Elettronica Srl +40:D8:55:10:20:00/36 PowerEle # Power Electronics +40:D8:55:10:30:00/36 PeekTraf # Peek Traffic Corporation +40:D8:55:10:40:00/36 ImpleSis # IMPLE SISTEMAS ELETRONICOS EMBARCADOS LTDA +40:D8:55:10:50:00/36 TielineR # Tieline Research Pty Ltd 40:E7:30 DeyStora # DEY Storage Systems, Inc. 40:E7:93 Shenzhen # Shenzhen Siviton Technology Co.,Ltd 40:EC:F8 Siemens # Siemens AG @@ -18675,6 +18687,7 @@ 44:23:AA Farmage # Farmage Co., Ltd. 44:25:BB BambooEn # Bamboo Entertainment Corporation 44:2A:60 Apple # Apple, Inc. +44:2A:FF E3Techno # E3 Technology, Inc. 44:2B:03 Cisco # CISCO SYSTEMS, INC. 44:32:2A Avaya # Avaya, Inc 44:32:C8 Technico # Technicolor USA Inc. @@ -19584,6 +19597,7 @@ 70:A1:91 Trendset # Trendsetter Medical, LLC 70:A4:1C Advanced # Advanced Wireless Dynamics S.L. 70:A6:6A ProxDyna # Prox Dynamics AS +70:A8:E3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 70:AA:B2 Research # Research In Motion 70:B0:35 Shenzhen # Shenzhen Zowee Technology Co., Ltd 70:B0:8C ShenouCo # Shenou Communication Equipment Co.,Ltd @@ -19838,6 +19852,7 @@ 7C:7B:E4 ZSedaiKe # Z'SEDAI KENKYUSHO CORPORATION 7C:7D:41 JinmuyuE # Jinmuyu Electronics Co., Ltd. 7C:82:2D Nortec +7C:83:06 GlenDimp # Glen Dimplex Nordic as 7C:8E:E4 TexasIns # Texas Instruments 7C:94:B2 PhilipsH # Philips Healthcare PCCI 7C:9A:9B VseValen # VSE valencia smart energy @@ -19968,6 +19983,7 @@ 84:1E:26 Kernel-I # KERNEL-I Co.,LTD 84:21:41 Shenzhen # Shenzhen Ginwave Technologies Ltd. 84:24:8D Motorola # Motorola Solutions Inc +84:25:3F SilexTec # Silex Technology, Inc 84:25:DB SamsungE # Samsung Electronics Co.,Ltd 84:27:CE OfPresid # Corporation of the Presiding Bishop of The Church of Jesus Christ of Latter-day Saints 84:29:14 EmporiaT # EMPORIA TELECOM Produktions- und VertriebsgesmbH & Co KG @@ -20222,6 +20238,7 @@ 90:6D:C8 DlgAutom # DLG Automação Industrial Ltda 90:6E:BB HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:70:25 GareaMic # Garea Microsys Co.,Ltd. +90:7A:0A GebrBode # Gebr. Bode GmbH & Co KG 90:7A:28 BeijingM # Beijing Morncloud Information And Technology Co. Ltd. 90:7A:F1 SnupiTec # SNUPI Technologies 90:7F:61 ChiconyE # Chicony Electronics Co., Ltd. @@ -21022,6 +21039,7 @@ B8:77:C3 DecagonD # Decagon Devices, Inc. B8:78:2E Apple B8:79:7E SecureMe # Secure Meters (UK) Limited B8:87:1E GoodMind # Good Mind Industries Co., Ltd. +B8:87:A8 StepAhea # Step Ahead Innovations Inc. B8:88:E3 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD B8:89:CA IljinEle # ILJIN ELECTRIC Co., Ltd. B8:8A:60 IntelCor # Intel Corporate @@ -21679,6 +21697,7 @@ D8:31:CF SamsungE # Samsung Electronics Co.,Ltd D8:33:7F OfficeFa # Office FA.com Co.,Ltd. D8:42:AC Shanghai # Shanghai Feixun Communication Co.,Ltd. D8:46:06 SiliconV # Silicon Valley Global Marketing +D8:49:0B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD D8:4B:2A Cognitas # Cognitas Technologies, Inc. D8:54:3A TexasIns # Texas Instruments D8:57:EF SamsungE # Samsung Electronics @@ -21687,6 +21706,7 @@ D8:5D:84 CaxSoft # CAx soft GmbH D8:62:DB Eno # Eno Inc. D8:66:C6 Shenzhen # Shenzhen Daystar Technology Co.,ltd D8:67:D9 Cisco # CISCO SYSTEMS, INC. +D8:69:60 Steinsvi # Steinsvik D8:6B:F7 Nintendo # Nintendo Co., Ltd. D8:6C:E9 Sagemcom # SAGEMCOM SAS D8:71:57 LenovoMo # Lenovo Mobile Communication Technology Ltd. @@ -21745,6 +21765,7 @@ DC:0B:1A AdbBroad # ADB Broadband Italia DC:0E:A1 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD DC:16:A2 Medtroni # Medtronic Diabetes DC:17:5A HitachiH # Hitachi High-Technologies Corporation +DC:17:92 Captivat # Captivate Network DC:1D:9F UBTech # U & B tech DC:1D:D4 Microste # Microstep-MIS spol. s r.o. DC:1E:A3 Accensus # Accensus LLC @@ -22047,6 +22068,7 @@ E8:E5:D6 SamsungE # Samsung Electronics Co.,Ltd E8:E7:32 Alcatel- # Alcatel-Lucent E8:E7:76 Shenzhen # Shenzhen Kootion Technology Co., Ltd E8:E8:75 Is5Commu # iS5 Communications Inc. +E8:EA:DA DenkoviA # Denkovi Assembly Electroncs LTD E8:F1:B0 Sagemcom # SAGEMCOM SAS E8:F9:28 RftechSr # RFTECH SRL EC:0E:D6 ItechIns # ITECH INSTRUMENTS SAS @@ -22313,6 +22335,7 @@ F8:4F:57 Cisco F8:50:63 Verathon F8:51:6D DenwaTec # Denwa Technology Corp. F8:52:DF VnlEurop # VNL Europe AB +F8:5B:C9 M-Cube # M-Cube Spa F8:5F:2A Nokia # Nokia Corporation F8:66:F2 Cisco # CISCO SYSTEMS, INC. F8:69:71 SeibuEle # Seibu Electric Co., @@ -14,7 +14,7 @@ # Service Name and Transport Protocol Port Number Registry # # Last Updated -# 2013-05-10 +# 2013-05-24 # # Expert(s) # @@ -185,10 +185,7 @@ re-mail-ck 50/tcp # Remote Mail Checking [Steve_Dorner] # Protocol re-mail-ck 50/udp # Remote Mail Checking [Steve_Dorner] [Steve_Dorner] # Protocol -la-maint 51/tcp # IMP Logical Address [Andy_Malis] [Andy_Malis] -# Maintenance -la-maint 51/udp # IMP Logical Address [Andy_Malis] [Andy_Malis] -# Maintenance +# 51 Reserved 2013-05-24 This entry is being removed on 2013-05-24. xns-time 52/tcp # XNS Time Protocol [Susie_Armstrong] [Susie_Armstrong] xns-time 52/udp # XNS Time Protocol [Susie_Armstrong] [Susie_Armstrong] domain 53/tcp # Domain Name Server [Paul_Mockapetris] [Paul_Mockapetris] @@ -2133,12 +2130,9 @@ cap 1026/udp # Calendar Access Protocol [Doug_Royer] # 1028 Deprecated 2004-02 solid-mux 1029/tcp # Solid Mux Server [Anders_Borg] [Anders_Borg] 2004-11 solid-mux 1029/udp # Solid Mux Server [Anders_Borg] [Anders_Borg] 2004-11 -iad1 1030/tcp # BBN IAD -iad1 1030/udp # BBN IAD -iad2 1031/tcp # BBN IAD -iad2 1031/udp # BBN IAD -iad3 1032/tcp # BBN IAD [Andy_Malis] [Andy_Malis] -iad3 1032/udp # BBN IAD [Andy_Malis] [Andy_Malis] +# 1030 Reserved 2013-05-24 This entry is being removed on 2013-05-24. +# 1031 Reserved 2013-05-24 This entry is being removed on 2013-05-24. +# 1032 Reserved 2013-05-24 This entry is being removed on 2013-05-24. netinfo-local 1033/tcp # local netinfo port [Marc_Majka] [Marc_Majka] 2002-08 netinfo-local 1033/udp # local netinfo port [Marc_Majka] [Marc_Majka] 2002-08 activesync 1034/tcp # ActiveSync Notifications [Sandra_Vargas] [Sandra_Vargas] 2003-03 @@ -13593,7 +13587,7 @@ openremote-ctrl 8688/tcp # OpenRemote Controller [OpenRemote_Inc] # 8688 udp Reserved # 8689-8698 Unassigned vnyx 8699/tcp # VNYX Primary Port [Gregg_Green] [Gregg_Green] 2004-11 -vnyx 8699/udp # VNYX Primary Port [Gregg_Green] [Gregg_Green] 2004-11 +# 8699 udp Reserved 2004-11 2013-05-24 This entry is being removed on 2013-05-24. # 8700-8710 Unassigned nvc 8711/tcp # Nuance Voice Control [Nuance_Communications_Inc2] [Diego_Negre] 2012-10-05 # 8711 udp Reserved @@ -16169,6 +16163,7 @@ matahari 49000/tcp # Matahari Broker [Matahari_Project] # Interface # bridgeprotocol tcp JSON RPC Bridge Protocol [Michel_Stam_2] [Michel_Stam_2] 2012-11-20 Defined TXT keys: path, version # bsqdea Backup Simplicity [Qdea] [Qdea] Defined TXT keys: None +# buddycloud-api tcp buddycloud API [buddycloud] [Simon_Tennant] 2013-05-20 Defined TXT keys: v, host, protocol, path, port # caldav tcp Calendaring Extensions to [IESG] [IETF_Chair] 2012-02-17 [RFC6764] This is an extension of the http service. Defined TXT keys: # WebDAV (CalDAV) - non-TLS path=<context path> # caldavs tcp Calendaring Extensions to [IESG] [IETF_Chair] 2012-02-17 [RFC6764] This is an extension of the https service. Defined TXT keys: @@ -16451,6 +16446,9 @@ matahari 49000/tcp # Matahari Broker [Matahari_Project] # htvncconf udp HomeTouch Vnc Configuration [Yuval_Rakavy] [Yuval_Rakavy] 2012-07-10 Defined TXT keys: None # hyperstream Atempo HyperStream [Laurent_Charmet] [Laurent_Charmet] Defined TXT keys: version=x.y.z.w uuid=<36 bytes UUID string> # deduplication server host=<real host name> +# iad1 BBN IAD 2013-05-24 This service name is no longer in use. +# iad2 BBN IAD 2013-05-24 This service name is no longer in use. +# iad3 BBN IAD 2013-05-24 This service name is no longer in use. # ibiz iBiz Server [IGG_Software] [IGG_Software] Defined TXT keys: None # ica-networking Image Capture Networking [Baskaran_Subramaniam] [Baskaran_Subramaniam] Defined TXT keys: None # ican Northrup Grumman/TASC/ICAN [Laurent_Mihalkovic] [Laurent_Mihalkovic] Defined TXT keys: None @@ -16525,6 +16523,8 @@ matahari 49000/tcp # Matahari Broker [Matahari_Project] # keynotepairing tcp pair Keynote Remote with [Apple] [Brad_Vaughan] 2011-10-12 Defined TXT keys: None # Keynote # ktp Kabira Transaction Platform [Ramiro_Sarmiento] [Ramiro_Sarmiento] Defined TXT keys: None +# la-maint IMP Logical Address 2013-05-24 This service name is no longer in use. +# Maintenance # labyrinth udp Labyrinth local multiplayer [Andreas_Alptun] [Andreas_Alptun] Defined TXT keys: None # protocol # lan2p Lan2P Peer-to-Peer Network [Ben_Guild] [Ben_Guild] Defined TXT keys: None @@ -17480,7 +17480,6 @@ matahari 49000/tcp # Matahari Broker [Matahari_Project] # [Andy_Grover] Andy Grover mailto:andy.grover&oracle.com 2009-05-20 # [Andy_Heron] Andy Heron mailto:btexact.ports&bt.com # [Andy_Krouwel] Andy Krouwel mailto:andy&kar2ouche.com -# [Andy_Malis] Andy Malis mailto:malis_a&timeplex.com # [Andy_McKeen] Andy McKeen mailto:mckeen&osf.org # [Andy_O_Meara] Andy O'Meara mailto:andy&soundspectrum.com # [Andy_Perreault] Andy Perreault mailto:aperreault&erlphase.com 2010-03-31 @@ -17826,6 +17825,7 @@ matahari 49000/tcp # Matahari Broker [Matahari_Project] # America (PEWLA) # [Bryce_Beeston] Bryce Beeston mailto:bryce.beeston&emerson.com 2011-06-23 # [Bryce_Bhatnagar] Bryce Bhatnagar mailto:BRYCEBH&attachmate.com +# [buddycloud] buddycloud mailto:simon&buddycloud.com 2013-05-20 # [Buck_Caldwell] Buck Caldwell mailto:buck_c&polygon.com # [Bulent_Kasman] Bulent Kasman mailto:BKasman&symantec.com # [Byron_Jones] Byron Jones mailto:byronj&bellsouth.net @@ -21358,6 +21358,7 @@ matahari 49000/tcp # Matahari Broker [Matahari_Project] # [Simon_Phipps] Simon Phipps mailto:sphipps&vnet.ibm.com # [Simon_Robillard] Simon Robillard mailto:RobillardS&actresearch.com # [Simon_Skaria] Simon Skaria mailto:simonskµsoft.com 2006-01 +# [Simon_Tennant] Simon Tennant buddycloud mailto:simon&buddycloud.com 2013-05-20 # [Simon_Wunderlich] Simon Wunderlich mailto:siwu&hrz.tu-chemnitz.de 2007-08-30 # [Simone_Molendini] Simone Molendini mailto:simone.molendini&unile.it 2003-11 # [Simson_L_Garfinkel] Simson L. Garfinkel mailto:simsong&next.cambridge.ma.us |