diff --git a/AUTHORS b/AUTHORS index 336141ad69..ad9cc101db 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4056,6 +4056,7 @@ Claudius Zingerli Cody Doucette Cédric Delmas D. Ulis +Daan De Meyer Daniel Mack Daniel Stenberg Daniel Tan @@ -4064,6 +4065,7 @@ Daniele Lacamera Daniël van Eeden Darien Spencer Darshan Nevgi +Dave Goodell Dave Pifke Dave Rigby Dave Tapuska @@ -4161,6 +4163,7 @@ Jens Kilian Jeremy Hitt Jeroen Roovers Jeroen Sack +Jeroen Sack Jesse Gross Jim Schaettle Jim Young @@ -4223,6 +4226,7 @@ Mark Cunningham Mark Phillips Mark Weel Marko Hrastovec +Martin Boye Petersen Martin Sehnoutka Martin Tibenský Martin Vit @@ -4262,6 +4266,7 @@ Nicolas BERTIN Nicolas Cavallari Nicolas S. Dade Nils Ohlmeier +Nitzan Carmi Noel Power Nora Sandler Olaf Bergmann @@ -4310,6 +4315,7 @@ Remi Gacogne Ricardo Cristian Ramirez Rich Coe Richard Kuemmel +Richard Sharpe Richard Sharpe Rishi Dev Singh Robert Beardsworth diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers index b37b5d897e..fcf8b10632 100644 --- a/epan/enterprise-numbers +++ b/epan/enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2017-06-09) +(last updated 2017-06-18) SMI Network Management Private Enterprise Codes: @@ -29118,9 +29118,9 @@ Decimal Youngbong Choe hurd&sds.co.kr 7291 - Lecointe Ludovic + LUTEUS SARL (formerly 'Lecointe Ludovic') Lecointe Ludovic - loriot&llecointe.com + support&loriotpro.com 7292 Krone Multimedia Ges.m.b.H Co KG Hans Peleska @@ -77077,8 +77077,8 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa yoshiaki.hasegawa&tamura-ss.co.jp 19381 Bundesanstalt fuer Finanzdienstleistungsaufsicht - Carsten Guenther - Carsten.Guenther&bafin.de + Stefan Klueppel, Oliver Hennl, Ruediger Vetter, Martin Steitz + pki&bafin.de 19382 Manzara Electronics LTD. Stacy Minkin @@ -91412,7 +91412,7 @@ Urzêdzie Wojewódzkim w Olsztynie 22962 matrix.mx Martin Tomanec - martin-t&utanet.at + martin+iana&myspot.at 22963 Vale Technology LTD Edward Moloney @@ -142918,7 +142918,7 @@ Decentralization / Helenic Public Administra 35834 Gozaimass Pascal VIVIEN - darwin&gozaimass.fr + pen.iana.org&gozaimass.fr 35835 iB Solution Corporation Satoshi HOSHINO @@ -194812,7 +194812,7 @@ Decentralization / Helenic Public Administra David Combs david.combs&postholdings.com 48808 - THALES SERVICES LAB CSK + Thales Services France ATHENA (formerly 'THALES SERVICES LAB CSK') GINTRAND Olivier olivier.gintrand&thalesgroup.com 48809 @@ -197108,9 +197108,9 @@ Decentralization / Helenic Public Administra OID Administrator oid-admin&uow.edu.au 49382 - Engility Corporation - Tyson Meza - tyson.meza&engilitycorp.com + Engility Corporation + Administrator + j.goldberg&engilitycorp.com 49383 Riverscape Software Brian Mottershead @@ -197897,8 +197897,8 @@ Decentralization / Helenic Public Administra praneet&globalcom.in 49579 TCOM L.P. - Drew Hornischer - drew.hornischer&tcomlp.com + Matt Fields + tclo&tcomlp.com 49580 Samuel Bächler Informatik Samuel Bächler @@ -200123,6 +200123,214 @@ Decentralization / Helenic Public Administra Markon Cooperative Inc John Eldredge johne&markon.com +50136 + High Sec Hosting HSDC AB + Rickard Johnsson + rille&highsechosting.eu +50137 + Greene County Circuit Court + Doug Shy + dshy&courts.mo.gov +50138 + Legrand North and Central America + John Canny + John.Canny&Legrand.Us +50139 + Trice Medical, Inc. + Al Intintoli + aintintoli&tricemedical.com +50140 + Thinking Objects GmbH + Raffaele Lupo + penmaster&to.com +50141 + Sundkontor + Igor Hein + igor.hein&sundkontor.de +50142 + Sunshine Coast Council + Web Master + webmaster&sunshinecoast.qld.gov.au +50143 + Universitätsmedizin Greifswald + UMG Hostmaster + umg-it-netz&uni-greifswald.de +50144 + Viz.AI + David Golan + david&viz.ai +50145 + FRRouting + David Lamparter + equinox&opensourcerouting.org +50146 + Wi-Net Telecom + Hugo De Zela + hugodz&winet.com.pe +50147 + Mateer Harbert + Bryan Fowler + bfowler&mateerharbert.com +50148 + PIXELLAB LLC + Jaiden Benz + pixellab&icloud.com +50149 + Beijing ZhongChuang Teraspek Co.,LTD + Marvin + Marvin&teraspek.com +50150 + Royole Corporation + Tuochen Lyu + Tuochen.Lyu&Royole.com +50151 + Flugatlas + PEN Administrator + pen.administrator&flugatlas.com +50152 + NEOCHROM-TRADE, ltd + Oleksii Serikov + ceo&neochrom.trade +50153 + Span d.o.o. + Jasmin Kotur + jasmin.kotur&span.eu +50154 + NU2 Systems LLC + Isac Tabib + isac&ifly51.com +50155 + Babioch + Karol Babioch + karol&babioch.de +50156 + Navigators Studentenverenging Enschede + Daniël van de Giessen + daniel&nsenschede.nl +50157 + fouss + Sébastien Fouss + sebastien&fouss.be +50158 + City of Burnsville + Ryan Huss + ryan.huss&burnsvillemn.gov +50159 + Monro Muffler Brake Inc. + Mark Kraska + mark.kraska&monro.com +50160 + YUASA-NET + Toru Yuasa + cert_contact&yuasa.org +50161 + it-pro-berlin.de + Evgenij Smirnov + es&it-pro-berlin.de +50162 + Sweet Hub + Yanwen Sun + sunyanwen&steadysweet.com +50163 + Hartmut Eilers + Hartmut Eilers + hartmut&eilers.net +50164 + STATUS INTERNET CO., LTD + Nick Chang + Nickchang&status.com.tw +50165 + IPN Solutions GmbH & Co. KG + Daniel Glaser + info&ipn-solutions.com +50166 + Aviall Services, Inc. + Lesli Hust + Netops&aviall.com +50167 + NGP VAN, Inc + Louis Levine + it&ngpvan.com +50168 + Aaltronav + ICT Manager + hostmaster&aaltronav.eu +50169 + Industrielle Alliance + Olivier Van Uytvanck + olivier.vanuytvanck&ia.ca +50170 + Price International Ltd + Martin Kokalov + support&callflowlab.com +50171 + ICON Multimedia, S.L. + Rafael Hornos + rhornos&iconmm.com +50172 + ifm syntron gmbh + Andreas Gebhard + andreas.gebhard&ifm.com +50173 + DOMINAE Srl Unipersonale + Alessandro Bressan + info&dominae.com +50174 + Beekeeper Technology + Jonathan Steinert + iana&beekeeper.technology +50175 + The Department for Work and Pensions + Phil Raynor + phil.raynor&dwp.gsi.gov.uk +50176 + Mark H. Zangmeister Center + Dewana Frazier + mstromer&zangcenter.com +50177 + Nextiva + Ralph Goers + rgoers&nextiva.com +50178 + FLR Services Ltd + Lewis Richards + flr_ots&hotmail.com +50179 + Ocean Technical Systems + Lewis Richards + lrichards&oceantechsys.co.uk +50180 + MiaRec, Inc. + Gennadiy Bezkorovayniy + gb&miarec.com +50181 + pioto.org + Mike Kelly + pioto&pioto.org +50182 + Weibel Scientific A/S + Peter Adamsen + pa&weibel.dk +50183 + EIUS d.o.o. + Andrej Komelj + akomelj&gmail.com +50184 + Tech4Lyfe Co. Ltd + Nur Nadia Nabila Binti Mustakim + misenns&gmail.com +50185 + WH Gelsenkirchen FB Informatik + Volker Goerick + Volker.Goerick&w-hs.de +50186 + Vodafone UK + Lorraine Dryland + Lorraine.Dryland&vodafone.com +50187 + Pattern Recognition and Inteligent Systems Laboratory + Fransisco Siles + prislab.soporte&gmail.com End of Document diff --git a/epan/sminmpec.c b/epan/sminmpec.c index 8262dc2dbb..6949641062 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -7311,7 +7311,7 @@ const value_string sminmpec_values[] = { { 7288, "ActiveSky Inc." }, { 7289, "Visual Analysis AG" }, { 7290, "Samjung Data Service LTD.,CO." }, - { 7291, "Lecointe Ludovic" }, + { 7291, "LUTEUS SARL (formerly 'Lecointe Ludovic')" }, { 7292, "Krone Multimedia Ges.m.b.H Co KG" }, { 7293, "POWERCOM CO., Ltd." }, { 7294, "Soci\0303\0251t\0303\0251 G\0303\0251n\0303\0251rale de T\0303\0251l\0303\0251informatique" }, @@ -48828,7 +48828,7 @@ const value_string sminmpec_values[] = { { 48805, "Shadrinsk State Pedagogical University" }, { 48806, "uznm" }, { 48807, "Post Holdings" }, - { 48808, "THALES SERVICES LAB CSK" }, + { 48808, "Thales Services France ATHENA (formerly 'THALES SERVICES LAB CSK')" }, { 48809, "medi-x-Thomas Kadlubowski" }, { 48810, "21st Century Onco EKWR" }, { 48811, "BADU Networks Inc." }, @@ -49402,7 +49402,7 @@ const value_string sminmpec_values[] = { { 49379, "RGB Spectrum" }, { 49380, "The Fastest Dog, Inc." }, { 49381, "University of Wollongong" }, - { 49382, "Engility Corporation " }, + { 49382, "Engility Corporation" }, { 49383, "Riverscape Software" }, { 49384, "InfoTest@KinLong" }, { 49385, "effiPilot" }, @@ -50156,6 +50156,58 @@ const value_string sminmpec_values[] = { { 50133, "GPI RAS" }, { 50134, "Enika LLC" }, { 50135, "Markon Cooperative Inc" }, + { 50136, "High Sec Hosting HSDC AB" }, + { 50137, "Greene County Circuit Court" }, + { 50138, "Legrand North and Central America" }, + { 50139, "Trice Medical, Inc." }, + { 50140, "Thinking Objects GmbH" }, + { 50141, "Sundkontor" }, + { 50142, "Sunshine Coast Council" }, + { 50143, "Universit\0303\0244tsmedizin Greifswald" }, + { 50144, "Viz.AI" }, + { 50145, "FRRouting" }, + { 50146, "Wi-Net Telecom" }, + { 50147, "Mateer Harbert" }, + { 50148, "PIXELLAB LLC" }, + { 50149, "Beijing ZhongChuang Teraspek Co.,LTD" }, + { 50150, "Royole Corporation" }, + { 50151, "Flugatlas" }, + { 50152, "NEOCHROM-TRADE, ltd " }, + { 50153, "Span d.o.o." }, + { 50154, "NU2 Systems LLC" }, + { 50155, "Babioch" }, + { 50156, "Navigators Studentenverenging Enschede" }, + { 50157, "fouss" }, + { 50158, "City of Burnsville" }, + { 50159, "Monro Muffler Brake Inc." }, + { 50160, "YUASA-NET" }, + { 50161, "it-pro-berlin.de" }, + { 50162, "Sweet Hub" }, + { 50163, "Hartmut Eilers" }, + { 50164, "STATUS INTERNET CO., LTD" }, + { 50165, "IPN Solutions GmbH & Co. KG" }, + { 50166, "Aviall Services, Inc." }, + { 50167, "NGP VAN, Inc" }, + { 50168, "Aaltronav" }, + { 50169, "Industrielle Alliance" }, + { 50170, "Price International Ltd" }, + { 50171, "ICON Multimedia, S.L." }, + { 50172, "ifm syntron gmbh" }, + { 50173, "DOMINAE Srl Unipersonale" }, + { 50174, "Beekeeper Technology" }, + { 50175, "The Department for Work and Pensions" }, + { 50176, "Mark H. Zangmeister Center" }, + { 50177, "Nextiva" }, + { 50178, "FLR Services Ltd" }, + { 50179, "Ocean Technical Systems" }, + { 50180, "MiaRec, Inc." }, + { 50181, "pioto.org" }, + { 50182, "Weibel Scientific A/S" }, + { 50183, "EIUS d.o.o." }, + { 50184, "Tech4Lyfe Co. Ltd" }, + { 50185, "WH Gelsenkirchen FB Informatik" }, + { 50186, "Vodafone UK" }, + { 50187, "Pattern Recognition and Inteligent Systems Laboratory" }, { 0, NULL} }; diff --git a/manuf b/manuf index ac44ba1d80..310c97ab1d 100644 --- a/manuf +++ b/manuf @@ -17337,6 +17337,7 @@ 04:CF:25 Manycolo # MANYCOLORS, INC. 04:D3:CF Apple # Apple, Inc. 04:D4:37 Znv +04:D6:AA SamsungE # SAMSUNG ELECTRO-MECHANICS(THAILAND) 04:D7:83 Y&HE&C # Y&H E&C Co.,LTD. 04:DA:D2 Cisco # Cisco Systems, Inc 04:DB:56 Apple # Apple, Inc. @@ -17580,6 +17581,7 @@ 08:60:6E AsustekC # ASUSTek COMPUTER INC. 08:62:66 AsustekC # ASUSTek COMPUTER INC. 08:63:61 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +08:66:1F PaloAlto # Palo Alto Networks 08:66:98 Apple # Apple, Inc. 08:68:D0 JapanSys # Japan System Design 08:68:EA EitoElec # EITO ELECTRONICS CO., LTD. @@ -17733,6 +17735,7 @@ 0C:55:21 Axiros # Axiros GmbH 0C:56:5C HybroadV # HyBroad Vision (Hong Kong) Technology Co Ltd 0C:57:EB Mueller # Mueller Systems +0C:58:42 DmeMicro # DME Micro 0C:5A:19 AxtionSd # Axtion Sdn Bhd 0C:5A:9E Wi-SunAl # Wi-SUN Alliance 0C:5C:D8 DoliElek # DOLI Elektronik GmbH @@ -18052,6 +18055,7 @@ 10:FA:CE Reacheng # Reacheng Communication Technology Co.,Ltd 10:FB:F0 Kangshen # KangSheng LTD. 10:FC:54 ShanyEle # Shany Electronic Co., Ltd. +10:FC:B6 Mirusyst # mirusystems CO.,LTD 10:FE:ED Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 11:00:AA Private 11:11:11 Private @@ -19335,11 +19339,13 @@ 2C:27:9E:30:00:00/28 Private 2C:27:9E:40:00:00/28 Shijiazh # Shijiazhuang King Transportation Equipment Co.,Ltd 2C:27:9E:50:00:00/28 Audionor # AudioNord Distribution A/S +2C:27:9E:60:00:00/28 Rutledge # Rutledge Omni Services Pte Ltd 2C:27:9E:80:00:00/28 Institut # Institut Dr. Foerster GmbH & Co. KG 2C:27:9E:90:00:00/28 Octoscop # octoScope, Inc. 2C:27:9E:A0:00:00/28 Exegy # Exegy Inc 2C:27:9E:C0:00:00/28 WaycomTe # WAYCOM Technology Co.,Ltd 2C:27:9E:D0:00:00/28 JiangsuJ # Jiangsu JianHu Science & Technology Co., Ltd. +2C:27:9E:E0:00:00/28 Amaryllo # Amaryllo International Inc. 2C:27:D7 HewlettP # Hewlett Packard 2C:28:2D BbkEduca # BBK EDUCATIONAL ELECTRONICS CORP.,LTD. 2C:29:97 Microsof # Microsoft Corporation @@ -19768,6 +19774,7 @@ 34:51:AA JidGloba # JID GLOBAL 34:51:C9 Apple # Apple, Inc. 34:54:3C TakaokaT # TAKAOKA TOKO CO.,LTD. +34:56:FE CiscoMer # Cisco Meraki 34:57:60 Mitrasta # MitraStar Technology Corp. 34:5B:11 EviHeat # EVI HEAT AB 34:5B:BB GdMideaA # GD Midea Air-Conditioning Equipment Co.,Ltd. @@ -20396,7 +20403,7 @@ 40:88:E0 BeijingE # Beijing Ereneben Information Technology Limited Shenzhen Branch 40:8A:9A Titeng # TITENG CO., Ltd. 40:8B:07 Actionte # Actiontec Electronics, Inc -40:8B:F6 Shenzhen # Shenzhen TCL New Technology Co; Ltd. +40:8B:F6 Shenzhen # Shenzhen TCL New Technology Co., Ltd 40:8D:5C Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 40:95:58 Aisino # Aisino Corporation 40:95:BD Ntmore # NTmore.Co.,Ltd @@ -21305,6 +21312,7 @@ 48:D1:8E MetisCom # Metis Communication Co.,Ltd 48:D2:24 LiteonTe # Liteon Technology Corporation 48:D3:43 ArrisGro # ARRIS Group, Inc. +48:D3:5D Private 48:D5:39 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 48:D5:4C JedaNetw # Jeda Networks 48:D7:05 Apple # Apple, Inc. @@ -21583,6 +21591,7 @@ 50:32:37 Apple # Apple, Inc. 50:32:75 SamsungE # Samsung Electronics Co.,Ltd 50:33:8B TexasIns # Texas Instruments +50:33:F0 YichenSh # YICHEN (SHENZHEN) TECHNOLOGY CO.LTD 50:39:55 CiscoSpv # Cisco SPVTG 50:3A:7D Alphatec # AlphaTech PLC Int’l Co., Ltd. 50:3A:A0 Shenzhen # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD. @@ -22809,6 +22818,7 @@ 68:BC:0C Cisco # Cisco Systems, Inc 68:BD:AB Cisco # Cisco Systems, Inc 68:C4:4D Motorola # Motorola Mobility LLC, a Lenovo Company +68:C6:3A Espressi # Espressif Inc. 68:C9:0B TexasIns # Texas Instruments 68:CA:00 Octopus # Octopus Systems Limited 68:CC:6E HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -23131,6 +23141,7 @@ 70:8B:CD AsustekC # ASUSTek COMPUTER INC. 70:8D:09 Nokia # Nokia Corporation 70:91:8F Weber-St # Weber-Stephen Products LLC +70:91:F3 Universa # Universal Electronics, Inc. 70:93:83 Intellig # Intelligent Optical Network High Tech CO.,LTD. 70:93:F8 SpaceMon # Space Monkey, Inc. 70:97:56 Happyele # Happyelectronics Co.,Ltd @@ -23404,6 +23415,7 @@ 70:B3:D5:1E:30:00/36 HatelEle # Hatel Elektronik LTD. STI. 70:B3:D5:1E:40:00/36 Tecnolog # Tecnologix s.r.l. 70:B3:D5:1E:50:00/36 Vendnova # VendNovation LLC +70:B3:D5:1E:60:00/36 SanminaI # Sanmina Israel 70:B3:D5:1E:90:00/36 Comtime # comtime GmbH 70:B3:D5:1E:F0:00/36 Adtek 70:B3:D5:1F:30:00/36 SmartEne # Smart Energy Code Company Limited @@ -23491,6 +23503,7 @@ 70:B3:D5:2A:20:00/36 Visualwa # Visualware, Inc. 70:B3:D5:2A:50:00/36 Taitotek # Taitotekniikka 70:B3:D5:2A:70:00/36 Plasmabi # Plasmability, LLC +70:B3:D5:2A:B0:00/36 NasaJohn # NASA Johnson Space Center 70:B3:D5:2A:C0:00/36 NewImagi # New Imaging Technologies 70:B3:D5:2A:D0:00/36 OpgalOpt # Opgal Optronic Industries 70:B3:D5:2B:00:00/36 BeijingZ # Beijing Zhongyi Yue Tai Technology Co., Ltd @@ -23950,7 +23963,6 @@ 70:B3:D5:67:90:00/36 Emac # EMAC, Inc. 70:B3:D5:67:B0:00/36 Stesalit # Stesalit Systems Ltd 70:B3:D5:68:20:00/36 Rosslare # Rosslare Enterprises Limited -70:B3:D5:68:30:00/36 ApeironD # Apeiron Data Systems 70:B3:D5:68:D0:00/36 Meta-Chr # Meta-chrom Co. Ltd. 70:B3:D5:68:E0:00/36 CeaTechn # CEA Technologies Pty Ltd 70:B3:D5:68:F0:00/36 PeekTraf # PEEK TRAFFIC @@ -24139,6 +24151,7 @@ 70:B3:D5:80:40:00/36 Pmt # PMT Corporation 70:B3:D5:80:50:00/36 Eurotron # Eurotronik Kranj d.o.o. 70:B3:D5:80:70:00/36 CamsatPr # Camsat Przemysław Gralak +70:B3:D5:80:90:00/36 TecnintH # Tecnint HTE SRL 70:B3:D5:80:A0:00/36 SensingL # SENSING LABS 70:B3:D5:80:B0:00/36 FischerB # Fischer Block, Inc. 70:B3:D5:80:D0:00/36 DataPhys # Data Physics Corporation @@ -24155,6 +24168,7 @@ 70:B3:D5:82:10:00/36 Hl2Group # HL2 group 70:B3:D5:82:30:00/36 SpContro # SP Controls 70:B3:D5:82:50:00/36 TattileS # TATTILE SRL +70:B3:D5:82:60:00/36 ElbitOfA # Elbit Systems of Amerixca 70:B3:D5:82:70:00/36 Metromat # Metromatics Pty Ltd 70:B3:D5:82:C0:00/36 Nels # NELS Ltd. 70:B3:D5:82:E0:00/36 Playaliv # PlayAlive A/S @@ -24166,6 +24180,7 @@ 70:B3:D5:83:C0:00/36 Sinoembe # Sinoembed 70:B3:D5:83:F0:00/36 LumineLi # Lumine Lighting Solutions Oy 70:B3:D5:84:00:00/36 Xm +70:B3:D5:84:20:00/36 PlutoSol # PLUTO Solution co.,ltd. 70:B3:D5:84:40:00/36 SansfilT # SANSFIL Technologies 70:B3:D5:84:70:00/36 Ai-Lynx 70:B3:D5:84:90:00/36 Rf-Tuote # RF-Tuote Oy @@ -24930,6 +24945,7 @@ 70:B3:D5:EB:10:00/36 CpContec # CP contech electronic GmbH 70:B3:D5:EB:20:00/36 ShooterD # Shooter Detection Systems 70:B3:D5:EB:70:00/36 Skreens +70:B3:D5:EB:90:00/36 ThielAud # Thiel Audio Products Company, LLC 70:B3:D5:EB:B0:00/36 BeijingW # Beijing Wing ICT Technology Co., Ltd. 70:B3:D5:EB:D0:00/36 MidbitTe # midBit Technologies, LLC 70:B3:D5:EB:E0:00/36 SierraPa # Sierra Pacific Innovations Corp @@ -25406,6 +25422,7 @@ 78:30:E1 Ultracle # UltraClenz, LLC 78:31:2B Zte # zte corporation 78:31:C1 Apple # Apple, Inc. +78:32:1B D-LinkIn # D-Link International 78:32:4F Millenni # Millennium Group, Inc. 78:36:90 YulongCo # Yulong Computer Telecommunication Scientific (Shenzhen) Co.,Ltd 78:3A:84 Apple # Apple, Inc. @@ -26020,6 +26037,7 @@ 80:C6:3F RemecBro # Remec Broadband Wireless , LLC 80:C6:AB Technico # Technicolor CH USA Inc. 80:C6:CA EndianSR # Endian s.r.l. +80:C7:55 Panasoni # Panasonic Appliances Company 80:C8:62 Openpeak # Openpeak, Inc 80:CE:B1 Theissen # Theissen Training Systems GmbH 80:CF:41 LenovoMo # Lenovo Mobile Communication Technology Ltd. @@ -26257,6 +26275,7 @@ 84:E0:F4:D0:00:00/28 Logos01S # Logos01 Srl 84:E0:F4:E0:00:00/28 Scale-Te # Scale-Tec Ltd. 84:E3:23 GreenWav # Green Wave Telecommunication SDN BHD +84:E3:27 TailynTe # TAILYN TECHNOLOGIES INC 84:E4:D9 Shenzhen # Shenzhen NEED technology Ltd. 84:E6:29 BluwanSa # Bluwan SA 84:E7:14 LiangHer # Liang Herng Enterprise,Co.Ltd. @@ -26370,6 +26389,7 @@ 88:79:7E Motorola # Motorola Mobility LLC, a Lenovo Company 88:7A:31 Velankan # Velankani Electronics Pvt. Ltd. 88:7F:03 ComperTe # Comper Technology Investment Limited +88:82:79 Shenzhen # Shenzhen RB-LINK Intelligent Technology Co.Ltd 88:83:22 SamsungE # Samsung Electronics Co.,Ltd 88:86:03 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 88:86:A0 SimtonTe # Simton Technologies, Ltd. @@ -29592,6 +29612,9 @@ CC:1E:FF Metrolog # Metrological Group BV CC:1F:C4 Invue CC:20:E8 Apple # Apple, Inc. CC:22:18 Innodigi # InnoDigital Co., Ltd. +CC:22:37 IeeeRegi # IEEE Registration Authority +CC:22:37:20:00:00/28 ApeironD # Apeiron Data Systems +CC:22:37:40:00:00/28 Shanghai # SHANGHAI CARGOA M.&E.EQUIPMENT CO.LTD CC:25:EF Apple # Apple, Inc. CC:26:2D VerifiLl # Verifi, LLC CC:29:F5 Apple # Apple, Inc. @@ -31483,6 +31506,7 @@ F4:6A:BC Adonit # Adonit Corp. Ltd. F4:6B:EF Sagemcom # Sagemcom Broadband SAS F4:6D:04 AsustekC # ASUSTek COMPUTER INC. F4:6D:E2 Zte # zte corporation +F4:6E:24 NecPerso # NEC Personal Computers, Ltd. F4:70:AB VivoMobi # vivo Mobile Communication Co., Ltd. F4:73:CA Conversi # Conversion Sound Inc. F4:76:26 Viltechm # Viltechmeda UAB @@ -31553,6 +31577,7 @@ F4:DC:F9 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD F4:DD:9E Gopro F4:DE:0C Espod # ESPOD Ltd. F4:E1:42 DeltaEle # Delta Elektronika BV +F4:E2:04 Traqueur F4:E3:FB HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD F4:E4:AD Zte # zte corporation F4:E6:D7 SolarPow # Solar Power Technologies, Inc. diff --git a/services b/services index e3f35e2892..fcae69a793 100644 --- a/services +++ b/services @@ -9753,7 +9753,7 @@ tidp 7548/udp # Threat Information Distribution Protocol [Chui_Tin_Y nls-tl 7549/tcp # Network Layer Signaling Transport Layer [Melinda_Shore] [Melinda_Shore] 2006-05 nls-tl 7549/udp # Network Layer Signaling Transport Layer [Melinda_Shore] [Melinda_Shore] 2006-05 cloudsignaling 7550/udp # Cloud Signaling Service [Scott_Dawson] [Scott_Dawson] 2011-07-01 -controlone-con 7551/tcp # ControlONE Console signaling [SIMB_Tecnologia] [Diego_Dias] 2014-11-07 +controlone-con 7551/tcp # ControlONE Console signaling [BYNE] [Andre_Nazario] 2014-11-07 2017-06-13 sncp 7560/tcp # Sniffer Command Protocol [Dominick_Cafarelli] [Dominick_Cafarelli] 2005-08 sncp 7560/udp # Sniffer Command Protocol [Dominick_Cafarelli] [Dominick_Cafarelli] 2005-08 cfw 7563/tcp # Control Framework [RFC6230] diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index b2870049d5..b56d842e58 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -7655,7 +7655,7 @@ text-decoration: underline; Osmux - + Osmux @@ -8233,7 +8233,7 @@ text-decoration: underline; Osmux packet counts - + Anzahl Osmux Pakete @@ -8537,37 +8537,37 @@ text-decoration: underline; Zoom in on the wireless timeline - + Vergrößern der Wireless Zeitleiste Ctrl+Shift+I - + Strg+Umschalt+I Zoom out on the wireless timeline - + Verkleinern der Wireless Zeitleiste Ctrl+Shift+O - + Strg+Umschalt+O Full capture - + Kompletter Mitschnitt Fully zoom out on the wireless timeline - + Wireless Zeitleiste komplett darstellen Ctrl+Shift+U - + Strg+Umschalt+U @@ -9389,22 +9389,22 @@ text-decoration: underline; vor dem Schließen - + Save packets before merging? Pakete vor dem Zusammenführen speichern? - + A temporary capture file can't be merged. Eine temporäre Mitschnittdatei kann nicht zusammengeführt werden. - + Save changes in "%1" before merging? Vor der Zusammenführung Änderungen in "%1" speichern? - + Changes must be saved before the files can be merged. Änderungen müssen vor dem Zusammenführen gespeichert werden. @@ -9414,128 +9414,128 @@ text-decoration: underline; Ungültiger Anzeigefilter - + Invalid Read Filter Ungültiger Lesefilter - + The filter expression %1 isn't a valid read filter. (%2). Der Filterausdruck %1 ist kein gültiger Lesefilter. (%2). - + before importing a capture before importing a new capture vor dem Importieren einer Aufzeichnung - + Unable to export to "%1". Kann nicht nach "%1" exportieren. - + You cannot export packets to the current capture file. Pakete können nicht in die aktuelle Mitschnittdatei exportiert werden. - - + + . . - + Do you want to save the changes you've made%1? Do you want to save the captured packets Wollen Sie die durchgeführten Änderungen speichern%1? - - + + Your captured packets will be lost if you don't save them. Die aufgezeichneten Pakete gehen verloren wenn sie nicht gespeichert werden. - + Do you want to save the changes you've made to the capture file "%1"%2? Sollen die Änderungen an der Mitschnittdatei "%1"%2 gespeichert werden? - - + + Your changes will be lost if you don't save them. Änderungen gehen verloren, wenn sie nicht gesichert werden. - + Unable to drop files during capture. Dateien können während dem Mitschnitt nicht verworfen werden. - + Do you want to stop the capture and save the captured packets%1? Wollen Sie die Aufzeichnung stoppen und die aufgezeichneten Pakete speichern%1? - + Do you want to save the captured packets%1? Wollen Sie die aufgezeichneten Pakete speichern%1? - + Save before Continue Vor dem Fortsetzen speichern - + Stop and Save Stoppen und speichern - + Stop and Quit &without Saving Stop and Quit without Saving Stoppen und beenden &ohne zu speichern - + Quit &without Saving Quit without Saving &Ohne speichern beenden - + Show or hide the toolbar Werkzeugleise anzeigen oder verstecken - - + + Continue &without Saving Continue without Saving Fortsetzen &ohne zu Speichern - + Stop and Continue &without Saving Stop and Continue without Saving Stoppen und Fortsetzen &ohne zu Speichern - + (File name can't be mapped to UTF-8) (Dateiname kann nicht auf UTF-8 angewendet werden) - + The Wireshark Network Analyzer Die Wireshark Netzwerk Analysesoftware - + Capturing from %1 Aufzeichnen von %1 @@ -11965,7 +11965,7 @@ text-decoration: underline; Stream Synchronized Forward and Reverse Audio - + Synchronisiertes Audio des Hin- und Rückweges streamen @@ -11975,7 +11975,7 @@ text-decoration: underline; Stream Synchronized Forward Stream Audio - + Synchronisiertes Audio des Hinweges streamen @@ -11985,7 +11985,7 @@ text-decoration: underline; Stream Synchronized Reverse Stream Audio - + Synchronisiertes Audio des Rückweges streamen @@ -11995,7 +11995,7 @@ text-decoration: underline; File Synchronized Forward and Reverse Audio - + Audiostream des Hin- und Rückweges speichern @@ -12005,7 +12005,7 @@ text-decoration: underline; File Synchronized Forward Stream Audio - + Audiostream des Hinweges speichern @@ -12015,7 +12015,7 @@ text-decoration: underline; File Synchronized Reverse Stream Audio - + Audiostream des Rückweges speichern @@ -14804,7 +14804,7 @@ text-decoration: underline; Select SACKs select SACKs - + SACKs auswählen diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 8c9a3c9f0b..7b1142151d 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -9280,22 +9280,22 @@ a:hover { - + Save packets before merging? - + A temporary capture file can't be merged. - + Save changes in "%1" before merging? - + Changes must be saved before the files can be merged. @@ -9305,128 +9305,128 @@ a:hover { - + Invalid Read Filter - + The filter expression %1 isn't a valid read filter. (%2). - + before importing a capture before importing a new capture - + Unable to export to "%1". - + You cannot export packets to the current capture file. - - + + . - + Do you want to save the changes you've made%1? Do you want to save the captured packets - - + + Your captured packets will be lost if you don't save them. - + Do you want to save the changes you've made to the capture file "%1"%2? - - + + Your changes will be lost if you don't save them. - + Unable to drop files during capture. - + Do you want to stop the capture and save the captured packets%1? - + Do you want to save the captured packets%1? - + Save before Continue - + Stop and Save - + Stop and Quit &without Saving Stop and Quit without Saving - + Quit &without Saving Quit without Saving - + Show or hide the toolbar - - + + Continue &without Saving Continue without Saving - + Stop and Continue &without Saving Stop and Continue without Saving - + (File name can't be mapped to UTF-8) - + The Wireshark Network Analyzer - + Capturing from %1 diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index 713610fca3..f66beca4de 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -9358,22 +9358,22 @@ a:hover { avant de quitter - + Save packets before merging? Sauvegarder les paquets avant la fusion? - + A temporary capture file can't be merged. une capture temporaire ne peut pas etre fusionner. - + Save changes in "%1" before merging? Sauvegarder les changements dans "%1" avant la fusion? - + Changes must be saved before the files can be merged. Les changements doivent etre sauvegarder avant la fusion de fichier. @@ -9383,128 +9383,128 @@ a:hover { Filtre d'affichage invalide - + Invalid Read Filter Filtre de Lecture Invalide - + The filter expression %1 isn't a valid read filter. (%2). L'expression de filtre %1 n'est pas un filtre de lecture valide. (%2). - + before importing a capture before importing a new capture - + Unable to export to "%1". Impossible d'exporter dans "%1". - + You cannot export packets to the current capture file. Vous ne pouvez pas exporter les paquets de la capture en cours. - - + + . . - + Do you want to save the changes you've made%1? Do you want to save the captured packets - - + + Your captured packets will be lost if you don't save them. Votre capture de paquet sera perdu si vous ne les enregistrez pas. - + Do you want to save the changes you've made to the capture file "%1"%2? Voulez-vous enregistrer les modifications que vous avez apportées au fichier de capture "%1"%2? - - + + Your changes will be lost if you don't save them. Vos changements seront perdus si vous ne les enregistrez pas. - + Unable to drop files during capture. - + Do you want to stop the capture and save the captured packets%1? - + Do you want to save the captured packets%1? - + Save before Continue - + Stop and Save Arreter et Sauvegarder - + Stop and Quit &without Saving Stop and Quit without Saving - + Quit &without Saving Quit without Saving - + Show or hide the toolbar - - + + Continue &without Saving Continue without Saving - + Stop and Continue &without Saving Stop and Continue without Saving - + (File name can't be mapped to UTF-8) (Nom du fichier ne peut pas être mappé à l'UTF-8) - + The Wireshark Network Analyzer L'analyseur de réseau Wireshark - + Capturing from %1 Capture en cours de %1 diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 0ed6a4d8a6..486ff2a85c 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -8536,37 +8536,37 @@ a:hover { Zoom in on the wireless timeline - + Ingrandisci sulla linea temporale del wireless Ctrl+Shift+I - + Ctrl+Maiusc+I Zoom out on the wireless timeline - + Rimpicciolisci sulla linea temporale del wireless Ctrl+Shift+O - + Ctrl+Maiusc+O Full capture - + Cattura completa Fully zoom out on the wireless timeline - + Rimpicciolisci completamente sulla linea temporale del wireless Ctrl+Shift+U - + Ctrl+Maiusc+U @@ -9388,22 +9388,22 @@ a:hover { prima di uscire - + Save packets before merging? Salvare i pacchetti prima di unire? - + A temporary capture file can't be merged. Un file di cattura temporaneo non può essere unito. - + Save changes in "%1" before merging? Salvare le modifiche a "%1" prima di unire? - + Changes must be saved before the files can be merged. Le modifiche devono essere salvate prima di unire. @@ -9413,128 +9413,128 @@ a:hover { Filtro di visualizzazione non valido - + Invalid Read Filter Filtro di lettura non valido - + The filter expression %1 isn't a valid read filter. (%2). L'espressione %1 non è un filtro di lettura valido. (%2). - + before importing a capture before importing a new capture prima di importare una cattura - + Unable to export to "%1". Impossibile esportare su "%1". - + You cannot export packets to the current capture file. Non puoi esportare pacchetti sul file di cattura attuale. - - + + . . - + Do you want to save the changes you've made%1? Do you want to save the captured packets Vuoi salvare le modifiche che hai apportato%1? - - + + Your captured packets will be lost if you don't save them. I pacchetti catturati saranno persi se non li salvi. - + Do you want to save the changes you've made to the capture file "%1"%2? Vuoi salvare le modifiche che hai apportato al file di cattura "%1"%2? - - + + Your changes will be lost if you don't save them. Le modifiche saranno perse se non le salvi. - + Unable to drop files during capture. Impossibile scartare file durante la cattura. - + Do you want to stop the capture and save the captured packets%1? Vuoi interrompere la cattura e salvare i pacchetti catturati%1? - + Do you want to save the captured packets%1? Vuoi salvare i pacchetti catturati%1? - + Save before Continue Salva prima di continuare - + Stop and Save Ferma e salva - + Stop and Quit &without Saving Stop and Quit without Saving Ferma ed esci senza sal&vare - + Quit &without Saving Quit without Saving Esci senza sal&vare - + Show or hide the toolbar Mostra o nascondi la barra degli strumenti - - + + Continue &without Saving Continue without Saving Continua senza sal&vare - + Stop and Continue &without Saving Stop and Continue without Saving Ferma e continua senza sal&vare - + (File name can't be mapped to UTF-8) (Il nome del file non può essere associato in UTF-8) - + The Wireshark Network Analyzer Wireshark l'analizzatore di rete - + Capturing from %1 Cattura da %1 diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 5610e4e032..7da1bb4a39 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -9345,22 +9345,22 @@ a:hover { 終了前 - + Save packets before merging? 結合する前にパケットを保存しますか？ - + A temporary capture file can't be merged. 一時的なキャプチャファイルは結合することができません - + Save changes in "%1" before merging? 結合する前に "%1" に変更を保存しますか？ - + Changes must be saved before the files can be merged. ファイルを結合する前に変更を保存する必要があります @@ -9370,128 +9370,128 @@ a:hover { 無効な表示フィルタ - + Invalid Read Filter 無効な読込フィルタ - + The filter expression %1 isn't a valid read filter. (%2). フィルタ式 %1 は有効な読込みフィルタではありません(%2) - + before importing a capture before importing a new capture 新しいキャプチャファイルをインポートする前に - + Unable to export to "%1". "%1" をエクスポートすることができません - + You cannot export packets to the current capture file. 現在のキャプチャファイルへパケットをエクスポートすることはできません - - + + . . - + Do you want to save the changes you've made%1? Do you want to save the captured packets %1 に作成した変更を保存したいですか？ - - + + Your captured packets will be lost if you don't save them. 保存しない場合キャプチャしたパケットは失われます - + Do you want to save the changes you've made to the capture file "%1"%2? キャプチャスタイルに行った変更を保存しますか - - + + Your changes will be lost if you don't save them. 保存しない場合変更は失われます - + Unable to drop files during capture. - + Do you want to stop the capture and save the captured packets%1? キャプチャを停止してキャプチャしたパケットを保存しますか？%1 - + Do you want to save the captured packets%1? キャプチャしたパケットを保存しますか？%1 - + Save before Continue - + Stop and Save 停止して保存 - + Stop and Quit &without Saving Stop and Quit without Saving - + Quit &without Saving Quit without Saving - + Show or hide the toolbar - - + + Continue &without Saving Continue without Saving - + Stop and Continue &without Saving Stop and Continue without Saving - + (File name can't be mapped to UTF-8) ファイル名をUTF-8形式に割り当てできません - + The Wireshark Network Analyzer ワイヤーシャークネットワークアナライザ - + Capturing from %1 %1 からキャプチャ中 diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 906d8c20c5..b74ddaa5ba 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -9390,22 +9390,22 @@ text-decoration: underline; przed wyjściem - + Save packets before merging? Zapisać pakiety przed scaleniem? - + A temporary capture file can't be merged. Tymczasowy plik przechwytywania nie może zostać scalony. - + Save changes in "%1" before merging? Zapisać zmiany w "%1" przed scaleniem? - + Changes must be saved before the files can be merged. Zmiany muszą być zapisane przed próbą scalenia plików. @@ -9415,128 +9415,128 @@ text-decoration: underline; Niepoprawny filtr - + Invalid Read Filter Niepoprawny filtr wczytywania - + The filter expression %1 isn't a valid read filter. (%2). Postać filtru wczytywania %1 nie jest poprawna. (%2). - + before importing a capture before importing a new capture przed zaimportowaniem nowego pliku przechwytywania - + Unable to export to "%1". Nie można wyeksportować do "%1". - + You cannot export packets to the current capture file. Nie można wyeksportować pakietów do aktualnego pliku. - - + + . . - + Do you want to save the changes you've made%1? Do you want to save the captured packets Czy chcesz zapisać zrobione zmiany %1? - - + + Your captured packets will be lost if you don't save them. Twoje przechwycone pakiety zostaną utracone jeśli nie zapiszesz ich. - + Do you want to save the changes you've made to the capture file "%1"%2? Czy chcesz zapisać zmiany, które zrobiłeś do pliku przechytywania "%1"%2? - - + + Your changes will be lost if you don't save them. Twoje zmiany zostaną utracone jeśli nie zapiszesz ich. - + Unable to drop files during capture. - + Do you want to stop the capture and save the captured packets%1? Czy chcesz zatrzymać przechwytywanie i zapisać przechwycone pakiety%1? - + Do you want to save the captured packets%1? Czy chcesz zapisać przechwycone pakiety%1? - + Save before Continue Zapisz przed kontynuowaniem - + Stop and Save Zatrzymaj i zapisz - + Stop and Quit &without Saving Stop and Quit without Saving Zatrzymaj i wyjdź bez zapisy&wania - + Quit &without Saving Quit without Saving Wyjdź bez zapisy&wania - + Show or hide the toolbar - - + + Continue &without Saving Continue without Saving Kontynuuj bez zapisy&wania - + Stop and Continue &without Saving Stop and Continue without Saving Zatrzymaj i kontynuuj bez zapisy&wania - + (File name can't be mapped to UTF-8) (Nazwa pliku nie może być przekonwertowana do formatu UTF-8) - + The Wireshark Network Analyzer Analizator Wireshark - + Capturing from %1 Przechwytywanie z %1 diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 69f12f3cb6..d834243dbf 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -9372,22 +9372,22 @@ text-decoration: underline; 在退出前 - + Save packets before merging? 是否在合并之前保存分组？ - + A temporary capture file can't be merged. 无法合并临时捕获文件。 - + Save changes in "%1" before merging? 是否在合并前保存对“%1”的更改？ - + Changes must be saved before the files can be merged. 在文件合并之前，其更改必须先保存。 @@ -9397,128 +9397,128 @@ text-decoration: underline; 无效显示过滤器 - + Invalid Read Filter 无效读取过滤器 - + The filter expression %1 isn't a valid read filter. (%2). 过滤器表达式 %1 不是有效的读取过滤器 (%2)。 - + before importing a capture before importing a new capture 导入新捕获前 - + Unable to export to "%1". 无法导出“%1”。 - + You cannot export packets to the current capture file. 您不能将分组导出到当前捕获文件。 - - + + . . - + Do you want to save the changes you've made%1? Do you want to save the captured packets 您是否要保存已做出的更改%1？ - - + + Your captured packets will be lost if you don't save them. 若不保存，您已经捕获的分组将会丢失。 - + Do you want to save the changes you've made to the capture file "%1"%2? 是否希望保存对捕获文件“%1”%2 的更改？ - - + + Your changes will be lost if you don't save them. 若不保存，您的更改将会丢失。 - + Unable to drop files during capture. 无法在捕获时拖放文件。 - + Do you want to stop the capture and save the captured packets%1? 您是否要停止捕获，并保存已捕获的分组%1？ - + Do you want to save the captured packets%1? 您是否要保存已捕获的分组%1？ - + Save before Continue 继续前保存 - + Stop and Save 停止并保存 - + Stop and Quit &without Saving Stop and Quit without Saving 停止并退出，不保存(&W) - + Quit &without Saving Quit without Saving 直接退出，不保存(&W) - + Show or hide the toolbar 显示或隐藏该工具栏 - - + + Continue &without Saving Continue without Saving 继续，不保存(&W) - + Stop and Continue &without Saving Stop and Continue without Saving 停止并继续，不保存(&W) - + (File name can't be mapped to UTF-8) 文件名不能映射到UTF-8 - + The Wireshark Network Analyzer Wireshark 网络分析器 - + Capturing from %1 正在捕获 %1