summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-02-01 08:06:45 -0800
committerGerald Combs <gerald@wireshark.org>2015-02-01 16:06:51 +0000
commit351e7d58aad584b5ba2ee29bc835ee8686406c01 (patch)
tree629777fabb0ca3cade13cba05ba7e899f8463dcd
parent70912c892535248a47d3f365cf3df0e1f07b38ae (diff)
downloadwireshark-351e7d58aad584b5ba2ee29bc835ee8686406c01.tar.gz
[Automatic manuf, services and enterprise-numbers update for 2015-02-01]
Change-Id: Iead3755cfba6c39c5da6398e356515337f2ecdd4 Reviewed-on: https://code.wireshark.org/review/6887 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--epan/dissectors/usb.c1
-rw-r--r--epan/enterprise-numbers276
-rw-r--r--epan/sminmpec.c69
-rw-r--r--manuf53
-rw-r--r--services1
5 files changed, 379 insertions, 21 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 9b4dd477e5..0655010238 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -3498,6 +3498,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f07702, "HP PhotoSmart 817" },
{ 0x03f07704, "DeskJet D4100" },
{ 0x03f07717, "CM8050 Color MFP with Edgeline Technology" },
+ { 0x03f07778, "Counterfeit flash drive [Kingston]" },
{ 0x03f07802, "HP PhotoSmart 417" },
{ 0x03f07804, "DeskJet D1360" },
{ 0x03f07817, "Color LaserJet CP3505" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 716866076d..a33a2ee99a 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2015-01-25)
+(last updated 2015-01-31)
SMI Network Management Private Enterprise Codes:
@@ -8986,9 +8986,9 @@ Decimal
Plamen Minev
plamen&promatory.com
2245
- Syncsort Inc.
+ Catalogic Software Inc. (previous was 'Syncsort, Inc.')
Chi Shih Chang
- cchang&syncsort.com
+ cchang&catalogicsoftware.com
2246
LloydsTSB Group Plc
Peter Byrne
@@ -107398,9 +107398,9 @@ Institute
Binon Gorbutt
bgorbutt&avalonnetworks.us
26956
- AG04
- Domagoj Maduniæ
- domagoj.madunic&gmail.com
+ AG04 Innovative Solutions
+ Domagoj Madunić
+ domagoj.madunic&ag04.com
26957
Kognita
Mr. Siniša Babiæ
@@ -109152,9 +109152,9 @@ Technischen Universität Dresden
Alberto Martin
sistemas&metrovacesa.es
27394
- Cabo TV Madeirense
- Eduardo Teles
- eteles&cabotvm.pt
+ NOSMadeira
+ David de Sousa
+ ds&nosmadeira.pt
27395
AVANSI C. por A.
Diego Gil Serrano
@@ -128792,8 +128792,8 @@ Decentralization / Helenic Public Administra
tvjames&insertdatahere.net
32303
Anchor Systems Pty Ltd
- Paul De Audney
- iana&anchor.net.au
+ Anchor NOC
+ noc&anchor.net.au
32304
Lojas Maia LTDA.
Julianne Martins Cavalcanti
@@ -137995,9 +137995,9 @@ Decentralization / Helenic Public Administra
Jon-Eirik Pettersen
joneirik&seria.no
34604
- 3757277 Canada Inc. (o/a 295.ca)
- Cory Albrecht
- support&fibernetics.ca
+ Fibernetics Corp
+ Yvon Bertrand
+ role.iana.pen&fibernetics.ca
34605
SL Corporation
Michael Kairys
@@ -162837,8 +162837,8 @@ Decentralization / Helenic Public Administra
info&agenturadmin.de
40814
Garden City Hospital
- Donna Bellomo
- DBellomo&gchosp.org
+ Linda Bell
+ LBell&gchosp.org
40815
Dr. Thalmair
Dr. Tobias Thalmair
@@ -180199,6 +180199,250 @@ Decentralization / Helenic Public Administra
ELES, d.o.o., sistemski operater prenosnega elektroenergetskega omrezja
Tomaz Rus
tomaz.rus&eles.si
+45155
+ Democratic Alliance
+ Adrian Frith
+ adrianf&da.org.za
+45156
+ The IcedTea project (HeapStats)
+ Shinji Takao
+ oss-java-support&lab.ntt.co.jp
+45157
+ Medgate AG
+ Oliver Schmid
+ administrator&medgate.ch
+45158
+ Infracom S.p.A.
+ Marco Bessone
+ marco.bessone&infracom.it
+45159
+ Heinz Nixdorf MuseumsForum GmbH
+ Thorsten Fuchs
+ tfuchs&hnf.de
+45160
+ Jabatan Ketua Menteri Melaka
+ Md Ridzuan bin Mohammad Latiah
+ mdridzuan&melaka.gov.my
+45161
+ YouCo Srl
+ Filippo Ferrari
+ filippo.ferrari&youco.eu
+45162
+ GUANG DONG SMART ELECTRIC INFORMATION INDUSTRY CO.,LTD.
+ PAN HONGKAI
+ 13922302687&163.com
+45163
+ Hafen-Entwicklungsgesellschaft Rostock mbH
+ Rayk Zimmermann
+ r.zimmermann&rostock-port.de
+45164
+ Brulli Energia
+ Laura Filippini
+ laura.filippini&brulli.it
+45165
+ IT Services, Loughborough University
+ John Dodson
+ si.supportcontracts&lboro.ac.uk
+45166
+ Itaipu Binacional
+ Jacson Querubin
+ querubin&itaipu.gov.br
+45167
+ Redgates.com
+ Karl Redgate
+ Karl.Redgate&gmail.com
+45168
+ krumedia GmbH
+ Michael Krutwig
+ office&krumedia.de
+45169
+ Tahoe Forest Health System
+ Michael Soule
+ NetworkTeam&TFHD.COM
+45170
+ The Baupost Group, L.L.C.
+ Greg Smith
+ baupostinfosec&baupost.com
+45171
+ Gareth Morgan Investments
+ Robert Pearce
+ robertp&gmi.co.nz
+45172
+ Stronghold, Ltd.
+ Matt Walker
+ matt.walker&strongholdlimited.com
+45173
+ The Furukawa Battery Co.,Ltd
+ Osamu Yuzawa
+ a-tominaga&furukawadenchi.co.jp
+45174
+ Eyecom Telecommunication Equipments Ltd
+ Master Guan
+ master&eyecom-telecom.com
+45175
+ NGI SpA
+ NGI Network Group
+ network&ngi.it
+45176
+ Mirantis Inc
+ Alexey Rogusskiy, Scale Team Lead
+ unix.linux.aix&gmail.com
+45177
+ Sapientier Development
+ John W Davidson
+ jwdavidson&gmail.com
+45178
+ Direktion der Justiz und des Innern des Kantons Zuerich
+ Fabian Jucker
+ fabian.jucker&ji.zh.ch
+45179
+ Jablotron Alarms a.s.
+ Karel Hladik
+ hladik&jablotron.cz
+45180
+ Rolls-Royce Marine
+ Oscar Endre Edvardsen
+ oscar.edvardsen&rolls-royce.com
+45181
+ AVSystem
+ Danilo Mitera
+ d.mitera&avsystem.com
+45182
+ bkaiser GmbH
+ Bruno Kaiser
+ bruno&bkaiser.com
+45183
+ Access Control Services Ltd
+ Russell Martin
+ rmartin&xplan.com
+45184
+ Patrick Kalkman
+ Patrick Kalkman
+ snmp&pakalkman.nl
+45185
+ SCA Skog AB
+ Magnus Tjärnskog
+ magnus.tjarnskog&sca.com
+45186
+ frazz.se
+ Franz Levin
+ iana&frazz.se
+45187
+ Amber Technical Solutions Ltd
+ Paul Mailes
+ contact&ambertechnical.co.uk
+45188
+ Vzajemna, d.v.z.
+ Rok Goli
+ it_app&vzajemna.si
+45189
+ Genplus Pte Ltd
+ LIM CHOON BOON
+ limcb&genplus.sg
+45190
+ Peaxy, Inc.
+ Giordano Beretta
+ gberetta&peaxy.net
+45191
+ Simple Finance Technology Corp
+ Miah Johnson
+ ops&simple.com
+45192
+ Lonmin
+ Simon Bezuidenhout
+ simon.bezuidenhout&lonmin.com
+45193
+ TeraStream
+ Kristian Larsson
+ kristian.larsson&t-systems.se
+45194
+ Oryx Embedded
+ Clément Zeller
+ info&oryx-embedded.com
+45195
+ Beijing 35one Technology Development Co., Ltd
+ MoYusheng
+ moyusheng&35one.com
+45196
+ Of Modems and Men
+ Nick Kamenyitzky
+ nick&kamenyitzky.com.au
+45197
+ C.S.C.D.G.R
+ Richard Mantha
+ manthar&cscdgr.on.ca
+45198
+ Weichert Lead Network, Inc
+ Arthur Quintalino
+ aquintalino&wlninc.com
+45199
+ Lite-On Power System Solutions
+ Jing Shao
+ jing.shao&liteon.com
+45200
+ Reserve Bank Of Australia
+ Ronnie Sidhu
+ SidhuR&rba.gov.au
+45201
+ BBright
+ Gael Martin
+ gael.martin&bbright.com
+45202
+ Fachhochschule Potsdam
+ Stephan Schier
+ it-service&fh-potsdam.de
+45203
+ Synergy Consulting Ltd.
+ Andrej Sandyrov
+ andrej.sandyrov&synergy.lt
+45204
+ Four Horsemen
+ Lionel Mehl
+ ldapadmin&sanemail.de
+45205
+ Richard Frostell
+ Richard Frostell
+ rich_f01&yahoo.com
+45206
+ Quintron Systems, Inc
+ Craig Armstrong
+ wcarmstrong&quintron.com
+45207
+ healcerion
+ lyle chung
+ lyle&healcerion.com
+45208
+ GSS International Group
+ Riaz Farhanian
+ riaz.farhanian&gssint.com
+45209
+ Altostratus Oy
+ Timo Kälviäinen
+ timo.kalviainen&instepsoftware.fi
+45210
+ DigiSeq Limited
+ Colin Tanner
+ colin.tanner&digiseq.co.uk
+45211
+ Data Control Ltd
+ Nihar Mohanta
+ nihar.mohanta&datacontrol-ltd.com
+45212
+ Vecture Inc.
+ Eric Roman
+ eroman&vectureinc.com
+45213
+ Municipal Parking Services, Inc.
+ Dave Collins
+ dave&mpspark.com
+45214
+ Community Campaign (Hart)
+ James Radley
+ iana&jradley.com
+45215
+ Matchpoint Systems, Inc.
+ Ross Dreyer
+ rdreyer&matchpointsystems.com
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 7f42c68aee..1220fec97e 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -2265,7 +2265,7 @@ const value_string sminmpec_values[] = {
{ 2242, "NET-TEL Computer Systems Limited" },
{ 2243, "Sattel Communications" },
{ 2244, "Promatory Communications Inc." },
- { 2245, "Syncsort Inc." },
+ { 2245, "Catalogic Software Inc. (previous was 'Syncsort, Inc.')" },
{ 2246, "LloydsTSB Group Plc" },
{ 2247, "IT Consultancy Engineering Management Group Ltd." },
{ 2248, "LITE-ON COMMUNICATIONS Corp." },
@@ -26976,7 +26976,7 @@ const value_string sminmpec_values[] = {
{ 26953, "Astronix Technology Inc." },
{ 26954, "INdustrias Sola Basic, SA de CV" },
{ 26955, "Avalon Networks LLC" },
- { 26956, "AG04" },
+ { 26956, "AG04 Innovative Solutions" },
{ 26957, "Kognita" },
{ 26958, "Indu-Sol GmbH" },
{ 26959, "www.brianmichael.org" },
@@ -27414,7 +27414,7 @@ const value_string sminmpec_values[] = {
{ 27391, "Braintribe IT Technologies" },
{ 27392, "SCHILLER" },
{ 27393, "Metrovacesa, S.A." },
- { 27394, "Cabo TV Madeirense" },
+ { 27394, "NOSMadeira" },
{ 27395, "AVANSI C. por A." },
{ 27396, "Open Journal Project" },
{ 27397, "Praxis Balster-De Beer" },
@@ -34624,7 +34624,7 @@ const value_string sminmpec_values[] = {
{ 34601, "MongoDB" },
{ 34602, "Bomgar Corporation" },
{ 34603, "Seria AS" },
- { 34604, "3757277 Canada Inc. (o/a 295.ca)" },
+ { 34604, "Fibernetics Corp" },
{ 34605, "SL Corporation" },
{ 34606, "Wayne RESA" },
{ 34607, "Newdaysoft Co., Ltd" },
@@ -45175,6 +45175,67 @@ const value_string sminmpec_values[] = {
{ 45152, "Parchment Inc." },
{ 45153, "Drillinginfo" },
{ 45154, "ELES, d.o.o., sistemski operater prenosnega elektroenergetskega omrezja " },
+ { 45155, "Democratic Alliance" },
+ { 45156, "The IcedTea project (HeapStats)" },
+ { 45157, "Medgate AG" },
+ { 45158, "Infracom S.p.A." },
+ { 45159, "Heinz Nixdorf MuseumsForum GmbH" },
+ { 45160, "Jabatan Ketua Menteri Melaka" },
+ { 45161, "YouCo Srl" },
+ { 45162, "GUANG DONG SMART ELECTRIC INFORMATION INDUSTRY CO.,LTD." },
+ { 45163, "Hafen-Entwicklungsgesellschaft Rostock mbH" },
+ { 45164, "Brulli Energia" },
+ { 45165, "IT Services, Loughborough University" },
+ { 45166, "Itaipu Binacional" },
+ { 45167, "Redgates.com" },
+ { 45168, "krumedia GmbH" },
+ { 45169, "Tahoe Forest Health System" },
+ { 45170, "The Baupost Group, L.L.C." },
+ { 45171, "Gareth Morgan Investments" },
+ { 45172, "Stronghold, Ltd." },
+ { 45173, "The Furukawa Battery Co.,Ltd" },
+ { 45174, "Eyecom Telecommunication Equipments Ltd" },
+ { 45175, "NGI SpA" },
+ { 45176, "Mirantis Inc" },
+ { 45177, "Sapientier Development" },
+ { 45178, "Direktion der Justiz und des Innern des Kantons Zuerich" },
+ { 45179, "Jablotron Alarms a.s." },
+ { 45180, "Rolls-Royce Marine" },
+ { 45181, "AVSystem" },
+ { 45182, "bkaiser GmbH" },
+ { 45183, "Access Control Services Ltd" },
+ { 45184, "Patrick Kalkman" },
+ { 45185, "SCA Skog AB" },
+ { 45186, "frazz.se" },
+ { 45187, "Amber Technical Solutions Ltd" },
+ { 45188, "Vzajemna, d.v.z." },
+ { 45189, "Genplus Pte Ltd" },
+ { 45190, "Peaxy, Inc." },
+ { 45191, "Simple Finance Technology Corp" },
+ { 45192, "Lonmin" },
+ { 45193, "TeraStream" },
+ { 45194, "Oryx Embedded" },
+ { 45195, "Beijing 35one Technology Development Co., Ltd" },
+ { 45196, "Of Modems and Men" },
+ { 45197, "C.S.C.D.G.R" },
+ { 45198, "Weichert Lead Network, Inc" },
+ { 45199, "Lite-On Power System Solutions" },
+ { 45200, "Reserve Bank Of Australia" },
+ { 45201, "BBright" },
+ { 45202, "Fachhochschule Potsdam" },
+ { 45203, "Synergy Consulting Ltd." },
+ { 45204, "Four Horsemen" },
+ { 45205, "Richard Frostell" },
+ { 45206, "Quintron Systems, Inc" },
+ { 45207, "healcerion" },
+ { 45208, "GSS International Group" },
+ { 45209, "Altostratus Oy" },
+ { 45210, "DigiSeq Limited" },
+ { 45211, "Data Control Ltd" },
+ { 45212, "Vecture Inc." },
+ { 45213, "Municipal Parking Services, Inc." },
+ { 45214, "Community Campaign (Hart)" },
+ { 45215, "Matchpoint Systems, Inc." },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 57d912a7ad..44840d815f 100644
--- a/manuf
+++ b/manuf
@@ -10904,7 +10904,7 @@
00:50:8F AsitaTec # ASITA TECHNOLOGIES INT'L LTD.
00:50:90 Dctri
00:50:91 Netacces # NETACCESS, INC.
-00:50:92 RigakuIn # RIGAKU INDUSTRIAL CORPORATION
+00:50:92 RigakuOs # Rigaku Corporation Osaka Plant
00:50:93 Boeing
00:50:94 Pace # PACE plc
00:50:95 PeracomN # PERACOM NETWORKS
@@ -17749,6 +17749,7 @@
14:A8:6B Shenzhen # ShenZhen Telacom Science&Technology Co., Ltd
14:A9:E3 Mst # MST CORPORATION
14:AB:F0 ArrisGro # ARRIS Group, Inc.
+14:AE:DB VtechTel # VTech Telecommunications Ltd.
14:B1:26 Industri # Industrial Software Co
14:B1:C8 Infiniwi # InfiniWing, Inc.
14:B4:84 SamsungE # Samsung Electronics Co.,Ltd
@@ -17822,6 +17823,7 @@
18:42:1D Private
18:42:2F AlcatelL # Alcatel Lucent
18:44:62 RiavaNet # Riava Networks, Inc.
+18:44:E6 Zte # zte corporation
18:46:17 SamsungE # Samsung Electronics
18:48:D8 Fastback # Fastback Networks
18:4A:6F Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd
@@ -18018,6 +18020,7 @@
1C:E6:C7 Cisco
1C:E8:5D Cisco
1C:EE:E8 IlshinEl # Ilshin Elecom
+1C:F0:3E Wearhaus # Wearhaus Inc.
1C:F0:61 Scaps # SCAPS GmbH
1C:F4:CA Private
1C:F5:E7 TurtleIn # Turtle Industry Co., Ltd.
@@ -18088,6 +18091,7 @@
20:87:AC AesMotom # AES motomation
20:89:84 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD
20:89:86 Zte # zte corporation
+20:91:48 TexasIns # Texas Instruments
20:91:8A Profalux
20:91:D9 IM # I'M SPA
20:93:4D FujianSt # Fujian Star-net Communication Co., Ltd
@@ -18175,6 +18179,7 @@
24:62:78 Sysmocom # sysmocom - systems for mobile communications GmbH
24:64:EF CygSunri # CYG SUNRI CO.,LTD.
24:65:11 Avm # AVM GmbH
+24:69:3E Innodisk # innodisk Corporation
24:69:4A Jasmine # Jasmine Systems Inc.
24:69:A5 HuaweiTe # Huawei Technologies Co., Ltd
24:6A:AB It-IsInt # IT-IS International
@@ -18282,6 +18287,7 @@
28:51:32 Shenzhen # Shenzhen Prayfly Technology Co.,Ltd
28:52:E0 LayonInt # Layon international Electronic & Telecom Co.,Ltd
28:57:67 Echostar # Echostar Technologies Corp
+28:5A:EB Apple
28:5F:DB Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd
28:60:46 LantechC # Lantech Communications Global, Inc.
28:60:94 Capelec
@@ -18587,6 +18593,7 @@
34:0A:22 Top-Acce # TOP-ACCESS ELECTRONICS CO LTD
34:0A:FF QingdaoH # Qingdao Hisense Communications Co.,Ltd
34:0B:40 MiosElet # MIOS ELETTRONICA SRL
+34:12:98 Apple
34:13:A8 Mediplan # Mediplan Limited
34:13:E8 IntelCor # Intel Corporate
34:15:9E Apple
@@ -18878,6 +18885,7 @@
3C:77:E6 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
3C:7D:B1 TexasIns # Texas Instruments
3C:81:D8 Sagemcom # SAGEMCOM SAS
+3C:83:75 Microsof # Microsoft Corporation
3C:83:B5 AdvanceV # Advance Vision Electronics Co. Ltd.
3C:86:A8 Sangshin # Sangshin elecom .co,, LTD
3C:89:A6 Kapelse
@@ -19019,6 +19027,7 @@
40:A6:77 JuniperN # Juniper Networks
40:A6:A4 Passivsy # PassivSystems Ltd
40:A6:D9 Apple
+40:A6:E8 Cisco
40:A8:F0 HewlettP # Hewlett Packard
40:AC:8D DataMana # Data Management, Inc.
40:B0:FA LgElectr # LG Electronics
@@ -19664,6 +19673,7 @@
47:54:43 GtcNotRe # GTC (Not registered!) (This number is a multicast!)
48:02:2A B-LinkEl # B-Link Electronic Limited
48:03:62 DesayEle # DESAY ELECTRONICS(HUIZHOU)CO.,LTD
+48:06:6A Tempered # Tempered Networks, Inc.
48:0C:49 NakayoTe # NAKAYO TELECOMMUNICATIONS,INC
48:12:49 LuxcomTe # Luxcom Technologies Inc.
48:13:F3 BbkElect # BBK Electronics Corp., Ltd.
@@ -19671,6 +19681,7 @@
48:18:42 Shanghai # Shanghai Winaas Co. Equipment Co. Ltd.
48:1A:84 PointerT # Pointer Telocation Ltd
48:1B:D2 IntronSc # Intron Scientific co., ltd.
+48:1D:70 CiscoSpv # Cisco SPVTG
48:26:E8 Tek-Air # Tek-Air Systems, Inc.
48:28:2F Zte # ZTE Corporation
48:2C:EA Motorola # Motorola Inc Business Light Radios
@@ -20386,6 +20397,7 @@
60:96:20 Private
60:99:D1 Vuzix/Le # Vuzix / Lenovo
60:9A:A4 GviSecur # GVI SECURITY INC.
+60:9C:9F BrocadeC # Brocade Communications Systems, Inc.
60:9E:64 Vivonic # Vivonic GmbH
60:9F:9D Cloudswi # CloudSwitch
60:A1:0A SamsungE # Samsung Electronics Co.,Ltd
@@ -20489,6 +20501,7 @@
64:55:7F NsfocusI # NSFOCUS Information Technology Co., Ltd.
64:55:B1 ArrisGro # ARRIS Group, Inc.
64:56:01 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD
+64:59:F8 Vodafone # Vodafone Omnitel B.V.
64:5A:04 ChiconyE # Chicony Electronics Co., Ltd.
64:5D:D7 Shenzhen # Shenzhen Lifesense Medical Electronics Co., Ltd.
64:5E:BE Yahoo!Ja # Yahoo! JAPAN
@@ -20653,8 +20666,10 @@
68:9C:5E AcsipTec # AcSiP Technology Corp.
68:9C:70 Apple
68:9C:E2 Cisco
+68:9E:19 TexasIns # Texas Instruments
68:A0:F6 HuaweiTe # Huawei Technologies Co., Ltd
68:A1:B7 HonghaoM # Honghao Mingchuan Technology (Beijing) CO.,Ltd.
+68:A3:78 FreeboxS # FREEBOX SAS
68:A3:C4 LiteonTe # Liteon Technology Corporation
68:A4:0E BshBosch # BSH Bosch and Siemens Home Appliances GmbH
68:A8:6D Apple
@@ -20731,6 +20746,7 @@
6C:40:C6 NimbusDa # Nimbus Data Systems, Inc.
6C:41:6A Cisco
6C:44:18 Zappware
+6C:45:98 AntexEle # Antex Electronic Corp.
6C:4B:7F Vossloh- # Vossloh-Schwabe Deutschland GmbH
6C:50:4D Cisco # CISCO SYSTEMS, INC.
6C:57:79 Aclima # Aclima, Inc.
@@ -20945,6 +20961,7 @@
70:B3:D5:0B:30:00/36 ReonixAu # Reonix Automation
70:B3:D5:0C:00:00/36 MoluTech # Molu Technology Inc., LTD.
70:B3:D5:0C:10:00/36 NexusTec # Nexus Technologies Pty Ltd
+70:B3:D5:0C:80:00/36 FinRobot # Fin Robotics Inc
70:B3:D5:0C:D0:00/36 AmlOcean # AML Oceanographic
70:B3:D5:0D:60:00/36 TattileS # TATTILE SRL
70:B3:D5:0D:70:00/36 RussianT # Russian Telecom Equipment Company
@@ -20981,6 +20998,7 @@
70:B3:D5:1F:50:00/36 MartecSP # Martec S.p.A.
70:B3:D5:20:40:00/36 Twc
70:B3:D5:20:50:00/36 EsourceS # Esource Srl
+70:B3:D5:20:80:00/36 DspDesig # DSP DESIGN LTD
70:B3:D5:20:C0:00/36 SiemensH # Siemens Healthcare Diagnostics
70:B3:D5:20:E0:00/36 AmrehnPa # Amrehn & Partner EDV-Service GmbH
70:B3:D5:22:B0:00/36 Vitec
@@ -21009,6 +21027,7 @@
70:B3:D5:30:80:00/36 DsdMicro # DSD MICROTECHNOLOGY,INC.
70:B3:D5:32:30:00/36 TattileS # TATTILE SRL
70:B3:D5:32:70:00/36 Seneco # Seneco A/S
+70:B3:D5:33:60:00/36 Synacces # Synaccess Networks Inc.
70:B3:D5:33:C0:00/36 Videri # Videri Inc.
70:B3:D5:34:10:00/36 VtronPty # Vtron Pty Ltd
70:B3:D5:34:40:00/36 IhiInspe # IHI Inspection & Instrumentation Co., Ltd.
@@ -21064,6 +21083,7 @@
70:B3:D5:4C:D0:00/36 PowerEle # Power Electronics Espana, S.L.
70:B3:D5:4D:80:00/36 Versilis # Versilis Inc.
70:B3:D5:4D:C0:00/36 JkDevice # JK DEVICE CORPORATION
+70:B3:D5:4D:D0:00/36 Road-IqL # Road-iQ, LLC
70:B3:D5:4D:F0:00/36 NidecAvt # Nidec Avtron Automation Corp
70:B3:D5:4F:00:00/36 LiSengTe # Li Seng Technology Ltd.,
70:B3:D5:50:00:00/36 MistralS # Mistral Solutions Pvt. LTD
@@ -21082,6 +21102,7 @@
70:B3:D5:57:C0:00/36 Automata # Automata GmbH & Co. KG
70:B3:D5:58:30:00/36 Ducommun # Ducommun Inc.
70:B3:D5:58:70:00/36 IncaaCom # INCAA Computers
+70:B3:D5:58:90:00/36 Cityntel # Cityntel OU
70:B3:D5:58:E0:00/36 Veilux # Veilux Inc.
70:B3:D5:58:F0:00/36 Lsl # LSL systems
70:B3:D5:5A:20:00/36 WallnerA # Wallner Automation GmbH
@@ -21152,6 +21173,7 @@
70:B3:D5:79:E0:00/36 Cw2 # CW2. Gmbh & Co. KG
70:B3:D5:7A:70:00/36 Symbicon # Symbicon Ltd
70:B3:D5:7A:90:00/36 Adidas # adidas AG
+70:B3:D5:7A:D0:00/36 Insitu # Insitu Inc
70:B3:D5:7A:E0:00/36 ExiFlowM # Exi Flow Measurement Ltd
70:B3:D5:7B:30:00/36 Broadsof # BroadSoft Inc
70:B3:D5:7B:70:00/36 Lsb-LaSa # LSB - LA SALLE BLANCHE
@@ -21174,6 +21196,7 @@
70:B3:D5:84:A0:00/36 MogLabor # MOG Laboratories Pty Ltd
70:B3:D5:85:C0:00/36 RobotPub # Robot Pub Group
70:B3:D5:86:D0:00/36 CensusDi # Census Digital Incorporated
+70:B3:D5:87:00:00/36 BentrupI # bentrup Industriesteuerungen
70:B3:D5:87:10:00/36 OsoTechn # Oso Technologies
70:B3:D5:87:50:00/36 PeekTraf # PEEK TRAFFIC
70:B3:D5:87:B0:00/36 LiquidIn # Liquid Instruments Pty Ltd
@@ -21195,6 +21218,7 @@
70:B3:D5:93:60:00/36 FaroTech # FARO TECHNOLOGIES, INC.
70:B3:D5:94:10:00/36 Triax # Triax A/S
70:B3:D5:95:60:00/36 Aerovisi # AeroVision Avionics, Inc.
+70:B3:D5:95:70:00/36 EaElektr # EA Elektroautomatik GmbH & Co. KG
70:B3:D5:95:90:00/36 ZulexInt # Zulex International Co.,Ltd.
70:B3:D5:95:A0:00/36 SigmannE # Sigmann Elektronik GmbH
70:B3:D5:96:F0:00/36 4cam # 4CAM GmbH
@@ -21220,6 +21244,7 @@
70:B3:D5:A4:00:00/36 StrackLi # STRACK LIFT AUTOMATION GmbH
70:B3:D5:A4:B0:00/36 MckayBro # McKay Brothers LLC
70:B3:D5:A5:00:00/36 Lecip # LECIP CORPORATION
+70:B3:D5:A5:10:00/36 RfCode # RF Code
70:B3:D5:A5:50:00/36 EmbestTe # Embest Technology Co., Ltd
70:B3:D5:A5:70:00/36 Pcsc
70:B3:D5:A5:A0:00/36 RcsEnerg # RCS Energy Management Ltd
@@ -21294,6 +21319,7 @@
70:B3:D5:C6:00:00/36 Aircell # Aircell Inc
70:B3:D5:C6:10:00/36 JcHunter # JC HUNTER TECHNOLOGIES
70:B3:D5:C6:D0:00/36 CyvizAs # Cyviz AS
+70:B3:D5:C7:30:00/36 CDN # C.D.N.CORPORATION
70:B3:D5:C7:80:00/36 NetaElek # NETA Elektronik AS
70:B3:D5:C8:10:00/36 DspDesig # DSP DESIGN
70:B3:D5:C8:70:00/36 Siemens # Siemens AG
@@ -21328,6 +21354,7 @@
70:B3:D5:D7:F0:00/36 Conectai # ConectaIP Tecnologia S.L.
70:B3:D5:D8:00:00/36 Ammt # AMMT GmbH
70:B3:D5:D8:60:00/36 WpgsysPt # WPGSYS Pte Ltd
+70:B3:D5:D8:70:00/36 Zigen # Zigen Corp
70:B3:D5:D8:B0:00/36 LenoxiAu # Lenoxi Automation s.r.o.
70:B3:D5:D8:F0:00/36 MoluTech # Molu Technology Inc., LTD.
70:B3:D5:D9:70:00/36 BrsSiste # BRS Sistemas Eletronicos
@@ -21409,6 +21436,7 @@
70:B3:D5:FA:10:00/36 BbiEngin # BBI Engineering, Inc.
70:B3:D5:FA:40:00/36 Energybo # Energybox Limited
70:B3:D5:FB:00:00/36 Rohde&Sc # Rohde&Schwarz Topex SA
+70:B3:D5:FB:A0:00/36 ApogeeAp # Apogee Applied Research, Inc.
70:B3:D5:FC:50:00/36 Eltwin # Eltwin A/S
70:B3:D5:FC:60:00/36 TecnintH # Tecnint HTE Srl
70:B3:D5:FD:10:00/36 Redrat # RedRat Ltd
@@ -21436,6 +21464,7 @@
70:E1:39 3view # 3view Ltd
70:E2:4C SaeIt-Sy # SAE IT-systems GmbH & Co. KG
70:E2:84 WistronI # Wistron InfoComm(Zhongshan) Corporation
+70:E7:2C Apple
70:E8:43 BeijingC # Beijing C&W Optical Communication Technology Co.,Ltd.
70:EE:50 Netatmo
70:F1:76 DataModu # Data Modul AG
@@ -21488,6 +21517,7 @@
74:63:DF Vts # VTS GmbH
74:65:D1 Atlinks
74:66:30 T:MiYtti # T:mi Ytti
+74:6A:3A Aperi # Aperi Corporation
74:6A:89 Rezolt # Rezolt Corporation
74:6A:8F VsVision # VS Vision Systems GmbH
74:6B:82 Movek
@@ -21831,6 +21861,7 @@
7C:E5:6B EsenOpto # ESEN Optoelectronics Technology Co.,Ltd.
7C:E9:D3 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
7C:EB:EA Asct
+7C:EC:79 TexasIns # Texas Instruments
7C:ED:8D Microsof # MICROSOFT
7C:EF:18 Creative # Creative Product Design Pty. Ltd.
7C:EF:8A InhonInt # Inhon International Ltd.
@@ -22330,6 +22361,7 @@
90:27:E4 Apple
90:2B:34 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD.
90:2C:C7 C-MaxAsi # C-MAX Asia Limited
+90:2E:1C IntelCor # Intel Corporate
90:2E:87 Labjack
90:31:CD OnyxHeal # Onyx Healthcare Inc.
90:34:2B Gatekeep # Gatekeeper Systems, Inc.
@@ -22499,6 +22531,7 @@
94:9F:3F OptekDig # Optek Digital Technology company limited
94:9F:B4 ChengduJ # ChengDu JiaFaAnTai Technology Co.,Ltd
94:A1:A2 AmpakTec # AMPAK Technology Inc.
+94:A7:B7 Zte # zte corporation
94:A7:BC Bodymedi # BodyMedia, Inc.
94:AA:B8 JoviewBe # Joview(Beijing) Technology Co. Ltd.
94:AC:CA TrivumTe # trivum technologies GmbH
@@ -22604,6 +22637,7 @@
98:73:C4 SageElec # Sage Electronic Engineering LLC
98:76:B6 Adafruit
98:77:70 PepDigit # Pep Digital Technology (Guangzhou) Co., Ltd
+98:7B:F3 TexasIns # Texas Instruments
98:7E:46 EmizonNe # Emizon Networks Limited
98:82:17 Disrupti # Disruptive Ltd
98:83:89 SamsungE # Samsung Electronics Co.,LTD
@@ -22635,6 +22669,7 @@
98:D8:8C NortelNe # Nortel Networks
98:DA:92 Vuzix # Vuzix Corporation
98:DC:D9 Unitec # UNITEC Co., Ltd.
+98:E0:D9 Apple
98:E1:65 Accutome
98:E7:9A FoxconnN # Foxconn(NanJing) Communication Co.,Ltd.
98:EC:65 CosesyAp # Cosesy ApS
@@ -22894,6 +22929,8 @@ A0:F3:E4 AlcatelL # Alcatel Lucent IPD
A0:F4:19 Nokia # Nokia Corporation
A0:F4:50 Htc # HTC Corporation
A0:F4:59 Fn-LinkT # FN-LINK TECHNOLOGY LIMITED
+A0:F6:FD TexasIns # Texas Instruments
+A0:F8:49 Cisco
A0:FC:6E Telegraf # Telegrafia a.s.
A0:FE:91 AvatAuto # AVAT Automation GmbH
A4:01:30 Abisyste # ABIsystems Co., LTD
@@ -22918,6 +22955,7 @@ A4:29:B7 Bluesky
A4:2B:8C Netgear # Netgear Inc
A4:2C:08 Masterwo # Masterwork Automodules
A4:33:D1 Fibrlink # Fibrlink Communications Co.,Ltd.
+A4:34:D9 IntelCor # Intel Corporate
A4:38:FC PlasticL # Plastic Logic
A4:3A:69 Vers # Vers Inc
A4:3B:FA IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information.
@@ -23068,6 +23106,7 @@ A8:7C:01 SamsungE # Samsung Elec Co.,Ltd
A8:7E:33 NokiaDan # Nokia Danmark A/S
A8:80:38 Shenzhen # ShenZhen MovingComm Technology Co., Limited
A8:81:F1 BmeyeBV # BMEYE B.V.
+A8:82:7F CibnOrie # CIBN Oriental Network(Beijing) CO.,Ltd
A8:86:DD Apple # Apple, Inc.
A8:87:92 Broadban # Broadband Antenna Tracking Systems
A8:87:ED ArcWirel # ARC Wireless LLC
@@ -23103,6 +23142,7 @@ A8:D0:E3 SystechE # Systech Electronics Ltd.
A8:D0:E5 JuniperN # Juniper Networks
A8:D2:36 Lightwar # Lightware Visual Engineering
A8:D3:C8 Wachendo # Wachendorff Elektronik GmbH & Co. KG
+A8:D4:09 Usa111 # USA 111 Inc
A8:D8:8A Wyconn
A8:E0:18 Nokia # Nokia Corporation
A8:E3:EE SonyComp # Sony Computer Entertainment Inc.
@@ -23571,6 +23611,7 @@ B8:BD:79 Trendpoi # TrendPoint Systems
B8:BE:BF Cisco # CISCO SYSTEMS, INC.
B8:BF:83 IntelCor # Intel Corporate
B8:C1:A2 DragonPa # Dragon Path Technologies Co., Limited
+B8:C3:BF HenanChe # Henan Chengshi NetWork Technology Co.,Ltd
B8:C4:6F Primmcon # PRIMMCON INDUSTRIES INC
B8:C6:8E SamsungE # Samsung Electronics Co.,Ltd
B8:C7:16 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD
@@ -23722,6 +23763,7 @@ BC:F2:AF Devolo # devolo AG
BC:F5:AC LgElectr # LG Electronics
BC:F6:1C Geomodel # Geomodeling Wuxi Technology Co. Ltd.
BC:F6:85 D-LinkIn # D-Link International
+BC:F8:11 XiamenDn # Xiamen DNAKE Technology Co.,Ltd
BC:FE:8C Altronic # Altronic, LLC
BC:FF:AC Topcon # TOPCON CORPORATION
C0:00:00 WesternD # Western Digital (may be reversed 00 00 C0?)
@@ -23813,10 +23855,12 @@ C0:C5:69 Shanghai # SHANGHAI LYNUC CNC TECHNOLOGY CO.,LTD
C0:C6:87 CiscoSpv # Cisco SPVTG
C0:C9:46 MitsuyaL # MITSUYA LABORATORIES INC.
C0:CB:38 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
+C0:CE:CD Apple
C0:CF:A3 Creative # Creative Electronics & Software, Inc.
C0:D0:44 Sagemcom
C0:D9:62 AskeyCom # Askey Computer Corp.
C0:DA:74 Hangzhou # Hangzhou Sunyard Technology Co., Ltd.
+C0:DC:6A QingdaoE # Qingdao Eastsoft Communication Technology Co.,LTD
C0:DF:77 ConradEl # Conrad Electronic SE
C0:E4:22 TexasIns # Texas Instruments
C0:E5:4E DenxComp # DENX Computer Systems GmbH
@@ -23983,6 +24027,7 @@ C8:3E:A7 Kunbus # KUNBUS GmbH
C8:3F:B4 ArrisGro # ARRIS Group, Inc.
C8:45:29 ImkNetwo # IMK Networks Co.,Ltd
C8:45:44 Shanghai # Shanghai Enlogic Electric Technology Co., Ltd.
+C8:45:8F Wyler # Wyler AG
C8:48:F5 MedisonX # MEDISON Xray Co., Ltd
C8:4C:75 Cisco # CISCO SYSTEMS, INC.
C8:56:45 Intermas # Intermas France
@@ -24091,6 +24136,7 @@ CC:1A:FA Zte # zte corporation
CC:1E:FF Metrolog # Metrological Group BV
CC:22:18 Innodigi # InnoDigital Co., Ltd.
CC:26:2D VerifiLl # Verifi, LLC
+CC:29:F5 Apple
CC:2A:80 Micro-Bi # Micro-Biz intelligence solutions Co.,Ltd
CC:2D:8C LgElectr # LG ELECTRONICS INC
CC:30:80 Vaio # VAIO Corporation
@@ -24279,6 +24325,7 @@ D0:B3:3F Shenzhen # SHENZHEN TINNO MOBILE TECHNOLOGY CO.,LTD.
D0:B4:98 RobertBo # Robert Bosch LLC Automotive Electronics
D0:B5:23 Bestcare # Bestcare Cloucal Corp.
D0:B5:3D SeproRob # SEPRO ROBOTIQUE
+D0:B5:C2 TexasIns # Texas Instruments
D0:BB:80 ShlTelem # SHL Telemedicine International Ltd.
D0:BD:01 DsIntern # DS International
D0:BE:2C Cnslink # CNSLink Co., Ltd.
@@ -24457,6 +24504,7 @@ D8:18:2B ContiTem # Conti Temic Microelectronic GmbH
D8:19:CE Telesqua # Telesquare
D8:1B:FE Twinlinx # TWINLINX CORPORATION
D8:1C:14 Compacta # Compacta International, Ltd.
+D8:1D:72 Apple
D8:1E:DE B&WGroup # B&W Group Ltd
D8:24:BD Cisco # CISCO SYSTEMS, INC.
D8:25:22 Pace # Pace plc
@@ -24779,6 +24827,7 @@ E0:DA:DC JvcKenwo # JVC KENWOOD Corporation
E0:DB:55 Dell # Dell Inc
E0:DB:88 OpenStan # Open Standard Digital-IF Interface for SATCOM Systems
E0:DC:A0 SiemensE # Siemens Electrical Apparatus Ltd., Suzhou Chengdu Branch
+E0:E5:CF TexasIns # Texas Instruments
E0:E6:31 SnbTechn # SNB TECHNOLOGIES LIMITED
E0:E7:51 Nintendo # Nintendo Co., Ltd.
E0:E8:E8 OliveTel # Olive Telecommunication Pvt. Ltd
@@ -24851,6 +24900,7 @@ E4:85:01 GeberitI # Geberit International AG
E4:8A:D5 RfWindow # RF WINDOW CO., LTD.
E4:8B:7F Apple
E4:8C:0F Discover # Discovery Insure
+E4:8D:8C Routerbo # Routerboard.com
E4:90:69 Rockwell # Rockwell Automation
E4:92:E7 Gridlink # Gridlink Tech. Co.,Ltd.
E4:92:FB SamsungE # Samsung Electronics Co.,Ltd
@@ -25049,6 +25099,7 @@ EC:46:70 Meinberg # Meinberg Funkuhren GmbH & Co. KG
EC:47:3C RedwireL # Redwire, LLC
EC:49:93 QihanTec # Qihan Technology Co., Ltd
EC:4C:4D ZaoNpkRo # ZAO NPK RoTeK
+EC:4F:82 Calix # Calix Inc.
EC:54:2E Shanghai # Shanghai XiMei Electronic Technology Co. Ltd
EC:55:F9 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
EC:59:E7 Microsof # Microsoft Corporation
diff --git a/services b/services
index 031663b04b..dd05cc795d 100644
--- a/services
+++ b/services
@@ -10575,6 +10575,7 @@ helix 10860/tcp # Helix Client/Server [Matthew_Strange][Larry_Atkin_2]
helix 10860/udp # Helix Client/Server [Matthew_Strange][Larry_Atkin_2] [Matthew_Strange][Larry_Atkin_2] 2009-03-06
bveapi 10880/tcp # BVEssentials HTTP API [Tri_Tech_Computers_Ltd] [James_Emerton] 2012-11-19
bveapi 10880/udp # BVEssentials HTTP API [Tri_Tech_Computers_Ltd] [James_Emerton] 2012-11-19
+octopustentacle 10933/tcp # Listen port used by the Octopus Deploy Tentacle deployment agent [Octopus_Deploy_Pty_Ltd] [Paul_Stovell] 2015-01-28
rmiaux 10990/tcp # Auxiliary RMI Port [Eugen_Bacic_2] [Eugen_Bacic_2]
rmiaux 10990/udp # Auxiliary RMI Port [Eugen_Bacic_2] [Eugen_Bacic_2]
irisa 11000/tcp # IRISA [V_A_Brauner] [V_A_Brauner]