Version in base suite: 4.4.16-0+deb13u1 Base version: wireshark_4.4.16-0+deb13u1 Target version: wireshark_4.4.18-0+deb13u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/w/wireshark/wireshark_4.4.16-0+deb13u1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/w/wireshark/wireshark_4.4.18-0+deb13u1.dsc .gitlab-ci.yml | 31 CMakeLists.txt | 69 ChangeLog | 959 ++++++++---- cmake/modules/FindWinSparkle.cmake | 78 debian/changelog | 42 doc/attributes.adoc | 2 doc/release-notes.adoc | 417 ++++- doc/wsug_src/capinfos-h.txt | 2 doc/wsug_src/dumpcap-h.txt | 2 doc/wsug_src/editcap-h.txt | 2 doc/wsug_src/mergecap-h.txt | 2 doc/wsug_src/rawshark-h.txt | 2 doc/wsug_src/reordercap-h.txt | 2 doc/wsug_src/text2pcap-h.txt | 2 doc/wsug_src/tshark-h.txt | 2 epan/CMakeLists.txt | 2 epan/addr_resolv.c | 6 epan/crypt/dot11decrypt.c | 5 epan/dissectors/asn1/c1222/packet-c1222-template.c | 15 epan/dissectors/asn1/cms/cms.cnf | 22 epan/dissectors/asn1/cms/packet-cms-template.c | 14 epan/dissectors/asn1/ess/ess.cnf | 18 epan/dissectors/asn1/h245/h245.cnf | 4 epan/dissectors/asn1/kerberos/packet-kerberos-template.c | 91 - epan/dissectors/asn1/rrc/rrc.cnf | 5 epan/dissectors/asn1/x509af/x509af.cnf | 12 epan/dissectors/asn1/x509if/x509if.cnf | 28 epan/dissectors/asn1/z3950/packet-z3950-template.c | 30 epan/dissectors/packet-bacapp.c | 33 epan/dissectors/packet-ber.c | 4 epan/dissectors/packet-btatt.c | 4 epan/dissectors/packet-btavrcp.c | 41 epan/dissectors/packet-btbredr_rf.c | 3 epan/dissectors/packet-bthfp.c | 8 epan/dissectors/packet-c1222.c | 15 epan/dissectors/packet-catapult-dct2000.c | 3 epan/dissectors/packet-cms.c | 37 epan/dissectors/packet-csn1.c | 3 epan/dissectors/packet-dns.c | 10 epan/dissectors/packet-edonkey.c | 8 epan/dissectors/packet-epl.c | 6 epan/dissectors/packet-ess.c | 18 epan/dissectors/packet-fcels.c | 1 epan/dissectors/packet-fmp_notify.c | 18 epan/dissectors/packet-h245.c | 4 epan/dissectors/packet-h265.c | 4 epan/dissectors/packet-ieee80211.c | 24 epan/dissectors/packet-kerberos.c | 91 - epan/dissectors/packet-knxip.c | 2 epan/dissectors/packet-lls.c | 2 epan/dissectors/packet-megaco.c | 11 epan/dissectors/packet-mih.c | 37 epan/dissectors/packet-mpeg-dsmcc.c | 1 epan/dissectors/packet-nas_5gs.c | 76 epan/dissectors/packet-ositp.c | 2 epan/dissectors/packet-reload.c | 118 - epan/dissectors/packet-reload.h | 2 epan/dissectors/packet-rlogin.c | 22 epan/dissectors/packet-rmt-alc.c | 2 epan/dissectors/packet-rrc.c | 5 epan/dissectors/packet-ssh.c | 20 epan/dissectors/packet-tds.c | 4 epan/dissectors/packet-umts_fp.c | 22 epan/dissectors/packet-woww.c | 10 epan/dissectors/packet-x509af.c | 11 epan/dissectors/packet-x509if.c | 28 epan/dissectors/packet-z3950.c | 30 epan/dissectors/usb.c | 11 epan/enterprises.c | 737 ++++++++- epan/exported_pdu.c | 20 epan/manuf-data.c | 1025 +++++++++++-- epan/reassemble.c | 24 epan/services-data.c | 4 epan/to_str.c | 3 epan/tvbuff_rdp.c | 6 epan/wslua/wslua_dumper.c | 163 +- extcap/androiddump.c | 31 extcap/ciscodump.c | 29 extcap/sdjournal.c | 7 packaging/debian/changelog | 2 packaging/debian/rules | 10 packaging/nsis/windeployqt-to-nsis.py | 10 packaging/source/git-export-release.sh.in | 2 packaging/wix/CMakeLists.txt | 17 packaging/wix/windeployqt-to-wix.ps1 | 10 resources/freedesktop/org.wireshark.Wireshark.metainfo.xml | 8 sharkd_session.c | 854 +++++----- tools/make-enterprises.py | 2 tools/make-manuf.py | 2 tools/make-version.py | 4 tools/mingw-rpm-setup.sh | 16 tools/pre-commit | 2 tools/win-setup.ps1 | 12 ui/logray/CMakeLists.txt | 69 ui/qt/CMakeLists.txt | 73 ui/qt/about_dialog.cpp | 57 ui/qt/firewall_rules_dialog.cpp | 7 ui/qt/geometry_state_dialog.cpp | 5 ui/qt/iax2_analysis_dialog.cpp | 17 ui/qt/io_graph_dialog.cpp | 4 ui/qt/main_application.cpp | 54 ui/qt/models/astringlist_list_model.cpp | 71 ui/qt/models/column_list_model.cpp | 7 ui/qt/models/dissector_tables_model.cpp | 7 ui/qt/models/enabled_protocols_model.cpp | 7 ui/qt/models/expert_info_proxy_model.cpp | 15 ui/qt/models/export_objects_model.cpp | 14 ui/qt/models/interface_sort_filter_model.cpp | 35 ui/qt/models/manuf_table_model.cpp | 21 ui/qt/models/pref_models.cpp | 14 ui/qt/models/profile_model.cpp | 14 ui/qt/models/supported_protocols_model.cpp | 7 ui/qt/rtp_analysis_dialog.cpp | 6 ui/qt/rtp_player_dialog.cpp | 24 ui/qt/show_packet_bytes_dialog.cpp | 6 ui/qt/widgets/qcustomplot.cpp | 57 ui/qt/widgets/traffic_tree.cpp | 14 ui/qt/widgets/traffic_types_list.cpp | 7 ui/qt/wireshark_de.ts | 19 ui/qt/wireshark_en.ts | 19 ui/qt/wireshark_es.ts | 29 ui/qt/wireshark_fr.ts | 19 ui/qt/wireshark_it.ts | 19 ui/qt/wireshark_ja_JP.ts | 19 ui/qt/wireshark_ko.ts | 19 ui/qt/wireshark_pl.ts | 19 ui/qt/wireshark_ru.ts | 19 ui/qt/wireshark_sv.ts | 19 ui/qt/wireshark_tr_TR.ts | 23 ui/qt/wireshark_uk.ts | 33 ui/qt/wireshark_zh_CN.ts | 53 ui/recent.c | 5 ui/recent.h | 10 ui/ws_ui_util.h | 2 wiretap/CMakeLists.txt | 2 wiretap/blf.c | 314 ++- wiretap/busmaster_scanner.l | 6 wiretap/catapult_dct2000.c | 2 wiretap/daintree-sna.c | 13 wiretap/dbs-etherwatch.c | 6 wiretap/erf.c | 9 wiretap/file_wrappers.c | 29 wiretap/k12.c | 131 - wiretap/log3gpp.c | 4 wiretap/logcat.c | 50 wiretap/logcat.h | 12 wiretap/logcat_text.c | 24 wiretap/ngsniffer.c | 4 wiretap/pcapng.c | 3 wiretap/rtpdump.c | 12 wiretap/wtap.c | 2 wsutil/eax.c | 59 wsutil/filesystem.c | 4 wsutil/version_info.c | 8 wsutil/ws_strptime.c | 2 wsutil/wsgcrypt.c | 4 wsutil/wsjson.c | 10 157 files changed, 5108 insertions(+), 2157 deletions(-) dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmpnkqgmqal/wireshark_4.4.16-0+deb13u1.dsc: no acceptable signature found dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmpnkqgmqal/wireshark_4.4.18-0+deb13u1.dsc: no acceptable signature found diff -Nru wireshark-4.4.16/.gitlab-ci.yml wireshark-4.4.18/.gitlab-ci.yml --- wireshark-4.4.16/.gitlab-ci.yml 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/.gitlab-ci.yml 2026-08-12 17:19:13.000000000 +0000 @@ -25,7 +25,7 @@ # The Qt versions that we ship in our offical installers. Must match # windows-qt6-lts-version and macos-qt6-lts-version in # doc/wsdg_src/developer-guide.adoc in master. - WINDOWS_QT6_LTS_VERSION: "6.5.3" + WINDOWS_QT6_LTS_VERSION: "6.7.3" MACOS_QT6_LTS_VERSION: "6.5.3" # Enable color output in various tools. # CMake, Ninja, and others: https://bixense.com/clicolors/ @@ -184,7 +184,7 @@ - $env:Path += ";C:\Program Files\CMake\bin" - $env:CMAKE_PREFIX_PATH = "C:\qt\$($env:WINDOWS_QT6_LTS_VERSION)\msvc2019_64" # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell - - cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt" + - cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\18\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt" - Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } } # Testing / debugging only. # - cmd.exe /c "set CI_PIPELINE_SOURCE" @@ -416,7 +416,12 @@ # build-ubuntu puts us in `build`. - cd .. - ln --symbolic --no-dereference --force packaging/debian - - CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ MAKE=ninja dpkg-buildpackage -us -uc -rfakeroot -jauto -zfast + # Shared GitLab runners limit the log size to 4M, so reduce verbosity. See + # https://gitlab.com/gitlab-com/support-forum/issues/2790 + - export DEB_BUILD_OPTIONS="nocheck parallel=$(( $(getconf _NPROCESSORS_ONLN) + 2 ))" + - export DH_QUIET=1 + - export MAKEFLAGS=--silent + - CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ dpkg-buildpackage -us -uc -rfakeroot -jauto -zfast # Please don't add a Lintian step unless you can guarantee that someone # will fix any breakages that invariably pop up. - mkdir ubuntu-packages @@ -454,14 +459,14 @@ - $env:Configuration = "RelWithDebInfo" - $env:CMAKE_PREFIX_PATH = "C:\Qt\$($env:WINDOWS_QT6_LTS_VERSION)\msvc2019_64" # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell - - cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt" + - cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\18\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt" - Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } } - mkdir build - cd build script: - C:\Windows\py.exe ..\tools\make-version.py --set-release --version-file=wireshark_version.txt .. - - cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_WERROR=ON -DENABLE_LTO=off -DENABLE_SIGNED_NSIS=on .. - - msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln + - cmake -G "Visual Studio 18 2026" -A x64 -DENABLE_WERROR=ON -DENABLE_LTO=off -DENABLE_SIGNED_NSIS=on .. + - msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.slnx - msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj - msbuild /verbosity:minimal /maxcpucount wireshark_nsis_prep.vcxproj - msbuild /verbosity:minimal /maxcpucount wireshark_wix_prep.vcxproj @@ -500,14 +505,14 @@ - $env:Configuration = "RelWithDebInfo" - $env:CMAKE_PREFIX_PATH = "C:\Qt\$($env:WINDOWS_QT6_LTS_VERSION)\msvc2019_arm64" # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell - - cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsarm64.bat`" && set > %temp%\vcvars.txt" + - cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\18\Community\VC\Auxiliary\Build\vcvarsarm64.bat`" && set > %temp%\vcvars.txt" - Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } } - mkdir build - cd build script: - C:\Windows\py.exe ..\tools\make-version.py --set-release --version-file=wireshark_version.txt .. - - cmake -G "Visual Studio 17 2022" -A arm64 -DENABLE_WERROR=ON -DENABLE_LTO=off -DENABLE_SIGNED_NSIS=on -DQT_HOST_PATH="C:\Qt\$($env:WINDOWS_QT6_LTS_VERSION)\msvc2019_64" .. - - msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln + - cmake -G "Visual Studio 18 2026" -A arm64 -DENABLE_WERROR=ON -DENABLE_LTO=off -DENABLE_SIGNED_NSIS=on -DQT_HOST_PATH="C:\Qt\$($env:WINDOWS_QT6_LTS_VERSION)\msvc2019_64" .. + - msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.slnx - msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj - msbuild /verbosity:minimal /maxcpucount wireshark_nsis_prep.vcxproj - C:\gitlab-builds\bin\sign-files.ps1 -Recurse -Path run\RelWithDebInfo @@ -569,6 +574,7 @@ stage: build rules: !reference [.if-w-w-only-merged] variables: + CCACHE_DIR: "$CI_PROJECT_DIR/../ccache" CODE_SIGN_IDENTITY: "Wireshark Foundation" WIRESHARK_BASE_DIR: "$CI_PROJECT_DIR/../wireshark-third-party" tags: @@ -629,6 +635,7 @@ stage: build rules: !reference [.if-w-w-only-merged] variables: + CCACHE_DIR: "$CI_PROJECT_DIR/../ccache" CODE_SIGN_IDENTITY: "Wireshark Foundation" tags: - wireshark-macos-intel-package @@ -689,7 +696,7 @@ script: # XXX We might want to move this to wireshark-ubuntu-dev or debian-setup.sh. - DEBIAN_FRONTEND=noninteractive apt-get update - - DEBIAN_FRONTEND=noninteractive apt-get --yes install ruby-asciidoctor-pdf ruby-coderay ruby-dev + - DEBIAN_FRONTEND=noninteractive apt-get --yes install asciidoctor-pdf ruby-coderay ruby-dev - NOKOGIRI_USE_SYSTEM_LIBRARIES=1 gem install asciidoctor-epub3 - mkdir build - cd build @@ -914,8 +921,8 @@ script: # lib{sinsp,scap} don't support Configuration=Debug, so we can't enable # BUILD_logray or BUILD_falcodump here just yet. - - cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_WERROR=ON -DENABLE_LTO=off .. - - msbuild /verbosity:minimal /maxcpucount /property:Configuration=Debug Wireshark.sln + - cmake -G "Visual Studio 18 2026" -A x64 -DENABLE_WERROR=ON -DENABLE_LTO=off .. + - msbuild /verbosity:minimal /maxcpucount /property:Configuration=Debug Wireshark.slnx - msbuild /verbosity:minimal /maxcpucount /property:Configuration=Debug test-programs.vcxproj - C:\Windows\py.exe -m pytest --disable-gui --build-type=Debug diff -Nru wireshark-4.4.16/CMakeLists.txt wireshark-4.4.18/CMakeLists.txt --- wireshark-4.4.16/CMakeLists.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/CMakeLists.txt 2026-08-12 17:19:13.000000000 +0000 @@ -57,7 +57,7 @@ # Updated by tools/make-version.py set(PROJECT_MAJOR_VERSION 4) set(PROJECT_MINOR_VERSION 4) -set(PROJECT_PATCH_VERSION 16) +set(PROJECT_PATCH_VERSION 18) set(PROJECT_BUILD_VERSION 0) set(PROJECT_VERSION_EXTENSION "") @@ -360,6 +360,20 @@ endif() endif() +# Preprocessor definitions common to all compilers +# Do not put any add_[compile_]definitions calls before this, +# as this overrides the existing values. +# These only depend on values from CMakeOptions.txt and CMAKE_BUILD_TYPE, +# which have been handled above. +set_property(DIRECTORY + PROPERTY COMPILE_DEFINITIONS + "G_DISABLE_DEPRECATED" + "G_DISABLE_SINGLE_INCLUDES" + $<$,$>:WS_DEBUG> + $<$,$>,$>:WS_DEBUG_UTF_8> + $<$:ENABLE_ASSERT> +) + # Ensure that executables in the build directory always have the same RPATH. # This ensures relocatable binaries and reproducible builds (invariant of the # build directory location). (Requires CMake 3.14) @@ -521,16 +535,6 @@ # -fPIC/-fPIE (so set CMAKE_POSITION_INDEPENDENT_CODE to enable that). set(CMAKE_POSITION_INDEPENDENT_CODE ON) -# Preprocessor definitions common to all compilers -set_property(DIRECTORY - PROPERTY COMPILE_DEFINITIONS - "G_DISABLE_DEPRECATED" - "G_DISABLE_SINGLE_INCLUDES" - $<$,$>:WS_DEBUG> - $<$,$>,$>:WS_DEBUG_UTF_8> - $<$:ENABLE_ASSERT> -) - if(WIN32) # # NOTE: Because of the way Qt moc is including "config.h" (not as the @@ -598,6 +602,13 @@ set(LOCAL_CFLAGS /MP /W2 + + # Some of our code requires object files with + # a 32-bit index to the section table instead of 16-bit. + # This makes the .obj files slightly larger (~2%) and makes + # it so that Microsoft linkers prior to MSVC 2005 can't read + # the files, but those are too old anyway. + /bigobj ) set(WS_LINK_FLAGS "/LARGEADDRESSAWARE /MANIFEST:NO /INCREMENTAL:NO /RELEASE") @@ -1010,12 +1021,6 @@ add_compile_options(${ASAN_FLAG}) endif() if(MSVC) - # Using ASAN makes some of our code require object files with - # a 32-bit index to the section table instead of 16-bit. - # This makes the .obj files slightly larger (~2%) and makes - # it so that Microsoft linkers prior to MSVC 2005 can't read - # the files, but those are too old anyway. - add_compile_options(/bigobj) # The Microsoft LINK linker doesn't recognize or need the # ASAN flag, and will give a LNK4044 warning. else() @@ -1293,6 +1298,16 @@ ws_find_package(AIRPCAP ENABLE_AIRPCAP HAVE_AIRPCAP) ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD) +# The SpeexDSP resampler is required iff building sharkd, or building +# Wireshark or Logray with Qt Multimedia +if(BUILD_sharkd) + reset_find_package(SPEEXDSP) + find_package(SpeexDSP REQUIRED) +elseif(BUILD_wireshark OR BUILD_logray) + reset_find_package(SPEEXDSP) + find_package(SpeexDSP) +endif() + # Build one of the Qt GUIs? if(BUILD_wireshark OR BUILD_logray) if(USE_qt6) @@ -1322,8 +1337,11 @@ Core5Compat OPTIONAL_COMPONENTS DBus - Multimedia ) + + if (SPEEXDSP_FOUND) + find_package(Qt6 ${Qt6_VERSION} REQUIRED OPTIONAL_COMPONENTS Multimedia) + endif() else(USE_qt6) set(qtver 5) if(DEFINED ENV{WIRESHARK_QT5_PREFIX_PATH}) @@ -1348,9 +1366,13 @@ Qt5Widgets Qt5Concurrent ) - set(QT5_OPTIONAL_PACKAGELIST - Qt5Multimedia - ) + + if (SPEEXDSP_FOUND) + set(QT5_OPTIONAL_PACKAGELIST + Qt5Multimedia + ) + endif() + if(WIN32) list(APPEND QT5_PACKAGELIST Qt5WinExtras) endif() @@ -1514,11 +1536,6 @@ find_package(DOXYGEN) -# The SpeexDSP resampler is required iff building wireshark or sharkd. -if(BUILD_wireshark OR BUILD_logray OR BUILD_sharkd) - find_package(SpeexDSP REQUIRED) -endif() - # Generate the distribution tarball. add_custom_target(dist COMMAND ${CMAKE_BINARY_DIR}/packaging/source/git-export-release.sh -d "${CMAKE_BINARY_DIR}" diff -Nru wireshark-4.4.16/ChangeLog wireshark-4.4.18/ChangeLog --- wireshark-4.4.16/ChangeLog 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ChangeLog 2026-08-12 17:19:13.000000000 +0000 @@ -1,492 +1,853 @@ -commit 2495dcd8bc +commit 732223d4cf Author: Gerald Combs -Date: Tue May 19 09:06:42 2026 -0700 +Date: Tue Aug 11 13:17:08 2026 -0700 - Build: 4.4.16 [skip ci] + tools: Update libssh to 0.12.2 -commit fc1d23886a + (cherry picked from commit ff6b064137c56625813f7eb7bae9497fc79d4ed2) + + Conflicts: + cmake/modules/FetchArtifacts.cmake + +commit 0391cde810 +Author: Gerald Combs +Date: Mon Aug 10 16:08:53 2026 -0700 + + Prep for 4.4.18 + +commit 539e5ba4c6 Author: John Thacker -Date: Tue May 19 09:51:36 2026 -0400 +Date: Sun Aug 9 16:20:18 2026 -0400 - kafka: Avoid overflow (and offset moving backwards) in compact string + BT AVRCP: Do not overflow on too large reassemblies - Fix #21263 + If the total reassembled size of a PDU would overflow, truncate at a value. + Similar to #21423 / 9f68da57d360629eb7cee8d97d2f894b4858ce8f, stop at + INT32_MAX for now until unsigned lengths can be handled for tvbuffers + everywhere. This prevents allocating a buffer that is in reality too short. + Add a warning field (use a field instead of a expert info to make this + similar to the standard reassembly API, which perhaps should be used in + the future.) - AI-Assisted: no + Thanks to both AISLE Research and Feng Xue for independently reporting + this issue and providing PoCs and proposed fixes. + + Fix #21488. - (cherry picked from commit cc856b7750900f8298a4174ecadfdf3682c93932) + (backported from commit 1b599808322109ddbac92dd4d81c41ef09bea488) Co-authored-by: John Thacker -commit 5919eff9f1 +commit 32ecb4ce4e +Author: Ronnie Sahlberg +Date: Wed Aug 5 23:29:51 2026 +1000 + + Fix potential heap corruption in UMTS RRC + + Fixes #21478 + + Signed-off-by: Ronnie Sahlberg + (cherry picked from commit a44c8dc01cac93fca23debab465298fc08b06658) + +commit 0e1d75a037 Author: John Thacker -Date: Mon May 18 22:43:55 2026 -0400 +Date: Sun Aug 9 16:23:20 2026 -0400 - Kafka: Eliminate signed overflow UB + btavrcp: Fix Coverity Dereference null return value - Separate the tvb_get_ptr call into a separate instruction line, - because that function will throw an exception if - offset + 4 + length overflows, and thus if 4 + length overflows. - The order of the parameters in proto_tree_add_... is wrong for - preventing overflow here as a single statement. + Fix Coverity Dereference null return value warning - Use tvb_get_ntohil instead of tvb_get_ntohl and casting for retrieving - a signed integer. Fix the returned values of the offset pointers (note - these are never used and could be probably removed.) + Add a condition to check that data_fragment is not NULL. - Similarly prevent possible signed overflow in the KIP-482 compact - coding, although we don't have an example test case yet. + Coverity CID 1405201 - OSS-Fuzz Issue 448035023 + AI-Assisted: no - (cherry picked from commit b3e8fcf3a7948853de023e942831ff6807751560) + (cherry picked from commit 8841ffbe83d2055ed83b9b91329d5b2bf0b01347) - Co-authored-by: John Thacker + Co-authored-by: infostam GitHub -commit fd925fc6db +commit a24d913593 Author: Gerald Combs -Date: Mon May 18 11:48:40 2026 -0700 +Date: Sun Aug 9 10:12:40 2026 +0000 - Prep for 4.4.16 [skip ci] + [Automatic update for 2026-08-09] -commit 35a67dc8fc -Author: John Thacker -Date: Mon May 18 09:08:04 2026 -0400 + Update manuf, services, enterprise numbers, translations, and other items. - SAP HDB: Don't go backwards on a negative option length +commit e15834c812 +Author: Chuck Craft +Date: Tue Aug 4 15:10:40 2026 -0500 - The option length is apparently a signed 16-bit integer. - Don't go backwards if it's negative. + daintree: validate timestamp fraction - (backported from e9a06b6020e9a22737b4bae595be12ce12020d33) + Fixes #21473 - Fix #21259 (note the other checks catch this so I'm not sure there's - an actual infinite loop, but it might be possible to craft one.) + (cherry picked from commit a78713609bee82268b95c441aa4bf1ea6719dfbd) - AI-Assisted: no +commit f2429bb23a +Author: Pascal Quantin +Date: Thu Aug 6 16:16:52 2026 +0200 + + NAS 5GS: fix dissection of type 1 service-level-AA parameter + + Fixes #21479 + + (cherry picked from commit 077d999dff577ba4c60dff981e5e448cac8a7fc3) + + (cherry picked from commit 61469331d74488b63be76dd114b32eb408510250) + + Co-authored-by: Pascal Quantin + +commit f3eba66172 +Author: Pascal Quantin +Date: Wed Aug 5 12:17:02 2026 +0200 + + NAS 5GS: fix a copy/paste error in SOR transparent container dissection + + Fixes #21477 + + (cherry picked from commit 35a0df6e8e889433d5f7db99f16f9b627864182a) + + Co-authored-by: Pascal Quantin -commit 2c040401d1 +commit 71d0f537fe +Author: Pascal Quantin +Date: Tue Aug 4 20:01:23 2026 +0200 + + NAS 5GS: fix SOR transparent container dissection + + Fixes #21472 + + (cherry picked from commit 1dbdfdc340809da28afcf7b448b61a1d21f9d0ba) + +commit ed1294055c Author: John Thacker -Date: Mon May 18 09:34:01 2026 -0400 +Date: Sun Aug 2 19:43:53 2026 -0400 + + ESS: Avoid DISSECTOR_ASSERTing on a zero length BIT STRING + + The VAL_PTR from dissecting a BIT STRING can be uninitialized without + throwing an exception, notably in the zero length case. That likely + will call a DISSECTOR_ASSERT later with most compilers (but because + the parameter tvb was not initialized to NULL, it may not, particularly + under testing.) + + Fix #21467 + + Thanks to AISLE Research for the report and suggested fix + + (backported from commit affa11c6256fd697bc451e8c0139ff6230e7858a) + +commit ff9f1bc138 +Author: Peter Wu +Date: Tue Aug 4 01:31:56 2026 +0200 + + x509if: fix null-pointer dereference on invalid nested RDN + + A RDN nested within a RDN is malformed and creates a nested call to + `dissect_x509if_RelativeDistinguishedName`. The inner dissection resets + `last_rdn_buf` to NULL, causing a NULL-pointer deref in the outer call. + + Fix this by gracefully handling the outcome. `last_dn_buf` seems + similar, but is unaffected as it doesn't reset to NULL after dissection. - Update nl80211 generation tool source URL + Fixes #21469 - With recent changes to the kernel.org to combat burdensome - AI web scrapers [1], grabbing latest nl80211.h constants - from the existing URL generates a HTTP 403 URL forbidden - error. Switch to GitHub mirror which does not generate same - error. + Fixes: v4.1.0rc0-821-g59ee5247dc ("X509IF: Fix string truncation") + (cherry picked from commit 340b45bcb2a9cabe7b33562ebefbe7a6d7bea0ee) - [1] https://social.kernel.org/notice/Asir7LiPevX6XcEVJQ +commit 930f2f39c4 +Author: Chuck Craft +Date: Sun Aug 2 12:27:18 2026 -0500 - (cherry picked from commit 74d9da4edaadd0ee4dfd4d25a3e98a98b10612f3) + bblog: check for truncated option block - Co-authored-by: Alex Gavin + Fixes: #21460 -commit 99da8c2cdc +commit 04dc6b2af4 Author: John Thacker -Date: Mon May 18 08:44:42 2026 -0400 +Date: Sun Aug 2 14:25:33 2026 -0400 - MDB: Allocate a column string with pinfo->pool + SSH: Check Curve25519 key lengths - Just using the old val_to_str on 4.4 uses wmem_packet_scope, which has - slightly too short a lifespan to be used in a column and leads to a - use-after-free with the simple (malloc based) allocator. It probably - has no effect on the normal block [fast] allocator. This was fixed - as part of a large overhaul on 4.6. + crypto_scalarmult_curve25519 requires that the key lengths be the + correct size (32 bytes), so check that before calling in case the + Decryption Secrets Block has a bogus length. - Fix #21261. + Fix #21465 - AI-Assisted: no + Thanks to Vivek Parikh of BreachX Zero Day Labs, using Typhon AI Mil v2, + for the report. + + (cherry picked from commit 3f38ce6c3740d3553ef682c19da5e413af6b61ce) + + Co-authored-by: John Thacker -commit 176d0485ca +commit 34fdc00602 Author: Gerald Combs -Date: Sun May 17 10:15:46 2026 +0000 +Date: Sun Aug 2 10:21:48 2026 +0000 - [Automatic update for 2026-05-17] + [Automatic update for 2026-08-02] - Update manuf, services enterprise numbers, translations, and other items. + Update manuf, services, enterprise numbers, translations, and other items. -commit f828bd27c4 +commit 0d14b9e49e Author: John Thacker -Date: Thu May 14 19:11:45 2026 -0400 +Date: Sat Aug 1 21:24:12 2026 -0400 - Qt: Export Objects: Move after retap cleanup to endRetapPackets + androiddump: Avoid overflow in btsnoop reported or captured lengths - Otherwise, if the dialog is closed before tapping finishes, already - freed memory can be accessed and there can be segfaults. This is - why this exists in WiresharkDialog, it fires after receiving the - signal. + The btsnoop file format, derived, from the Sun snoop format, features + 32-bit unsigned values for reported and captured lengths. It is + extremely unlikely that real values will be in the top half of the + range, and thus convert to negative numbers if cast to signed 32-bit + integers, but a hostile or buggy Android Debug Bridge service could + do so. Guard against that. - AI-Assisted: no + Decode record lengths as unsigned values, reject impossible records before + length arithmetic, and use the validated values for dumping and buffering. + + Assisted-by: AISLE:Snapshot + + Fix #21464 - (cherry picked from commit 06309b952e8f710364d26d0bfc63d3f696478385) + Thanks to Aisle Security for the report, PoC, and proposed fix. + + (cherry picked from commit 3c221601fd471c457dd23c414cd5090980d3d99d) Co-authored-by: John Thacker -commit 7709a71bca +commit b201d45928 Author: John Thacker -Date: Wed May 13 09:46:14 2026 -0400 +Date: Fri Jul 31 11:34:23 2026 -0400 + + wsjon: Make json_get_next_object iterative + + The current implementation is recursive, albeit probably optimized + considerably in most build types. Replace it with an iterative + implementation to reduce stack use, especially in an ASan Debug build. - MSYS2: Add missing nghttp3 DLL to installer + Fix #21462 - Also add nghttp3 to setup script. + Thanks to Aisle Security for the report, PoC, and proposed fix. - (cherry picked from commit 5135143f2d5482be903085f62317a8cf43ed4618) + (cherry picked from commit 35d9347975451d5a57af8cc1514af7657f7ef02f) - Co-authored-by: João Valverde + Co-authored-by: John Thacker -commit b21c89780c +commit b73bf93aa8 Author: John Thacker -Date: Wed May 13 08:42:26 2026 -0400 +Date: Thu Jul 30 20:10:48 2026 -0400 - CMake: Don't look for Chocolatey on MSYS2 + ngsniffer: Don't read past the actual buffer read - All the packages we use are available in the MSYS2 repo. This is - particularly bad if it finds the Chocolatey xsltproc, because then - it won't use the stylesheets from the MSYS2 package and we also - won't have downloaded the stylesheets from FetchArtifacts, so - documentation will fail. (This applies especially to people who - try building both ways.) + Pass in the number of bytes we read (which was limited to 256), + not the total remaining length, to the header processing function. + Fix it in both paths, even though it doesn't matter in one. - AI-Assisted: no + Fix #21461 + + Thanks to AISLE Security for the report, PoC, and proposed fix. - (cherry picked from commit 08023890269d603a65af5ab334fe53b4261edee2) + (cherry picked from commit 5b624b9c3a4c0b14ffe25300842e741cf3cf37d4) Co-authored-by: John Thacker -commit af11ff4936 +commit da9204174b Author: John Thacker -Date: Wed May 13 01:29:16 2026 -0400 +Date: Thu Jul 30 12:21:07 2026 -0400 - androiddump: Fix a shadowed variable name + CMS: Move globals into packet private data - This shows up when compiling with MSYS2, etc. + This prevents reusing the proto_trees in a later frame, or having + to add a frame end routine, in the case of unusual non-spec + compliant captures. - (cherry picked from commit e1d130de449b54378820838cd1a86546ee1313b2) + Thanks to AISLE Security for the reports, PoCs, and proposed fixes. + + Fix #21457, #21458 + + (backported from commit 70b341567adb8b7bae0268b7a6fe61f1374073d6) + +commit 5119ed263f +Author: John Thacker +Date: Thu Jul 30 15:57:17 2026 -0400 + + wiretap: log3gpp: Use proper bounds for writing + + Fix the loop bound when procesing hexstring data. Exploiting this + requires very specific packet lengths in the data due to how + the wiretap buffers are allocated. + + Thanks to AISLE Security for the report, PoC, and proposed fix. + + Fix #21454 + + (backported from c5f900e92227495ff944356f25523c530a277900) + +commit 5520cc92a8 +Author: John Thacker +Date: Wed Jul 29 18:21:02 2026 -0400 + + BT BR/EDR: Register reassembly table + + Thanks to Aisle Security for the report, PoC, and proposed fix. + + Fix #21452 + + (cherry picked from commit 0e191266dd14ff099f91d051cdf34ff4ae1e0571) Co-authored-by: John Thacker -commit d4807b9b0d +commit a1cc189664 Author: John Thacker -Date: Wed May 13 00:56:44 2026 -0400 +Date: Wed Jul 29 10:29:17 2026 -0400 - Lua: Make tests pass on Lua 5.5 + BT HFP: Check the length of the +XAPL first parameter - The way in which luaL_[un]ref works in order to allow references be - reused means that the length operator # does not work in the expected - way in Lua 5.4 and 5.5 on arrays that use references instead of - consecutive integer keys indexed starting at 1. (Lua arrays are - 1-indexed by custom, and various functions expect that.) + Check the length of the first parameter of the HFP Command AT+XAPL + before trying to parse hex strings out of the raw array. - There's only an advantage to using luaL_ref if the references are - stored, and then used to unreference strict subsets of the table - members, which we don't support and have never supported for the - field and expert info tables in a wslua Proto. Some of the tests - depend on the length operator providing the expected answer. Just - use consecutive integer keys for now. (This is what luaL_ref will - eventually do, more or less, in a slightly slower manner, if we - never remove individual items without clearing the entire table - or letting it garbage collect.) + https://developer.apple.com/accessories/Accessory-Design-Guidelines.pdf - This fixes the wslua_proto_field test on Lua 5.5 + Thanks to AISLE Security for the report, PoC, and suggested patch. - https://www.lua.org/manual/5.5/manual.html#luaL_ref - https://www.lua.org/manual/5.5/manual.html#3.4.7 - https://www.lua.org/source/5.5/lauxlib.c.html#luaL_ref + Fix #21451 - AI-Assisted: no + (backported from commit fc4171f4ddf75b4f243f392f0ea093e8962fcb73) + +commit a1d6efed38 +Author: John Thacker +Date: Wed Jul 29 07:11:20 2026 -0400 + + kerberos: Add a function to print up to the first 4 bytes of a key + + Add a static function to print up to the first 4 bytes of a key + (with an ellipsis if there are more than 4 bytes, as is likely) + and use it in the various expert items formats. This avoids having + to worry if the key is for some reason shorter than 4 bytes. + + Fix #21449 - (cherry picked from commit 6add14a3f37029a71633dececc0deaf2284a46d2) + Thanks to AISLE Security for the report, PoC, and proposed fix. + + (cherry picked from commit 78d67418e8cfec6eb30a80bd399d8485f01efdd3) Co-authored-by: John Thacker -commit b8084806d3 -Author: Gerald Combs -Date: Thu May 7 09:53:13 2026 -0700 +commit de13f9ff4c +Author: John Thacker +Date: Tue Jul 28 15:19:39 2026 -0400 - CMake: Update libgcrypt to 1.12.2, second try + H.245: Do not update state for a returnedFunction GenericMessage - Upgrade to 1.12.2, this time with Gabriel Potter's FreeLibrary patch - from !24787. + In H.245, a returnedFunction is much like an encapsulated original + datagram in a ICMP error packet. The h245_pi is cleared before + processing one. In the case that the returnedFunction is a + GenericMessage it h245_pi should be checked against NULL, and the + info column and frame label should not be updated. It is checked + in all the other cases in H.245 - AI-Assisted: no - (cherry picked from commit 61ce51994400cb34c064586491f980c288731780) + Thanks to AISLE Security for the report, PoC, and suggested patch. - Conflicts: - cmake/modules/FetchArtifacts.cmake + Fix #21447 -commit d83e92708a + (cherry picked from commit 86df5f3b401f77dbbaf02d7dc1af39b820b2b489) + + Co-authored-by: John Thacker + +commit 920cb47359 Author: John Thacker -Date: Fri May 1 09:03:51 2026 -0400 +Date: Tue Jul 28 09:02:28 2026 -0400 - GitLab CI: Run the Qt5 job on 4.4 on merge requests that change Qt + CMS: Check if Digest Algorithm is NULL - Since the 4.4 branch still supports Qt 5 for more platforms, and doesn't - require C++14, we need to run the Qt 5 job on cherry-picks and backports - that run on master but might not run on earlier branches + Check for the Digest Algorithm being NULL. (g_strcmp0 could + also be used instead.) - (backported from 0041cb30830d6f4e94ba06601dba9d00e9cd3726) + Also, clear the old digest algorithm at the start of dissecting + an AlgorithmIdentifier instead of after dissecting the OID, in + case there is an exception, etc. to avoid stale data. Do this before + the sequence processing, in case of an empty sequence. (The BER + dissector probably should check for missing mandatory elements + for SEQUENCE as it appears to do for SET.) - AI-Assisted: no + Thanks to AISLE Research for the report, PoC, and proposed mitigation. -commit e6fea1b5a7 -Author: Jaap Keuter -Date: Mon May 11 11:25:18 2026 +0000 - - GDSDB: Fix rounding up - - The align to 4 bytes function as currently written rounds up numbers - already divisible by 4 to the next higher power. This is incorrect - for this protocol, as demonstrated by the file in #3749, which dissects - without malformed packets after this change. + Fix #21446 - AI-Assisted: no + (backported from commit 02dd1e7af093163feae29ef1937caef24da54d17) + +commit cfc38a9f04 +Author: John Thacker +Date: Tue Jul 28 10:18:06 2026 -0400 + + wiretap: RTPDump: Fix swapped caplen / len + + Also check to make sure that the total packet length, which + includes the mandatory 8-byte header, is at least 8. + + Fix #21445 + + Thanks to Be33eD for the report and PoC. + + (backported from commit 613fdd1682bd307f82d2ed5d2efc2866b88f2085) + +commit 5b73ba672f +Author: John Thacker +Date: Tue Jul 28 10:20:29 2026 -0400 + + KNX/IP: Prevent NULL dereference by using tvb_get_ptr call correctly + + The size variable is already the length of the encrypted data, so + the offset does not need to be subtracted a second time. The size + was verified by tvb_get_captured_length_remaining and checked before + each subtraction, so size bytes (which must be at least 16) are + always present. + + tvb_get_ptr() returns a raw pointer into the data, so the length + value at the end being shorter than the desired size only matters + for the verification step (not needed here because the size has + already been verified) not the length of the returned pointer, + except in the case where the value after subtraction becomes 0 and + the returned pointer is NULL. - (cherry picked from commit 16ee4938cd244bbbcfc006ccf152fd303002aa3d) + Thanks to Be33eD for the report and PoC. + + Fix #21444 + + (cherry picked from commit b42ae78d867ba6acaf1fc8479344ab939f30b834) Co-authored-by: John Thacker -commit d0f80c12a5 +commit 7f7f869d32 Author: Gerald Combs -Date: Sun May 10 10:12:20 2026 +0000 +Date: Sun Jul 26 10:12:34 2026 +0000 - [Automatic update for 2026-05-10] + [Automatic update for 2026-07-26] - Update manuf, services enterprise numbers, translations, and other items. + Update manuf, services, enterprise numbers, translations, and other items. -commit 80a5565b72 +commit d53b33eabd Author: John Thacker -Date: Sat May 9 14:51:46 2026 -0400 +Date: Sat Jul 25 08:12:58 2026 -0400 - SIP: Fix a possibility of a crash in follow conv filter with sharkd + EAX: Don't truncate lengths - Commit e75e1fb580f3a496309ae1d65c1865fa98262ec5 added the ability for - the follow conversation filters to be built out of the epan_dissect_t, - instead of just the packet_info it contains, and had the SIP dissector - use the proto_tree information. Unfortunately, despite an update in - 9778cc82207520547e22c39f11ca3c1ac52c8aea, it's still possible for the - dissection to have occurred with a NULL tree, and functions like - proto_find_first_finfo will crash in that case. + C12.22 can send 32-bit lengths to the EAX handling to be decrypted. + The buffer to decrypt is all copied from packet data via tvb_memcpy + before decryption, so this isn't just a 32-bit length read from packet + data that doesn't correspond to actual data. - It's possible that this entire approach doesn't work, and information - for follow filters should be placed in proto data (file or packet - scoped) for this purpose; alternatively, sharkd and other follows - of the follow_conv_filter functions would need to guarantee a non-NULL - tree before calling them. + Don't truncate the lengths. Do checked arithemtic to check for overflow. - AI-Assisted: no + It is unlikely to be larger than a 16-bit value without some kind of + reassembly, but reassembly is possible since this is over TCP. Return + false in a few failure cases. - (cherry picked from commit 8ac1be08cfdf14feb7098a04ac9ecd038d37d2ff) + Fix #21439 + + Thanks to AISLE Security for the report, PoC, and suggsted fix (though + this fix goes in a slightly different direction.) + + (cherry picked from commit 360bdc60fe1084061d4cc98fcdfbe55d9e2cb375) Co-authored-by: John Thacker -commit 401de4288e -Author: Gerald Combs -Date: Thu May 7 17:07:14 2026 -0700 +commit 6d895fe9f3 +Author: John Thacker +Date: Sat Jul 25 07:28:58 2026 -0400 - docs: Update the sharkd man page admonition + EAX: Move a static struct onto the stack. - Sharkd shouldn't be exposed to any untrusted user. + There's no need to use static storage for the decryption working space; No + state need be maintained across calls to Eax_Decrypt. Moving it to the stack + frees up a tiny amount of .bss but most importantly eliminates the risk of + concurrency issues. - AI-Assisted: no - (cherry picked from commit 9ead72497968d76227a797b7b6d1db8947fdb867) + Tested using the capture attached to issue #5531. + + (cherry picked from commit bb9bb86070f0e72456e19753ff94863921f94a90) -commit a60f3dcbb3 + Co-authored-by: Darius Davis + +commit 7028cf20df Author: John Thacker -Date: Thu Apr 30 12:28:51 2026 -0400 +Date: Fri Jul 24 09:46:16 2026 -0400 - CMake: Add sharkd HTML page to be installed in one more place + k12: Don't try to write records larger than supported for writing - Fixup aab6a4cc574dac8540e48ec9ce23a9f18de4b31f (the Windows packages - need this apparently.) + The Tektronix K12xx (.rf5) wiretap dumper can only write the k12 + encapsulation, but the reader can read files with records larger + than the dumper can write. Prevent writing past an allocated buffer + by refusing to write a too long record. - AI-Assisted: no - (cherry picked from commit 7ff76b099be845d81e2d59cd072dfcad21609ffd) + Also replace a few numeric literals with the appropriate #defines. - Conflicts: - CMakeLists.txt + Fix #21436 -commit f02ab2c33e -Author: Gerald Combs -Date: Thu Apr 30 12:45:57 2026 -0700 + Thanks to AISLE Security for the report, PoC, and suggested fix. - WiX: Install the sharkd man page + (backport from commit 08dde3f0ed385261d56270fe5289e029a666c6bf) - AI-Assisted: no - (cherry picked from commit 1c693e3d343e2741cfac4bd0a70ab29a1a9dfb04) +commit 02e8e31cb0 +Author: John Thacker +Date: Fri Jul 24 12:08:37 2026 -0400 -commit f464c9ff8d -Author: Gerald Combs -Date: Mon Apr 27 16:55:32 2026 -0700 + Windows: Update to libgcrypt-1.12.2-3 package - docs: Add an initial sharkd man page + For some reason the previous package doesn't seem to remember that + the library is already initialized, and ends up calling LoadLibraryEx + and FreeLibrary every single time a libgcrypt function is called. - Add an initial man page for sharkd. The bulk of the text was generated - using Claude, and I corrected some errors and omissions. + Fix #21337 - Ping #19562 + (backported from e699ab947839ac6fa5e6d1740dee4502557f5b6e) - AI-Assisted: yes [Claude Opus 4.6] - (cherry picked from commit aab6a4cc574dac8540e48ec9ce23a9f18de4b31f) +commit 32c63e1b62 +Author: John Thacker +Date: Fri Jul 24 09:57:55 2026 -0400 - Conflicts: - doc/CMakeLists.txt - (cherry picked from commit 2dfd050fdd8698dbdc2d3abbf07f158505d64886) + wiretap: busmaster: Do not exit the program on a malformed file + + Report a malformed header as a bad file and have that handled through + the normal wiretap error routines, instead of rudely exiting the + process. + + Fix #21435 -commit b9750e0096 + Thanks to AISLE Security and AISLE:Snapshot for the report, PoC and suggested + patch. + + (cherry picked from commit 8e984f1f8360d90c5250c1a77b8754f3ce64890b) + + Co-authored-by: John Thacker + +commit f95f229f4e Author: John Thacker -Date: Thu May 7 21:31:27 2026 -0400 +Date: Fri Jul 24 11:04:16 2026 -0400 - ROHC: Fix handing of uncompressed profile with large CID + UMTS-FP: More bounds checking against subframes[] - There's an off-by-one in how tvb_captured_length_remaining is - used. One extra octet, representing the first octet of the packet, - should be added. + (cherry picked from commit 5c5d3d53818a78db8f14ebc46c67b052b6542894) - In the normal case, this results in the packet passed to the IP - dissector being one octet short. In the edge case, this results in - writing one octet to a NULL pointer. + 16010858 UMTS-FP: More bounds checking against subframes[] - Fix #21243 + Co-authored-by: Martin Mathieson - AI-Assisted: no +commit dbefcd3101 +Author: Pascal Quantin +Date: Thu Jul 23 17:47:35 2026 +0200 + + NAS 5GS: add extraneous data check to UE security capability IE + + Fixes #21431 + + (cherry picked from commit f2d3d9f070750d1a23b30b5ec231cedf62802a83) + + Co-authored-by: Pascal Quantin + +commit e839c9e603 +Author: Pascal Quantin +Date: Thu Jul 23 17:07:01 2026 +0200 + + NAS 5GS: fix dissection of extended CAG information list IE + + Fixes #21433 + + (cherry picked from commit ba4e7dfb1020673cca0bb497b68765caf9db0789) + + Co-authored-by: Pascal Quantin + +commit 9427a5b378 +Author: Pascal Quantin +Date: Thu Jul 23 16:27:08 2026 +0200 + + NAS 5GS: fix dissection of registration wait range IE - (cherry picked from commit 6f0cf1551dcc81ad92508bf8ccaf51af8e1512f9) + Fixes #21432 + + (cherry picked from commit 1ada3fc602388e1b8d37cfb008b0ac1278267c58) + + Co-authored-by: Pascal Quantin + +commit 3eaf9083d3 +Author: John Thacker +Date: Wed Jul 22 09:09:09 2026 -0400 + + Qt: QCustomPlot: Fix overflow in QCPItemTracer + + Converting a QRectF to a QRect can cause integer overflow, particularly + when the QRectF in question has just been radically shifted by a conversion + from relative times to absolute times. Qt 6.10 added a check for integer + overflow in QRect and other geometry classes: + + https://github.com/qt/qtbase/commit/1145e1709d1072f7dd45683e9c25a14615603854 + + This causes non-UB wraparound Qt is not compiled in Debug mode, but + causes an Error which leads to Wireshark being aborted when compiled in + Debug mode. (The wraparound is still incorrect, but also the QRect + produced by wrapping around is unlikely to intersect, although it + could.) + + Convert the clipRect to a QRectF before checking the intersection with + various QRectF, instead of converting the QRectFs to QRects in order to + avoid overflow. + + Ping #21426 + + (cherry picked from commit 2f022fab2cc9523e1407ef7403eec61a873109a7) Co-authored-by: John Thacker -commit 3b7b868cea -Author: Gerald Combs -Date: Tue May 5 12:01:18 2026 -0700 +commit e32702d6be +Author: John Thacker +Date: Tue Jul 21 20:10:39 2026 -0400 - GitLab CI: Start using rclone + Qt: Trim off extra attributes from Qt >= 6.11 QFont::toString - AI-Assisted: no - (cherry picked from commit b2fe6e15489d92757274e54c58c7d78a43b3c67a) + Qt 6.11 added two new attributes to the comma separated list produced + by QFont::toString(). Older versions have 17 attributes; now there are + 19. (Qt 5 also uses 17 attributes, although the weights numbers are + different.) + + https://doc.qt.io/qt-6/qfont.html#toString + https://doc.qt.io/qt-6.10/qfont.html#toString + + Strip extra attributes when running on Qt < 6.11, to avoid console + warnings like: + + [GUI WARNING] -- QFont::fromString: Invalid description + 'Consolas,9,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular,0,0'` + + This can happen when using the same preferences on multiple versions of + Wireshark or on multiple computers, only some of which have Qt 6.11. + + Fonts are managed in a different place in 4.6 and earlier, so this + commit is made directly to 4.6 + + (cherry picked from commit 1360624cc4b33603afee5b665c469791fd13e6aa) + + Co-authored-by: John Thacker + +commit f8edcd3db2 +Author: Pascal Quantin +Date: Tue Jul 21 23:37:26 2026 +0200 + + DCT2000: fix buffer overflow when copying packet data + + Fixes #21427 + + Thanks to Yazan Balawneh from CyStack Security Team for the report + + (cherry picked from commit 46c813e7ad05316afdbb06c1ecb0cf82b7c1c000) + + Co-authored-by: Pascal Quantin + +commit 40ab60fce7 +Author: Pascal Quantin +Date: Tue Jul 21 00:02:06 2026 +0200 + + BT ATT: check handle count when decoding Read Multiple Variable Response + + Fixes #21424 + + Thanks to Yazan Balawneh from CyStack Security Team for the report + + (cherry picked from commit 6e2dfd4f0bfc62a35b0d520e57165aee5b441d99) + + Co-authored-by: Pascal Quantin + +commit c1378c3314 +Author: John Thacker +Date: Sun Jul 19 21:50:17 2026 -0500 + + reassemble: Put a max limit on add_seq() reassembly lengths + + The add_seq family of reassembly functions uses sequence ids within + the reassembly (instead of offsets, the way the TCP-like fragment_add + functions do). The total length is computed at the end. If that length + overflows, or otherwise goes beyond a maximum supported size + (INT32_MAX until #20103 is fully solved), stop copying. This prevents + allocating too short a buffer if the total length would overflow. + + Fix #21423 + + Thanks to Daniel Birtwhistle for the report and POC. + + (backported from commit 9f68da57d360629eb7cee8d97d2f894b4858ce8f) + +commit a7c97b297d +Author: Pascal Quantin +Date: Sun Jul 19 23:14:17 2026 +0200 + + C12.22: fix bound check in canonify_unencrypted_header() + + Thanks to Aisle Security for reporting and PoC. + + (cherry picked from commit 94a0319ec2d26b4d724dcafdacf6a7abc2ba2d57) + + Co-authored-by: Pascal Quantin + +commit d28eaacbad +Author: Pascal Quantin +Date: Sat Jul 18 13:27:31 2026 -0500 + + RDP: fix bound checks + + Fixes #21396 + + Thanks to Anthropic's Claude and Ada Logics for reporting and PoC. + + (cherry picked from commit d50d557d84ddb546ca4a43f51034780e2493c409) Conflicts: - .gitlab-ci.yml + epan/tvbuff_rdp.c + +commit 68dfb30566 +Author: Gerald Combs +Date: Sun Jul 19 10:17:24 2026 +0000 + + [Automatic update for 2026-07-19] -commit ec397370d0 + Update manuf, services, enterprise numbers, translations, and other items. + +commit 4ef42a732c Author: John Thacker -Date: Tue May 5 07:26:39 2026 -0400 +Date: Sat Jul 18 10:14:32 2026 -0400 - rtps-virtual-transport: Initialize the rtpsvt_data struct + rlogin: Don't add invalid UTF-8 to a column - It appears that in RTPS-VT that some of the parameters, such as - direction, are mandatory. If they are missing, what should the - dissector do? Should it use a default value or not pass the - information onto RTPS-PROC? + Instead of a fixed array buffer, allocate the string; since we bound + the length we're willing to read, this shouldn't cause any problems. + This also means we do sanitization and replacement of invalid characters + right away. - Fix #21240 + Fix #21419 - AI-Assisted: no + (cherry picked from commit 7def9acc2c7f9db36662df1cd17b6d73ec91bae9) + + Co-authored-by: John Thacker + +commit 82c0b871be +Author: Anders Broman +Date: Wed Jul 15 07:26:55 2026 +0200 - (cherry picked from commit badcc16cfcc28acf9e326ea84822739c712a52f9) + erf: Check that a time tag is long enough before copying + + This is a similar test used for other sorts of tags elsewhere + in the wiretap module for ERF. + + Fix #21415 + + Thanks to Jaime Cavero for the report and PoC. + + (cherry picked from commit 4e030d2b1791de6bc84a60278ea730d3660fe6f5) Co-authored-by: John Thacker -commit 915c34d373 +commit 6f812cbb50 Author: John Thacker -Date: Mon May 4 08:44:07 2026 -0400 +Date: Tue Jul 14 00:47:45 2026 -0400 - GitLab CI: Fix Fedora build + K12: Fix a possible buffer overrun - cmake3 was necessary during the CMake 2 to 3 transition. The just - released Fedora 44 has CMake 4 only, which builds fine, and on all - at all recent Fedora, cmake points to CMake 3, not 2. + The k12 wiretap module's get_record() has always returned the length + read in the file, i.e., the offset advanced, not the length of the + record. These are distinct values because every 8192 bytes there are + 16 byte blobs that are thrown away. - AI-Assisted: no + Starting at least with commit 74322911219429bc6e5a6b17a4bee2fa87e7df65 + 19.5 years ago, that return value was incorrectly treated as the record + length. This meant that the length of extra bytes in the record after + the frame length was calculated too large whenever the portion of the + file including the record included the blob. + + Since the buffer is allocated with 8192 bytes originally, this generally + means copying uninitialized data, but with certain record lengths can + mean a buffer overrun. The buffer size was increased as necessary to + accommodate the actual payload, but this did not take into account the + 16 byte blob, and so any value within 16 bytes of 8192 or a power of 2 + multiplied by 8192 could produce this. - (backported from commit 5e79628c7e4b82ecc6aa93d9678aa8417edd5739) + To reduce the confusion, use a Buffer instead of a raw uint8_t array + with length, and use ws_buffer_length() to retrieve the length written + to the buffer, as separate from the offset advance. -commit a0de11381f + Thanks to Jaime Cavero for the report and PoC. + + Fix #21414 + + (backported from commit c517aedc993f6f12f6768c9d6115efb0b956e5e3) + +commit 5b56712fb9 Author: John Thacker -Date: Mon May 4 09:09:50 2026 -0400 +Date: Sun Jul 12 14:56:47 2026 -0400 - epan: Fix signed_time_msecs_to_str for INT32_MIN + sharkd: Make sure to deregister and free taps on failure - C integer division and remainder is defined since C99 to always round - towards towards zero, and C++11 adopted this, so for what we want in - order to produce a string (the seconds part with the appropriate sign - but the fractional part unsigned), and to handle the edge case of INT32_MIN - correctly, we can divide as normal and then negate the remainder. - This is the same as the current implementation for all values other - than INT32_MIN for time_val. - - The current implementation for an time_val of INT32_MIN produces - 2,147,483 for the dividend and -648 for msecs, then cast to - 4,294,966,648. (That is with -fwrapv/-fno-strict-overflow; otherwise - it's UB and all bets are off; it's quite possible that msecs will - be set to -330641784 under a standard optimization assuming overflow - can never happen. On the other hand, in certain cases clang will - actually give the correct answer without wrapping turned on, but - it can change depending on other surrounding statements.) - This is because -INT32_MIN is still negative; -INT32_MIN == INT32_MIN. - This implementation produces -2,147,483 and 648, respectively, as - desired. + Move registering a single tap to a separate static function, + and on failure, make sure that all the registered taps are + removed and freed appropriately. - OSS-Fuzz 494034581 + Fix #21395 - AI-Assisted: no + Thanks to Anthropic's Claude and Ada Logics for reporting and PoC. - (cherry picked from commit ef0e6f7790257ec470017bf81a4ba92bbe744c41) + (backported from commit 178939f126d5eeb442d96e10b0ea4c1cfc6920e9) - Co-authored-by: John Thacker +commit a03f38a12d +Author: Pascal Quantin +Date: Mon Jul 13 16:16:37 2026 +0200 -commit 918b969cbd -Author: Gerald Combs -Date: Sun May 3 10:13:03 2026 +0000 + NAS 5GS: fix dissection of NSAG information - [Automatic update for 2026-05-03] + Fixes #21412 - Update manuf, services enterprise numbers, translations, and other items. + (cherry picked from commit 8ef8e0fa782cea54570dda01ee25a36b24f03ae7) -commit 9f362204a7 -Author: Gerald Combs -Date: Fri May 1 10:52:39 2026 -0700 +commit e298ec78a0 +Author: Pascal Quantin +Date: Mon Jul 13 11:54:54 2026 +0200 - CMake: Update GnuTLS to 3.8.13 and libgcrypt to 1.12.2 + NAS 5GS: fix S-NSSAI location validity information dissection - AI-Assisted: no + Fixes #21411 - (cherry picked from commit 44b886ac28d739465afb858c6bf66d520a9ac64c) + (cherry picked from commit c92cf203e28054944c55ad83f28557fa342ed955) - Conflicts: - cmake/modules/FetchArtifacts.cmake + Co-authored-by: Pascal Quantin -commit 255e23dd11 +commit 560ec98247 Author: John Thacker -Date: Thu Apr 30 22:50:33 2026 -0400 +Date: Sun Jul 12 17:22:32 2026 -0400 - VeriWave: Fix finding the signature + sharkd: Make sure to deregister and already added IO Graphs on error - Have the find_signature routine return a bool, instead of returning the - original offset on failure, so that the caller doesn't have to check the - returned offset to see if it has the magic byte. This also allows - returning false when the record isn't long enough to check the expected - signature offset, without the caller then trying to dereference it - anyway. + Commit 647205177179a6e9ef6c08f08c33a2b405efffbc (pre-3.6.0) + made it so that bad I/O Graphs lines returned an error immediately + instead of being silently ignored. This meant that they were no + longer freed and deregistered. - It doesn't appear that this causes a buffer overrun because of how - the Buffer is initialized to be at least 2048 bytes always, but it can - be a read of uninitialized data. + Fix #21399 - Fix #16460. Fix #16461. + Thanks to Anthropic's Claude and Ada Logics for reporting. - AI-Assisted: no + (cherry picked from commit d43d89d201b18f1c6d77460e52b4e6b5a4ec68f8) - (backported from d8242c14feee454467e4a1dda1557001a9f08b92) + Co-authored-by: John Thacker -commit eaf05a97eb +commit 6716c765ef Author: Gerald Combs -Date: Wed Apr 29 15:02:31 2026 -0700 +Date: Sun Jul 12 10:16:19 2026 +0000 + + [Automatic update for 2026-07-12] - macos-setup: Just set our minimum OS target to 11.0 + Update manuf, services, enterprise numbers, translations, and other items. -commit 9e6f565554 +commit a15f6d0b5f Author: Gerald Combs -Date: Wed Apr 29 19:29:13 2026 -0700 +Date: Wed Jul 8 15:19:06 2026 -0700 - Version: 4.4.15 → 4.4.16 [skip ci] + Version: 4.4.17 → 4.4.18 [skip ci] diff -Nru wireshark-4.4.16/cmake/modules/FindWinSparkle.cmake wireshark-4.4.18/cmake/modules/FindWinSparkle.cmake --- wireshark-4.4.16/cmake/modules/FindWinSparkle.cmake 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/cmake/modules/FindWinSparkle.cmake 2026-08-12 17:19:13.000000000 +0000 @@ -9,48 +9,64 @@ # WINSPARKLE_DLL - (Windows) Name of the WinSparkle DLL. -IF (WINSPARKLE_INCLUDE_DIRS) +if (WINSPARKLE_INCLUDE_DIRS) # Already in cache, be silent - SET(WINSPARKLE_FIND_QUIETLY TRUE) -ENDIF (WINSPARKLE_INCLUDE_DIRS) + set(WINSPARKLE_FIND_QUIETLY TRUE) +endif() -INCLUDE(FindWSWinLibs) -FindWSWinLibs("WinSparkle.*" "WINSPARKLE_HINTS") +include(FindWSWinLibs) +FindWSWinLibs("WinSparkle-.*" WINSPARKLE_HINTS) -set (_release_subdir "${WIRESHARK_TARGET_PLATFORM}/Release") +find_path(WINSPARKLE_INCLUDE_DIR + NAMES winsparkle.h + HINTS "${WINSPARKLE_HINTS}/include" +) + +find_library(WINSPARKLE_LIBRARY + NAMES WinSparkle + HINTS "${WINSPARKLE_HINTS}/lib" +) + +# WinSparkle uses the "WIN_SPARKLE_" variable prefix. We probably should too. +if( WINSPARKLE_INCLUDE_DIR AND WINSPARKLE_LIBRARY ) + file(STRINGS ${WINSPARKLE_INCLUDE_DIR}/winsparkle-version.h WIN_SPARKLE_VERSION_MAJOR + REGEX "#define[ \t]+WIN_SPARKLE_VERSION_MAJOR[ \t]+[0-9]+") + string(REGEX MATCH "[0-9]+" WIN_SPARKLE_VERSION_MAJOR ${WIN_SPARKLE_VERSION_MAJOR}) + file(STRINGS ${WINSPARKLE_INCLUDE_DIR}/winsparkle-version.h WIN_SPARKLE_VERSION_MINOR + REGEX "#define[ \t]+WIN_SPARKLE_VERSION_MINOR[ \t]+[0-9]+") + string(REGEX MATCH "[0-9]+" WIN_SPARKLE_VERSION_MINOR ${WIN_SPARKLE_VERSION_MINOR}) + file(STRINGS ${WINSPARKLE_INCLUDE_DIR}/winsparkle-version.h WIN_SPARKLE_VERSION_MICRO + REGEX "#define[ \t]+WIN_SPARKLE_VERSION_MICRO[ \t]+[0-9]+") + string(REGEX MATCH "[0-9]+" WIN_SPARKLE_VERSION_MICRO ${WIN_SPARKLE_VERSION_MICRO}) + set(WINSPARKLE_VERSION ${WIN_SPARKLE_VERSION_MAJOR}.${WIN_SPARKLE_VERSION_MINOR}.${WIN_SPARKLE_VERSION_MICRO}) +endif() -FIND_PATH(WINSPARKLE_INCLUDE_DIR winsparkle.h HINTS "${WINSPARKLE_HINTS}/include" ) - -FIND_LIBRARY(WINSPARKLE_LIBRARY NAMES WinSparkle HINTS "${WINSPARKLE_HINTS}/${_release_subdir}" ) - -# handle the QUIETLY and REQUIRED arguments and set WINSPARKLE_FOUND to TRUE if +# Handle the QUIETLY and REQUIRED arguments and set WINSPARKLE_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(WinSparkle DEFAULT_MSG WINSPARKLE_LIBRARY WINSPARKLE_INCLUDE_DIR) - -IF(WINSPARKLE_FOUND) - SET(WINSPARKLE_LIBRARIES ${WINSPARKLE_LIBRARY} ) - SET(WINSPARKLE_INCLUDE_DIRS ${WINSPARKLE_INCLUDE_DIR} ) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(WinSparkle + REQUIRED_VARS WINSPARKLE_LIBRARY WINSPARKLE_INCLUDE_DIR + VERSION_VAR WINSPARKLE_VERSION +) + +if(WINSPARKLE_FOUND) + set(WINSPARKLE_LIBRARIES ${WINSPARKLE_LIBRARY} ) + set(WINSPARKLE_INCLUDE_DIRS ${WINSPARKLE_INCLUDE_DIR} ) if (WIN32) - set (WINSPARKLE_DLL_DIR "${WINSPARKLE_HINTS}/${_release_subdir}" + set (WINSPARKLE_DLL_DIR "${WINSPARKLE_HINTS}/bin" CACHE PATH "Path to the WinSparkle DLL" ) - file( GLOB _winsparkle_dll RELATIVE "${WINSPARKLE_DLL_DIR}" - "${WINSPARKLE_DLL_DIR}/WinSparkle.dll" - ) - set ( WINSPARKLE_DLL ${_winsparkle_dll} + set (WINSPARKLE_DLL WinSparkle.dll # We're storing filenames only. Should we use STRING instead? CACHE FILEPATH "WinSparkle DLL file name" ) mark_as_advanced( WINSPARKLE_DLL_DIR WINSPARKLE_DLL ) endif() -ELSE(WINSPARKLE_FOUND) - SET(WINSPARKLE_LIBRARIES ) - SET(WINSPARKLE_INCLUDE_DIRS ) - SET(WINSPARKLE_DLL_DIR ) - SET(WINSPARKLE_DLL ) -ENDIF(WINSPARKLE_FOUND) - -unset(_release_subdir) +else() + set(WINSPARKLE_LIBRARIES ) + set(WINSPARKLE_INCLUDE_DIRS ) + set(WINSPARKLE_DLL_DIR ) + set(WINSPARKLE_DLL ) +endif() -MARK_AS_ADVANCED( WINSPARKLE_LIBRARIES WINSPARKLE_INCLUDE_DIRS ) +mark_as_advanced( WINSPARKLE_LIBRARIES WINSPARKLE_INCLUDE_DIRS ) diff -Nru wireshark-4.4.16/debian/changelog wireshark-4.4.18/debian/changelog --- wireshark-4.4.16/debian/changelog 2026-07-01 09:02:06.000000000 +0000 +++ wireshark-4.4.18/debian/changelog 2026-08-23 15:34:57.000000000 +0000 @@ -1,3 +1,45 @@ +wireshark (4.4.18-0+deb13u1) trixie-security; urgency=medium + + * Team upload. + * New upstream version 4.4.18 (Closes: #1142268, #1144924) + - CVE-2026-15163: Multiple loops in dissectors, allows DoS + - CVE-2026-15164: Crash in ciscodump, allows DoS + - CVE-2026-15166: IEEE 802.11 dissector crash, allows DoS + - CVE-2026-15167: DBS Etherwatch parser crash, allows DoS + - CVE-2026-15168: BLF parser, allows information disclosure + - CVE-2026-15169: UMTS FP dissector crash, allows DoS + - CVE-2026-15170: Z39.50 dissector crash, allows DoS + - CVE-2026-15171: SSH dissector crash, allows DoS + - CVE-2026-15172: FMP/NOTIFY dissector crash, allows DoS + - CVE-2026-15174: Catapult DCT2000 dissector crash, allows DoS + - CVE-2026-76879: C12.22 dissector crash, allows DoS + - CVE-2026-76880: RRC dissector crash, allows DoS + - CVE-2026-76881: CMS dissector crash, allows DoS + - CVE-2026-76882: Bluetooth Attribute dissector crash, allows DoS + - CVE-2026-76883: Catapult DCT2000 parser crash, allows DoS + - CVE-2026-76884: ERF parser crash, allows DoS + - CVE-2026-76885: Tektronix K12xx parser crash, allows DoS + - CVE-2026-76886: C12.22 dissector crash, allows DoS + - CVE-2026-76887: Dissection engine crash, allows DoS + - CVE-2026-76888: RDP dissector crash, allows DoS + - CVE-2026-76889: UMTS FP dissector crash, allows DoS + - CVE-2026-76890: Crash in sharkd, allows DoS + - CVE-2026-76891: Crash in sharkd, allows DoS + - CVE-2026-76917: Bluetooth AVRCP dissector crash, allows DoS + - CVE-2026-76918: SSH dissector crash, allows DoS + - CVE-2026-76919: ESS dissector crash, allows DoS + - CVE-2026-76920: 3gpp phone log parser crash, allows DoS + - CVE-2026-76921: CMS dissector crash, allows DoS + - CVE-2026-76922: Bluetooth BR/EDR FHS dissector crash, allows DoS + - CVE-2026-76923: Bluetooth HFP dissector crash, allows DoS + - CVE-2026-76924: Kerberos dissector crash, allows DoS + - CVE-2026-76926: BUSMASTER parser abnormal exit, allows DoS + - CVE-2026-76927: H.245 dissector crash, allows DoS + - CVE-2026-76928: X.509IF dissector crash, allows DoS + - CVE-2026-76929: Pcapng parser crash, allows DoS + + -- Matheus Polkorny Sun, 23 Aug 2026 12:34:57 -0300 + wireshark (4.4.16-0+deb13u1) trixie; urgency=medium * Non-maintainer upload. diff -Nru wireshark-4.4.16/doc/attributes.adoc wireshark-4.4.18/doc/attributes.adoc --- wireshark-4.4.16/doc/attributes.adoc 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/attributes.adoc 2026-08-12 17:19:13.000000000 +0000 @@ -1,6 +1,6 @@ // Common attributes -:wireshark-version: 4.4.16 +:wireshark-version: 4.4.18 :logray-version: 0.9.0 // Required for btn, kbd:, and menu: macros. diff -Nru wireshark-4.4.16/doc/release-notes.adoc wireshark-4.4.18/doc/release-notes.adoc --- wireshark-4.4.16/doc/release-notes.adoc 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/release-notes.adoc 2026-08-12 17:19:13.000000000 +0000 @@ -16,23 +16,294 @@ Wireshark and the foundation depend on your contributions in order to do their work! If you or your organization would like to contribute or become a sponsor, please visit https://wiresharkfoundation.org[wiresharkfoundation.org]. +If you use Wireshark professionally or you just want to learn more about protocol analysis, you should join us at https://sharkfest.wireshark.org/[SharkFest], the Wireshark developer and user conference. + +You can also become a Wireshark Certified Analyst! Official Wireshark training and certification are available from +https://www.wireshark.org/certifications[the Wireshark Foundation]. + == What’s New === Bug Fixes The following vulnerabilities have been fixed: -// * wssalink:2026-51[] {notable} -// Foo dissector {crash,infinite loop,memory leak}. -// wsbuglink:xxx[]. +* wssalink:2026-64[] +sharkd crash. +wsbuglink:21395[]. // cveidlink:2026-xxx[]. -// Fixed in master: xxx -// Fixed in release-4.6: xxx -// Fixed in release-4.4: xxx +// Fixed in master: 178939f126 +// Fixed in release-4.6: 51d0eea79f +// Fixed in release-4.4: 5b56712fb9 +// CVSS AV:N/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:L +// CWE-825 +// Credit: Claude and Ada Logics + +* wssalink:2026-65[] +sharkd crash. +wsbuglink:21399[]. +// cveidlink:2026-xxx[]. +// Fixed in master: d43d89d201 +// Fixed in release-4.6: c40bdd55da +// Fixed in release-4.4: 560ec98247 +// CVSS AV:N/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:L +// CWE-825 +// Credit: Claude and Ada Logics + +* wssalink:2026-66[] {notable} +UMTS FP protocol dissector crash. +wsbuglink:21413[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 5c5d3d5381 +// Fixed in release-4.6: 67b2d8b865 +// Fixed in release-4.4: f95f229f4e +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-122 +// Credit: Jaime Cavero + +* wssalink:2026-67[] {notable} +RDP protocol dissector crash. +wsbuglink:21396[]. +// cveidlink:2026-xxx[]. +// Fixed in master: d50d557d84 +// Fixed in release-4.6: 26edba6065 +// Fixed in release-4.4: d28eaacbad +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-122 +// Credit: Claude and Ada Logics + +* wssalink:2026-69[] {notable} +Dissection engine reassembly crash. +wsbuglink:21423[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 9f68da57d3 +// Fixed in release-4.6: 1df97a20fb +// Fixed in release-4.4: c1378c3314 // CVSS AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:N/A:H -// CWE-824 +// CWE-122 +// Credit: Daniel Birtwhistle + +* wssalink:2026-70[] {notable} +BUSMASTER file parser abnormal exit. +wsbuglink:21435[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 8e984f1f83 +// Fixed in release-4.6: 6aba0a890f +// Fixed in release-4.4: 32c63e1b62 +// CVSS AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-703 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-71[] {notable} +Tektronix K12xx file parser crash. +wsbuglink:21414[]. +// cveidlink:2026-xxx[]. +// Fixed in master: c517aedc99 +// Fixed in release-4.6: 349750c199a +// Fixed in release-4.4: 6f812cbb50 +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-126 +// Credit: Jaime Cavero + +* wssalink:2026-72[] {notable} +ERF file parser crash. +wsbuglink:21415[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 4e030d2b17 +// Fixed in release-4.6: b8a7c24b534 +// Fixed in release-4.4: 82c0b871be +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-126 +// Credit: Jaime Cavero + +* wssalink:2026-73[] {notable} +Bluetooth Attribute Protocol dissector crash. +wsbuglink:21424[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 6e2dfd4f0b +// Fixed in release-4.6: dec594457c7 +// Fixed in release-4.4: 40ab60fce7 +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-125 +// Credit: Yazan Balawneh - CyStack Security Team + +* wssalink:2026-74[] {notable} +Catapult DCT2000 file parser crash. +wsbuglink:21427[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 46c813e7ad +// Fixed in release-4.6: c91e5e16339 +// Fixed in release-4.4: f8edcd3db2 +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-122 +// Credit: Yazan Balawneh - CyStack Security Team + +* wssalink:2026-75[] {notable} +C12.22 protocol dissector crash. +wsbuglink:21439[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 360bdc60fe +// Fixed in release-4.6: 2a7ea46648f +// Fixed in release-4.4: d53b33eabd +// CVSS AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:H/A:H +// CWE-122 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-76[] {notable} +CMS protocol dissector crash. +wsbuglink:21446[]. +// cveidlink:2026-xxx[]. +// Fixed in master: ​​02dd1e7af0 +// Fixed in release-4.6: ​​fdcae73419f +// Fixed in release-4.4: 920cb47359 +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-476 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-77[] {notable} +H.245 protocol dissector {crash,infinite loop,memory leak}. +wsbuglink:21447[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 86df5f3b40 +// Fixed in release-4.6: 73467571b0e +// Fixed in release-4.4: de13f9ff4c +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-476 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-78[] {notable} +Kerberos protocol dissector crash. +wsbuglink:21449[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 78d67418e8 +// Fixed in release-4.6: 848f415af2b +// Fixed in release-4.4: a1d6efed38 +// CVSS AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-125 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-79[] {notable} +Bluetooth HFP Profile protocol dissector crash. +wsbuglink:21451[]. +// cveidlink:2026-xxx[]. +// Fixed in master: fc4171f4dd +// Fixed in release-4.6: 068d179d5f6 +// Fixed in release-4.4: a1cc189664 +// CVSS AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-125 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-80[] {notable} +Bluetooth BR/EDR FHS protocol dissector crash. +wsbuglink:21452[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 0e191266dd +// Fixed in release-4.6: 907c6ab2200 +// Fixed in release-4.4: 5520cc92a8 +// CVSS AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-476 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) -// * wssalink:2026-51[] {notable} +* wssalink:2026-81[] {notable} +3gpp phone log file parser crash. +wsbuglink:21454[]. +// cveidlink:2026-xxx[]. +// Fixed in master: c5f900e922 +// Fixed in release-4.6: f41e4d1ecfa +// Fixed in release-4.4: 5119ed263f +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-787 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-83[] {notable} +CMS protocol dissector crash. +wsbuglink:21457[], wsbuglink:21458[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 70b341567a +// Fixed in release-4.6: e6320512dc3 +// Fixed in release-4.4: da9204174b +// CVSS AV:N/AC:L/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-416 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-84[] {notable} +Pcapng file parser crash. +wsbuglink:21460[]. +// cveidlink:2026-xxx[]. +// Fixed in master: c72babdb03 +// Fixed in release-4.6: 8a3cbd7b91f +// Fixed in release-4.4: 930f2f39c4 +// CVSS AV:L/AC:H/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-125 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-85[] {notable} +SSH protocol dissector crash. +wsbuglink:21465[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 3f38ce6c37 +// Fixed in release-4.6: ccd12dd4920 +// Fixed in release-4.4: 04dc6b2af4 +// CVSS AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-122 +// Credit: BreachX Zero Day Labs + +* wssalink:2026-86[] {notable} +ESS protocol dissector crash. +wsbuglink:21467[]. +// cveidlink:2026-xxx[]. +// Fixed in master: affa11c625 +// Fixed in release-4.6: d77dcfd071a +// Fixed in release-4.4: ed1294055c +// CVSS AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:L +// CWE-457 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-87[] {notable} +X.509IF protocol dissector crash. +wsbuglink:21469[]. +cveidlink:2026-xxx[]. +// Fixed in master: 340b45bcb2 +// Fixed in release-4.6: 179c1d24c03 +// Fixed in release-4.4: ff9f1bc138 +// CVSS AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H +// CWE-476 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-88[] {notable} +RRC protocol dissector crash. +wsbuglink:21478[]. +// cveidlink:2026-xxx[]. +// Fixed in master: a44c8dc01c +// Fixed in release-4.6: a29767a9e89 +// Fixed in release-4.4: 32ecb4ce4e +// CVSS AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H +// CWE-787 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-89[] {notable} +C12.22 protocol dissector crash. +wsbuglink:21480[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 94a0319ec2 +// Fixed in release-4.6: 71528302b11 +// Fixed in release-4.4: a7c97b297d +// CVSS AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H +// CWE-121 +// Credit: Aisle Research (Dmitrijs Trizna, Luigino Camastra, Ze Sheng (O2Lab & TAMU), Igor Morgenstern) + +* wssalink:2026-91[] {notable} +Bluetooth AVRCP Profile protocol dissector crash. +wsbuglink:21488[]. +// cveidlink:2026-xxx[]. +// Fixed in master: 1b59980832 +// Fixed in release-4.6: b302764efd2 +// Fixed in release-4.4: 539e5ba4c6 +// CVSS AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:N/A:H +// CWE-122 +// Credit: Feng Xue + + +// * wssalink:2026-92[] {notable} // Foo dissector {crash,infinite loop,memory leak}. // wsbuglink:xxx[]. // cveidlink:2026-xxx[]. @@ -49,16 +320,30 @@ //* cveidlink:2014-2486[] //* Wireshark took a bite out of each of your freshly baked muffins until it found the perfect one. {notable} -* vwr: Read of uninitialized memory in pntoh16. wsbuglink:16460[]. -* vwr: Read of uninitialized memory in find_signature. wsbuglink:16461[]. -* Fuzz job issue: fuzz-2026-05-02-14184750352.pcap. wsbuglink:21240[]. -* ROHC NULL Write / Heap Corruption with uncompressed profile and large CID. wsbuglink:21243[]. -* Fuzz job crash: fuzz-2026-05-18-14414274873.pcap. wsbuglink:21261[]. - +* Wireshark Version 4.6.6 - File Capture Properties is excessively slow and hangs Wireshark on Windows. wsbuglink:21337[]. +* Wireshark misdecodes S-NSSAI location validity information IE (5G NAS) wsbuglink:21411[]. +* Wireshark misdecodes NSAG information IE (5G NAS) wsbuglink:21412[]. +* Fuzz job UTF-8 encoding issue: fuzz-2026-07-17-15393056954.pcap. wsbuglink:21419[]. +* Wireshark misdecodes UE security capability IE (5G NAS) wsbuglink:21431[]. +* Wireshark misdecodes Registration wait range IE (5G NAS) wsbuglink:21432[]. +* Wireshark misdecodes Extended CAG information IE (5G NAS) wsbuglink:21433[]. +* Stack buffer overflow in K12/RF5 writer. wsbuglink:21436[]. +* packet-knxip: Secure Wrapper size-offset causes NULL deref / SEGV when decrypting. wsbuglink:21444[]. +* wiretap/rtpdump: swapped caplen/len on truncated samples. wsbuglink:21445[]. +* Sniffer REC_HEADER2 error path over-reads stack buffer. wsbuglink:21461[]. +* Deep NetLog JSON nesting exhausts the native stack. wsbuglink:21462[]. +* androiddump signed btsnoop length causes global out-of-bounds read. wsbuglink:21464[]. +* Wireshark misdecodes SOR transparent container IE (5G NAS) wsbuglink:21472[]. +* Unbounded Daintree timestamp fraction causes signed integer overflow. wsbuglink:21473[]. +* Wireshark misdecodes SOR-CMCI of SOR transparent container IE (5G NAS) wsbuglink:21477[]. +* Wireshark misdecodes Service level AA container (5GSM NAS) wsbuglink:21479[]. // == Known Bugs -// === New and Updated Features +=== New and Updated Features + +// * The Windows installers now ship with Qt 6.7.3. +// They previously shipped with Qt 6.5.3. // === Removed Features and Support @@ -71,15 +356,23 @@ === Updated Protocol Support // Add one protocol per line between the -- delimiters. -// rg -A1 '(define PSNAME|proto_register_protocol[^_])' $(git diff --name-only v4.4.16.. | rg packet- | sort -u) +// rg -A1 '(define PSNAME|proto_register_protocol[^_])' $(git diff --name-only v4.4.18.. | rg packet- | sort -u) [commaize] -- -FB/IB GDS DB -Kafka -MDB -ROHC -RTPS-VT -SIP +BT ATT +BT AVRCP +BT BR/EDR RF +BT HFP +C12.22 +CMS +ESS +FP +H.245 +Kerberos +Rlogin +SSH +X.509AF +X.509IF -- === New and Updated Capture File Support @@ -88,7 +381,15 @@ // Add one file type per line between the -- delimiters. [commaize] -- -VeriWave +3gpp phone log +Busmaster +Catapult DCT2000 +Daintree SNA +Endace ERF +pcapng +RTPDump +Sniffer +Tektronix K12xx -- === New and Updated File Format Decoding Support @@ -107,6 +408,76 @@ == Prior Versions +Wireshark 4.4.17 included the following changes. +See the +https://www.wireshark.org/docs/relnotes/wireshark-4.4.17.html[release notes] +for details: + +* wssalink:2026-52[] {notable} +Catapult DCT2000 protocol dissector crash. +wsbuglink:21270[]. + +* wssalink:2026-54[] {notable} +FMP/NOTIFY protocol dissector large loop. +wsbuglink:21347[]. + +* wssalink:2026-55[] {notable} +SSH protocol dissector crash. +wsbuglink:21378[]. + +* wssalink:2026-57[] {notable} +IEEE 802.11 protocol dissector crash. +wsbuglink:21391[]. + +* wssalink:2026-58[] {notable} +Z39.50 protocol dissector crash. +wsbuglink:21397[]. + +* wssalink:2026-59[] {notable} +UMTS FP protocol dissector crash. +wsbuglink:21398[]. + +* wssalink:2026-60[] {notable} +BLF file parser information disclosure. +wsbuglink:21361[]. + +* wssalink:2026-61[] {notable} +Multiple protocol dissector infinite loops. +wsbuglink:21275[], +wsbuglink:21277[], +wsbuglink:21330[], +wsbuglink:21383[]. + +* wssalink:2026-62[] {notable} +DBS Etherwatch file parser crash. +wsbuglink:21352[]. + +* wssalink:2026-63[] {notable} +Ciscodump extcap crash. +wsbuglink:21375[]. + +* Build failure with Qt 6.11 beta. wsbuglink:20965[]. +* BACapp: Error parsing you-are request. wsbuglink:21260[]. +* Fuzz job issue: fuzz-2026-05-24-14517548985.pcap. wsbuglink:21272[]. +* Fuzz job UTF-8 encoding issue: fuzz-2026-06-07-14732586286.pcap. wsbuglink:21331[]. +* Memory leak in alp-sample1.pcap. wsbuglink:21343[]. +* Heap-Buffer-Overflow in Wireshark Logcat Parser. wsbuglink:21346[]. +* HEVC (H.265) dissector: bit_offset not advanced after sub_layer_hrd_parameters() causes false Malformed Packet. wsbuglink:21362[]. +* dfilter_compile_full: heap-buffer-overflow READ in ws_strptime on a time literal. wsbuglink:21376[]. +* Wireshark crashes with a HEAP_CORRUPTION error when using the last saved recent_common file. wsbuglink:21379[]. +* Fuzz job issue: fuzz-2026-06-30-15106674620.pcap. wsbuglink:21381[]. + +Wireshark 4.4.16 included the following changes. +See the +https://www.wireshark.org/docs/relnotes/wireshark-4.4.16.html[release notes] +for details: + +* vwr: Read of uninitialized memory in pntoh16. wsbuglink:16460[]. +* vwr: Read of uninitialized memory in find_signature. wsbuglink:16461[]. +* Fuzz job issue: fuzz-2026-05-02-14184750352.pcap. wsbuglink:21240[]. +* ROHC NULL Write / Heap Corruption with uncompressed profile and large CID. wsbuglink:21243[]. +* Fuzz job crash: fuzz-2026-05-18-14414274873.pcap. wsbuglink:21261[]. + Wireshark 4.4.15 included the following changes. See the https://www.wireshark.org/docs/relnotes/wireshark-4.4.15.html[release notes] diff -Nru wireshark-4.4.16/doc/wsug_src/capinfos-h.txt wireshark-4.4.18/doc/wsug_src/capinfos-h.txt --- wireshark-4.4.16/doc/wsug_src/capinfos-h.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/wsug_src/capinfos-h.txt 2026-08-12 17:19:13.000000000 +0000 @@ -1,4 +1,4 @@ -Capinfos (Wireshark) 4.4.16 (v4.4.16rc0-3-g9f362204a777) +Capinfos (Wireshark) 4.4.18 (v4.4.18rc0-0-ga15f6d0b5f5a) Print various information (infos) about capture files. See https://www.wireshark.org for more information. diff -Nru wireshark-4.4.16/doc/wsug_src/dumpcap-h.txt wireshark-4.4.18/doc/wsug_src/dumpcap-h.txt --- wireshark-4.4.16/doc/wsug_src/dumpcap-h.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/wsug_src/dumpcap-h.txt 2026-08-12 17:19:13.000000000 +0000 @@ -1,4 +1,4 @@ -Dumpcap (Wireshark) 4.4.16 (v4.4.16rc0-3-g9f362204a777) +Dumpcap (Wireshark) 4.4.18 (v4.4.18rc0-0-ga15f6d0b5f5a) Capture network packets and dump them into a pcapng or pcap file. See https://www.wireshark.org for more information. diff -Nru wireshark-4.4.16/doc/wsug_src/editcap-h.txt wireshark-4.4.18/doc/wsug_src/editcap-h.txt --- wireshark-4.4.16/doc/wsug_src/editcap-h.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/wsug_src/editcap-h.txt 2026-08-12 17:19:13.000000000 +0000 @@ -1,4 +1,4 @@ -Editcap (Wireshark) 4.4.16 (v4.4.16rc0-3-g9f362204a777) +Editcap (Wireshark) 4.4.18 (v4.4.18rc0-0-ga15f6d0b5f5a) Edit and/or translate the format of capture files. See https://www.wireshark.org for more information. diff -Nru wireshark-4.4.16/doc/wsug_src/mergecap-h.txt wireshark-4.4.18/doc/wsug_src/mergecap-h.txt --- wireshark-4.4.16/doc/wsug_src/mergecap-h.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/wsug_src/mergecap-h.txt 2026-08-12 17:19:13.000000000 +0000 @@ -1,4 +1,4 @@ -Mergecap (Wireshark) 4.4.16 (v4.4.16rc0-3-g9f362204a777) +Mergecap (Wireshark) 4.4.18 (v4.4.18rc0-0-ga15f6d0b5f5a) Merge two or more capture files into one. See https://www.wireshark.org for more information. diff -Nru wireshark-4.4.16/doc/wsug_src/rawshark-h.txt wireshark-4.4.18/doc/wsug_src/rawshark-h.txt --- wireshark-4.4.16/doc/wsug_src/rawshark-h.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/wsug_src/rawshark-h.txt 2026-08-12 17:19:13.000000000 +0000 @@ -1,4 +1,4 @@ -Rawshark (Wireshark) 4.4.16 (v4.4.16rc0-3-g9f362204a777) +Rawshark (Wireshark) 4.4.18 (v4.4.18rc0-0-ga15f6d0b5f5a) Dump and analyze network traffic. See https://www.wireshark.org for more information. diff -Nru wireshark-4.4.16/doc/wsug_src/reordercap-h.txt wireshark-4.4.18/doc/wsug_src/reordercap-h.txt --- wireshark-4.4.16/doc/wsug_src/reordercap-h.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/wsug_src/reordercap-h.txt 2026-08-12 17:19:13.000000000 +0000 @@ -1,4 +1,4 @@ -Reordercap (Wireshark) 4.4.16 (v4.4.16rc0-3-g9f362204a777) +Reordercap (Wireshark) 4.4.18 (v4.4.18rc0-0-ga15f6d0b5f5a) Reorder timestamps of input file frames into output file. See https://www.wireshark.org for more information. diff -Nru wireshark-4.4.16/doc/wsug_src/text2pcap-h.txt wireshark-4.4.18/doc/wsug_src/text2pcap-h.txt --- wireshark-4.4.16/doc/wsug_src/text2pcap-h.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/wsug_src/text2pcap-h.txt 2026-08-12 17:19:13.000000000 +0000 @@ -1,4 +1,4 @@ -Text2pcap (Wireshark) 4.4.16 (v4.4.16rc0-3-g9f362204a777) +Text2pcap (Wireshark) 4.4.18 (v4.4.18rc0-0-ga15f6d0b5f5a) Generate a capture file from an ASCII hexdump of packets. See https://www.wireshark.org for more information. diff -Nru wireshark-4.4.16/doc/wsug_src/tshark-h.txt wireshark-4.4.18/doc/wsug_src/tshark-h.txt --- wireshark-4.4.16/doc/wsug_src/tshark-h.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/doc/wsug_src/tshark-h.txt 2026-08-12 17:19:13.000000000 +0000 @@ -1,4 +1,4 @@ -TShark (Wireshark) 4.4.16 (v4.4.16rc0-3-g9f362204a777) +TShark (Wireshark) 4.4.18 (v4.4.18rc0-0-ga15f6d0b5f5a) Dump and analyze network traffic. See https://www.wireshark.org for more information. diff -Nru wireshark-4.4.16/epan/CMakeLists.txt wireshark-4.4.18/epan/CMakeLists.txt --- wireshark-4.4.16/epan/CMakeLists.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/CMakeLists.txt 2026-08-12 17:19:13.000000000 +0000 @@ -316,7 +316,7 @@ set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" LINK_FLAGS "${WS_LINK_FLAGS}" - VERSION "18.0.16" SOVERSION 18 + VERSION "18.0.18" SOVERSION 18 INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}" # By default the name for a library with target name epan will be libepan, # but Ethereal is now named Wireshark diff -Nru wireshark-4.4.16/epan/addr_resolv.c wireshark-4.4.18/epan/addr_resolv.c --- wireshark-4.4.16/epan/addr_resolv.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/addr_resolv.c 2026-08-12 17:19:13.000000000 +0000 @@ -1790,6 +1790,7 @@ unsigned manuf_key; hashmanuf_t *manuf_value; char *endp; + size_t attempted_size; /* manuf needs only the 3 most significant octets of the ethernet address */ manuf_key = (addr[0] << 16) + (addr[1] << 8) + addr[2]; @@ -1800,7 +1801,10 @@ (void) g_strlcpy(manuf_value->resolved_name, name, MAXNAMELEN); manuf_value->flags = NAME_RESOLVED; if (longname != NULL) { - (void) g_strlcpy(manuf_value->resolved_longname, longname, MAXNAMELEN); + attempted_size = g_strlcpy(manuf_value->resolved_longname, longname, MAXNAMELEN); + if (attempted_size >= MAXNAMELEN) { + ws_utf8_truncate(manuf_value->resolved_longname, MAXNAMELEN - 1); + } } else { (void) g_strlcpy(manuf_value->resolved_longname, name, MAXNAMELEN); diff -Nru wireshark-4.4.16/epan/crypt/dot11decrypt.c wireshark-4.4.18/epan/crypt/dot11decrypt.c --- wireshark-4.4.16/epan/crypt/dot11decrypt.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/crypt/dot11decrypt.c 2026-08-12 17:19:13.000000000 +0000 @@ -459,6 +459,11 @@ } } + if (key_bytes_len > *decrypted_len) { + ws_debug("Too large EAPOL key data"); + return DOT11DECRYPT_RET_UNSUCCESS; + } + if ((key_bytes_len < GROUP_KEY_MIN_LEN) || (eapol_parsed->len < EAPOL_RSN_KEY_LEN) || (key_bytes_len > eapol_parsed->len - EAPOL_RSN_KEY_LEN)) { diff -Nru wireshark-4.4.16/epan/dissectors/asn1/c1222/packet-c1222-template.c wireshark-4.4.18/epan/dissectors/asn1/c1222/packet-c1222-template.c --- wireshark-4.4.16/epan/dissectors/asn1/c1222/packet-c1222-template.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/c1222/packet-c1222-template.c 2026-08-12 17:19:13.000000000 +0000 @@ -713,10 +713,10 @@ * \param maxsize is the maximum number of bytes we're allowed to write * \returns length of encoded value in bytes */ -static int -encode_ber_len(uint8_t *ptr, uint32_t n, int maxsize) +static uint32_t +encode_ber_len(uint8_t *ptr, uint32_t n, uint32_t maxsize) { - int len = get_ber_len_size(n); + uint32_t len = get_ber_len_size(n); if (len > maxsize) return 0; if (len == 1) { *ptr = 0x7f & n; @@ -785,7 +785,7 @@ canonify_unencrypted_header(unsigned char *buff, uint32_t *offset, uint32_t buffsize) { const TOP_ELEMENT_CONTROL *t = canonifyTable; - uint32_t len, allocated; + uint32_t len, allocated, ret; for (t = canonifyTable; t->element != NULL; t++) { @@ -796,8 +796,13 @@ if (*(t->element) != NULL) { if (t->addtag) { /* recreate original tag and length */ + if (buffsize < *offset + 1) + return false; buff[(*offset)++] = t->tag; - (*offset) += encode_ber_len(&buff[*offset], len, 4); + ret = encode_ber_len(&buff[*offset], len, MIN(buffsize - *offset, 4)); + if (ret == 0) + return false; + (*offset) += ret; } if (t->truncate) { len = 3+2*get_ber_len_size(len); diff -Nru wireshark-4.4.16/epan/dissectors/asn1/cms/cms.cnf wireshark-4.4.18/epan/dissectors/asn1/cms/cms.cnf --- wireshark-4.4.16/epan/dissectors/asn1/cms/cms.cnf 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/cms/cms.cnf 2026-08-12 17:19:13.000000000 +0000 @@ -138,9 +138,10 @@ FirmwarePackageLoadError/version fwErrorVersion #.FN_BODY ContentInfo - top_tree = tree; + struct cms_private_data *cms_data = cms_get_private_data(actx->pinfo); + cms_data->top_tree = tree; %(DEFAULT_BODY)s - top_tree = NULL; + cms_data->top_tree = NULL; #.FN_PARS ContentType FN_VARIANT = _str VAL_PTR = &cms_data->object_identifier_id @@ -170,7 +171,7 @@ if(cms_data->content_tvb) { proto_item_set_text(actx->created_item, "eContent (%%u bytes)", tvb_reported_length(cms_data->content_tvb)); - call_ber_oid_callback(cms_data->object_identifier_id, cms_data->content_tvb, 0, actx->pinfo, top_tree ? top_tree : tree, NULL); + call_ber_oid_callback(cms_data->object_identifier_id, cms_data->content_tvb, 0, actx->pinfo, cms_data->top_tree ? cms_data->top_tree : tree, NULL); } #.FN_PARS OtherRecipientInfo/oriType @@ -242,6 +243,14 @@ if(cms_data->content_tvb) cms_verify_msg_digest(pi, cms_data->content_tvb, x509af_get_last_algorithm_id(), tvb, old_offset); +#.FN_BODY SMIMECapability + struct cms_private_data *cms_data = cms_get_private_data(actx->pinfo); + cms_data->cap_tree = NULL; + + %(DEFAULT_BODY)s + + cms_data->cap_tree = NULL; + #.FN_PARS SMIMECapability/capability FN_VARIANT = _str HF_INDEX = hf_cms_attrType VAL_PTR = &cms_data->object_identifier_id @@ -255,7 +264,7 @@ if(cms_data->object_identifier_id) { name = oid_resolved_from_string(actx->pinfo->pool, cms_data->object_identifier_id); proto_item_append_text(tree, " %%s", name ? name : cms_data->object_identifier_id); - cap_tree = tree; + cms_data->cap_tree = tree; } #.FN_BODY SMIMECapability/parameters @@ -268,11 +277,12 @@ #.FN_BODY RC2ParameterVersion uint32_t length = 0; + struct cms_private_data *cms_data = cms_get_private_data(actx->pinfo); %(DEFAULT_BODY)s - if(cap_tree != NULL) - proto_item_append_text(cap_tree, " (%%d bits)", length); + if(cms_data->cap_tree != NULL) + proto_item_append_text(cms_data->cap_tree, " (%%d bits)", length); #.FN_PARS EncryptedContent VAL_PTR = &encrypted_tvb diff -Nru wireshark-4.4.16/epan/dissectors/asn1/cms/packet-cms-template.c wireshark-4.4.18/epan/dissectors/asn1/cms/packet-cms-template.c --- wireshark-4.4.16/epan/dissectors/asn1/cms/packet-cms-template.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/cms/packet-cms-template.c 2026-08-12 17:19:13.000000000 +0000 @@ -51,11 +51,10 @@ struct cms_private_data { const char *object_identifier_id; tvbuff_t *content_tvb; + proto_tree *top_tree; + proto_tree *cap_tree; }; -static proto_tree *top_tree; -static proto_tree *cap_tree; - #define HASH_SHA1 "1.3.14.3.2.26" #define HASH_MD5 "1.2.840.113549.2.5" @@ -111,7 +110,12 @@ int i= 0, buffer_size = 0; /* we only support two algorithms at the moment - if we do add SHA2 - we should add a registration process to use a registration process */ + we should add a registration process and use it */ + + if (alg == NULL) { + proto_item_append_text(pi, " [unable to verify]"); + return; + } if(strcmp(alg, HASH_SHA1) == 0) { gcry_md_hash_buffer(GCRY_MD_SHA1, digest_buf, tvb_get_ptr(content, 0, tvb_captured_length(content)), tvb_captured_length(content)); @@ -129,7 +133,7 @@ (tvb_memeql(tvb, offset, digest_buf, buffer_size) != 0)) { proto_item_append_text(pi, " [incorrect, should be "); for(i = 0; i < buffer_size; i++) - proto_item_append_text(pi, "%02X", digest_buf[i]); + proto_item_append_text(pi, "%02X", digest_buf[i]); proto_item_append_text(pi, "]"); } diff -Nru wireshark-4.4.16/epan/dissectors/asn1/ess/ess.cnf wireshark-4.4.18/epan/dissectors/asn1/ess/ess.cnf --- wireshark-4.4.16/epan/dissectors/asn1/ess/ess.cnf 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/ess/ess.cnf 2026-08-12 17:19:13.000000000 +0000 @@ -73,28 +73,34 @@ VAL_PTR = &attributes #.FN_BODY RestrictiveTag/attributeFlags - tvbuff_t *attributes; + tvbuff_t *attributes = NULL; %(DEFAULT_BODY)s - ess_dissect_attribute_flags (attributes, actx); + if (attributes != NULL) { + ess_dissect_attribute_flags (attributes, actx); + } #.FN_PARS PermissiveTag/attributeFlags VAL_PTR = &attributes #.FN_BODY PermissiveTag/attributeFlags - tvbuff_t *attributes; + tvbuff_t *attributes = NULL; %(DEFAULT_BODY)s - ess_dissect_attribute_flags (attributes, actx); + if (attributes != NULL) { + ess_dissect_attribute_flags (attributes, actx); + } #.FN_PARS FreeFormField/bitSetAttributes VAL_PTR = &attributes #.FN_BODY FreeFormField/bitSetAttributes - tvbuff_t *attributes; + tvbuff_t *attributes = NULL; %(DEFAULT_BODY)s - ess_dissect_attribute_flags (attributes, actx); + if (attributes != NULL) { + ess_dissect_attribute_flags (attributes, actx); + } #.FN_BODY Receipt col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, "ESS"); diff -Nru wireshark-4.4.16/epan/dissectors/asn1/h245/h245.cnf wireshark-4.4.18/epan/dissectors/asn1/h245/h245.cnf --- wireshark-4.4.16/epan/dissectors/asn1/h245/h245.cnf 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/h245/h245.cnf 2026-08-12 17:19:13.000000000 +0000 @@ -585,7 +585,7 @@ gefx = gef_ctx_get(actx->private_data); if (gefx) { /* If this is a standard generic message use hf_h245_subMessageIdentifier_standard to get - * the value translated and make it fileterable. + * the value translated and make it filterable. */ if (strcmp("GenericMessage/0.0.8.239.2", gefx->key) == 0) { hf_index = hf_h245_subMessageIdentifier_standard; @@ -597,7 +597,7 @@ gefx->subid = wmem_strdup_printf(actx->pinfo->pool, "%%u", subMessageIdentifier); gef_ctx_update_key(actx->pinfo->pool, gef_ctx_get(actx->private_data)); } - if (hf_index == hf_h245_subMessageIdentifier_standard) + if (h245_pi && hf_index == hf_h245_subMessageIdentifier_standard) { col_append_str(actx->pinfo->cinfo, COL_INFO, val_to_str_const(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "") ); snprintf(h245_pi->frame_label, 50, "%%s", val_to_str_const(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "")); diff -Nru wireshark-4.4.16/epan/dissectors/asn1/kerberos/packet-kerberos-template.c wireshark-4.4.18/epan/dissectors/asn1/kerberos/packet-kerberos-template.c --- wireshark-4.4.16/epan/dissectors/asn1/kerberos/packet-kerberos-template.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/kerberos/packet-kerberos-template.c 2026-08-12 17:19:13.000000000 +0000 @@ -67,6 +67,7 @@ #include #include #include +#include #include "packet-kerberos.h" #include "packet-netbios.h" #include "packet-tcp.h" @@ -720,6 +721,31 @@ read_keytab_file(last_keytab); } + +/* Like bytes_to_str_maxlen with a fixed maxlen of 4, and writing + into a preallocated static buffer. */ +static char* +key_to_hexstr_maxfour(const uint8_t *keyvalue, unsigned keylength) +{ + // UTF8_HORIZONTAL_ELLIPSIS (U+2026) is 3 bytes, so the buffer must + // have room for 8 + 3 + 1 = 12 bytes. + static char keystr_buf[12]; + char *keystr_end; + bool truncated = false; + unsigned len = keylength; + if (len > 4U) { + len = 4U; + truncated = true; + } + keystr_end = bytes_to_hexstr(keystr_buf, keyvalue, len); + if (truncated) { + g_stpcpy(keystr_end, UTF8_HORIZONTAL_ELLIPSIS); + } else { + *keystr_end = '\0'; + } + return keystr_buf; +} + #endif /* HAVE_KERBEROS */ #if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) @@ -1006,30 +1032,27 @@ item = proto_tree_add_expert_format(key_tree, pinfo, &ei_kerberos_learnt_keytype, key_tvb, 0, keylength, - "%s %s keytype %d (id=%d.%u) (%02x%02x%02x%02x...)", + "%s %s keytype %d (id=%d.%u) (%s)", methodu, origin, keytype, pinfo->num, new_key->id, - keyvalue[0] & 0xFF, keyvalue[1] & 0xFF, - keyvalue[2] & 0xFF, keyvalue[3] & 0xFF); + key_to_hexstr_maxfour((const uint8_t*)keyvalue, keylength)); if (item != NULL && key_hidden_item != NULL) { proto_tree_move_item(key_tree, key_hidden_item, item); } if (src1 != NULL) { enc_key_t *sek = src1; expert_add_info_format(pinfo, item, &ei_kerberos_learnt_keytype, - "SRC1 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC1 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } if (src2 != NULL) { enc_key_t *sek = src2; expert_add_info_format(pinfo, item, &ei_kerberos_learnt_keytype, - "SRC2 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC2 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } kerberos_key_list_append(private_data->learnt_keys, new_key); @@ -1192,10 +1215,9 @@ item = proto_tree_add_expert_format(tree, pinfo, &ei_kerberos_decrypted_keytype, cryptotvb, 0, 0, "Decrypted keytype %d usage %d " - "using %s (id=%s same=%u) (%02x%02x%02x%02x...)", + "using %s (id=%s same=%u) (%s)", ek->keytype, usage, ek->key_origin, ek->id_str, ek->num_same, - ek->keyvalue[0] & 0xFF, ek->keyvalue[1] & 0xFF, - ek->keyvalue[2] & 0xFF, ek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(ek->keyvalue, ek->keylength)); expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, "Used keymap=%s num_keys=%u num_tries=%u)", keymap_name, @@ -1204,29 +1226,26 @@ if (ek->src1 != NULL) { sek = ek->src1; expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, - "SRC1 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC1 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } if (ek->src2 != NULL) { sek = ek->src2; expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, - "SRC2 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC2 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } sek = ek->same_list; while (sek != NULL) { expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, "Decrypted keytype %d usage %d " - "using %s (id=%s same=%u) (%02x%02x%02x%02x...)", + "using %s (id=%s same=%u) (%s)", sek->keytype, usage, sek->key_origin, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); sek = sek->same_list; } kerberos_key_list_append(private_data->decryption_keys, ek); @@ -1285,11 +1304,10 @@ item = proto_tree_add_expert_format(tree, pinfo, &ei_kerberos_decrypted_keytype, tvb, 0, 0, "%s checksum %d keytype %d " - "using %s (id=%s same=%u) (%02x%02x%02x%02x...)", + "using %s (id=%s same=%u) (%s)", reason, checksum, ek->keytype, ek->key_origin, ek->id_str, ek->num_same, - ek->keyvalue[0] & 0xFF, ek->keyvalue[1] & 0xFF, - ek->keyvalue[2] & 0xFF, ek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(ek->keyvalue, ek->keylength)); expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, "Used keymap=%s num_keys=%u num_tries=%u)", keymap_name, @@ -1299,11 +1317,10 @@ while (sek != NULL) { expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, "%s checksum %d keytype %d " - "using %s (id=%s same=%u) (%02x%02x%02x%02x...)", + "using %s (id=%s same=%u) (%s)", reason, checksum, sek->keytype, sek->key_origin, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); sek = sek->same_list; } kerberos_key_list_append(private_data->decryption_keys, ek); @@ -5171,45 +5188,41 @@ state->tvb, state->start, state->length, - "%s %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "%s %s keytype %d (id=%s same=%u) (%s)", state->name, ek->key_origin, ek->keytype, ek->id_str, ek->num_same, - ek->keyvalue[0] & 0xFF, ek->keyvalue[1] & 0xFF, - ek->keyvalue[2] & 0xFF, ek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(ek->keyvalue, ek->keylength)); if (ek->src1 != NULL) { sek = ek->src1; expert_add_info_format(state->pinfo, item, state->expindex, - "SRC1 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC1 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } if (ek->src2 != NULL) { sek = ek->src2; expert_add_info_format(state->pinfo, item, state->expindex, - "SRC2 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC2 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } sek = ek->same_list; while (sek != NULL) { expert_add_info_format(state->pinfo, item, state->expindex, - "%s %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "%s %s keytype %d (id=%s same=%u) (%s)", state->name, sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); sek = sek->same_list; } #endif /* HAVE_KERBEROS */ diff -Nru wireshark-4.4.16/epan/dissectors/asn1/rrc/rrc.cnf wireshark-4.4.18/epan/dissectors/asn1/rrc/rrc.cnf --- wireshark-4.4.16/epan/dissectors/asn1/rrc/rrc.cnf 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/rrc/rrc.cnf 2026-08-12 17:19:13.000000000 +0000 @@ -1524,6 +1524,11 @@ rbid = private_data_get_rbid(actx); rlc_ciphering_sqn = private_data_get_rlc_ciphering_sqn(actx); direction = fpinf->is_uplink ? P2P_DIR_UL : P2P_DIR_DL; + if (rbid >= G_N_ELEMENTS(ciphering_info->seq_no) || + direction >= G_N_ELEMENTS(ciphering_info->seq_no[0])) { + return offset; + } + /*Set the ciphering activation frame information*/ ciphering_info->seq_no[rbid][direction] = rlc_ciphering_sqn; diff -Nru wireshark-4.4.16/epan/dissectors/asn1/x509af/x509af.cnf wireshark-4.4.18/epan/dissectors/asn1/x509af/x509af.cnf --- wireshark-4.4.16/epan/dissectors/asn1/x509af/x509af.cnf 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/x509af/x509af.cnf 2026-08-12 17:19:13.000000000 +0000 @@ -67,6 +67,12 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate revokedUserCertificate #.END +#.FN_HDR AlgorithmIdentifier + if (algorithm_id) { + wmem_free(wmem_file_scope(), (void*)algorithm_id); + algorithm_id = NULL; + } + #.FN_PARS AlgorithmIdentifier/algorithmId FN_VARIANT = _str HF_INDEX = hf_x509af_algorithm_id VAL_PTR = &actx->external.direct_reference @@ -75,18 +81,12 @@ %(DEFAULT_BODY)s - if (algorithm_id) { - wmem_free(wmem_file_scope(), (void*)algorithm_id); - } - if(actx->external.direct_reference) { algorithm_id = (const char *)wmem_strdup(wmem_file_scope(), actx->external.direct_reference); name = oid_resolved_from_string(actx->pinfo->pool, actx->external.direct_reference); proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference); - } else { - algorithm_id = NULL; } #.FN_BODY AlgorithmIdentifier/parameters diff -Nru wireshark-4.4.16/epan/dissectors/asn1/x509if/x509if.cnf wireshark-4.4.18/epan/dissectors/asn1/x509if/x509if.cnf --- wireshark-4.4.16/epan/dissectors/asn1/x509if/x509if.cnf 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/x509if/x509if.cnf 2026-08-12 17:19:13.000000000 +0000 @@ -335,20 +335,22 @@ %(DEFAULT_BODY)s - /* we've finished - close the bracket */ - proto_item_append_text(top_of_rdn, " (%%s)", wmem_strbuf_get_str(last_rdn_buf)); + if (last_rdn_buf) { + /* we've finished - close the bracket */ + proto_item_append_text(top_of_rdn, " (%%s)", wmem_strbuf_get_str(last_rdn_buf)); - /* now append this to the DN */ - if (last_dn_buf) { - if(wmem_strbuf_get_len(last_dn_buf) > 0) { - wmem_strbuf_t *temp_dn_buf = wmem_strbuf_new_sized(actx->pinfo->pool, wmem_strbuf_get_len(last_rdn_buf) + wmem_strbuf_get_len(last_dn_buf) + 1); - wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); - wmem_strbuf_append_c(temp_dn_buf, ','); - wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_dn_buf)); - wmem_strbuf_destroy(last_dn_buf); - last_dn_buf = temp_dn_buf; - } else { - wmem_strbuf_append(last_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); + /* now append this to the DN */ + if (last_dn_buf) { + if(wmem_strbuf_get_len(last_dn_buf) > 0) { + wmem_strbuf_t *temp_dn_buf = wmem_strbuf_new_sized(actx->pinfo->pool, wmem_strbuf_get_len(last_rdn_buf) + wmem_strbuf_get_len(last_dn_buf) + 1); + wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); + wmem_strbuf_append_c(temp_dn_buf, ','); + wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_dn_buf)); + wmem_strbuf_destroy(last_dn_buf); + last_dn_buf = temp_dn_buf; + } else { + wmem_strbuf_append(last_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); + } } } diff -Nru wireshark-4.4.16/epan/dissectors/asn1/z3950/packet-z3950-template.c wireshark-4.4.18/epan/dissectors/asn1/z3950/packet-z3950-template.c --- wireshark-4.4.16/epan/dissectors/asn1/z3950/packet-z3950-template.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/asn1/z3950/packet-z3950-template.c 2026-08-12 17:19:13.000000000 +0000 @@ -1276,6 +1276,7 @@ proto_tree *marc_tree, *leader_tree, *directory_tree, *fields_tree; + wmem_array_t *marc_directory_array; marc_directory_entry *marc_directory; unsigned len = tvb_reported_length(tvb); const uint8_t *marc_value_str; @@ -1448,10 +1449,8 @@ directory_entry_len = 3 + length_of_field_size + starting_character_position_size; - directory_entry_count = ((data_offset - 1) - MARC_LEADER_LENGTH) / directory_entry_len; - marc_directory = (marc_directory_entry *)wmem_alloc0(pinfo->pool, - directory_entry_count * sizeof(marc_directory_entry)); + marc_directory_array = wmem_array_new(pinfo->pool, sizeof(marc_directory_entry)); directory_item = proto_tree_add_item(marc_tree, hf_marc_directory, tvb, offset, data_offset - offset, ENC_NA); @@ -1460,9 +1459,7 @@ dir_index = 0; /* Minus one for the terminator character */ while (offset < (data_offset - 1)) { - uint32_t tag_value = 0, - length_value = 0, - starting_char_value = 0; + marc_directory_entry new_entry = {0}; proto_item *length_item; proto_item *directory_entry_item; proto_tree *directory_entry_tree; @@ -1478,7 +1475,7 @@ offset += 3; if (marc_value_str) { if (isdigit_string(marc_value_str)) { - tag_value = (unsigned)strtoul(marc_value_str, NULL, 10); + new_entry.tag = (unsigned)strtoul(marc_value_str, NULL, 10); } else { expert_add_info_format(pinfo, item, @@ -1495,7 +1492,7 @@ offset += length_of_field_size; if (marc_value_str) { if (isdigit_string(marc_value_str)) { - length_value = (unsigned)strtoul(marc_value_str, NULL, 10); + new_entry.length = (unsigned)strtoul(marc_value_str, NULL, 10); } else { expert_add_info_format(pinfo, length_item, @@ -1511,7 +1508,7 @@ offset += starting_character_position_size; if (marc_value_str) { if (isdigit_string(marc_value_str)) { - starting_char_value = (unsigned)strtoul(marc_value_str, NULL, 10); + new_entry.starting_character = (unsigned)strtoul(marc_value_str, NULL, 10); } else { expert_add_info_format(pinfo, item, @@ -1521,23 +1518,24 @@ } } - if (starting_char_value >= (record_length - data_offset)) { + if (new_entry.starting_character >= (record_length - data_offset)) { expert_add_info_format(pinfo, item, &ei_marc_invalid_value, "MARC directory entry %d starting char value %d is outside record size %d", - dir_index, starting_char_value, (record_length - data_offset)); + dir_index, new_entry.starting_character, (record_length - data_offset)); } - if ((starting_char_value + length_value) >= (record_length - data_offset)) { + if ((new_entry.starting_character + new_entry.length) >= (record_length - data_offset)) { expert_add_info_format(pinfo, length_item, &ei_marc_invalid_value, "MARC directory entry %d length value %d goes outside record size %d", - dir_index, length_value, (record_length - data_offset)); + dir_index, new_entry.length, (record_length - data_offset)); } - marc_directory[dir_index].tag = tag_value; - marc_directory[dir_index].length = length_value; - marc_directory[dir_index].starting_character = starting_char_value; + wmem_array_append_one(marc_directory_array, new_entry); dir_index++; } + directory_entry_count = wmem_array_get_count(marc_directory_array); + marc_directory = (marc_directory_entry *)wmem_array_finalize(marc_directory_array); + proto_tree_add_item(directory_tree, hf_marc_directory_terminator, tvb, offset, 1, ENC_ASCII); offset += 1; diff -Nru wireshark-4.4.16/epan/dissectors/packet-bacapp.c wireshark-4.4.18/epan/dissectors/packet-bacapp.c --- wireshark-4.4.16/epan/dissectors/packet-bacapp.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-bacapp.c 2026-08-12 17:19:13.000000000 +0000 @@ -14586,20 +14586,43 @@ uint8_t tag_no, tag_info; uint32_t lvt; + /* https://bacnet.org/wp-content/uploads/sites/4/2022/08/Add-135-2016bz.pdf + * Vendor ID | M + * Model Name | M + * Serial Number | M + * Device Identifier | C + * Device MAC Addresss | C + * + * "Either the 'Device Identifier', or 'Device MAC Address', or both shall + * be present." + */ + + /* XXX - Does this really need to loop? */ while (tvb_reported_length_remaining(tvb, offset) > 0) { /* exit loop if nothing happens inside */ lastoffset = offset; offset = fApplicationTypes(tvb, pinfo, tree, offset, "Vendor ID: "); offset = fApplicationTypes(tvb, pinfo, tree, offset, "Model name: "); offset = fApplicationTypes(tvb, pinfo, tree, offset, "Serial number: "); + /* At least one of Device Identifier (12) or Device MAC Address (6) + * shall be present, so we should error if neither are. */ fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt); - if(tvb_reported_length_remaining(tvb, offset) > 0 && tag_no == 12) { + switch (tag_no) { + case 12: offset = fApplicationTypes(tvb, pinfo, tree, offset, "Device Identifier: "); - } - - fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt); - if(tvb_reported_length_remaining(tvb, offset) > 0 && tag_no == 6) { + if (tvb_reported_length_remaining(tvb, offset) == 0) { + return offset; + } + fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt); + if (tag_no != 6) { + expert_add_info(pinfo, tree, &ei_bacapp_bad_tag); + } + /* FALLTHROUGH */ + case 6: offset = fApplicationTypes(tvb, pinfo, tree, offset, "Device MAC address: "); + break; + default: + expert_add_info(pinfo, tree, &ei_bacapp_bad_tag); } if (offset <= lastoffset) break; /* nothing happened, exit loop */ } diff -Nru wireshark-4.4.16/epan/dissectors/packet-ber.c wireshark-4.4.18/epan/dissectors/packet-ber.c --- wireshark-4.4.16/epan/dissectors/packet-ber.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-ber.c 2026-08-12 17:19:13.000000000 +0000 @@ -2235,6 +2235,10 @@ if(offset == end_offset){ proto_item_append_text(item, " [0 length]"); } + + /* XXX - record the mandatory elements of the sequence so we can check at + the end that they were present, as in dissect_ber_set. */ + /* loop over all entries until we reach the end of the sequence */ while (offset < end_offset) { int8_t ber_class; diff -Nru wireshark-4.4.16/epan/dissectors/packet-btatt.c wireshark-4.4.18/epan/dissectors/packet-btatt.c --- wireshark-4.4.16/epan/dissectors/packet-btatt.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-btatt.c 2026-08-12 17:19:13.000000000 +0000 @@ -11427,9 +11427,8 @@ offset = dissect_attribute_value(main_tree, NULL, pinfo, tvb, offset, tvb_captured_length_remaining(tvb, offset), request_data->parameters.read_multiple.handle[i_handle], uuid, &att_data); } } else { - i_handle = 0; /* Read Multiple Variable Response */ - for (;;) { + for (i_handle = 0; i_handle < request_data->parameters.read_multiple.number_of_handles; i_handle += 1) { int remain = tvb_reported_length_remaining(tvb, offset); uint16_t length; if (remain < 2) @@ -11443,7 +11442,6 @@ dissect_handle(main_tree, pinfo, hf_btatt_handle, tvb, offset, bluetooth_data, &uuid, request_data->parameters.read_multiple.handle[i_handle], opcode); dissect_attribute_value(main_tree, NULL, pinfo, tvb, offset, length, request_data->parameters.read_multiple.handle[i_handle], uuid, &att_data); - i_handle++; offset += length; } } diff -Nru wireshark-4.4.16/epan/dissectors/packet-btavrcp.c wireshark-4.4.18/epan/dissectors/packet-btavrcp.c --- wireshark-4.4.16/epan/dissectors/packet-btavrcp.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-btavrcp.c 2026-08-12 17:19:13.000000000 +0000 @@ -183,6 +183,7 @@ static int hf_btavrcp_feature_number_of_items; static int hf_btavrcp_feature_cover_art; static int hf_btavrcp_reassembled; +static int hf_btavrcp_reassembled_too_long_fragment; static int hf_btavrcp_current_path; static int hf_btavrcp_response_time; static int hf_btavrcp_command_in_frame; @@ -1192,24 +1193,43 @@ wmem_tree_insert32(fragment->fragments, fragment->count, data_fragment); } /* reassembling*/ + /* XXX - Use the standard reassembly API; among other things, to + * handle depended upon frames. */ length = 0; if (fragment->state == 2) { - unsigned i_length = 0; + unsigned i_length = 0, new_i_length; uint8_t *reassembled; + bool too_long = false; for (i_frame = 1; i_frame <= fragment->count; ++i_frame) { data_fragment = (data_fragment_t *)wmem_tree_lookup32_le(fragment->fragments, i_frame); - length += data_fragment->length; + if (data_fragment) { + if (ckd_add(&length, length, data_fragment->length) || length > INT32_MAX) { + // Unsigned lengths are not yet fully supported (#20103, but + // also possibly a Qt limitation.) + length = INT32_MAX; + break; + } + } } reassembled = (uint8_t *) wmem_alloc(pinfo->pool, length); for (i_frame = 1; i_frame <= fragment->count; ++i_frame) { data_fragment = (data_fragment_t *)wmem_tree_lookup32_le(fragment->fragments, i_frame); - memcpy(reassembled + i_length, - data_fragment->data, - data_fragment->length); - i_length += data_fragment->length; + if (data_fragment) { + if (ckd_add(&new_i_length, i_length, data_fragment->length) || new_i_length > (unsigned)length) { + memcpy(reassembled + i_length, + data_fragment->data, + length - i_length); + too_long = true; + break; + } + memcpy(reassembled + i_length, + data_fragment->data, + data_fragment->length); + i_length = new_i_length; + } } next_tvb = tvb_new_child_real_data(tvb, reassembled, length, length); @@ -1220,6 +1240,10 @@ pitem = proto_tree_add_item(tree, hf_btavrcp_reassembled, tvb, offset, 0, ENC_NA); proto_item_set_generated(pitem); + + if (too_long) { + proto_item_set_generated(proto_tree_add_boolean(tree, hf_btavrcp_reassembled_too_long_fragment, tvb, 0, 0, true)); + } } } } @@ -3105,6 +3129,11 @@ FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_btavrcp_reassembled_too_long_fragment, + { "Reassembled PDU too long", "btavrcp.reassembled.too_long_fragment", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, { &hf_btavrcp_response_time, { "Response Time", "btavrcp.response_time", FT_UINT32, BASE_DEC, NULL, 0x00, diff -Nru wireshark-4.4.16/epan/dissectors/packet-btbredr_rf.c wireshark-4.4.18/epan/dissectors/packet-btbredr_rf.c --- wireshark-4.4.16/epan/dissectors/packet-btbredr_rf.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-btbredr_rf.c 2026-08-12 17:19:13.000000000 +0000 @@ -2526,6 +2526,9 @@ expert_module = expert_register_protocol(proto_btbredr_rf); expert_register_field_array(expert_module, ei, array_length(ei)); + + reassembly_table_register(&l2cap_msg_reassembly_table, + &addresses_reassembly_table_functions); } void diff -Nru wireshark-4.4.16/epan/dissectors/packet-bthfp.c wireshark-4.4.18/epan/dissectors/packet-bthfp.c --- wireshark-4.4.16/epan/dissectors/packet-bthfp.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-bthfp.c 2026-08-12 17:19:13.000000000 +0000 @@ -168,6 +168,7 @@ static expert_field ei_aplefm_out_of_range; static expert_field ei_aplsiri_out_of_range; static expert_field ei_iphoneaccev_key_out_of_range; +static expert_field ei_xapl_info_format; static expert_field ei_xapl_features_reserved; static expert_field ei_parameter_blank; @@ -1099,7 +1100,11 @@ if (parameter_number == 0) { if (role == ROLE_HS) { - pitem = proto_tree_add_item(tree, hf_xapl_accessory_info, tvb, offset, parameter_length, ENC_NA | ENC_ASCII); + pitem = proto_tree_add_item(tree, hf_xapl_accessory_info, tvb, offset, parameter_length, ENC_ASCII); + if (parameter_length < 14) { + expert_add_info(pinfo, pitem, &ei_xapl_info_format); + return true; + } ptree = proto_item_add_subtree(pitem, ett_bthfp_xapl_accessory_info); value = get_uint_hex_parameter(parameter_stream + (4 + 1) * 0, 4); @@ -3222,6 +3227,7 @@ { &ei_aplefm_out_of_range, { "bthfp.expert.aplefm.out_of_range", PI_PROTOCOL, PI_WARN, "Only 0-1 is valid", EXPFILL }}, { &ei_aplsiri_out_of_range, { "bthfp.expert.aplsiri.out_of_range", PI_PROTOCOL, PI_WARN, "Only 1-2 is valid", EXPFILL }}, { &ei_iphoneaccev_key_out_of_range, { "bthfp.expert.iphoneaccev.out_of_range", PI_PROTOCOL, PI_WARN, "Only 1-2 is valid", EXPFILL }}, + { &ei_xapl_info_format, { "bthfp.expert.xapl.short", PI_PROTOCOL, PI_WARN, "The first parameter must have the format XXXX-XXXX-XXXX", EXPFILL }}, { &ei_xapl_features_reserved, { "bthfp.expert.xapl.reserved", PI_PROTOCOL, PI_WARN, "The reserved bits [6-31] shall be initialized to Zero", EXPFILL }} }; diff -Nru wireshark-4.4.16/epan/dissectors/packet-c1222.c wireshark-4.4.18/epan/dissectors/packet-c1222.c --- wireshark-4.4.16/epan/dissectors/packet-c1222.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-c1222.c 2026-08-12 17:19:13.000000000 +0000 @@ -749,10 +749,10 @@ * \param maxsize is the maximum number of bytes we're allowed to write * \returns length of encoded value in bytes */ -static int -encode_ber_len(uint8_t *ptr, uint32_t n, int maxsize) +static uint32_t +encode_ber_len(uint8_t *ptr, uint32_t n, uint32_t maxsize) { - int len = get_ber_len_size(n); + uint32_t len = get_ber_len_size(n); if (len > maxsize) return 0; if (len == 1) { *ptr = 0x7f & n; @@ -821,7 +821,7 @@ canonify_unencrypted_header(unsigned char *buff, uint32_t *offset, uint32_t buffsize) { const TOP_ELEMENT_CONTROL *t = canonifyTable; - uint32_t len, allocated; + uint32_t len, allocated, ret; for (t = canonifyTable; t->element != NULL; t++) { @@ -832,8 +832,13 @@ if (*(t->element) != NULL) { if (t->addtag) { /* recreate original tag and length */ + if (buffsize < *offset + 1) + return false; buff[(*offset)++] = t->tag; - (*offset) += encode_ber_len(&buff[*offset], len, 4); + ret = encode_ber_len(&buff[*offset], len, MIN(buffsize - *offset, 4)); + if (ret == 0) + return false; + (*offset) += ret; } if (t->truncate) { len = 3+2*get_ber_len_size(len); diff -Nru wireshark-4.4.16/epan/dissectors/packet-catapult-dct2000.c wireshark-4.4.18/epan/dissectors/packet-catapult-dct2000.c --- wireshark-4.4.16/epan/dissectors/packet-catapult-dct2000.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-catapult-dct2000.c 2026-08-12 17:19:13.000000000 +0000 @@ -1876,6 +1876,9 @@ int n; p_fp_info->no_ddi_entries = outhdr_values[i++]; + if (p_fp_info->no_ddi_entries > MAX_EDCH_DDIS) { + p_fp_info->no_ddi_entries = MAX_EDCH_DDIS; + } /* DDI values */ for (n=0; n < p_fp_info->no_ddi_entries; n++) { diff -Nru wireshark-4.4.16/epan/dissectors/packet-cms.c wireshark-4.4.18/epan/dissectors/packet-cms.c --- wireshark-4.4.16/epan/dissectors/packet-cms.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-cms.c 2026-08-12 17:19:13.000000000 +0000 @@ -317,11 +317,10 @@ struct cms_private_data { const char *object_identifier_id; tvbuff_t *content_tvb; + proto_tree *top_tree; + proto_tree *cap_tree; }; -static proto_tree *top_tree; -static proto_tree *cap_tree; - #define HASH_SHA1 "1.3.14.3.2.26" #define HASH_MD5 "1.2.840.113549.2.5" @@ -377,7 +376,12 @@ int i= 0, buffer_size = 0; /* we only support two algorithms at the moment - if we do add SHA2 - we should add a registration process to use a registration process */ + we should add a registration process and use it */ + + if (alg == NULL) { + proto_item_append_text(pi, " [unable to verify]"); + return; + } if(strcmp(alg, HASH_SHA1) == 0) { gcry_md_hash_buffer(GCRY_MD_SHA1, digest_buf, tvb_get_ptr(content, 0, tvb_captured_length(content)), tvb_captured_length(content)); @@ -395,7 +399,7 @@ (tvb_memeql(tvb, offset, digest_buf, buffer_size) != 0)) { proto_item_append_text(pi, " [incorrect, should be "); for(i = 0; i < buffer_size; i++) - proto_item_append_text(pi, "%02X", digest_buf[i]); + proto_item_append_text(pi, "%02X", digest_buf[i]); proto_item_append_text(pi, "]"); } @@ -448,11 +452,12 @@ int dissect_cms_ContentInfo(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - top_tree = tree; + struct cms_private_data *cms_data = cms_get_private_data(actx->pinfo); + cms_data->top_tree = tree; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ContentInfo_sequence, hf_index, ett_cms_ContentInfo); - top_tree = NULL; + cms_data->top_tree = NULL; return offset; @@ -511,7 +516,7 @@ if(cms_data->content_tvb) { proto_item_set_text(actx->created_item, "eContent (%u bytes)", tvb_reported_length(cms_data->content_tvb)); - call_ber_oid_callback(cms_data->object_identifier_id, cms_data->content_tvb, 0, actx->pinfo, top_tree ? top_tree : tree, NULL); + call_ber_oid_callback(cms_data->object_identifier_id, cms_data->content_tvb, 0, actx->pinfo, cms_data->top_tree ? cms_data->top_tree : tree, NULL); } @@ -1673,13 +1678,14 @@ static int dissect_cms_RC2ParameterVersion(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { uint32_t length = 0; + struct cms_private_data *cms_data = cms_get_private_data(actx->pinfo); offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &length); - if(cap_tree != NULL) - proto_item_append_text(cap_tree, " (%d bits)", length); + if(cms_data->cap_tree != NULL) + proto_item_append_text(cms_data->cap_tree, " (%d bits)", length); return offset; @@ -1758,7 +1764,7 @@ if(cms_data->object_identifier_id) { name = oid_resolved_from_string(actx->pinfo->pool, cms_data->object_identifier_id); proto_item_append_text(tree, " %s", name ? name : cms_data->object_identifier_id); - cap_tree = tree; + cms_data->cap_tree = tree; } @@ -1786,9 +1792,16 @@ static int dissect_cms_SMIMECapability(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + struct cms_private_data *cms_data = cms_get_private_data(actx->pinfo); + cms_data->cap_tree = NULL; + + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, SMIMECapability_sequence, hf_index, ett_cms_SMIMECapability); + + cms_data->cap_tree = NULL; + + return offset; } diff -Nru wireshark-4.4.16/epan/dissectors/packet-csn1.c wireshark-4.4.18/epan/dissectors/packet-csn1.c --- wireshark-4.4.16/epan/dissectors/packet-csn1.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-csn1.c 2026-08-12 17:19:13.000000000 +0000 @@ -419,8 +419,9 @@ pui8 = pui8DATA(data, pDescr->offset); do { - *pui8++ = tvb_get_bits8(tvb, bit_offset, no_of_bits); + *pui8 = tvb_get_bits8(tvb, bit_offset, no_of_bits); proto_tree_add_uint_bits_format_value(tree, *(pDescr->hf_ptr), tvb, bit_offset, no_of_bits, *pui8, ENC_BIG_ENDIAN, " (Count %d)", i++); + pui8++; bit_offset += no_of_bits; } while (--nCount > 0); } diff -Nru wireshark-4.4.16/epan/dissectors/packet-dns.c wireshark-4.4.18/epan/dissectors/packet-dns.c --- wireshark-4.4.16/epan/dissectors/packet-dns.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-dns.c 2026-08-12 17:19:13.000000000 +0000 @@ -3794,10 +3794,8 @@ /* Base 32 Encoding with Extended Hex Alphabet (see RFC 4648 section 7) */ const char *base32hex = "0123456789abcdefghijklmnopqrstuv"; wmem_strbuf_t *hash_value_base32hex = wmem_strbuf_new(pinfo->pool, ""); - int group, in_offset, out_offset; - for (in_offset = 0, out_offset = 0; - in_offset / 8 < hash_len; - in_offset += 5, out_offset += 1) { + unsigned group, in_offset; + for (in_offset = 0; in_offset / 8 < hash_len; in_offset += 5) { group = tvb_get_bits8(tvb, cur_offset * 8 + in_offset, 5); wmem_strbuf_append_c(hash_value_base32hex, base32hex[group]); } @@ -6853,12 +6851,12 @@ NULL, HFILL }}, { &hf_dns_dnskey_flags_secure_entry_point, - { "Key Signing Key", "dns.dnskey.flags.secure_entry_point", + { "Secure Entry Point", "dns.dnskey.flags.secure_entry_point", FT_BOOLEAN, 16, TFS(&tfs_yes_no), DNSKEY_FLAGS_SEP, NULL, HFILL }}, { &hf_dns_dnskey_flags_reserved, - { "Key Signing Key", "dns.dnskey.flags.reserved", + { "Reserved", "dns.dnskey.flags.reserved", FT_UINT16, BASE_HEX, NULL, DNSKEY_FLAGS_RSV, "Must be zero", HFILL }}, diff -Nru wireshark-4.4.16/epan/dissectors/packet-edonkey.c wireshark-4.4.18/epan/dissectors/packet-edonkey.c --- wireshark-4.4.16/epan/dissectors/packet-edonkey.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-edonkey.c 2026-08-12 17:19:13.000000000 +0000 @@ -26,6 +26,7 @@ #include #include #include +#include #include "packet-edonkey.h" #include "packet-tcp.h" @@ -630,6 +631,9 @@ /* dissect one list element */ offset = (*item_dissector)(tvb, pinfo, offset, subtree); + if (offset <= item_start_offset) { + THROW(ReportedBoundsError); + } /* Set the container node length */ proto_item_set_len( ti, offset - item_start_offset ); } @@ -869,7 +873,7 @@ if (tag_type==real_tag_type) proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_namesize, tvb, offset+1, 2, tag_name_size); edonkey_tree_add_metatag_name(metatag_tree, tvb, tag_offset-tag_name_size, tag_name_size, special_tagtype); - proto_tree_add_item(metatag_tree, hf_edonkey_blob_length, tvb, tag_offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(metatag_tree, hf_edonkey_blob_length, tvb, tag_offset, 4, ENC_LITTLE_ENDIAN); break; case EDONKEY_MTAG_BSOB: @@ -3321,7 +3325,7 @@ { &hf_edonkey_meta_tag_value_revision, { "Meta Tag Value", "edonkey.meta_tag_value.revision", FT_UINT32, BASE_CUSTOM, CF_FUNC(edonkey_fmt_revision), 0x0, NULL, HFILL }}, { &hf_edonkey_meta_tag_value_uint, { "Meta Tag Value", "edonkey.meta_tag_value.uint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_edonkey_boolean_array_length, { "Boolean Array Length", "edonkey.boolean_array_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_edonkey_blob_length, { "BLOB Length", "edonkey.blob_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_edonkey_blob_length, { "BLOB Length", "edonkey.blob_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_edonkey_kademlia_string, { "String", "edonkey.kademlia_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_emule_public_key_length, { "Public key length", "edonkey.emule.public_key_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_emule_signature_length, { "Signature length", "edonkey.emule.signature_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff -Nru wireshark-4.4.16/epan/dissectors/packet-epl.c wireshark-4.4.18/epan/dissectors/packet-epl.c --- wireshark-4.4.16/epan/dissectors/packet-epl.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-epl.c 2026-08-12 17:19:13.000000000 +0000 @@ -5236,14 +5236,20 @@ { profile = profile_new(allocator); if (!epl_eds_load(profile, path)) + { profile_del(profile); + profile = NULL; + } } #if HAVE_LIBXML2 else if (g_str_has_suffix(path, ".xdd") || g_str_has_suffix(path, ".xdc")) { profile = profile_new(allocator); if (!epl_xdd_load(profile, path)) + { profile_del(profile); + profile = NULL; + } } #endif if (!profile) diff -Nru wireshark-4.4.16/epan/dissectors/packet-ess.c wireshark-4.4.18/epan/dissectors/packet-ess.c --- wireshark-4.4.16/epan/dissectors/packet-ess.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-ess.c 2026-08-12 17:19:13.000000000 +0000 @@ -571,13 +571,15 @@ static int dissect_ess_T_restrictiveAttributeFlags(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - tvbuff_t *attributes; + tvbuff_t *attributes = NULL; offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, NULL, 0, hf_index, -1, &attributes); - ess_dissect_attribute_flags (attributes, actx); + if (attributes != NULL) { + ess_dissect_attribute_flags (attributes, actx); + } return offset; @@ -663,13 +665,15 @@ static int dissect_ess_T_permissiveAttributeFlags(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - tvbuff_t *attributes; + tvbuff_t *attributes = NULL; offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, NULL, 0, hf_index, -1, &attributes); - ess_dissect_attribute_flags (attributes, actx); + if (attributes != NULL) { + ess_dissect_attribute_flags (attributes, actx); + } return offset; @@ -703,13 +707,15 @@ static int dissect_ess_T_informativeAttributeFlags(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - tvbuff_t *attributes; + tvbuff_t *attributes = NULL; offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, NULL, 0, hf_index, -1, &attributes); - ess_dissect_attribute_flags (attributes, actx); + if (attributes != NULL) { + ess_dissect_attribute_flags (attributes, actx); + } return offset; diff -Nru wireshark-4.4.16/epan/dissectors/packet-fcels.c wireshark-4.4.18/epan/dissectors/packet-fcels.c --- wireshark-4.4.16/epan/dissectors/packet-fcels.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-fcels.c 2026-08-12 17:19:13.000000000 +0000 @@ -1533,6 +1533,7 @@ else if (opcode == FC_ELS_TPRLO) { proto_tree_add_item(svcpg_tree, hf_fcels_prlilo_3rd_party_n_port_id, tvb, offset+13, 3, ENC_NA); } + offset += 16; } } diff -Nru wireshark-4.4.16/epan/dissectors/packet-fmp_notify.c wireshark-4.4.18/epan/dissectors/packet-fmp_notify.c --- wireshark-4.4.16/epan/dissectors/packet-fmp_notify.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-fmp_notify.c 2026-08-12 17:19:13.000000000 +0000 @@ -162,29 +162,25 @@ proto_tree *tree) { - int numHandles; - int listLength; - int i; + unsigned numHandles; proto_tree *handleListTree; + proto_item *ti; numHandles = tvb_get_ntohl(tvb, offset); - listLength = 4; - for (i = 0; i < numHandles; i++) { - listLength += (4 + tvb_get_ntohl(tvb, offset + listLength)); - } - - handleListTree = proto_tree_add_subtree(tree, tvb, offset, listLength, - ett_fmp_notify_hlist, NULL, "Handle List"); + handleListTree = proto_tree_add_subtree(tree, tvb, offset, 4, + ett_fmp_notify_hlist, &ti, "Handle List"); offset = dissect_rpc_uint32(tvb, handleListTree, hf_fmp_handleListLen, offset); - for (i = 0; i < numHandles; i++) { + for (unsigned i = 0; i < numHandles; i++) { offset = dissect_rpc_data(tvb, handleListTree, hf_fmp_fmpFHandle, offset);/* changed */ } + proto_item_set_end(ti, tvb, offset); + return offset; } diff -Nru wireshark-4.4.16/epan/dissectors/packet-h245.c wireshark-4.4.18/epan/dissectors/packet-h245.c --- wireshark-4.4.16/epan/dissectors/packet-h245.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-h245.c 2026-08-12 17:19:13.000000000 +0000 @@ -6568,7 +6568,7 @@ gefx = gef_ctx_get(actx->private_data); if (gefx) { /* If this is a standard generic message use hf_h245_subMessageIdentifier_standard to get - * the value translated and make it fileterable. + * the value translated and make it filterable. */ if (strcmp("GenericMessage/0.0.8.239.2", gefx->key) == 0) { hf_index = hf_h245_subMessageIdentifier_standard; @@ -6582,7 +6582,7 @@ gefx->subid = wmem_strdup_printf(actx->pinfo->pool, "%u", subMessageIdentifier); gef_ctx_update_key(actx->pinfo->pool, gef_ctx_get(actx->private_data)); } - if (hf_index == hf_h245_subMessageIdentifier_standard) + if (h245_pi && hf_index == hf_h245_subMessageIdentifier_standard) { col_append_str(actx->pinfo->cinfo, COL_INFO, val_to_str_const(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "") ); snprintf(h245_pi->frame_label, 50, "%s", val_to_str_const(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "")); diff -Nru wireshark-4.4.16/epan/dissectors/packet-h265.c wireshark-4.4.18/epan/dissectors/packet-h265.c --- wireshark-4.4.16/epan/dissectors/packet-h265.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-h265.c 2026-08-12 17:19:13.000000000 +0000 @@ -2409,11 +2409,11 @@ } if (nal_hrd_parameters_present_flag) { - dissect_h265_sub_layer_hrd_parameters(tree, tvb, pinfo, bit_offset, subLayerId, cpb_cnt_minus1[subLayerId] + 1, sub_pic_hrd_params_present_flag); + bit_offset = dissect_h265_sub_layer_hrd_parameters(tree, tvb, pinfo, bit_offset, subLayerId, cpb_cnt_minus1[subLayerId] + 1, sub_pic_hrd_params_present_flag); } if (vcl_hrd_parameters_present_flag) { - dissect_h265_sub_layer_hrd_parameters(tree, tvb, pinfo, bit_offset, subLayerId, cpb_cnt_minus1[subLayerId] + 1, sub_pic_hrd_params_present_flag); + bit_offset = dissect_h265_sub_layer_hrd_parameters(tree, tvb, pinfo, bit_offset, subLayerId, cpb_cnt_minus1[subLayerId] + 1, sub_pic_hrd_params_present_flag); } } return bit_offset; diff -Nru wireshark-4.4.16/epan/dissectors/packet-ieee80211.c wireshark-4.4.18/epan/dissectors/packet-ieee80211.c --- wireshark-4.4.16/epan/dissectors/packet-ieee80211.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-ieee80211.c 2026-08-12 17:19:13.000000000 +0000 @@ -40982,29 +40982,38 @@ return 0; } -static void +static bool get_eapol_parsed(packet_info *pinfo, PDOT11DECRYPT_EAPOL_PARSED eapol_parsed) { if (!eapol_parsed) { - return; + return false; } proto_eapol_key_frame_t *eapol_key = (proto_eapol_key_frame_t *)p_get_proto_data(pinfo->pool, pinfo, proto_eapol, EAPOL_KEY_FRAME_KEY); if (!eapol_key) { - return; + return false; } eapol_parsed->len = eapol_key->len; + if (eapol_parsed->len > DOT11DECRYPT_EAPOL_MAX_LEN) { + return false; + } eapol_parsed->key_type = eapol_key->type; eapol_parsed->key_version = (uint8_t) GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_wlan, KEY_VERSION_KEY)); eapol_parsed->key_len = (uint16_t) GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_wlan, KEY_LEN_KEY)); + if (eapol_parsed->key_len > DOT11DECRYPT_EAPOL_MAX_LEN) { + return false; + } eapol_parsed->key_iv = (uint8_t *)p_get_proto_data(pinfo->pool, pinfo, proto_wlan, KEY_IV_KEY); eapol_parsed->key_data = (uint8_t *)p_get_proto_data(pinfo->pool, pinfo, proto_wlan, KEY_DATA_KEY); eapol_parsed->key_data_len = (uint16_t) GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_wlan, KEY_DATA_LEN_KEY)); + if (eapol_parsed->key_data_len > DOT11DECRYPT_EAPOL_MAX_LEN) { + return false; + } eapol_parsed->nonce = (uint8_t *)p_get_proto_data(pinfo->pool, pinfo, proto_wlan, NONCE_KEY); eapol_parsed->group_cipher = (uint8_t) GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_wlan, GROUP_CIPHER_KEY)); @@ -41029,6 +41038,7 @@ (uint8_t *)p_get_proto_data(pinfo->pool, pinfo, proto_wlan, FTE_R1KH_ID_KEY); eapol_parsed->fte.r1kh_id_len = (uint8_t) GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_wlan, FTE_R1KH_ID_LEN_KEY)); + return true; } static void @@ -41078,7 +41088,7 @@ static void try_decrypt_keydata(packet_info *pinfo) { - uint32_t dec_caplen; + uint32_t dec_caplen = DOT11DECRYPT_EAPOL_MAX_LEN; unsigned char dec_data[DOT11DECRYPT_EAPOL_MAX_LEN]; DOT11DECRYPT_EAPOL_PARSED eapol_parsed; DOT11DECRYPT_KEY_ITEM used_key; @@ -41094,7 +41104,8 @@ } memset(&eapol_parsed, 0, sizeof(eapol_parsed)); - get_eapol_parsed(pinfo, &eapol_parsed); + if (!get_eapol_parsed(pinfo, &eapol_parsed)) + return; int ret = Dot11DecryptDecryptKeyData(&dot11decrypt_ctx, &eapol_parsed, @@ -41132,7 +41143,8 @@ } memset(&eapol_parsed, 0, sizeof(eapol_parsed)); - get_eapol_parsed(pinfo, &eapol_parsed); + if (!get_eapol_parsed(pinfo, &eapol_parsed)) + return; eapol_parsed.msg_type = msg_type; Dot11DecryptScanEapolForKeys(&dot11decrypt_ctx, diff -Nru wireshark-4.4.16/epan/dissectors/packet-kerberos.c wireshark-4.4.18/epan/dissectors/packet-kerberos.c --- wireshark-4.4.16/epan/dissectors/packet-kerberos.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-kerberos.c 2026-08-12 17:19:13.000000000 +0000 @@ -72,6 +72,7 @@ #include #include #include +#include #include "packet-kerberos.h" #include "packet-netbios.h" #include "packet-tcp.h" @@ -1168,6 +1169,31 @@ read_keytab_file(last_keytab); } + +/* Like bytes_to_str_maxlen with a fixed maxlen of 4, and writing + into a preallocated static buffer. */ +static char* +key_to_hexstr_maxfour(const uint8_t *keyvalue, unsigned keylength) +{ + // UTF8_HORIZONTAL_ELLIPSIS (U+2026) is 3 bytes, so the buffer must + // have room for 8 + 3 + 1 = 12 bytes. + static char keystr_buf[12]; + char *keystr_end; + bool truncated = false; + unsigned len = keylength; + if (len > 4U) { + len = 4U; + truncated = true; + } + keystr_end = bytes_to_hexstr(keystr_buf, keyvalue, len); + if (truncated) { + g_stpcpy(keystr_end, UTF8_HORIZONTAL_ELLIPSIS); + } else { + *keystr_end = '\0'; + } + return keystr_buf; +} + #endif /* HAVE_KERBEROS */ #if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) @@ -1454,30 +1480,27 @@ item = proto_tree_add_expert_format(key_tree, pinfo, &ei_kerberos_learnt_keytype, key_tvb, 0, keylength, - "%s %s keytype %d (id=%d.%u) (%02x%02x%02x%02x...)", + "%s %s keytype %d (id=%d.%u) (%s)", methodu, origin, keytype, pinfo->num, new_key->id, - keyvalue[0] & 0xFF, keyvalue[1] & 0xFF, - keyvalue[2] & 0xFF, keyvalue[3] & 0xFF); + key_to_hexstr_maxfour((const uint8_t*)keyvalue, keylength)); if (item != NULL && key_hidden_item != NULL) { proto_tree_move_item(key_tree, key_hidden_item, item); } if (src1 != NULL) { enc_key_t *sek = src1; expert_add_info_format(pinfo, item, &ei_kerberos_learnt_keytype, - "SRC1 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC1 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } if (src2 != NULL) { enc_key_t *sek = src2; expert_add_info_format(pinfo, item, &ei_kerberos_learnt_keytype, - "SRC2 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC2 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } kerberos_key_list_append(private_data->learnt_keys, new_key); @@ -1640,10 +1663,9 @@ item = proto_tree_add_expert_format(tree, pinfo, &ei_kerberos_decrypted_keytype, cryptotvb, 0, 0, "Decrypted keytype %d usage %d " - "using %s (id=%s same=%u) (%02x%02x%02x%02x...)", + "using %s (id=%s same=%u) (%s)", ek->keytype, usage, ek->key_origin, ek->id_str, ek->num_same, - ek->keyvalue[0] & 0xFF, ek->keyvalue[1] & 0xFF, - ek->keyvalue[2] & 0xFF, ek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(ek->keyvalue, ek->keylength)); expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, "Used keymap=%s num_keys=%u num_tries=%u)", keymap_name, @@ -1652,29 +1674,26 @@ if (ek->src1 != NULL) { sek = ek->src1; expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, - "SRC1 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC1 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } if (ek->src2 != NULL) { sek = ek->src2; expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, - "SRC2 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC2 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } sek = ek->same_list; while (sek != NULL) { expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, "Decrypted keytype %d usage %d " - "using %s (id=%s same=%u) (%02x%02x%02x%02x...)", + "using %s (id=%s same=%u) (%s)", sek->keytype, usage, sek->key_origin, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); sek = sek->same_list; } kerberos_key_list_append(private_data->decryption_keys, ek); @@ -1733,11 +1752,10 @@ item = proto_tree_add_expert_format(tree, pinfo, &ei_kerberos_decrypted_keytype, tvb, 0, 0, "%s checksum %d keytype %d " - "using %s (id=%s same=%u) (%02x%02x%02x%02x...)", + "using %s (id=%s same=%u) (%s)", reason, checksum, ek->keytype, ek->key_origin, ek->id_str, ek->num_same, - ek->keyvalue[0] & 0xFF, ek->keyvalue[1] & 0xFF, - ek->keyvalue[2] & 0xFF, ek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(ek->keyvalue, ek->keylength)); expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, "Used keymap=%s num_keys=%u num_tries=%u)", keymap_name, @@ -1747,11 +1765,10 @@ while (sek != NULL) { expert_add_info_format(pinfo, item, &ei_kerberos_decrypted_keytype, "%s checksum %d keytype %d " - "using %s (id=%s same=%u) (%02x%02x%02x%02x...)", + "using %s (id=%s same=%u) (%s)", reason, checksum, sek->keytype, sek->key_origin, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); sek = sek->same_list; } kerberos_key_list_append(private_data->decryption_keys, ek); @@ -8739,45 +8756,41 @@ state->tvb, state->start, state->length, - "%s %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "%s %s keytype %d (id=%s same=%u) (%s)", state->name, ek->key_origin, ek->keytype, ek->id_str, ek->num_same, - ek->keyvalue[0] & 0xFF, ek->keyvalue[1] & 0xFF, - ek->keyvalue[2] & 0xFF, ek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(ek->keyvalue, ek->keylength)); if (ek->src1 != NULL) { sek = ek->src1; expert_add_info_format(state->pinfo, item, state->expindex, - "SRC1 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC1 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } if (ek->src2 != NULL) { sek = ek->src2; expert_add_info_format(state->pinfo, item, state->expindex, - "SRC2 %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "SRC2 %s keytype %d (id=%s same=%u) (%s)", sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); } sek = ek->same_list; while (sek != NULL) { expert_add_info_format(state->pinfo, item, state->expindex, - "%s %s keytype %d (id=%s same=%u) (%02x%02x%02x%02x...)", + "%s %s keytype %d (id=%s same=%u) (%s)", state->name, sek->key_origin, sek->keytype, sek->id_str, sek->num_same, - sek->keyvalue[0] & 0xFF, sek->keyvalue[1] & 0xFF, - sek->keyvalue[2] & 0xFF, sek->keyvalue[3] & 0xFF); + key_to_hexstr_maxfour(sek->keyvalue, sek->keylength)); sek = sek->same_list; } #endif /* HAVE_KERBEROS */ diff -Nru wireshark-4.4.16/epan/dissectors/packet-knxip.c wireshark-4.4.18/epan/dissectors/packet-knxip.c --- wireshark-4.4.16/epan/dissectors/packet-knxip.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-knxip.c 2026-08-12 17:19:13.000000000 +0000 @@ -2728,7 +2728,7 @@ } else { - const uint8_t* encrypted = tvb_get_ptr( tvb, offset, size - offset ); + const uint8_t* encrypted = tvb_get_ptr( tvb, offset, size ); const int a_length = header_length + 16; // length of leading non-encrypted data const uint8_t* a_data = encrypted - a_length; // ptr to KIP header uint8_t* decrypted = NULL; diff -Nru wireshark-4.4.16/epan/dissectors/packet-lls.c wireshark-4.4.18/epan/dissectors/packet-lls.c --- wireshark-4.4.16/epan/dissectors/packet-lls.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-lls.c 2026-08-12 17:19:13.000000000 +0000 @@ -102,7 +102,7 @@ } proto_tree *uncompress_tree = proto_item_add_subtree(ti, ett_lls_table_payload); - tvbuff_t *uncompress_tvb = tvb_uncompress_zlib(tvb, offset, len); + tvbuff_t *uncompress_tvb = tvb_child_uncompress_zlib(tvb, tvb, offset, len); proto_tree *xml_tree = NULL; if (uncompress_tvb) { const char *table_type_short = val_to_str_const(lls_table_id, hf_lls_table_type_short_vals, "Unknown"); diff -Nru wireshark-4.4.16/epan/dissectors/packet-megaco.c wireshark-4.4.18/epan/dissectors/packet-megaco.c --- wireshark-4.4.16/epan/dissectors/packet-megaco.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-megaco.c 2026-08-12 17:19:13.000000000 +0000 @@ -2836,6 +2836,7 @@ tvb_LBRKT = tvb_find_uint8(tvb, tvb_LBRKT, tvb_packages_end_offset, '{'); + /* Find the comma that delimits the next packagesItem */ tvb_current_offset = tvb_find_uint8(tvb, tvb_previous_offset, tvb_packages_end_offset, ','); @@ -2870,19 +2871,13 @@ proto_tree_add_format_text(megaco_packagesdescriptor_tree, tvb, tvb_previous_offset, tokenlen); - tvb_current_offset = tvb_find_uint8(tvb, tvb_RBRKT, - tvb_packages_end_offset, ','); - - if (tvb_current_offset == -1 || tvb_current_offset > tvb_packages_end_offset ){ - tvb_current_offset = tvb_packages_end_offset; - } - + /* Move past the comma and any LWSP */ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset+1); tvb_LBRKT = tvb_previous_offset; tvb_RBRKT = tvb_previous_offset; - } while ( tvb_current_offset < tvb_packages_end_offset ); + } while ( tvb_previous_offset < tvb_packages_end_offset ); } } diff -Nru wireshark-4.4.16/epan/dissectors/packet-mih.c wireshark-4.4.18/epan/dissectors/packet-mih.c --- wireshark-4.4.16/epan/dissectors/packet-mih.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-mih.c 2026-08-12 17:19:13.000000000 +0000 @@ -983,33 +983,40 @@ uint8_t len = 0; proto_tree_add_item(tlv_tree, hf_link_addr_type, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; switch (link_addr_choice) { case 0 : /*MAC_ADDR*/ - proto_tree_add_item(tlv_tree, hf_link_transport_addr_type, tvb, offset+1, 2, ENC_BIG_ENDIAN); - if(tvb_get_ntohs(tvb, offset+1) == 0x06) - proto_tree_add_item(tlv_tree, hf_mac_addr, tvb, offset+4, tvb_get_uint8(tvb, offset+3), ENC_NA); - return (offset + 10); + proto_tree_add_item(tlv_tree, hf_link_transport_addr_type, tvb, offset, 2, ENC_BIG_ENDIAN); + if(tvb_get_ntohs(tvb, offset) == 0x06) + proto_tree_add_item(tlv_tree, hf_mac_addr, tvb, offset+3, tvb_get_uint8(tvb, offset+2), ENC_NA); + return (offset + 9); case 1 :/*3GPP_3G_CELL_ID*/ - proto_tree_add_item(tlv_tree, hf_plmn_id, tvb, offset+1, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cell_id, tvb, offset+4, 4, ENC_BIG_ENDIAN); - return (offset + 8); + proto_tree_add_item(tlv_tree, hf_plmn_id, tvb, offset, 3, ENC_BIG_ENDIAN); + offset += 3; + proto_tree_add_item(tlv_tree, hf_cell_id, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; + return offset; case 2 :/*3GPP_2G_CELL_ID*/ - proto_tree_add_item(tlv_tree, hf_plmn_id, tvb, offset+1, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_location_area_id, tvb, offset+4, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_ci, tvb, offset+6, 2, ENC_BIG_ENDIAN); - return (offset + 8); + proto_tree_add_item(tlv_tree, hf_plmn_id, tvb, offset, 3, ENC_BIG_ENDIAN); + offset += 3; + proto_tree_add_item(tlv_tree, hf_location_area_id, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; + proto_tree_add_item(tlv_tree, hf_ci, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; + return offset; case 3 :/*3GPP_ADDR*/ case 4 :/*3GPP2_ADDR*/ case 5 :/*OTHER_L2_ADDR*/ - len = tvb_get_uint8(tvb, offset+1); - proto_tree_add_item(tlv_tree, hf_link_addr_string, tvb, offset+2, len, ENC_ASCII); - return (offset + 2 + len); + len = tvb_get_uint8(tvb, offset); + offset += 1; + proto_tree_add_item(tlv_tree, hf_link_addr_string, tvb, offset, len, ENC_ASCII); + return offset + len; } - return 0; + return offset; } static int16_t dissect_tsp_container(tvbuff_t *tvb, int16_t offset, proto_tree *tlv_tree) diff -Nru wireshark-4.4.16/epan/dissectors/packet-mpeg-dsmcc.c wireshark-4.4.18/epan/dissectors/packet-mpeg-dsmcc.c --- wireshark-4.4.16/epan/dissectors/packet-mpeg-dsmcc.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-mpeg-dsmcc.c 2026-08-12 17:19:13.000000000 +0000 @@ -1384,6 +1384,7 @@ for (i=0; i> 1; list_type = (oct & 0x4) >> 2; ap = (oct & 0x10) >> 4; /* SOR-MAC-IAUSF octet 5-20 */ @@ -3835,37 +3838,39 @@ NULL }; - proto_tree_add_item_ret_uint(tree, hf_nas_5gs_sor_plmn_id_act_len, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &plmn_id_act_len); - curr_offset++; - while ((curr_offset - offset) < plmn_id_act_len) { - sub_tree = proto_tree_add_subtree_format(tree, tvb, curr_offset, 5, ett_nas_5gs_mm_sor, NULL, "List item %u", i); - curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, true); - curr_offset += 3; - proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, flags_access_tech_1, ENC_BIG_ENDIAN); + if (list_ind) { + proto_tree_add_item_ret_uint(tree, hf_nas_5gs_sor_plmn_id_act_len, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &plmn_id_act_len); curr_offset++; - proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, flags_access_tech_2, ENC_BIG_ENDIAN); - curr_offset++; - i++; + while ((curr_offset - offset) < plmn_id_act_len) { + sub_tree = proto_tree_add_subtree_format(tree, tvb, curr_offset, 5, ett_nas_5gs_mm_sor, NULL, "List item %u", i); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, true); + curr_offset += 3; + proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, flags_access_tech_1, ENC_BIG_ENDIAN); + curr_offset++; + proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, flags_access_tech_2, ENC_BIG_ENDIAN); + curr_offset++; + i++; + } } proto_tree_add_bitmask_list_ret_uint64(tree, tvb, curr_offset, 1, flags_oct_o, ENC_BIG_ENDIAN, &oct_o_flags); curr_offset++; if (oct_o_flags & 0x01) { proto_tree_add_item_ret_uint(tree, hf_nas_5gs_sor_cmci_len, tvb, curr_offset, 2, ENC_BIG_ENDIAN, &cont_len); curr_offset += 2; - proto_tree_add_item(tree, hf_nas_5gs_sor_cmci_payload, tvb, curr_offset, len, ENC_NA); - curr_offset += len; + proto_tree_add_item(tree, hf_nas_5gs_sor_cmci_payload, tvb, curr_offset, cont_len, ENC_NA); + curr_offset += cont_len; } if (oct_o_flags & 0x04) { proto_tree_add_item_ret_uint(tree, hf_nas_5gs_sor_snpn_si_len, tvb, curr_offset, 2, ENC_BIG_ENDIAN, &cont_len); curr_offset += 2; - proto_tree_add_item(tree, hf_nas_5gs_sor_snpn_si_payload, tvb, curr_offset, len, ENC_NA); - curr_offset += len; + proto_tree_add_item(tree, hf_nas_5gs_sor_snpn_si_payload, tvb, curr_offset, cont_len, ENC_NA); + curr_offset += cont_len; } if (oct_o_flags & 0x08) { proto_tree_add_item_ret_uint(tree, hf_nas_5gs_sor_snpn_si_ls_len, tvb, curr_offset, 2, ENC_BIG_ENDIAN, &cont_len); curr_offset += 2; - proto_tree_add_item(tree, hf_nas_5gs_sor_snpn_si_ls_payload, tvb, curr_offset, len, ENC_NA); - curr_offset += len; + proto_tree_add_item(tree, hf_nas_5gs_sor_snpn_si_ls_payload, tvb, curr_offset, cont_len, ENC_NA); + curr_offset += cont_len; } } else { /* PLMN ID and access technology list octet 23*-102* */ @@ -4009,7 +4014,9 @@ /* EIA0 128-EIA1 128-EIA2 128-EIA3 EIA4 EIA5 EIA6 EIA7 octet 6 */ proto_tree_add_bitmask_list(tree, tvb, curr_offset, 1, oct6_flags, ENC_NA); + curr_offset++; + EXTRANEOUS_DATA_CHECK(len, curr_offset - offset, pinfo, &ei_nas_5gs_extraneous_data); return len; } @@ -4650,8 +4657,8 @@ subtree = proto_tree_add_subtree(tree, tvb, offset, 1, ett_nas_5gs_mm_reg_wait_range, NULL, "Minimum registration wait time"); de_gc_timer(tvb, subtree, pinfo, offset, 1, NULL, 0); - subtree = proto_tree_add_subtree(tree, tvb, offset+1, 1, ett_nas_5gs_mm_reg_wait_range, NULL, "Minimum registration wait time"); - de_gc_timer(tvb, subtree, pinfo, offset, 1, NULL, 0); + subtree = proto_tree_add_subtree(tree, tvb, offset+1, 1, ett_nas_5gs_mm_reg_wait_range, NULL, "Maximum registration wait time"); + de_gc_timer(tvb, subtree, pinfo, offset+1, 1, NULL, 0); return len; } @@ -4693,7 +4700,7 @@ while ((curr_offset - offset) < len) { proto_item *item; proto_tree *subtree; - uint32_t nsag_len, s_nssai_len, tai_len, nsag_start; + uint32_t nsag_len, s_nssai_len, s_nssai_start, tai_len, nsag_start, length; subtree = proto_tree_add_subtree_format(tree, tvb, curr_offset, -1, ett_nas_5gs_mm_nsag_info, &item, "NSSRG values for S-NSSAI %u", i); proto_tree_add_item_ret_uint(subtree, hf_nas_5gs_mm_nsag_info_len, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &nsag_len); @@ -4704,7 +4711,12 @@ curr_offset++; proto_tree_add_item_ret_uint(subtree, hf_nas_5gs_mm_nsag_info_s_nssai_len, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &s_nssai_len); curr_offset++; - curr_offset += de_nas_5gs_cmn_s_nssai(tvb, subtree, pinfo, curr_offset, s_nssai_len, NULL, 0); + s_nssai_start = curr_offset; + while ((curr_offset - s_nssai_start) < s_nssai_len) { + proto_tree_add_item_ret_uint(subtree, hf_nas_5gs_mm_length, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &length); + curr_offset++; + curr_offset += de_nas_5gs_cmn_s_nssai(tvb, subtree, pinfo, curr_offset, length, NULL, 0); + } proto_tree_add_item(subtree, hf_nas_5gs_mm_nsag_prio, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; if ((curr_offset - nsag_start) < nsag_len) { @@ -5077,12 +5089,12 @@ proto_tree_add_item_ret_uint(subtree, hf_nas_5gs_mm_length, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &length); curr_offset++; curr_offset += de_nas_5gs_cmn_s_nssai(tvb, subtree, pinfo, curr_offset, length, NULL, 0); - proto_tree_add_item_ret_uint(subtree, hf_nas_5gs_mm_s_nssai_loc_valid_info_per_s_nssai_nb_nr_cgi, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &length); - curr_offset++; + proto_tree_add_item_ret_uint(subtree, hf_nas_5gs_mm_s_nssai_loc_valid_info_per_s_nssai_nb_nr_cgi, tvb, curr_offset, 2, ENC_BIG_ENDIAN, &length); + curr_offset += 2; for (j = 0; j < length; j++) { proto_tree_add_item(subtree, hf_nas_5gs_mm_s_nssai_loc_valid_info_per_s_nssai_nr_cell_id, tvb, curr_offset, 5, ENC_BIG_ENDIAN); curr_offset += 5; - curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, E212_NONE, true); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, subtree, curr_offset, E212_NONE, true); } proto_item_set_len(item, curr_offset - start_offset); } @@ -6958,14 +6970,12 @@ uint32_t type, param_len, param_offset = curr_offset; subtree = proto_tree_add_subtree_format(tree, tvb, curr_offset, -1, ett_nas_5gs_cmn_service_level_aa_cont_param, &item, "Service-level-AA parameter %d", i + 1); - type = tvb_get_uint8(tvb, curr_offset); + proto_tree_add_item_ret_uint(subtree, hf_nas_5gs_cmn_service_level_aa_param_type, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &type); + curr_offset++; if ((type & NAS_5GS_TV_IE_MASK) == NAS_5GS_TV_IE_VAL) { param_len = 0; type &= 0xf0; - } - proto_tree_add_uint(subtree, hf_nas_5gs_cmn_service_level_aa_param_type, tvb, curr_offset, 1, type); - curr_offset++; - if ((type & NAS_5GS_TLV_E_IE_MASK) == NAS_5GS_TLV_E_IE_VAL) { + } else if ((type & NAS_5GS_TLV_E_IE_MASK) == NAS_5GS_TLV_E_IE_VAL) { proto_tree_add_item_ret_uint(subtree, hf_nas_5gs_cmn_service_level_aa_param_len, tvb, curr_offset, 2, ENC_BIG_ENDIAN, ¶m_len); curr_offset += 2; } else { @@ -15080,7 +15090,7 @@ }, { &hf_nas_5gs_mm_s_nssai_loc_valid_info_per_s_nssai_nb_nr_cgi, { "Number of NR CGIs", "nas-5gs.mm.s_nssai_loc_valid_info.nb_nr_cgi", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_nas_5gs_mm_s_nssai_loc_valid_info_per_s_nssai_nr_cell_id, diff -Nru wireshark-4.4.16/epan/dissectors/packet-ositp.c wireshark-4.4.18/epan/dissectors/packet-ositp.c --- wireshark-4.4.16/epan/dissectors/packet-ositp.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-ositp.c 2026-08-12 17:19:13.000000000 +0000 @@ -676,7 +676,7 @@ } else { uint32_t calc_c0 = 0, calc_c1 = 0; - if (osi_calc_checksum(tvb, 0, length, &calc_c0, &calc_c1)) { + if (osi_calc_checksum(tvb, 0, tpdu_len, &calc_c0, &calc_c1)) { /* Successfully processed checksum, verify it */ proto_tree_add_checksum(tree, tvb, offset, hf_cotp_checksum, hf_cotp_checksum_status, &ei_cotp_checksum, pinfo, calc_c0 | calc_c1, ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY|PROTO_CHECKSUM_ZERO); } else { diff -Nru wireshark-4.4.16/epan/dissectors/packet-reload.c wireshark-4.4.18/epan/dissectors/packet-reload.c --- wireshark-4.4.16/epan/dissectors/packet-reload.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-reload.c 2026-08-12 17:19:13.000000000 +0000 @@ -1017,7 +1017,7 @@ } static int -dissect_opaque_string_or_data(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, int anchor_index, uint16_t offset, uint16_t length_size, int32_t max_field_length, bool is_string) +dissect_opaque_string_or_data(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, int anchor_index, unsigned offset, uint16_t length_size, int32_t max_field_length, bool is_string) { proto_tree *opaque_tree; proto_item *ti_anchor; @@ -1085,16 +1085,16 @@ } static int -dissect_opaque(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, int anchor_index, uint16_t offset, uint16_t length_size, int32_t max_field_length) { +dissect_opaque(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, int anchor_index, unsigned offset, uint16_t length_size, int32_t max_field_length) { return dissect_opaque_string_or_data(tvb, pinfo, tree, anchor_index, offset, length_size, max_field_length, false); } static int -dissect_opaque_string(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, int anchor_index, uint16_t offset, uint16_t length_size, int32_t max_field_length) { +dissect_opaque_string(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, int anchor_index, unsigned offset, uint16_t length_size, int32_t max_field_length) { return dissect_opaque_string_or_data(tvb, pinfo, tree, anchor_index, offset, length_size, max_field_length, true); } -static int dissect_length(tvbuff_t *tvb, proto_tree *tree, uint16_t offset, uint16_t length_size) { +static int dissect_length(tvbuff_t *tvb, proto_tree *tree, unsigned offset, uint16_t length_size) { switch (length_size) { case 1: proto_tree_add_item(tree, hf_reload_length_uint8, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -1118,7 +1118,7 @@ return 0; } -static int dissect_resourceid(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_resourceid(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -1153,7 +1153,7 @@ return 1+local_length; } -static int dissect_nodeid(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_nodeid(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_nodeid; int hf = hf_reload_nodeid; @@ -1201,7 +1201,7 @@ } static int -dissect_destination(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_destination(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { uint8_t destination_type; proto_tree *destination_tree; @@ -1265,7 +1265,7 @@ static int -dissect_destination_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *list_tree, uint16_t offset, uint16_t length, int *numDestinations) +dissect_destination_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *list_tree, unsigned offset, uint16_t length, int *numDestinations) { int local_offset = 0; int local_increment; @@ -1281,7 +1281,7 @@ } static int -dissect_probe_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_probe_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_probe_information; proto_tree *probe_information_tree; @@ -1341,7 +1341,7 @@ static int -dissect_ipaddressport(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset) +dissect_ipaddressport(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset) { proto_item *ti_ipaddressport; proto_tree *ipaddressport_tree; @@ -1403,7 +1403,7 @@ } static int -dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_icecandidates; proto_tree *icecandidates_tree; @@ -1562,7 +1562,7 @@ } static int -dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_attachreqans; proto_tree *attachreqans_tree; @@ -1624,7 +1624,7 @@ static int -dissect_sipregistration(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, uint16_t offset, uint16_t length) +dissect_sipregistration(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local, *ti_sipregistrationdata; proto_tree *local_tree, *sipregistrationdata_tree; @@ -1677,7 +1677,7 @@ } static int -dissect_turnserver(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_turnserver(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -1693,7 +1693,7 @@ return local_offset; } -static int dissect_redirserviceproviderdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_redirserviceproviderdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -1711,7 +1711,7 @@ return length; } -static int dissect_redirserviceprovider(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_redirserviceprovider(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -1737,7 +1737,7 @@ return (2+length_field); } -static int dissect_datavalue(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length, bool meta, kind_t *kind) { +static int dissect_datavalue(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length, bool meta, kind_t *kind) { proto_item *ti_datavalue; proto_tree *datavalue_tree; @@ -1851,7 +1851,7 @@ return 0; } -static unsigned getDataValueLength(tvbuff_t *tvb, uint16_t offset, bool meta) { +static unsigned getDataValueLength(tvbuff_t *tvb, unsigned offset, bool meta) { if (meta != true) { unsigned value_length = tvb_get_ntohl(tvb,offset+1); return (1+4+value_length); @@ -1863,7 +1863,7 @@ return 0; } -static int dissect_arrayentry(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length, bool meta, kind_t *kind) { +static int dissect_arrayentry(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length, bool meta, kind_t *kind) { proto_item *ti_arrayentry, *ti_index; proto_tree *arrayentry_tree; int data_length = getDataValueLength(tvb, offset+4, meta); @@ -1894,7 +1894,7 @@ return (4+data_length); } -static int dissect_dictionaryentry(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length, bool meta, kind_t *kind) { +static int dissect_dictionaryentry(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length, bool meta, kind_t *kind) { proto_item *ti_dictionaryentry; proto_tree *dictionaryentry_tree; int local_offset = 0; @@ -1967,7 +1967,7 @@ } static int -dissect_signature(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset) +dissect_signature(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset) { int local_offset = 0; proto_item *ti_signature; @@ -2066,7 +2066,7 @@ static int -dissect_storeddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length, kind_t *kind, bool meta) +dissect_storeddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length, kind_t *kind, bool meta) { proto_item *ti_storeddata; proto_tree *storeddata_tree; @@ -2136,7 +2136,7 @@ static int -dissect_kindid(int anchor, tvbuff_t *tvb, proto_tree *tree, uint16_t offset, kind_t **kind) +dissect_kindid(int anchor, tvbuff_t *tvb, proto_tree *tree, unsigned offset, kind_t **kind) { proto_item *ti_kindid; uint32_t kindid = 0; @@ -2159,7 +2159,7 @@ } static int -dissect_kinddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length, bool meta) +dissect_kinddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length, bool meta) { proto_item *ti_kinddata; proto_item *kinddata_tree; @@ -2218,7 +2218,7 @@ return local_offset; } -static int dissect_nodeid_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length, int hf) +static int dissect_nodeid_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length, int hf) { uint16_t list_length; uint16_t local_offset = 0; @@ -2254,7 +2254,7 @@ static int -dissect_storekindresponse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_storekindresponse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -2283,7 +2283,7 @@ } static int -dissect_storeans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_storeans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local, *ti_kind_responses; proto_tree *local_tree, *kind_responses_tree; @@ -2314,7 +2314,7 @@ } static int -dissect_storereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_storereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_storereq; proto_tree *storereq_tree; @@ -2385,7 +2385,7 @@ return local_offset; } -static int dissect_arrayrange(tvbuff_t *tvb, proto_tree *tree, uint16_t offset) { +static int dissect_arrayrange(tvbuff_t *tvb, proto_tree *tree, unsigned offset) { proto_item *ti; int32_t first; int32_t last; @@ -2405,7 +2405,7 @@ } static int -dissect_storeddataspecifier(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_storeddataspecifier(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { uint16_t length_field, local_offset = 0; proto_item *ti_storeddataspecifier; @@ -2481,7 +2481,7 @@ static int -dissect_fetchreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length, bool meta) +dissect_fetchreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length, bool meta) { proto_item *ti_fetchreq; proto_item *ti_specifiers; @@ -2536,7 +2536,7 @@ static int -dissect_fetchans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_fetchans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_fetchans; proto_tree *fetchans_tree; @@ -2568,7 +2568,7 @@ static int -dissect_statans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_statans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_statans; proto_tree *statans_tree; @@ -2607,7 +2607,7 @@ static int -dissect_chordupdate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_chordupdate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_chordupdate; proto_tree *chordupdate_tree; @@ -2643,7 +2643,7 @@ static int -dissect_chordroutequeryans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_chordroutequeryans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_chordroutequeryans; proto_tree *chordroutequeryans_tree; @@ -2656,7 +2656,7 @@ } static int -dissect_chordleavedata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +dissect_chordleavedata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -2685,7 +2685,7 @@ return local_offset; } -static int dissect_kindid_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_kindid_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -2717,7 +2717,7 @@ return (1+kinds_length); } -static int dissect_findreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) { +static int dissect_findreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; uint16_t local_offset = 0; @@ -2731,7 +2731,7 @@ return length; } -static int dissect_findans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) { +static int dissect_findans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; uint16_t results_length; @@ -2774,7 +2774,7 @@ return length; } -static int dissect_selftuningdata(tvbuff_t *tvb, proto_tree *tree, uint16_t offset) +static int dissect_selftuningdata(tvbuff_t *tvb, proto_tree *tree, unsigned offset) { proto_item *ti_local; proto_tree *local_tree; @@ -2789,7 +2789,7 @@ return 12; } -static int dissect_extensiveroutingmodeoption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_extensiveroutingmodeoption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -2826,7 +2826,7 @@ return local_offset; } -static int dissect_forwardingoption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_forwardingoption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_option; uint16_t local_offset = 0; @@ -2873,7 +2873,7 @@ return local_offset; } -static int dissect_dmflag(tvbuff_t *tvb, proto_tree *tree, uint16_t offset) { +static int dissect_dmflag(tvbuff_t *tvb, proto_tree *tree, unsigned offset) { proto_item *ti_local; proto_tree *local_tree; unsigned i; @@ -2890,7 +2890,7 @@ return 8; } -static int dissect_diagnosticextension(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_diagnosticextension(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -2908,7 +2908,7 @@ return local_offset; } -static int dissect_diagnosticrequest(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) { +static int dissect_diagnosticrequest(int anchor, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; uint16_t local_offset = 0; @@ -2964,7 +2964,7 @@ return local_offset; } -static int dissect_pathtrackreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_pathtrackreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -2978,7 +2978,7 @@ return local_offset; } -static int dissect_diagnosticinfo(tvbuff_t *tvb, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_diagnosticinfo(tvbuff_t *tvb, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -3144,7 +3144,7 @@ } -static int dissect_diagnosticresponse(int anchor, tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, uint16_t offset, uint16_t length) { +static int dissect_diagnosticresponse(int anchor, tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; uint16_t local_offset = 0; @@ -3195,7 +3195,7 @@ return local_offset; } -static int dissect_pathtrackans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_pathtrackans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -3209,7 +3209,7 @@ return local_offset; } -static int dissect_joinreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_joinreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -3224,7 +3224,7 @@ return local_offset; } -static int dissect_joinans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_joinans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -3238,7 +3238,7 @@ return local_offset; } -static int dissect_leavereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_leavereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local; proto_tree *local_tree; @@ -3271,7 +3271,7 @@ return local_offset; } -static int dissect_probereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_probereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local, *ti_requested_info; proto_tree *local_tree, *requested_info_tree; @@ -3305,7 +3305,7 @@ return info_list_length; } -static int dissect_probeans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +static int dissect_probeans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { proto_item *ti_local, *ti_infos; proto_tree *local_tree, *infos_tree; @@ -3339,7 +3339,7 @@ return length; } -extern int dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length) +extern int dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length) { uint32_t message_body_length; uint32_t extensions_length; @@ -3855,7 +3855,7 @@ uint32_t relo_token; unsigned effective_length; unsigned msg_length, dgram_msg_length; - uint16_t offset; + unsigned offset; conversation_t *conversation; reload_conv_info_t *reload_info; reload_transaction_t *reload_trans; @@ -4006,7 +4006,7 @@ offset += MIN_HDR_LENGTH; - if (((unsigned)offset + via_list_length) > msg_length) { + if ((offset + via_list_length) > msg_length) { expert_add_info(pinfo, ti, &ei_reload_truncated_packet); return MIN_HDR_LENGTH; } @@ -4023,7 +4023,7 @@ } offset += via_list_length; - if (((unsigned)offset + destination_list_length) > msg_length) { + if ((offset + destination_list_length) > msg_length) { expert_add_info(pinfo, ti, &ei_reload_truncated_packet); return offset; } @@ -4042,7 +4042,7 @@ } offset += destination_list_length; - if (((unsigned)offset + options_length) > msg_length) { + if ((offset + options_length) > msg_length) { expert_add_info(pinfo, ti, &ei_reload_truncated_packet); return offset; } diff -Nru wireshark-4.4.16/epan/dissectors/packet-reload.h wireshark-4.4.18/epan/dissectors/packet-reload.h --- wireshark-4.4.16/epan/dissectors/packet-reload.h 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-reload.h 2026-08-12 17:19:13.000000000 +0000 @@ -13,6 +13,6 @@ #ifndef __PACKET_RELOAD_H__ #define __PACKET_RELOAD_H__ -extern int dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint16_t offset, uint16_t length); +extern int dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, uint16_t length); #endif diff -Nru wireshark-4.4.16/epan/dissectors/packet-rlogin.c wireshark-4.4.18/epan/dissectors/packet-rlogin.c --- wireshark-4.4.16/epan/dissectors/packet-rlogin.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-rlogin.c 2026-08-12 17:19:13.000000000 +0000 @@ -71,11 +71,13 @@ DONE=2 } session_state_t; +/* Modern systems often support up to 256 these days (but rlogin isn't + * used so much anymore.) */ #define NAME_LEN 32 typedef struct { session_state_t state; uint32_t info_framenum; - char user_name[NAME_LEN]; + char* user_name; } rlogin_hash_entry_t; @@ -157,9 +159,17 @@ else if (stringlen > NAME_LEN - 1) stringlen = NAME_LEN - 1; /* name too long */ - /* Copy and terminate string into hash name */ - tvb_memcpy(tvb, (uint8_t *)hash_info->user_name, 0, stringlen); - hash_info->user_name[stringlen] = '\0'; + /* Copy string into hash name */ + /* POSIX-2024 strongly recommends that user names be composed of + * characteers from the portable filename character set and that + * the first character cannot be '-'. We could check this with + * module_check_valid_name and add an expert info in the tree, + * since that's exactly what that function tests. (There's also + * some usernames with '$' at the end for Samba, IIRC.) + * https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/V1_chap03.html#tag_03_409 + * https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/V1_chap03.html#tag_03_265 + */ + hash_info->user_name = (char *)tvb_get_string_enc(wmem_file_scope(), tvb, 0, stringlen, ENC_ASCII); col_append_str(pinfo->cinfo, COL_INFO, ", (User information)"); } @@ -399,7 +409,7 @@ hash_info = wmem_new(wmem_file_scope(), rlogin_hash_entry_t); hash_info->state = NONE; hash_info->info_framenum = 0; /* no frame has the number 0 */ - hash_info->user_name[0] = '\0'; + hash_info->user_name = NULL; /* ... and store in conversation */ conversation_add_proto_data(conversation, proto_rlogin, hash_info); @@ -410,7 +420,7 @@ /* Set info column */ /* Show user-name if available */ - if (hash_info->user_name[0]) + if (hash_info->user_name) { col_add_fstr(pinfo->cinfo, COL_INFO, "User name: %s, ", hash_info->user_name); diff -Nru wireshark-4.4.16/epan/dissectors/packet-rmt-alc.c wireshark-4.4.18/epan/dissectors/packet-rmt-alc.c --- wireshark-4.4.16/epan/dissectors/packet-rmt-alc.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-rmt-alc.c 2026-08-12 17:19:13.000000000 +0000 @@ -99,7 +99,7 @@ static void try_uncompress(tvbuff_t *tvb, packet_info *pinfo, int offset, /*int len,*/ proto_item *ti) { - tvbuff_t *uncompress_tvb = tvb_uncompress_zlib(tvb, offset, tvb_captured_length(tvb) - offset); + tvbuff_t *uncompress_tvb = tvb_child_uncompress_zlib(tvb, tvb, offset, tvb_captured_length_remaining(tvb, offset)); if (uncompress_tvb) { add_new_data_source(pinfo, uncompress_tvb, "Uncompressed Payload"); diff -Nru wireshark-4.4.16/epan/dissectors/packet-rrc.c wireshark-4.4.18/epan/dissectors/packet-rrc.c --- wireshark-4.4.16/epan/dissectors/packet-rrc.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-rrc.c 2026-08-12 17:19:13.000000000 +0000 @@ -18805,6 +18805,11 @@ rbid = private_data_get_rbid(actx); rlc_ciphering_sqn = private_data_get_rlc_ciphering_sqn(actx); direction = fpinf->is_uplink ? P2P_DIR_UL : P2P_DIR_DL; + if (rbid >= G_N_ELEMENTS(ciphering_info->seq_no) || + direction >= G_N_ELEMENTS(ciphering_info->seq_no[0])) { + return offset; + } + /*Set the ciphering activation frame information*/ ciphering_info->seq_no[rbid][direction] = rlc_ciphering_sqn; diff -Nru wireshark-4.4.16/epan/dissectors/packet-ssh.c wireshark-4.4.18/epan/dissectors/packet-ssh.c --- wireshark-4.4.16/epan/dissectors/packet-ssh.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-ssh.c 2026-08-12 17:19:13.000000000 +0000 @@ -2125,7 +2125,7 @@ cookie = split[0]; key = split[1]; } else { - ws_debug("ssh keylog: invalid format"); + ws_info("ssh keylog: invalid format"); g_strfreev(split); return; } @@ -2133,17 +2133,27 @@ key_len = strlen(key); cookie_len = strlen(cookie); if(key_len & 1){ - ws_debug("ssh keylog: invalid format (key could at least be even!)"); + ws_info("ssh keylog: invalid format (key should at least be even!)"); g_strfreev(split); return; } if(cookie_len & 1){ - ws_debug("ssh keylog: invalid format (cookie could at least be even!)"); + ws_info("ssh keylog: invalid format (cookie should at least be even!)"); g_strfreev(split); return; } ssh_bignum * bn_cookie = ssh_kex_make_bignum(NULL, (unsigned)(cookie_len/2)); + if (bn_cookie == NULL) { + ws_info("ssh keylog: invalid format (invalid cookie length %zu)", cookie_len); + g_strfreev(split); + return; + } ssh_bignum * bn_priv = ssh_kex_make_bignum(NULL, (unsigned)(key_len/2)); + if (bn_priv == NULL) { + ws_info("ssh keylog: invalid format (invalid key length %zu)", key_len); + g_strfreev(split); + return; + } uint8_t c; for (size_t i = 0; i < key_len/2; i ++) { char v0 = key[i * 2]; @@ -2628,6 +2638,10 @@ gcry_mpi_release(e); gcry_mpi_release(m); }else if(kex_type==SSH_KEX_CURVE25519){ + if (priv->length != 32 || pub->length != 32) { + ws_debug("curve25519: bad key length pub=%u or priv=%u != 32", pub->length, priv->length); + return NULL; + } if (crypto_scalarmult_curve25519(secret->data, priv->data, pub->data)) { ws_debug("curve25519: can't compute shared secret"); return NULL; diff -Nru wireshark-4.4.16/epan/dissectors/packet-tds.c wireshark-4.4.18/epan/dissectors/packet-tds.c --- wireshark-4.4.16/epan/dissectors/packet-tds.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-tds.c 2026-08-12 17:19:13.000000000 +0000 @@ -4516,7 +4516,7 @@ static void dissect_tds7_login(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tds_conv_info_t *tds_info) { - unsigned offset, i, j, k, offset2, len, login_hf = 0; + unsigned offset, i, j, offset2, len, login_hf = 0; proto_tree *login_tree; proto_tree *header_tree; proto_tree *length_tree; @@ -4636,7 +4636,7 @@ val = tvb_memdup(wmem_packet_scope(), tvb, offset2, len); val2 = wmem_strbuf_new_sized(wmem_packet_scope(), len/2+1); - for(j = 0, k = 0; j < len; j += 2, k++) { + for(j = 0; j < len; j += 2) { val[j] ^= 0xA5; /* Swap the most and least significant bits */ diff -Nru wireshark-4.4.16/epan/dissectors/packet-umts_fp.c wireshark-4.4.18/epan/dissectors/packet-umts_fp.c --- wireshark-4.4.16/epan/dissectors/packet-umts_fp.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-umts_fp.c 2026-08-12 17:19:13.000000000 +0000 @@ -261,10 +261,10 @@ /* E-DCH (T2) channel header information */ struct edch_t2_subframe_info { - uint8_t subframe_number; - uint8_t number_of_mac_is_pdus; - uint8_t number_of_mac_is_sdus[16]; - uint8_t mac_is_lchid[16][16]; + uint8_t subframe_number; + uint8_t number_of_mac_is_pdus; + uint8_t number_of_mac_is_sdus[16]; + uint8_t mac_is_lchid[16][16]; uint16_t mac_is_length[16][16]; }; @@ -705,8 +705,8 @@ proto_item_set_text(tree_ti, "TB data for %u chans", p_fp_info->num_chans); data_tree = proto_item_add_subtree(tree_ti, ett_fp_data); - if (p_fp_info->num_chans >= MAX_MAC_FRAMES) { - expert_add_info_format(pinfo, data_tree, &ei_fp_invalid_frame_count, "Invalid Number of channels (max is %u)", MAX_MAC_FRAMES); + if (p_fp_info->num_chans >= MAX_FP_CHANS) { + expert_add_info_format(pinfo, data_tree, &ei_fp_invalid_frame_count, "Invalid Number of channels (max is %u)", MAX_FP_CHANS); return offset; } @@ -3053,12 +3053,17 @@ ett_fp_edch_macis_descriptors); /* Find a sequence of descriptors for each MAC-is PDU in this subframe */ - for (pdu_no=0; pdu_no < subframes[n].number_of_mac_is_pdus; pdu_no++) { + for (pdu_no=0; pdu_no < subframes[n].number_of_mac_is_pdus && pdu_no < 16; pdu_no++) { proto_item *f_ti = NULL; subframes[n].number_of_mac_is_sdus[pdu_no] = 0; do { + if (subframes[n].number_of_mac_is_sdus[pdu_no] == 16) { + expert_add_info_format(pinfo, f_ti, &ei_fp_mac_is_sdus_miscount, "Found too many (%u) MAC-is SDUs - max tracked is 16", macis_sdus_found); + break; + } + /* Check we haven't gone past the limit */ if (macis_sdus_found++ > total_macis_sdus) { expert_add_info_format(pinfo, f_ti, &ei_fp_mac_is_sdus_miscount, "Found too many (%u) MAC-is SDUs - header said there were %u", macis_sdus_found, (uint16_t)total_macis_sdus); @@ -3099,7 +3104,6 @@ f_ti = proto_tree_add_item(subframe_macis_descriptors_tree, hf_fp_edch_macis_flag, tvb, offset, 1, ENC_BIG_ENDIAN); subframes[n].number_of_mac_is_sdus[pdu_no]++; - offset++; } while (F == 0); } @@ -3128,7 +3132,7 @@ } /* Call MAC for this PDU if configured to */ - if (preferences_call_mac_dissectors) { + if (preferences_call_mac_dissectors && data) { p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0, mac_is_info); call_dissector_with_data(mac_fdd_edch_type2_handle, tvb_new_subset_remaining(tvb, offset), pinfo, top_level_tree, data); } diff -Nru wireshark-4.4.16/epan/dissectors/packet-woww.c wireshark-4.4.18/epan/dissectors/packet-woww.c --- wireshark-4.4.16/epan/dissectors/packet-woww.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-woww.c 2026-08-12 17:19:13.000000000 +0000 @@ -12487,7 +12487,7 @@ ptvcursor_add(ptv, hf_woww_client_seed, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(ptv, hf_woww_client_proof, 20, ENC_NA); ptvcursor_add(ptv, hf_woww_decompressed_size, 4, ENC_LITTLE_ENDIAN); - compressed_tvb = tvb_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); + compressed_tvb = tvb_child_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); if (compressed_tvb != NULL) { ptvcursor_t* old_ptv = ptv; ptv = ptvcursor_new(wmem_packet_scope(), tree, compressed_tvb, 0); @@ -13097,7 +13097,7 @@ if (category == GM_TICKET_TYPE_BEHAVIOR_HARASSMENT) { ptvcursor_add(ptv, hf_woww_chat_data_line_count, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(ptv, hf_woww_decompressed_size, 4, ENC_LITTLE_ENDIAN); - compressed_tvb = tvb_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); + compressed_tvb = tvb_child_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); if (compressed_tvb != NULL) { ptvcursor_t* old_ptv = ptv; ptv = ptvcursor_new(wmem_packet_scope(), tree, compressed_tvb, 0); @@ -13918,7 +13918,7 @@ case CMSG_UPDATE_ACCOUNT_DATA: ptvcursor_add(ptv, hf_woww_account_data_type, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(ptv, hf_woww_decompressed_size, 4, ENC_LITTLE_ENDIAN); - compressed_tvb = tvb_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); + compressed_tvb = tvb_child_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); if (compressed_tvb != NULL) { ptvcursor_t* old_ptv = ptv; ptv = ptvcursor_new(wmem_packet_scope(), tree, compressed_tvb, 0); @@ -16368,7 +16368,7 @@ break; case SMSG_COMPRESSED_MOVES: ptvcursor_add(ptv, hf_woww_decompressed_size, 4, ENC_LITTLE_ENDIAN); - compressed_tvb = tvb_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); + compressed_tvb = tvb_child_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); if (compressed_tvb != NULL) { ptvcursor_t* old_ptv = ptv; ptv = ptvcursor_new(wmem_packet_scope(), tree, compressed_tvb, 0); @@ -16449,7 +16449,7 @@ break; case SMSG_COMPRESSED_UPDATE_OBJECT: ptvcursor_add(ptv, hf_woww_decompressed_size, 4, ENC_LITTLE_ENDIAN); - compressed_tvb = tvb_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); + compressed_tvb = tvb_child_uncompress_zlib(ptvcursor_tvbuff(ptv), ptvcursor_tvbuff(ptv), ptvcursor_current_offset(ptv), offset_packet_end - ptvcursor_current_offset(ptv)); if (compressed_tvb != NULL) { ptvcursor_t* old_ptv = ptv; ptv = ptvcursor_new(wmem_packet_scope(), tree, compressed_tvb, 0); diff -Nru wireshark-4.4.16/epan/dissectors/packet-x509af.c wireshark-4.4.18/epan/dissectors/packet-x509af.c --- wireshark-4.4.16/epan/dissectors/packet-x509af.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-x509af.c 2026-08-12 17:19:13.000000000 +0000 @@ -196,18 +196,12 @@ offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_algorithm_id, &actx->external.direct_reference); - if (algorithm_id) { - wmem_free(wmem_file_scope(), (void*)algorithm_id); - } - if(actx->external.direct_reference) { algorithm_id = (const char *)wmem_strdup(wmem_file_scope(), actx->external.direct_reference); name = oid_resolved_from_string(actx->pinfo->pool, actx->external.direct_reference); proto_item_append_text(tree, " (%s)", name ? name : actx->external.direct_reference); - } else { - algorithm_id = NULL; } @@ -233,6 +227,11 @@ int dissect_x509af_AlgorithmIdentifier(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + if (algorithm_id) { + wmem_free(wmem_file_scope(), (void*)algorithm_id); + algorithm_id = NULL; + } + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, AlgorithmIdentifier_sequence, hf_index, ett_x509af_AlgorithmIdentifier); diff -Nru wireshark-4.4.16/epan/dissectors/packet-x509if.c wireshark-4.4.18/epan/dissectors/packet-x509if.c --- wireshark-4.4.16/epan/dissectors/packet-x509if.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-x509if.c 2026-08-12 17:19:13.000000000 +0000 @@ -921,20 +921,22 @@ RelativeDistinguishedName_set_of, hf_index, ett_x509if_RelativeDistinguishedName); - /* we've finished - close the bracket */ - proto_item_append_text(top_of_rdn, " (%s)", wmem_strbuf_get_str(last_rdn_buf)); + if (last_rdn_buf) { + /* we've finished - close the bracket */ + proto_item_append_text(top_of_rdn, " (%s)", wmem_strbuf_get_str(last_rdn_buf)); - /* now append this to the DN */ - if (last_dn_buf) { - if(wmem_strbuf_get_len(last_dn_buf) > 0) { - wmem_strbuf_t *temp_dn_buf = wmem_strbuf_new_sized(actx->pinfo->pool, wmem_strbuf_get_len(last_rdn_buf) + wmem_strbuf_get_len(last_dn_buf) + 1); - wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); - wmem_strbuf_append_c(temp_dn_buf, ','); - wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_dn_buf)); - wmem_strbuf_destroy(last_dn_buf); - last_dn_buf = temp_dn_buf; - } else { - wmem_strbuf_append(last_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); + /* now append this to the DN */ + if (last_dn_buf) { + if(wmem_strbuf_get_len(last_dn_buf) > 0) { + wmem_strbuf_t *temp_dn_buf = wmem_strbuf_new_sized(actx->pinfo->pool, wmem_strbuf_get_len(last_rdn_buf) + wmem_strbuf_get_len(last_dn_buf) + 1); + wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); + wmem_strbuf_append_c(temp_dn_buf, ','); + wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_dn_buf)); + wmem_strbuf_destroy(last_dn_buf); + last_dn_buf = temp_dn_buf; + } else { + wmem_strbuf_append(last_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); + } } } diff -Nru wireshark-4.4.16/epan/dissectors/packet-z3950.c wireshark-4.4.18/epan/dissectors/packet-z3950.c --- wireshark-4.4.16/epan/dissectors/packet-z3950.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/packet-z3950.c 2026-08-12 17:19:13.000000000 +0000 @@ -12648,6 +12648,7 @@ proto_tree *marc_tree, *leader_tree, *directory_tree, *fields_tree; + wmem_array_t *marc_directory_array; marc_directory_entry *marc_directory; unsigned len = tvb_reported_length(tvb); const uint8_t *marc_value_str; @@ -12820,10 +12821,8 @@ directory_entry_len = 3 + length_of_field_size + starting_character_position_size; - directory_entry_count = ((data_offset - 1) - MARC_LEADER_LENGTH) / directory_entry_len; - marc_directory = (marc_directory_entry *)wmem_alloc0(pinfo->pool, - directory_entry_count * sizeof(marc_directory_entry)); + marc_directory_array = wmem_array_new(pinfo->pool, sizeof(marc_directory_entry)); directory_item = proto_tree_add_item(marc_tree, hf_marc_directory, tvb, offset, data_offset - offset, ENC_NA); @@ -12832,9 +12831,7 @@ dir_index = 0; /* Minus one for the terminator character */ while (offset < (data_offset - 1)) { - uint32_t tag_value = 0, - length_value = 0, - starting_char_value = 0; + marc_directory_entry new_entry = {0}; proto_item *length_item; proto_item *directory_entry_item; proto_tree *directory_entry_tree; @@ -12850,7 +12847,7 @@ offset += 3; if (marc_value_str) { if (isdigit_string(marc_value_str)) { - tag_value = (unsigned)strtoul(marc_value_str, NULL, 10); + new_entry.tag = (unsigned)strtoul(marc_value_str, NULL, 10); } else { expert_add_info_format(pinfo, item, @@ -12867,7 +12864,7 @@ offset += length_of_field_size; if (marc_value_str) { if (isdigit_string(marc_value_str)) { - length_value = (unsigned)strtoul(marc_value_str, NULL, 10); + new_entry.length = (unsigned)strtoul(marc_value_str, NULL, 10); } else { expert_add_info_format(pinfo, length_item, @@ -12883,7 +12880,7 @@ offset += starting_character_position_size; if (marc_value_str) { if (isdigit_string(marc_value_str)) { - starting_char_value = (unsigned)strtoul(marc_value_str, NULL, 10); + new_entry.starting_character = (unsigned)strtoul(marc_value_str, NULL, 10); } else { expert_add_info_format(pinfo, item, @@ -12893,23 +12890,24 @@ } } - if (starting_char_value >= (record_length - data_offset)) { + if (new_entry.starting_character >= (record_length - data_offset)) { expert_add_info_format(pinfo, item, &ei_marc_invalid_value, "MARC directory entry %d starting char value %d is outside record size %d", - dir_index, starting_char_value, (record_length - data_offset)); + dir_index, new_entry.starting_character, (record_length - data_offset)); } - if ((starting_char_value + length_value) >= (record_length - data_offset)) { + if ((new_entry.starting_character + new_entry.length) >= (record_length - data_offset)) { expert_add_info_format(pinfo, length_item, &ei_marc_invalid_value, "MARC directory entry %d length value %d goes outside record size %d", - dir_index, length_value, (record_length - data_offset)); + dir_index, new_entry.length, (record_length - data_offset)); } - marc_directory[dir_index].tag = tag_value; - marc_directory[dir_index].length = length_value; - marc_directory[dir_index].starting_character = starting_char_value; + wmem_array_append_one(marc_directory_array, new_entry); dir_index++; } + directory_entry_count = wmem_array_get_count(marc_directory_array); + marc_directory = (marc_directory_entry *)wmem_array_finalize(marc_directory_array); + proto_tree_add_item(directory_tree, hf_marc_directory_terminator, tvb, offset, 1, ENC_ASCII); offset += 1; diff -Nru wireshark-4.4.16/epan/dissectors/usb.c wireshark-4.4.18/epan/dissectors/usb.c --- wireshark-4.4.16/epan/dissectors/usb.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/dissectors/usb.c 2026-08-12 17:19:13.000000000 +0000 @@ -10844,6 +10844,8 @@ { 0x054c0e90, "Sony ILX-LR1" }, { 0x054c0ee7, "Sony ZV-E10M2" }, { 0x054c0eed, "Sony ILCE-1M2" }, + { 0x054c0f50, "Sony ILCE-7M5" }, + { 0x054c0f56, "Sony ILCE-7M5" }, { 0x054c1000, "Wireless Buzz! Receiver" }, { 0x054c1294, "Sony DCR-SR75" }, { 0x05500002, "InkJet Color Printer" }, @@ -14587,6 +14589,7 @@ { 0x07cf4500, "LV-20 Digital Camera" }, { 0x07cf6101, "fx-9750gII" }, { 0x07cf6102, "fx-CP400" }, + { 0x07cf6103, "fx-CG50" }, { 0x07cf6801, "PL-40R" }, { 0x07cf6802, "MIDI Keyboard" }, { 0x07cf6803, "CTK-3500 (MIDI keyboard)" }, @@ -15395,6 +15398,7 @@ { 0x091e50f0, "Garmin GPSMAP 67" }, { 0x091e5116, "Garmin Fenix 7s Pro Sapphire Solar" }, { 0x091e5117, "Garmin Fenix 7 Pro Solar" }, + { 0x091e5158, "Garmin Edge 1050" }, { 0x091e51b5, "Garmin Fenix 8 Solar Sapphire" }, { 0x091e51b6, "Garmin Fenix8" }, { 0x091e51b8, "Garmin Fenix 8 AMOLED" }, @@ -16051,6 +16055,7 @@ { 0x0a5c5804, "BCM5880 Secure Applications Processor with fingerprint swipe sensor" }, { 0x0a5c5832, "BCM5880 Secure Applications Processor Smartcard reader" }, { 0x0a5c5843, "BCM58200 ControlVault 3 (FingerPrint sensor + Contacted SmartCard)" }, + { 0x0a5c5865, "Fingerprint Reader (Dell Control Vault)" }, { 0x0a5c6300, "Pirelli Remote NDIS Device" }, { 0x0a5c6410, "BCM20703A1 Bluetooth 4.1 + LE" }, { 0x0a5cbd11, "BCM4320 802.11bg Wireless Adapter" }, @@ -21821,6 +21826,10 @@ { 0x17ef7e16, "Lenovo Tab P12" }, { 0x17ef7e7c, "Lenovo TAB M11" }, { 0x17ef7ea5, "Lenovo TAB Plus" }, + { 0x17ef7f40, "Lenovo Legion Tab Y700 (MTP)" }, + { 0x17ef7f41, "Lenovo Legion Tab Y700 (ADB+MTP)" }, + { 0x17ef7f44, "Lenovo Legion Tab Y700 (PTP)" }, + { 0x17ef7f45, "Lenovo Legion Tab Y700 (ADB+PTP)" }, { 0x17ef9039, "Lenovo P1060X" }, { 0x17efb000, "Virtual Keyboard and Mouse" }, { 0x17efb001, "Ethernet" }, @@ -24255,6 +24264,7 @@ { 0x25fb017b, "Pentax K3 II" }, { 0x25fb017d, "Pentax K70" }, { 0x25fb017f, "Pentax KP" }, + { 0x25fb018f, "Pentax K-3 Mark III Monochrome" }, { 0x25fb210b, "Ricoh WG-M2" }, { 0x25fb210f, "Ricoh GR III" }, { 0x25fb2115, "Ricoh GR IIIx" }, @@ -25030,6 +25040,7 @@ { 0x41021230, "A&K SE180" }, { 0x41021247, "A&K SR35" }, { 0x41021249, "A&K SE300" }, + { 0x41021262, "A&K SP4000" }, { 0x41022002, "H10 6GB" }, { 0x41022101, "iRiver H10 20GB" }, { 0x41022102, "iRiver H10 5GB" }, diff -Nru wireshark-4.4.16/epan/enterprises.c wireshark-4.4.18/epan/enterprises.c --- wireshark-4.4.16/epan/enterprises.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/enterprises.c 2026-08-12 17:19:13.000000000 +0000 @@ -8,7 +8,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -/* (last updated 2026-05-13) */ +/* (last updated 2026-08-07) */ #include "config.h" @@ -3736,7 +3736,7 @@ "BellSouth Wireless Data, L.P.", // 3714 "Teleste Corporation", // 3715 "Brand Communications Limited", // 3716 - "GeNUA mbH", // 3717 + "genua GmbH", // 3717 "Philips Broadband Networks", // 3718 "Exmicro", // 3719 "Visiqn", // 3720 @@ -3886,7 +3886,7 @@ "InTalk, Inc.", // 3864 "Thorne, West", // 3865 "Global Net Center", // 3866 - "Presence Technology GmbH+Co.KGMichael", // 3867 + "Webolution GmbH", // 3867 "Concentrix", // 3868 "IntelliLogic Networks, Inc.", // 3869 "Internet Business Emporium", // 3870 @@ -6208,7 +6208,7 @@ "Space CyberLink Inc.", // 6186 "Dartmouth-Hitchcock Medical Center", // 6187 "University of Massachusetts Lowell", // 6188 - "Eviden Germany GmbH - Trustcenter", // 6189 + "Atos Secure Digital GmbH - Trustcenter", // 6189 "Network365 Ltd", // 6190 "Plasmon, Inc.", // 6191 "Environmental Monitoring Solutions", // 6192 @@ -7233,7 +7233,7 @@ "Raiffeisen Schweiz", // 7211 "Raiffeisen Schweiz", // 7212 "Datria Systems", // 7213 - "Virginia-Meryland Regional College of Veterinary Medicine", // 7214 + "Virginia-Maryland College of Veterinary Medicine", // 7214 "ABN AMRO", // 7215 "Institut National de la Recherche Agronomique", // 7216 "The University of Memphis", // 7217 @@ -14270,7 +14270,7 @@ "Gemini Security Solutions, Inc.", // 14248 "Centre Hospitalier Henri Laborit", // 14249 "Conseil General de la Vienne", // 14250 - "Stellar Craft Inc.", // 14251 + "Stellar Craft, Inc.", // 14251 "Prime Solutions Ltd.", // 14252 "GridXpert", // 14253 "enhansiv", // 14254 @@ -14836,7 +14836,7 @@ "CaroTechnology BV", // 14814 "Datasul S.A.", // 14815 "Thomas Polnik", // 14816 - "4RF Communications Ltd.", // 14817 + "4RF", // 14817 "Voice Mobility, Inc.", // 14818 "University of Cyprus", // 14819 "net outremer caledonie", // 14820 @@ -18463,7 +18463,7 @@ "National Football League", // 18441 "Vimatix", // 18442 "Netsys.IT GbR", // 18443 - "Sandwich.Net, LLC", // 18444 + "Sandwich Internet Corp.", // 18444 "Datacard Corporation", // 18445 "Ascendant Technologies, Inc.", // 18446 "Willis Consulting", // 18447 @@ -19154,7 +19154,7 @@ "The Cheshire Web Mill", // 19132 "Baycom Opoto-Electronics Technology Co., Ltd.", // 19133 "Texocom Inc", // 19134 - "Darkerhosting.net", // 19135 + "spike.cx", // 19135 "Trichord, Inc.", // 19136 "Sebastian Staiger Computer Services", // 19137 "Bright Prospects LLC", // 19138 @@ -20772,7 +20772,7 @@ "Technolution BV", // 20750 "PERAX", // 20751 "SA Polyclinique de Courlancy", // 20752 - "Pharos Consulting (Pty) Ltd.", // 20753 + "Pharos Avantgard (Pty) Ltd.", // 20753 "Universitätsklinikum Aachen", // 20754 "WestGlobal Ltd.", // 20755 "het Concertgebouw NV", // 20756 @@ -22561,7 +22561,7 @@ "Champion Computer Technologies", // 22539 "Oulun Lyseon lukio", // 22540 "Open Acuity LLC", // 22541 - "Lex Persona", // 22542 + "Goodflag", // 22542 "GOUNOT", // 22543 "Host Collective Inc.", // 22544 "Daudt Consulting", // 22545 @@ -23962,7 +23962,7 @@ "Sysco S.p.A.", // 23940 "Opentaskforce", // 23941 "Intelligent Mobile Solutions, Inc.", // 23942 - "Cendres+Métaux Holding SA", // 23943 + "CMSA Holding SA", // 23943 "DENIC eG", // 23944 "Institute of Journalism, University Dortmund", // 23945 "MINISTERO DELL'INTERNO - DIREZIONE CENTRALE POLIZIA CRIMINALE", // 23946 @@ -33442,7 +33442,7 @@ "Voalte, Inc", // 33420 "South Gloucestershire Council CYP ICT", // 33421 "Com-Ned Netwerken B.V.", // 33422 - "Safran Passenger Innovations Germany GmbH", // 33423 + "RAVE Aerospace GmbH", // 33423 "ITXTEND LLC", // 33424 "Fortisbank NL NV", // 33425 "Mirae Ikorn company", // 33426 @@ -34578,7 +34578,7 @@ "EDAN INSTRUMENTS CO., LTD.", // 34556 "Ministerio de Justicia", // 34557 NULL, // 34558 - "Maschinenfabrik Reinhausen GmbH", // 34559 + "Reinhausen GmbH", // 34559 "Marquise Technologies", // 34560 "VITALATIV, s.r.o.", // 34561 "FUHST MEHRENS", // 34562 @@ -34604,7 +34604,7 @@ "Tuenti Technologies", // 34582 "V-Private AG", // 34583 "unterberg-electronic Gmbh", // 34584 - "REWE-Informations-Systeme GmbH", // 34585 + "REWE digital GmbH", // 34585 "Ontario Teachers Pension Plan Board", // 34586 "Hiive Systems", // 34587 "Beijing office of International Air Transport Association", // 34588 @@ -35429,7 +35429,7 @@ "BOUYGUES IMMOBILIER", // 35407 "Ing. Roman Těšík", // 35408 "AccelOps, Inc.", // 35409 - "SOLIS - Cooperativa de Soluções Livres Ltda", // 35410 + "SOLIS - Soluções Livres Ltda", // 35410 "Fortium Technologies Ltd", // 35411 "CZ-MAN s.r.o.", // 35412 "GlideAround LLC", // 35413 @@ -39011,7 +39011,7 @@ "Qtree BVBA", // 38989 "Nova World International, LLC dba Nova Shipping", // 38990 "Innoforma E-learning Technologies", // 38991 - "SCCT, Wilhelm Wimmreuter", // 38992 + "Wilhelm Wimmreuter", // 38992 "South Jersey Healthcare", // 38993 "San Juan Software", // 38994 "Connexon Telecom Inc.", // 38995 @@ -39984,7 +39984,7 @@ "Kern Scientific Co.", // 39962 "AGCO Corporation", // 39963 "EIDEN Co,Ltd", // 39964 - "Trans Sped", // 39965 + "Trans Sped SA", // 39965 "Luminoso, LLC", // 39966 "Ethersex Project", // 39967 "Toya Technologies Inc.", // 39968 @@ -40062,7 +40062,7 @@ "Stichting IFCAT Foundation", // 40040 "ООО «Электронные Офисные Системы (проектирование и внедрение)» /OOO “Elektronnye Ofisnye Sistemy (proektirovanie i vnedrenie)/",// 40041 "Stiftelsen Chalmers Studentbostäder", // 40042 - "NewPace Technology Development Inc.‎", // 40043 + "NewPace Technology Development Inc.", // 40043 "PC-Doctor, Inc.", // 40044 "Nexenta Systems, Inc.", // 40045 "CREDIT EUROPE BANK Ltd.", // 40046 @@ -40148,7 +40148,7 @@ "real virtual GmbH", // 40126 "Federos", // 40127 "Beijing Photon-Byte Technology Co., Ltd.", // 40128 - "MarLukKi Centre", // 40129 + "Axfootar", // 40129 "Tempered Networks", // 40130 "Nuvem Networks Inc", // 40131 "Telemedia Argentina S.A.", // 40132 @@ -43078,7 +43078,7 @@ "ENVISTACOM", // 43056 "PrAT CENTRAVIS PRODUCTION UKRAINE", // 43057 "Synergy Sky AS", // 43058 - "iteracon GmbH", // 43059 + "RADIUZE GmbH", // 43059 "Leepfrog Technologies, Inc.", // 43060 "Global System & Network Services BVBA", // 43061 "Ingenieure ohne Grenzen e.V.", // 43062 @@ -43461,7 +43461,7 @@ "J.J. Downs Industrial Plastics Inc.", // 43439 "royal holloway, university of london", // 43440 "royal holloway, university of london", // 43441 - "Niles Radio Communications", // 43442 + "BanditForge, LLC", // 43442 "Transacciones y Servicios Mobile", // 43443 "Inspire Living, Inc.", // 43444 "4th Layer Integrated Solutions S.r.l.", // 43445 @@ -48808,7 +48808,7 @@ "heiland.io", // 48786 "linudata GmbH", // 48787 "Bohlins Träexport AB", // 48788 - "Fielmann AG", // 48789 + "Fielmann Group AG", // 48789 "OOO KIT", // 48790 "H. Elderson", // 48791 "SCC Technology GmbH", // 48792 @@ -51457,7 +51457,7 @@ "SCLE SFE", // 51435 "Opendigitalradio", // 51436 "Razberi Technologies, Inc.", // 51437 - "Unshare", // 51438 + "unshare", // 51438 "Videotec S.P.A.", // 51439 "smart-edge.com", // 51440 "InfraNet AG", // 51441 @@ -52161,7 +52161,7 @@ "Old Republic Title", // 52139 "CardPlus Sverige AB", // 52140 "CardPlus Oy", // 52141 - "TRANS SPED LTD", // 52142 + NULL, // 52142 "RCCA MD LLC - Center for Cancer & Blood Disorders", // 52143 "Applied Video Solutions", // 52144 "CRSG Deutschland GmbH", // 52145 @@ -57745,7 +57745,7 @@ "Christian Financial Resources", // 57723 "SEPI Engineering & Construction", // 57724 "Xage Security, Inc.", // 57725 - "VivoKey Technologies", // 57726 + "VivoKey Inc.", // 57726 "Calspan", // 57727 "InsidePacket Inc", // 57728 "Foundry Health - an IQVIA business", // 57729 @@ -61987,7 +61987,7 @@ "Knoxville Utilities Board", // 61965 "MythicalKitten", // 61966 "SCM Insurance Services", // 61967 - "Wojciech Teichert (6961405014)", // 61968 + "Wojciech Teichert (9522207207)", // 61968 "TCIIT", // 61969 "Kinder.Bildung.Zukunft e.V.", // 61970 "Teleradiologia Avanzada SL", // 61971 @@ -63766,7 +63766,7 @@ "Moya", // 63744 "Vyskumny ustav vodneho hospodarstva", // 63745 "Noshaq", // 63746 - "EAJ Global", // 63747 + "EAJ Group", // 63747 "HEQA Security", // 63748 "MATTERS (Winb Estrategia)", // 63749 "Vincent Nic", // 63750 @@ -64894,7 +64894,7 @@ "Elemenik", // 64872 "Kendal College", // 64873 "Shanghai Hema Optical Co., Ltd.", // 64874 - "BJL13 Enterprise Solutions, LLC d/b/a BES", // 64875 + "CivicBrands", // 64875 "Nestor cv", // 64876 "Beacon Link Inc.", // 64877 "Prima Vista Solusi", // 64878 @@ -65219,7 +65219,7 @@ "Simsalasim Germany GmbH", // 65197 "VADES, LLC", // 65198 "Hanåsa Sågverk Aktiebolag", // 65199 - "coresdev, LLC", // 65200 + "Wavelet Systems Ltd", // 65200 "LMI Technologies", // 65201 "Dane", // 65202 "楠泰科技（深圳）有限公司 (Nantech Technology (Shenzhen) Co., Ltd.)", // 65203 @@ -65313,7 +65313,7 @@ "Konduit KYA", // 65291 "Aleph Cloud (Aleph.im SAS)", // 65292 "SSC-Services GmbH", // 65293 - "Novatronic LLC", // 65294 + "Novatronic DOO", // 65294 "Innovoris Labs IT srl", // 65295 "Netvio", // 65296 "CAITEK for Information Systems", // 65297 @@ -65824,7 +65824,680 @@ "Configura", // 65802 "John Michael Kane", // 65803 "Sintela, Inc.", // 65804 - "HIT Systempartner GmbH (PC-SPEZIALIST Hannover)" // 65805 + "HIT Systempartner GmbH (PC-SPEZIALIST Hannover)", // 65805 + "BubbleFish Technologies, Inc", // 65806 + "Tronic", // 65807 + "奥铂特医疗科技（深圳）有限公司 (AIBRT Medical Technology (Shenzhen) Co., Ltd.)", // 65808 + "深圳市昱达医疗器械有限公司 (Shenzhen Yuda Medical Instruments Co., Ltd.)", // 65809 + "ZHUO YI TECHNOLOGY CO., LTD.", // 65810 + "In the Cloud (Thailand) Co., Ltd.", // 65811 + "ingeek", // 65812 + "Triangle Products Co., Ltd.", // 65813 + "Black Horse Pike Regional School District", // 65814 + "via donau - Österreichische Wasserstraßen-Gesellschaft mbH", // 65815 + "Flatiron Health", // 65816 + "KIT", // 65817 + "E-Consilium Pty. Ltd.", // 65818 + "Vasolytics LLC", // 65819 + "Synop Inc", // 65820 + "Trisula Medika Teknologi", // 65821 + "Martin Daur", // 65822 + "General Reasoning", // 65823 + "Quantum Logic Corporation", // 65824 + "MATVIS GmbH", // 65825 + "Micro Ocean Technologies", // 65826 + "Pateon Network Technology", // 65827 + "GHESAR", // 65828 + "ECMC Shared Services Co LLC", // 65829 + "University of Nottingham", // 65830 + "Bristol Foundation Trust", // 65831 + "Convergent Solutions Group, LLC", // 65832 + "AyaTech LTD", // 65833 + "Lukasz Rzepecki", // 65834 + "Information Processing Society of Japan", // 65835 + "F.R.S.-FNRS", // 65836 + "Shenzhen widenedge electric co.,ltd", // 65837 + "China Unicom Global Ltd", // 65838 + "DotNet Internals AS", // 65839 + "AUTO BECORO SRL", // 65840 + "EQ2", // 65841 + "SoftMate GmbH Intelligent Software Solutions", // 65842 + "ALTES Informatique", // 65843 + "University of Nevada, Reno", // 65844 + "Medivis", // 65845 + "ReadyStackGo", // 65846 + "Actalis S.p.A.", // 65847 + "Stadler Signalling Deutschland GmbH - MOFIS", // 65848 + "LLC “InSoft”", // 65849 + "SCOPI", // 65850 + "PT Indonesia Digital Security", // 65851 + "スターシーズデジタル株式会社 (Star Seeds Digital Co., Ltd.)", // 65852 + "Maxiglobal", // 65853 + "UFO", // 65854 + "TP-Link Systems Inc", // 65855 + "Gemeinde Moehlin", // 65856 + "HaveYa PTY LTD", // 65857 + "PCS Software e Serviços Ltda", // 65858 + "Blockbit", // 65859 + "Hematology Oncology Associates of the Treasure Coast PA", // 65860 + "Secast", // 65861 + "COLEGIO DE ABOGADOS Y NOTARIOS DE GUATEMALA", // 65862 + "delphi.dev", // 65863 + "Alex Simon", // 65864 + "Solo.io", // 65865 + "Provincial Electricity Authority", // 65866 + "REDNET", // 65867 + "Unitek A/S", // 65868 + "Jorge Alegre Vilches", // 65869 + "Cubitel", // 65870 + "Bunge Canada Inc.", // 65871 + "Universal Strategy Group, Inc", // 65872 + "N NEAT SOLUTION", // 65873 + "QuickSolutions Media pty ltd", // 65874 + "Elevenware Limited", // 65875 + "Green Recursive Utility Service LLC", // 65876 + "Pixel AI SARLU", // 65877 + "Honoré DEMBÉLÉ (BAZURU)", // 65878 + "Shenzhen ENERGY CONTROL CLOUD Technology Co., Ltd.", // 65879 + "Digital Matter", // 65880 + "Hofstädtler I. E. GmbH", // 65881 + "Justin Michael Harris", // 65882 + "iPotisEdge Co., Ltd.", // 65883 + "Directhealth Tecnologias em Sistemas e Serviços do Brasil", // 65884 + "Beijing Yiyuan Information Technology Co., Ltd.", // 65885 + "MARSTEK", // 65886 + "3ForceIT", // 65887 + "Innlights GmbH", // 65888 + "Trinidad Area Health Association", // 65889 + "OptraSCAN INC", // 65890 + "SMARTMON", // 65891 + "Trebide (IKUSI S.L)", // 65892 + "Fabory Netherlands", // 65893 + "Henan Junyu Technologies co., Ltd.", // 65894 + "Tilman S.A.", // 65895 + "Xinjiang Ying Sheng Information Technology Co., Ltd.", // 65896 + "TERRA-0", // 65897 + "TRAVAILLEUR-0", // 65898 + "MangoBoost, Inc.", // 65899 + "Elevate", // 65900 + "openwisp", // 65901 + "Universidad Pedagogica Veracruzana", // 65902 + "Grupo Portfolio", // 65903 + "OOO 'NPO Dvina'", // 65904 + "广州石斧世纪软件有限公司 (Guangzhou zaxsoft Century Software Co., Ltd.)", // 65905 + "PhysioLogic Softworks Corp.", // 65906 + "OTOKO GmbH", // 65907 + "Yumankind OÜ", // 65908 + "Plexus Parc, LLC", // 65909 + "ONDO", // 65910 + "Max Weishaupt SE", // 65911 + "Shenzhen ConceMed Medical Technology Co., Ltd.", // 65912 + "IPD Group LLC", // 65913 + "VtSoftware", // 65914 + "medsky", // 65915 + "NCSE NETWORK LTD", // 65916 + "Taiwan Digital Streaming Co.", // 65917 + "Dolphitech AS", // 65918 + "Independence Bank", // 65919 + "Mid-Continent Public Library", // 65920 + "X Management Pro", // 65921 + "Selector Software, Inc.", // 65922 + "Prh-tech", // 65923 + "SEATBELT CONSULTING S.R.L.", // 65924 + "Multicase Norge AS", // 65925 + "East of England Coop", // 65926 + "Stadt Kaufbeuren", // 65927 + "Vallions Tecnologia", // 65928 + "SITS Group AG", // 65929 + "Jason Revello", // 65930 + "Junto Identity", // 65931 + "VERIFYTECH INC", // 65932 + "Dollar Tree", // 65933 + "BYOND Technologies Inc", // 65934 + "Tranter Engineering", // 65935 + "Joshua Winter", // 65936 + "GoverByte", // 65937 + "Scalair", // 65938 + "Oxydian", // 65939 + "Telecom Egypt", // 65940 + "Maytana, Inc dba Formal", // 65941 + "Marvaus Technologies Private Limited", // 65942 + "Raspberrypi Sht31d Snmp", // 65943 + "Gregory Hildstrom", // 65944 + "Desktop Alert Inc", // 65945 + "Atheer Connectivity", // 65946 + "Telekomunikacije Republike Srpske a.d. Banja Luka", // 65947 + "Weave Grid, Inc.", // 65948 + "Nikita Ledenev", // 65949 + "Afore New Energy Technology (Shanghai) Co., Ltd.", // 65950 + "Airly sp. z o.o.", // 65951 + "Kearfott Corporation, Guidance & Navigation Division", // 65952 + "Sanctum SecOps LLC", // 65953 + "Await Godot", // 65954 + "smlx", // 65955 + "Daniel Smith", // 65956 + "KBE Srl", // 65957 + "EPC Power Corp.", // 65958 + "Ellipse World, Inc.", // 65959 + "Kyle Evans", // 65960 + "ABLECOM TECHNOLOGY INC.", // 65961 + "Standart AG, LLC", // 65962 + "Technicalfellow Holding B.V.", // 65963 + "Xtractor UG (haftungsbeschraenkt)", // 65964 + "zerohash LLC", // 65965 + "武汉恩智电子科技有限公司 (Wuhan Enzhi Electronic Technology Co., Ltd.)", // 65966 + "GMB", // 65967 + "IIT Research Institute", // 65968 + "e-BO Enteprises", // 65969 + "GA Technologies", // 65970 + "Xiamen Tonmind Technology Co., Ltd.", // 65971 + "Dixit Srl", // 65972 + "Eccellenza Technologies Ltd", // 65973 + "Ellisys", // 65974 + "POS Solutions GmbH", // 65975 + "VerAvanti, Inc", // 65976 + "Jiangsu Koyoe Energy Technology Co., Ltd.", // 65977 + "National Digital Transformation Infrastructure Office", // 65978 + "Bleistahl Brasil Metalurgia Ltda.", // 65979 + "SPIFFE", // 65980 + "De Technische Jongens B.V.", // 65981 + "Counties Energy Limited", // 65982 + "Integrated Operations, LLC.", // 65983 + "Astrobit SpA", // 65984 + "VoxyWatch", // 65985 + "Hôpital Universitaire de Bruxelles", // 65986 + "CONVIDA", // 65987 + "uni-assist e.V.", // 65988 + "Leandro Felipe Castilhos", // 65989 + "Lakshcore Technologies Private Limited", // 65990 + "Jeff Welsh", // 65991 + "Hangzhou Gold Electronic Equipment Co., Ltd.", // 65992 + "TAS", // 65993 + "Evoked", // 65994 + "AI Universal Protocol Research Foundation", // 65995 + "Identity Consortium d.o.o.", // 65996 + "Reprodrive Center For Innovation Limited", // 65997 + "Reclaim Protocol", // 65998 + "SYL (Ningbo) Battery Co., Ltd.", // 65999 + "Nuclear Power Institute of China", // 66000 + "COSLINK DIGITAL ENERGY TECHNOLOGY CO., LTD", // 66001 + "DaDaCon GmbH", // 66002 + "Brabantia", // 66003 + "Serviços Partilhados do Ministério da Saúde, E.P.E.", // 66004 + "Secure Radio Communications Limited", // 66005 + "Städtische Werke Magdeburg GmbH & Co. KG", // 66006 + "CEA Technologies Pty Limited", // 66007 + "LumenaDx Inc.", // 66008 + "CRYPTOSIGN S.A.S.", // 66009 + "Materosava AB", // 66010 + "Hero Imaging AB", // 66011 + "Theo End Computing (Nanjing) Technology Co., Ltd", // 66012 + "Tierra S.p.A.", // 66013 + "Lightware Zrt.", // 66014 + "zhutangdata", // 66015 + "MORPON Technology Co., Ltd.", // 66016 + "Magnetica Limited", // 66017 + "SentryLabs Private Limited", // 66018 + "VOORTMANN GmbH & Co. KG Steuerungstechnik", // 66019 + "Select Mechanical Services", // 66020 + "Comité Unicef España", // 66021 + "Samlex Europe BV", // 66022 + "Encrypia Labs", // 66023 + "QOS.CH Sarl", // 66024 + "Datasoro", // 66025 + "Enginsight GmbH", // 66026 + "Timmergruppen i Norr AB", // 66027 + "Diehl Aviation Gilching GmbH", // 66028 + "ICB S.A.", // 66029 + "Heinrich Klöcker GmbH & Co. KG", // 66030 + "cadiros", // 66031 + "MaxxKonnect", // 66032 + "Abdal Security Group", // 66033 + "78ResearchLab", // 66034 + "Yucca Technology Co., LTD", // 66035 + "City of Davenport, IA", // 66036 + "ESTA", // 66037 + "Wathiqa PQC", // 66038 + "Joshua Cox", // 66039 + "Barkov Alexey Fedorovich", // 66040 + "HENAN JIUYU TENGLONG INFORMATION ENGINEERING CO.,LTD.", // 66041 + "Potin (Beijing) Technology Co., Ltd.", // 66042 + "imsoftware", // 66043 + "GEODIS", // 66044 + "AlbertiGroup", // 66045 + "Technix S.p.A.", // 66046 + "Marian, Inc.", // 66047 + "SPOT Imaging dba Diagnostic Instruments, Inc.", // 66048 + "Arpnex Technologies", // 66049 + "Vistra Netherlands", // 66050 + "GHQ systems s.r.o.", // 66051 + "Wireless Supply, LLC", // 66052 + "Bill Farmer, Jr.", // 66053 + "PetaBit S.r.l.", // 66054 + "Moultbase CAD for Code Signing", // 66055 + "Fablaja", // 66056 + "Aman Afzar Nahaanbin", // 66057 + "Bexyhub", // 66058 + "VYRTY Corporation d/b/a Sync.MD", // 66059 + "Chane Terminals", // 66060 + "ConnectPoint Sp. z o. o.", // 66061 + "Realworld", // 66062 + "Easy Telecom Law Firm S.L.", // 66063 + "Black & Veatch", // 66064 + "SORACOM, INC.", // 66065 + "Shenzhen SOSEN Innovation Technology Co.,Ltd", // 66066 + "Apoldaer Wasser GmbH", // 66067 + "Järbo Elektro-Kapsel AB", // 66068 + "Dayton Photonics", // 66069 + "MX Healthcare GmbH", // 66070 + "China Telecom Cybersecurity Technology", // 66071 + "Reddy Apps LTD", // 66072 + "Eastman Ghent S", // 66073 + "Damon Gillard", // 66074 + "Studentenwerk Chemnitz-Zwickau", // 66075 + "Z9 Security", // 66076 + "Mederer GmbH", // 66077 + "RSpond, Inc.", // 66078 + "SEVENP", // 66079 + "myenergi Ltd", // 66080 + "Transline Technologies Limited", // 66081 + "magnusschatz", // 66082 + "1off", // 66083 + "XXXLGroup", // 66084 + "Networkables", // 66085 + "AutenTIC S.A", // 66086 + "AgilityDelivered", // 66087 + "Boundless Rise LLC", // 66088 + "vinciBytes GmbH", // 66089 + "Nuupiot Labs", // 66090 + "Alvian Networks", // 66091 + "Axians RMP xG", // 66092 + "Locale Systems LLC", // 66093 + "BERAG", // 66094 + "Tomoverse Imaging Inc.", // 66095 + "NTT Data Global", // 66096 + "SOFTDREAMS TECHNOLOGY INVESTMENT AND TRADING JOINT STOCK COMPANY", // 66097 + "HOYAN Electronics Technology Co., Ltd.", // 66098 + "Sindhu Saraswati Research Pvt Ltd", // 66099 + "infinit Ingenieurbüro für industrielle Innovationstechniken", // 66100 + "WISTERIA LAB", // 66101 + "Sky Guard Cyber", // 66102 + "Parto Ertebat Saba", // 66103 + "Aragonese Institute of Health Sciences", // 66104 + "LLC «INFOMAT»", // 66105 + "iTEAM (Instituto de Telecomunicaciones y Aplicaciones Multimedia, Grupo MCG)", // 66106 + "FEHC-HHCP", // 66107 + "Coleg y Cymoedd", // 66108 + "Vendel Illyés", // 66109 + "Cape Fear Community College", // 66110 + "Polyflex Natal (Pty) Ltd", // 66111 + "北京迪为双兴通讯技术有限公司 (Beijing Diwei Shuangxing Communication Technology Co., Ltd.)", // 66112 + "lightupq technology", // 66113 + "Sierra Nevada Company, LLC - Defensible Security", // 66114 + "BrkrOps Inc", // 66115 + "HistoSonics, Inc.", // 66116 + "Andrews & Arnold Ltd", // 66117 + "Mats Classons Skogsvård i Mangskog AB", // 66118 + "Orsis Limited", // 66119 + "Acist Medical Systems", // 66120 + "Traversal Health", // 66121 + "RauchSystems", // 66122 + "YJC POWER AUSTRALIA PTY LTD", // 66123 + "Henrik levinsson AB", // 66124 + "PRAIMTECH, LIMITED LIABILITY COMPANY", // 66125 + "Perinet GmbH", // 66126 + "ANF AC DOMINICANA", // 66127 + "PharmaProspective LLC", // 66128 + "Ontario School District", // 66129 + "Wreckedkernel", // 66130 + "China Broadnet", // 66131 + "HaysMac LLP", // 66132 + "THINGS4NUVA SL", // 66133 + "AIRNITY", // 66134 + "Telonic Systems Inc.", // 66135 + "OOO NPO MIR", // 66136 + "Natalka", // 66137 + "Civic Hacker LLC", // 66138 + "slvk", // 66139 + "Viaflux", // 66140 + "extr3m IT", // 66141 + "NBSN Telecom Limited", // 66142 + "Bergkvist Siljan Insjön AB", // 66143 + "Arexico", // 66144 + "Reuniwatt SAS", // 66145 + "Hmi Muhendislik Otomatik Kontrol Sistemleri", // 66146 + "TAKE IT GmbH & Co. KG", // 66147 + "Cambodian Network Exchange", // 66148 + "FOM Hochschule für Oekonomie und Management", // 66149 + "Global Reach Technology EMEA Limited", // 66150 + "Signater", // 66151 + "Diatrend Corporation", // 66152 + "Transcom (Shanghai) Technologies Co., Ltd.", // 66153 + "Forged Networks", // 66154 + "Belikin Roman", // 66155 + "FIRMATIC S.A", // 66156 + "Marueng", // 66157 + "RDP Innovation", // 66158 + "Scorpio IT d.o.o.", // 66159 + "Netvyn", // 66160 + "Mysterion", // 66161 + "AlphaTrading SpA", // 66162 + "FunnelCloud Inc.", // 66163 + "Nordstam AB. (Namn på Bolagsverket Skog & Virke Nordstam AB) 559586-3449", // 66164 + "Adam Grazioli", // 66165 + "Narodna banka Srbije", // 66166 + "NetCon IT-Security GmbH", // 66167 + "EsyTech Pty Ltd", // 66168 + "CLEMAR ENGENHARIA LTDA", // 66169 + "BT Equipamentos Eletrônicos LTDA", // 66170 + "New Jersey Resources", // 66171 + "Netralux", // 66172 + "Digital Cinema Network Pty Ltd", // 66173 + "emplohouse spółka z ograniczoną odpowiedzialnością", // 66174 + "Siemens Mobility GmbH (OT)", // 66175 + "SHENZHEN JIUZHOU ELECTRIC CO.,LTD.", // 66176 + "Lars Kohnert", // 66177 + "Quantum B", // 66178 + "Edwin L. Heim Company", // 66179 + "Rubrix.lat", // 66180 + "Ranidae Aquaculture & Herpetoculture", // 66181 + "Tom Internet Research Office", // 66182 + "ZHOU YUTAO", // 66183 + "Oliver Aruväli", // 66184 + "NULL Pointers", // 66185 + "Hilscher Gesellschaft für Systemautomation mbH", // 66186 + "UNIVERSITI MALAYSIA KELANTAN", // 66187 + "SECUDOCX", // 66188 + "Banca Transilvania", // 66189 + "XCENA Inc.", // 66190 + "Stadt Angermünde", // 66191 + "GIGAMEDIA", // 66192 + "Kayten GmbH", // 66193 + "Romer Technologies, Inc", // 66194 + "NQNET", // 66195 + "Depth Development, Inc.", // 66196 + "Coreason AI", // 66197 + "secbits private limited", // 66198 + "汉中市龙岗高级中学 (Hanzhong Longgang Senior High School)", // 66199 + "Devling", // 66200 + "RAB Services LLC", // 66201 + "cisowscyEU", // 66202 + "Elshan M. Huseynov", // 66203 + "STRATAON EQUIPAMENTOS ELETRONICOS LTDA", // 66204 + "Auspex Labs Inc.", // 66205 + "LSE Group Corporation", // 66206 + "FreeDSx", // 66207 + "PathWarden", // 66208 + "SentinelSec Studios", // 66209 + "CÔNG TY TNHH CÔNG NGHỆ MÁY CHỦ 365", // 66210 + "Ryan T. Dean", // 66211 + "DEVTYPED sp. z o.o.", // 66212 + "Zeus Project Services Pty Ltd", // 66213 + "Viktor Gurgenidze", // 66214 + "Outlier Engineering Group LLC", // 66215 + "Shyam Electronics & Magnetics", // 66216 + "Rolf Ganser", // 66217 + "Sherief Farouk", // 66218 + "Atrius Healthcare Private Limited", // 66219 + "Hazelesque", // 66220 + "Rhiannon AI, LLC", // 66221 + "Sumauma Computadores e Telecomunicações S.A.", // 66222 + "Xinuo Information Technology (Xiamen) Corp.,Ltd", // 66223 + "iVeriTech", // 66224 + "nexos", // 66225 + "enia", // 66226 + "iDM Energiesysteme GmbH", // 66227 + "Northern Ireland Ambulance Service", // 66228 + "See All AI Inc.", // 66229 + "Brüel & Kjær Vibro GmbH", // 66230 + "Thomas Huppertz", // 66231 + "CyberMyte, LLC", // 66232 + "ServerJanitor", // 66233 + "biobedded systems GmbH", // 66234 + "Clutterbot Inc.", // 66235 + "SYNKEE", // 66236 + "IT Works", // 66237 + "FoxESS Australia Pty Ltd", // 66238 + "AnyRF Kft.", // 66239 + "Altyma Pty Ltd", // 66240 + "Massive Beams GmbH", // 66241 + "La Famosa", // 66242 + "Università degli Studi di Salerno", // 66243 + "DefenXee Private Limited", // 66244 + "Emma Paki", // 66245 + "Shanghai Xiongzhan Information Technology Co., Ltd.", // 66246 + "smuPweb Ltda", // 66247 + "MUST ENERGY (GUANGDONG) TECHNOLOGY CO.,LTD", // 66248 + "PLEIN SUD IT", // 66249 + "Doxee S.p.A.", // 66250 + "Radtech Systems L.L.C.", // 66251 + "Geomys", // 66252 + "Softonic", // 66253 + "F6", // 66254 + "DATAKEEN", // 66255 + "Philippine Army", // 66256 + "Varwof PKI", // 66257 + "Universal Quantum Ltd", // 66258 + "ComTRUST CyberSecurity LLC", // 66259 + "Anlix", // 66260 + "Rivian and Volkswagen Group Technologies, LLC", // 66261 + "Synaxiom Inc", // 66262 + "Network 23 LLC", // 66263 + "MASSPOINT", // 66264 + "Seven Fortunas", // 66265 + "GROUPE-SOINS", // 66266 + "RaoLabs, LLC", // 66267 + "Stadt Marl", // 66268 + "DYTECH CORP", // 66269 + "Allfunds Digital Solutions, SL", // 66270 + "PT Inti Muda Teknologi", // 66271 + "Tone Hellström", // 66272 + "Ciklo Industria e Comercio de Geradores LTDA", // 66273 + "Professional Systems Management Co., Ltd.", // 66274 + "Dekatron Sp. z o.o.", // 66275 + "Beeker Tech GmbH & Co. KG", // 66276 + "The San-in Godo Bank, Ltd.", // 66277 + "GaardTech", // 66278 + "EYKON AG", // 66279 + "Davosys", // 66280 + "Moehrke Research LLC", // 66281 + "Adiumentum GmbH", // 66282 + "Wolfgang Mitterbucher", // 66283 + "California State University, Fresno", // 66284 + "Fidalia Networks Inc", // 66285 + "William Dy Aymãn Francisco Rodrigues Costa", // 66286 + "Questel", // 66287 + "Cades Schutte LLP", // 66288 + "Distribuidora Diceltecsa S.A.", // 66289 + "yerendian.com", // 66290 + "Sololc", // 66291 + "Diti", // 66292 + "Abhishek Jain", // 66293 + "OPTILINK NETWORKS PVR LTD", // 66294 + "AUNDE Achter & Ebels GmbH", // 66295 + "Stream Checker", // 66296 + "AddendAI", // 66297 + "Umano Medical", // 66298 + "shen zhen vetoo Medical company", // 66299 + "TIFLEX", // 66300 + "WoodsNET", // 66301 + "Lembaga Akreditasi Mandiri Sains Alam dan Ilmu Formal (LAMSAMA)", // 66302 + "ARMAND DE BEER", // 66303 + "Willamette Education Service District", // 66304 + "Servicio de Administración Tributaria", // 66305 + "National information Technology Authority - Uganda (NITA-U)", // 66306 + "Yeswanth Sappa", // 66307 + "Airlinq Inc", // 66308 + "NANOSYSTEMS SRL", // 66309 + "RME Sensors", // 66310 + "CSIRT Infrastruktura", // 66311 + "Alessandro De Carne", // 66312 + "Solvegia", // 66313 + "Gabriel Gutiérrez Fuentes", // 66314 + "MinebeaMitsumi Inc.", // 66315 + "scemtec Transponder Technology GmbH", // 66316 + "Bitron Electronics LAB srl", // 66317 + "Havi's Inc.", // 66318 + "Stone Security", // 66319 + "Suzhou RouteFlow Energy Technology Co., Ltd.", // 66320 + "ODVA, Inc.", // 66321 + "BB Tecnologia e Serviços S.A.", // 66322 + "QWSoftware", // 66323 + "Mission Critical Innovation", // 66324 + "Private Tier Solutions", // 66325 + "Voltie Kft.", // 66326 + "Acentury Inc.", // 66327 + "Perkumpulan Ruang Kemajuan Indonesia (RKI)", // 66328 + "Anreal Twin Inc.", // 66329 + "Main-Taunus-Kreis, Der Kreisausschuss", // 66330 + "ORLEN TERMIKA S.A.", // 66331 + "Tinklo", // 66332 + "Zevix B.V.", // 66333 + "Zorggroep H.Hart", // 66334 + "Modeemi Ry", // 66335 + "China Huaxin Post and Telecommunication Technology Co., Ltd.", // 66336 + "Whessoe Engineering Limited", // 66337 + "INSA Strasbourg", // 66338 + "CyberSecAI Ltd", // 66339 + "Family Dollar", // 66340 + "KATHREIN Digital Systems GmbH", // 66341 + "UseKrypt", // 66342 + "Control Applications ltd.", // 66343 + "Innovasis Enerji Elektronik San. ve Tic. Ltd. Sti.", // 66344 + "Signivault", // 66345 + "Amit Kumar", // 66346 + "Sharx Datacenter LLC", // 66347 + "Gemik Software GmbH", // 66348 + "Marintel LLC", // 66349 + "Williams & Fudge, Inc.", // 66350 + "Maxcom Corporation", // 66351 + "Glenwood, Inc.", // 66352 + "Wiegand-Glas", // 66353 + "Cocoa", // 66354 + "NorcalBarnstormers LLC", // 66355 + "Nanaboshi Electric Mfg. Co., Ltd.", // 66356 + "DC ASIA Ltd.", // 66357 + "Privoro", // 66358 + "Altas Express LLC", // 66359 + "IaSoC", // 66360 + "AutographOS Corp", // 66361 + "Enchorium", // 66362 + "Sec s.r.o", // 66363 + "ABLATIVE PTY LTD", // 66364 + "Zhang He", // 66365 + "Ridgeway Telecommunications LLC", // 66366 + "eGloo Incorporated", // 66367 + "SETIC-FP/MINFIN Angola", // 66368 + "LXNDigital", // 66369 + "StampCode", // 66370 + "Logiqum Kft.", // 66371 + "Vexola GmbH", // 66372 + "Algonomia", // 66373 + "National Energy PKI Limited", // 66374 + "Hyundai Motor Company", // 66375 + "Xiamen Bitswaving Technology Co., Ltd.", // 66376 + "N.V. Nederlandse Spoorwegen", // 66377 + "Inexorable, Inc.", // 66378 + "Midwest Orthopaedic Center", // 66379 + "Chessmate Limited", // 66380 + "T.E.L.L. Software Hungária Kft.", // 66381 + "Coppin State University Community Health Center", // 66382 + "4future.digital", // 66383 + "Unifiber SA", // 66384 + "Sunjata Conseil", // 66385 + "Reed-Soft Bt.", // 66386 + "SOBE SOFTWARE, Inc.", // 66387 + "Spartified", // 66388 + "Verge Inc.", // 66389 + "Engel & Völkers Gewerbe Berlin GmbH & Co KG", // 66390 + "BLAISSED S.R.L.", // 66391 + "Mariusz Zieliński", // 66392 + "Dan Cross", // 66393 + "Indosat Ooredoo Hutchison (IM3)", // 66394 + "Indosat Ooredoo Hutchison (3ID)", // 66395 + "Le Vi Qui", // 66396 + "Banco Guayaquil S.A.", // 66397 + "Mobile-ID Technologies And Services Joint Stock Company", // 66398 + "Fairland iGarden Co.,Ltd.", // 66399 + "knoell Germany GmbH", // 66400 + "zdrei.com GmbH", // 66401 + "Aqua Vita International S. A.", // 66402 + "Metropolitni univerzita Praha, o.p.s.", // 66403 + "Common Codes GmbH", // 66404 + "Ambermind", // 66405 + "Usepov Oleg Surenovich", // 66406 + "Silver Cross Hospital and Medical Centers", // 66407 + "Johnson Controls", // 66408 + "PT NUSAGLOBAL KARYA TEKNO", // 66409 + "Aristotelian Network Solutions, INC.", // 66410 + "Resnics Technology (Shanghai), Inc.", // 66411 + "Deutsche Apotheker- und Ärztebank eG", // 66412 + "VERTICAL TECNOLOGIA INTERNET SERVICOS PAGAMENTOS E INTERMEDIACOES LTDA", // 66413 + "Delaval International AB", // 66414 + "Kiran Vaidya", // 66415 + "Guggenheim Securities, LLC", // 66416 + "ARIS", // 66417 + "Netavo Global Data Services Ltd", // 66418 + "ROTE Solutions", // 66419 + "NEONEX Tecnologia Eletronica Ltda", // 66420 + "Necessary Innovations AB", // 66421 + "DistroGlobe Solutions Private Limited", // 66422 + "Betreiberverein ZAM e.V.", // 66423 + "Rostro Foundation", // 66424 + "PLT networks GmbH", // 66425 + "IC Solutions sp. z o. o.", // 66426 + "DreamCoder", // 66427 + "Verity AI Technologies, Inc.", // 66428 + "Isla Cloud Solutions, S.L.", // 66429 + "Stansell Electric Company", // 66430 + "Paul Stanley Shulins", // 66431 + "MysticMoments Soap", // 66432 + "Alex Terrats Ciberseguretat SLU", // 66433 + "Resonance Development", // 66434 + "360biolabs", // 66435 + "CORYS", // 66436 + "Knitli", // 66437 + "Firjen Cloud & Datacenters", // 66438 + "Integrated Control Technology Limited", // 66439 + "TEPSYS (TDH / Z1D8)", // 66440 + "Districratic SpA", // 66441 + "Hitachi Rail, Ltd", // 66442 + "PPS Data LLC", // 66443 + "Bureau of Motor Vehicles Indiana", // 66444 + "Moss Point School District", // 66445 + "Noon Technology Co., Ltd.", // 66446 + "ROBERT ENAHOLO ASIBOR", // 66447 + "Beijing Millennium Software Co., Ltd.", // 66448 + "Vayu", // 66449 + "LEMIER LLC", // 66450 + "CE-LINK", // 66451 + "WardenRTU", // 66452 + "Reduxi GmbH", // 66453 + "Tilitoimisto Ikonen Ky", // 66454 + "NewRedo Ltd", // 66455 + "bezDodavatele a.s.", // 66456 + "Mahmut Erdem Özgen", // 66457 + "cyclohexane", // 66458 + "Isaiah Williams", // 66459 + "Tiet AI", // 66460 + "Bitsmart TI", // 66461 + "Ministry of Commerce, Cambodia", // 66462 + "Monoma Ltd", // 66463 + "Devops & Platforms", // 66464 + "KCEP LLP", // 66465 + "Shenzhen HugeMed Medical Technical Development Co., Ltd.", // 66466 + "GoodWe Technologies Co., Ltd", // 66467 + "Nova Goose Global Publishing Group Inc.", // 66468 + "南京浩铭电子科技有限公司 (Nanjing Haoming Electronic Technology Co., Ltd.)", // 66469 + "Opn Communication Inc.", // 66470 + "veesix ::networks", // 66471 + "Coppin State University Community Health Center", // 66472 + "Tiszamenti Regionális Vízművek Zrt.", // 66473 + "manji0", // 66474 + "Percivix", // 66475 + "Psyray International B.V.", // 66476 + "GrowVolution e.V.", // 66477 + "NextITX" // 66478 }; const char* global_enterprises_lookup(uint32_t value) diff -Nru wireshark-4.4.16/epan/exported_pdu.c wireshark-4.4.18/epan/exported_pdu.c --- wireshark-4.4.16/epan/exported_pdu.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/exported_pdu.c 2026-08-12 17:19:13.000000000 +0000 @@ -238,9 +238,11 @@ tag_buf_size += (proto_tag_len + 4); /* Compute size of items */ - while (*loop_items) { - tag_buf_size += (*loop_items)->size_func(pinfo, (*loop_items)->data); - loop_items++; + if (loop_items) { + while (*loop_items) { + tag_buf_size += (*loop_items)->size_func(pinfo, (*loop_items)->data); + loop_items++; + } } /* Add end of options length */ @@ -261,11 +263,13 @@ /* Populate data */ loop_items = items_list; - while (*loop_items) { - item_size = (*loop_items)->populate_data(pinfo, (*loop_items)->data, buffer_data, buf_remaining); - buffer_data += item_size; - buf_remaining -= item_size; - loop_items++; + if (loop_items) { + while (*loop_items) { + item_size = (*loop_items)->populate_data(pinfo, (*loop_items)->data, buffer_data, buf_remaining); + buffer_data += item_size; + buf_remaining -= item_size; + loop_items++; + } } return exp_pdu_data; diff -Nru wireshark-4.4.16/epan/manuf-data.c wireshark-4.4.18/epan/manuf-data.c --- wireshark-4.4.16/epan/manuf-data.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/manuf-data.c 2026-08-12 17:19:13.000000000 +0000 @@ -29,6 +29,7 @@ { { 0x04, 0xC9, 0x8B }, MA_M }, { { 0x04, 0xD1, 0x6E }, MA_M }, { { 0x04, 0xEE, 0xE8 }, MA_M }, + { { 0x08, 0x25, 0x32 }, MA_M }, { { 0x08, 0x26, 0xAE }, MA_M }, { { 0x08, 0x3C, 0x03 }, MA_M }, { { 0x08, 0x63, 0x32 }, MA_M }, @@ -161,6 +162,7 @@ { { 0x4C, 0xE1, 0x73 }, MA_M }, { { 0x4C, 0xEA, 0x41 }, MA_M }, { { 0x50, 0x0B, 0x91 }, MA_M }, + { { 0x50, 0x19, 0x11 }, MA_M }, { { 0x50, 0x48, 0x2C }, MA_M }, { { 0x50, 0x62, 0x55 }, MA_M }, { { 0x50, 0xA0, 0x30 }, MA_M }, @@ -220,6 +222,7 @@ { { 0x74, 0x25, 0x84 }, MA_M }, { { 0x74, 0x33, 0x36 }, MA_M }, { { 0x74, 0x5B, 0xC5 }, MA_M }, + { { 0x74, 0xA2, 0x35 }, MA_M }, { { 0x74, 0xE1, 0x4A }, MA_M }, { { 0x74, 0xF8, 0xDB }, MA_M }, { { 0x78, 0x13, 0x05 }, MA_M }, @@ -239,6 +242,7 @@ { { 0x7C, 0xBA, 0xCC }, MA_M }, { { 0x7C, 0xBC, 0x84 }, MA_M }, { { 0x7C, 0xCB, 0xE2 }, MA_M }, + { { 0x7C, 0xE4, 0xA1 }, MA_M }, { { 0x80, 0x02, 0xF4 }, MA_M }, { { 0x80, 0x0A, 0x80 }, MA_M }, { { 0x80, 0x1D, 0x0D }, MA_M }, @@ -300,6 +304,7 @@ { { 0xA0, 0x02, 0x4A }, MA_M }, { { 0xA0, 0x19, 0xB2 }, MA_M }, { { 0xA0, 0x22, 0x4E }, MA_M }, + { { 0xA0, 0x24, 0x90 }, MA_M }, { { 0xA0, 0x28, 0x33 }, MA_M }, { { 0xA0, 0x3E, 0x6B }, MA_M }, { { 0xA0, 0xBB, 0x3E }, MA_M }, @@ -331,6 +336,7 @@ { { 0xB4, 0x4D, 0x43 }, MA_M }, { { 0xB4, 0xA2, 0xEB }, MA_M }, { { 0xB4, 0xAB, 0xF3 }, MA_M }, + { { 0xB4, 0xDF, 0x43 }, MA_M }, { { 0xB8, 0x4C, 0x87 }, MA_M }, { { 0xB8, 0xD8, 0x12 }, MA_M }, { { 0xBC, 0x31, 0x98 }, MA_M }, @@ -366,6 +372,7 @@ { { 0xC8, 0xFF, 0xBF }, MA_M }, { { 0xCC, 0x1B, 0xE0 }, MA_M }, { { 0xCC, 0x22, 0x37 }, MA_M }, + { { 0xCC, 0x39, 0x53 }, MA_M }, { { 0xCC, 0x4F, 0x5C }, MA_M }, { { 0xCC, 0xC2, 0x61 }, MA_M }, { { 0xCC, 0xD3, 0x1E }, MA_M }, @@ -384,6 +391,7 @@ { { 0xD0, 0xAA, 0x5F }, MA_M }, { { 0xD0, 0xC8, 0x57 }, MA_M }, { { 0xD0, 0xD9, 0x4F }, MA_M }, + { { 0xD0, 0xDA, 0x24 }, MA_M }, { { 0xD4, 0x20, 0x00 }, MA_M }, { { 0xD4, 0x25, 0xCC }, MA_M }, { { 0xD4, 0x61, 0x37 }, MA_M }, @@ -753,7 +761,7 @@ { { 0x00, 0x01, 0x2D }, "KomodoTechno", "Komodo Technology" }, { { 0x00, 0x01, 0x2E }, "PCPartner", "PC Partner Ltd." }, { { 0x00, 0x01, 0x2F }, "TwinheadInte", "Twinhead International Corp" }, - { { 0x00, 0x01, 0x30 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x00, 0x01, 0x30 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x00, 0x01, 0x31 }, "BoschSecurit", "Bosch Security Systems, Inc." }, { { 0x00, 0x01, 0x32 }, "DranetzBMI", "Dranetz - BMI" }, { { 0x00, 0x01, 0x33 }, "KYOWAElectro", "KYOWA Electronic Instruments C" }, @@ -1419,7 +1427,7 @@ { { 0x00, 0x03, 0xC7 }, "hopfElektron", "hopf Elektronik GmbH" }, { { 0x00, 0x03, 0xC8 }, "CMLEmergency", "CML Emergency Services" }, { { 0x00, 0x03, 0xC9 }, "TECOM", "TECOM Co., Ltd." }, - { { 0x00, 0x03, 0xCA }, "MTS", "MTS Systems Corp." }, + { { 0x00, 0x03, 0xCA }, "Temposonics", "Temposonics, LLC" }, { { 0x00, 0x03, 0xCB }, "SystemGear", "SystemGear Co., Ltd." }, { { 0x00, 0x03, 0xCC }, "MomentumComp", "Momentum Computer, Inc." }, { { 0x00, 0x03, 0xCD }, "Clovertech", "Clovertech, Inc." }, @@ -1507,7 +1515,7 @@ { { 0x00, 0x04, 0x1F }, "SonyInteract", "Sony Interactive Entertainment Inc." }, { { 0x00, 0x04, 0x20 }, "SlimDevices", "Slim Devices, Inc." }, { { 0x00, 0x04, 0x21 }, "OcularNetwor", "Ocular Networks" }, - { { 0x00, 0x04, 0x22 }, "StudioTechno", "Studio Technologies, Inc" }, + { { 0x00, 0x04, 0x22 }, "StudioTechno", "Studio Technologies, Inc." }, { { 0x00, 0x04, 0x23 }, "Intel", "Intel Corporation" }, { { 0x00, 0x04, 0x24 }, "TMC", "TMC s.r.l." }, { { 0x00, 0x04, 0x25 }, "Atmel", "Atmel Corporation" }, @@ -1623,7 +1631,7 @@ { { 0x00, 0x04, 0x93 }, "TsinghuaUnis", "Tsinghua Unisplendour Co., Ltd." }, { { 0x00, 0x04, 0x94 }, "Breezecom", "Breezecom, Ltd." }, { { 0x00, 0x04, 0x95 }, "TejasNetwork", "Tejas Networks India Limited" }, - { { 0x00, 0x04, 0x96 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x00, 0x04, 0x96 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x00, 0x04, 0x97 }, "MacroSystemD", "MacroSystem Digital Video AG" }, { { 0x00, 0x04, 0x98 }, "MahiNetworks", "Mahi Networks" }, { { 0x00, 0x04, 0x99 }, "Chino", "Chino Corporation" }, @@ -2445,7 +2453,7 @@ { { 0x00, 0x07, 0xC9 }, "TechnolSeven", "Technol Seven Co., Ltd." }, { { 0x00, 0x07, 0xCA }, "CreatixPolym", "Creatix Polymedia Ges Fur Kommunikaitonssysteme" }, { { 0x00, 0x07, 0xCB }, "FreeboxSas", "Freebox Sas" }, - { { 0x00, 0x07, 0xCC }, "KabaBenzing", "Kaba Benzing GmbH" }, + { { 0x00, 0x07, 0xCC }, "dormakabaDeu", "dormakaba Deutschland GmbH" }, { { 0x00, 0x07, 0xCD }, "KumohElectro", "Kumoh Electronic Co, Ltd" }, { { 0x00, 0x07, 0xCE }, "Cabletime", "Cabletime Limited" }, { { 0x00, 0x07, 0xCF }, "Anoto", "Anoto AB" }, @@ -3452,7 +3460,7 @@ { { 0x00, 0x0B, 0xD4 }, "WiseTechnolo", "Beijing Wise Technology & Science Development Co.Ltd" }, { { 0x00, 0x0B, 0xD5 }, "Nvergence", "Nvergence, Inc." }, { { 0x00, 0x0B, 0xD6 }, "PaxtonAccess", "Paxton Access Ltd" }, - { { 0x00, 0x0B, 0xD7 }, "DORMATimeAcc", "DORMA Time + Access GmbH" }, + { { 0x00, 0x0B, 0xD7 }, "dormakabaDeu", "dormakaba Deutschland GmbH" }, { { 0x00, 0x0B, 0xD8 }, "IndustrialSc", "Industrial Scientific Corp." }, { { 0x00, 0x0B, 0xD9 }, "GeneralHydro", "General Hydrogen" }, { { 0x00, 0x0B, 0xDA }, "EyeCross", "EyeCross Co.,Inc." }, @@ -6940,7 +6948,7 @@ { { 0x00, 0x19, 0x74 }, "16063", "16063" }, { { 0x00, 0x19, 0x75 }, "Huisennetwor", "Beijing Huisen networks technology Inc" }, { { 0x00, 0x19, 0x76 }, "XipherTechno", "Xipher Technologies, LLC" }, - { { 0x00, 0x19, 0x77 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x00, 0x19, 0x77 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x00, 0x19, 0x78 }, "Datum", "Datum Systems, Inc." }, { { 0x00, 0x19, 0x79 }, "NokiaDanmark", "Nokia Danmark A/S" }, { { 0x00, 0x19, 0x7A }, "MAZeT", "MAZeT GmbH" }, @@ -7946,7 +7954,7 @@ { { 0x00, 0x1D, 0x63 }, "MieleCie", "Miele & Cie. KG" }, { { 0x00, 0x1D, 0x64 }, "AdamCommunic", "Adam Communications Systems Int Ltd" }, { { 0x00, 0x1D, 0x65 }, "MicrowaveRad", "Microwave Radio Communications" }, - { { 0x00, 0x1D, 0x66 }, "HyundaiTelec", "Hyundai Telecom" }, + { { 0x00, 0x1D, 0x66 }, "HYUNDAIHT", "HYUNDAI HT Co., Ltd." }, { { 0x00, 0x1D, 0x67 }, "Amec", "Amec" }, { { 0x00, 0x1D, 0x68 }, "ThomsonTelec", "Thomson Telecom Belgium" }, { { 0x00, 0x1D, 0x69 }, "KnorrBremseI", "Knorr-Bremse IT-Services GmbH" }, @@ -11559,6 +11567,7 @@ { { 0x00, 0x60, 0xFE }, "LynxSystemDe", "Lynx System Developers, Inc." }, { { 0x00, 0x60, 0xFF }, "QuVis", "QuVis, Inc." }, { { 0x00, 0x61, 0x51 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x00, 0x61, 0x68 }, "Nokia", "Nokia" }, { { 0x00, 0x61, 0x71 }, "Apple", "Apple, Inc." }, { { 0x00, 0x62, 0x01 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x00, 0x62, 0x0B }, "Broadcom", "Broadcom Limited" }, @@ -11570,6 +11579,7 @@ { { 0x00, 0x65, 0x1E }, "AmcrestTechn", "Amcrest Technologies" }, { { 0x00, 0x66, 0x19 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x00, 0x66, 0x4B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x00, 0x66, 0xDC }, "Apple", "Apple, Inc." }, { { 0x00, 0x67, 0x62 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0x00, 0x68, 0x2B }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x00, 0x68, 0xEB }, "HP", "HP Inc." }, @@ -11894,7 +11904,7 @@ { { 0x00, 0x87, 0x64 }, "Cisco", "Cisco Systems, Inc" }, { { 0x00, 0x88, 0x65 }, "Apple", "Apple, Inc." }, { { 0x00, 0x88, 0xBA }, "Nc&C", "Nc&C" }, - { { 0x00, 0x89, 0xC9 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x00, 0x89, 0xC9 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x00, 0x8A, 0x55 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x00, 0x8A, 0x76 }, "Apple", "Apple, Inc." }, { { 0x00, 0x8A, 0x96 }, "Cisco", "Cisco Systems, Inc" }, @@ -11936,7 +11946,7 @@ { { 0x00, 0x90, 0x1A }, "UnisphereSol", "Unisphere Solutions" }, { { 0x00, 0x90, 0x1B }, "DigitalContr", "Digital Controls" }, { { 0x00, 0x90, 0x1C }, "mpsSoftware", "mps Software Gmbh" }, - { { 0x00, 0x90, 0x1D }, "Pec", "Pec (Nz) Ltd." }, + { { 0x00, 0x90, 0x1D }, "GallagherGro", "Gallagher Group Limited" }, { { 0x00, 0x90, 0x1E }, "SelestaIngeg", "Selesta Ingegneria S.p.A." }, { { 0x00, 0x90, 0x1F }, "AdtecProduct", "Adtec Productions, Inc." }, { { 0x00, 0x90, 0x20 }, "PhilipsAnaly", "Philips Analytical X-Ray B.V." }, @@ -12184,6 +12194,7 @@ { { 0x00, 0x9B, 0x08 }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, { { 0x00, 0x9C, 0x02 }, "HewlettPacka", "Hewlett Packard" }, { { 0x00, 0x9C, 0x17 }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, + { { 0x00, 0x9C, 0x57 }, "Hextronics", "Hextronics" }, { { 0x00, 0x9C, 0xC0 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0x00, 0x9D, 0x6B }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x00, 0x9D, 0x85 }, "SigmastarTec", "Sigmastar Technology Ltd." }, @@ -12367,7 +12378,7 @@ { { 0x00, 0xA0, 0xAD }, "Marconi", "Marconi Spa" }, { { 0x00, 0xA0, 0xAE }, "Nucom", "Nucom Systems, Inc." }, { { 0x00, 0xA0, 0xAF }, "WmsIndustrie", "Wms Industries" }, - { { 0x00, 0xA0, 0xB0 }, "IODataDevice", "I-O Data Device,Inc." }, + { { 0x00, 0xA0, 0xB0 }, "IOData", "I-O Data, Inc." }, { { 0x00, 0xA0, 0xB1 }, "FirstVirtual", "First Virtual Corporation" }, { { 0x00, 0xA0, 0xB2 }, "ShimaSeiki", "Shima Seiki" }, { { 0x00, 0xA0, 0xB3 }, "Zykronix", "Zykronix" }, @@ -12418,7 +12429,7 @@ { { 0x00, 0xA0, 0xE0 }, "TennysonTech", "Tennyson Technologies Pty Ltd" }, { { 0x00, 0xA0, 0xE1 }, "WestportRese", "Westport Research Associates, Inc." }, { { 0x00, 0xA0, 0xE2 }, "Keisokugiken", "Keisokugiken Corporation" }, - { { 0x00, 0xA0, 0xE3 }, "Xkl", "Xkl Systems Corp." }, + { { 0x00, 0xA0, 0xE3 }, "Xkl", "Xkl Llc" }, { { 0x00, 0xA0, 0xE4 }, "Optiquest", "Optiquest" }, { { 0x00, 0xA0, 0xE5 }, "NhcCommunica", "Nhc Communications" }, { { 0x00, 0xA0, 0xE6 }, "Dialogic", "Dialogic Corporation" }, @@ -12538,7 +12549,7 @@ { { 0x00, 0xB7, 0x8D }, "NanjingShini", "Nanjing Shining Electric Automation Co., Ltd" }, { { 0x00, 0xB7, 0xA8 }, "Heinzingerel", "Heinzinger electronic GmbH" }, { { 0x00, 0xB8, 0x10 }, "YichipMicroe", "Yichip Microelectronics (Hangzhou) Co.,Ltd" }, - { { 0x00, 0xB8, 0x1D }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x00, 0xB8, 0x1D }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x00, 0xB8, 0x81 }, "Newplatforms", "New platforms LLC" }, { { 0x00, 0xB8, 0xB3 }, "Cisco", "Cisco Systems, Inc" }, { { 0x00, 0xB8, 0xB6 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, @@ -12720,7 +12731,7 @@ { { 0x00, 0xC0, 0x93 }, "AltaResearch", "Alta Research Corp." }, { { 0x00, 0xC0, 0x94 }, "Vmx", "Vmx Inc." }, { { 0x00, 0xC0, 0x95 }, "ZNYXNetworks", "ZNYX Networks, Inc." }, - { { 0x00, 0xC0, 0x96 }, "Tamura", "Tamura Corporation" }, + { { 0x00, 0xC0, 0x96 }, "TamuRadiance", "Tamu Radiance Corporation" }, { { 0x00, 0xC0, 0x97 }, "Archipel", "Archipel Sa" }, { { 0x00, 0xC0, 0x98 }, "ChuntexElect", "Chuntex Electronic Co., Ltd." }, { { 0x00, 0xC0, 0x99 }, "YoshikiIndus", "Yoshiki Industrial Co.,Ltd." }, @@ -13136,7 +13147,7 @@ { { 0x00, 0xDB, 0x45 }, "Thamway", "Thamway Co.,Ltd." }, { { 0x00, 0xDB, 0x70 }, "Apple", "Apple, Inc." }, { { 0x00, 0xDB, 0xDF }, "Intel", "Intel Corporate" }, - { { 0x00, 0xDC, 0xB2 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x00, 0xDC, 0xB2 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x00, 0xDD, 0x00 }, "UngermannBas", "Ungermann-Bass Inc." }, { { 0x00, 0xDD, 0x01 }, "UngermannBas", "Ungermann-Bass Inc." }, { { 0x00, 0xDD, 0x02 }, "UngermannBas", "Ungermann-Bass Inc." }, @@ -13200,7 +13211,7 @@ { { 0x00, 0xE0, 0x28 }, "Aptix", "Aptix Corporation" }, { { 0x00, 0xE0, 0x29 }, "StandardMicr", "Standard Microsystems Corp." }, { { 0x00, 0xE0, 0x2A }, "TandbergTele", "Tandberg Television As" }, - { { 0x00, 0xE0, 0x2B }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x00, 0xE0, 0x2B }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x00, 0xE0, 0x2C }, "AstComputer", "Ast Computer" }, { { 0x00, 0xE0, 0x2D }, "InnoMediaLog", "InnoMediaLogic, Inc." }, { { 0x00, 0xE0, 0x2E }, "SpcElectroni", "Spc Electronics Corporation" }, @@ -13425,7 +13436,7 @@ { { 0x00, 0xE5, 0xE4 }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, { { 0x00, 0xE5, 0xF1 }, "Buffalo", "Buffalo.Inc" }, { { 0x00, 0xE6, 0x07 }, "AurcoreTechn", "Aurcore Technology Inc." }, - { { 0x00, 0xE6, 0x0E }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x00, 0xE6, 0x0E }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x00, 0xE6, 0x3A }, "RuckusWirele", "Ruckus Wireless" }, { { 0x00, 0xE6, 0x66 }, "ARIMACommuni", "ARIMA Communications Corp." }, { { 0x00, 0xE6, 0xD3 }, "NixdorfCompu", "Nixdorf Computer Corp." }, @@ -13544,6 +13555,7 @@ { { 0x04, 0x22, 0x34 }, "WirelessStan", "Wireless Standard Extensions" }, { { 0x04, 0x22, 0xE7 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0x04, 0x23, 0x22 }, "TexasInstrum", "Texas Instruments" }, + { { 0x04, 0x23, 0xA3 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x04, 0x24, 0x05 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0x04, 0x25, 0xC5 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x04, 0x25, 0xE0 }, "TaicangT&WEl", "Taicang T&W Electronics" }, @@ -13561,6 +13573,7 @@ { { 0x04, 0x2D, 0xB4 }, "FirstPropert", "First Property (Beijing) Co., Ltd Modern MOMA Branch" }, { { 0x04, 0x2E, 0xC1 }, "Apple", "Apple, Inc." }, { { 0x04, 0x2F, 0x56 }, "ATOCS", "ATOCS (Shenzhen) LTD" }, + { { 0x04, 0x30, 0xFA }, "Cisco", "Cisco Systems, Inc" }, { { 0x04, 0x31, 0x10 }, "InspurGroup", "Inspur Group Co., Ltd." }, { { 0x04, 0x32, 0x01 }, "Broadcom", "Broadcom Limited" }, { { 0x04, 0x32, 0xF4 }, "Partron", "Partron" }, @@ -13632,6 +13645,7 @@ { { 0x04, 0x57, 0x47 }, "GoPro", "GoPro" }, { { 0x04, 0x57, 0x91 }, "ShenzhenshiX", "Shenzhenshi Xinzhongxin Technology Co.Ltd" }, { { 0x04, 0x58, 0x6F }, "SichuanWhaye", "Sichuan Whayer information industry Co.,LTD" }, + { { 0x04, 0x5A, 0x3D }, "NothingTechn", "Nothing Technology Limited" }, { { 0x04, 0x5A, 0x95 }, "Nokia", "Nokia Corporation" }, { { 0x04, 0x5C, 0x06 }, "ZmodoTechnol", "Zmodo Technology Corporation" }, { { 0x04, 0x5C, 0x6C }, "JuniperNetwo", "Juniper Networks" }, @@ -13761,6 +13775,7 @@ { { 0x04, 0xB1, 0xA1 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x04, 0xB2, 0x47 }, "Espressif", "Espressif Inc." }, { { 0x04, 0xB3, 0xB6 }, "Seamap", "Seamap (UK) Ltd" }, + { { 0x04, 0xB3, 0xC9 }, "WNC", "WNC Corporation" }, { { 0x04, 0xB4, 0x29 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x04, 0xB4, 0x66 }, "BSP", "BSP Co., Ltd." }, { { 0x04, 0xB4, 0xFE }, "AVMAudiovisu", "AVM Audiovisuelles Marketing und Computersysteme GmbH" }, @@ -13818,6 +13833,7 @@ { { 0x04, 0xCE, 0x09 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x04, 0xCE, 0x14 }, "Wilocity", "Wilocity LTD." }, { { 0x04, 0xCE, 0x7E }, "NXPFranceSem", "NXP France Semiconductors France" }, + { { 0x04, 0xCE, 0xD8 }, "NXPSemicondu", "NXP Semiconductors Germany GmbH" }, { { 0x04, 0xCF, 0x25 }, "Manycolors", "Manycolors, Inc." }, { { 0x04, 0xCF, 0x4B }, "Intel", "Intel Corporate" }, { { 0x04, 0xCF, 0x8C }, "XIAOMIElectr", "XIAOMI Electronics,CO.,LTD" }, @@ -13907,6 +13923,7 @@ { { 0x04, 0xF9, 0xF8 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x04, 0xFA, 0x3F }, "OptiCore", "OptiCore Inc." }, { { 0x04, 0xFA, 0x83 }, "QingdaoHaier", "Qingdao Haier Technology Co.,Ltd" }, + { { 0x04, 0xFB, 0x66 }, "Ericsson", "Ericsson AB" }, { { 0x04, 0xFD, 0xE8 }, "Technoalpin", "Technoalpin" }, { { 0x04, 0xFE, 0x31 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x04, 0xFE, 0x7F }, "Cisco", "Cisco Systems, Inc" }, @@ -14179,12 +14196,14 @@ { { 0x08, 0x4E, 0x1C }, "H2A", "H2A Systems, LLC" }, { { 0x08, 0x4E, 0xBF }, "SumitomoElec", "Sumitomo Electric Industries, Ltd" }, { { 0x08, 0x4F, 0x0A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x08, 0x4F, 0x44 }, "GEW", "GEW (EC) Ltd" }, { { 0x08, 0x4F, 0x66 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x08, 0x4F, 0xA9 }, "Cisco", "Cisco Systems, Inc" }, { { 0x08, 0x4F, 0xF9 }, "Cisco", "Cisco Systems, Inc" }, { { 0x08, 0x51, 0x04 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x08, 0x51, 0x14 }, "QingdaoTopsc", "Qingdao Topscomm Communication Co., Ltd" }, { { 0x08, 0x51, 0x2E }, "OrionDiagnos", "Orion Diagnostica Oy" }, + { { 0x08, 0x51, 0xF2 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x08, 0x52, 0x40 }, "EbVElektroni", "EbV Elektronikbau- und Vertriebs GmbH" }, { { 0x08, 0x52, 0x4E }, "FangchengBai", "Shenzhen Fangcheng Baiyi Technology Co., Ltd." }, { { 0x08, 0x54, 0x11 }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, @@ -14240,6 +14259,7 @@ { { 0x08, 0x75, 0x72 }, "Obelux", "Obelux Oy" }, { { 0x08, 0x76, 0x18 }, "ViTroxTechno", "ViTrox Technologies Sdn. Bhd" }, { { 0x08, 0x76, 0x71 }, "JuniperNetwo", "Juniper Networks" }, + { { 0x08, 0x76, 0x83 }, "AltoBeam", "AltoBeam Inc." }, { { 0x08, 0x76, 0x95 }, "AutoIndustri", "Auto Industrial Co., Ltd." }, { { 0x08, 0x76, 0xFF }, "ThomsonTelec", "Thomson Telecom Belgium" }, { { 0x08, 0x78, 0x08 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -14399,6 +14419,7 @@ { { 0x08, 0xE4, 0xDF }, "SandeDacomEl", "Shenzhen Sande Dacom Electronics Co., Ltd" }, { { 0x08, 0xE5, 0xDA }, "NanjingFujit", "Nanjing Fujitsu Computer Products Co.,Ltd." }, { { 0x08, 0xE6, 0x3B }, "zte", "zte corporation" }, + { { 0x08, 0xE6, 0x4B }, "Apple", "Apple, Inc." }, { { 0x08, 0xE6, 0x72 }, "JebseeElectr", "Jebsee Electronics Co.,Ltd." }, { { 0x08, 0xE6, 0x89 }, "Apple", "Apple, Inc." }, { { 0x08, 0xE6, 0xC9 }, "Businessinte", "Business-intelligence of Oriental Nations Corporation Ltd." }, @@ -14406,7 +14427,7 @@ { { 0x08, 0xE8, 0x4F }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x08, 0xE9, 0xF6 }, "AMPAKTechnol", "AMPAK Technology,Inc." }, { { 0x08, 0xEA, 0x40 }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, - { { 0x08, 0xEA, 0x44 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x08, 0xEA, 0x44 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x08, 0xEB, 0x21 }, "Intel", "Intel Corporate" }, { { 0x08, 0xEB, 0x29 }, "JiangsuHuito", "Jiangsu Huitong Group Co.,Ltd." }, { { 0x08, 0xEB, 0x74 }, "HUMAX", "HUMAX Co., Ltd." }, @@ -14490,6 +14511,7 @@ { { 0x0C, 0x15, 0x39 }, "Apple", "Apple, Inc." }, { { 0x0C, 0x15, 0x63 }, "Apple", "Apple, Inc." }, { { 0x0C, 0x15, 0xC5 }, "SDTEC", "SDTEC Co., Ltd." }, + { { 0x0C, 0x16, 0x6E }, "WirelessMobi", "WirelessMobility Engineering Centre SDN. BHD" }, { { 0x0C, 0x17, 0x73 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x0C, 0x17, 0xF1 }, "Telecsys", "Telecsys" }, { { 0x0C, 0x18, 0x4E }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -14497,6 +14519,7 @@ { { 0x0C, 0x19, 0xF8 }, "Apple", "Apple, Inc." }, { { 0x0C, 0x1A, 0x10 }, "AcousticStre", "Acoustic Stream" }, { { 0x0C, 0x1A, 0x61 }, "NeoxFZCO", "Neox FZCO" }, + { { 0x0C, 0x1B, 0x7B }, "Microsoft", "Microsoft Corporation" }, { { 0x0C, 0x1B, 0xCC }, "Iflytek", "Iflytek Co.,Ltd." }, { { 0x0C, 0x1C, 0x19 }, "LongconnElec", "Longconn Electronics(Shenzhen) Co.,Ltd" }, { { 0x0C, 0x1C, 0x1A }, "eero", "eero inc." }, @@ -14525,6 +14548,7 @@ { { 0x0C, 0x2A, 0xE7 }, "GeneralResea", "Beijing General Research Institute of Mining and Metallurgy" }, { { 0x0C, 0x2C, 0x54 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x0C, 0x2C, 0x7C }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, + { { 0x0C, 0x2D, 0x71 }, "Apple", "Apple, Inc." }, { { 0x0C, 0x2D, 0x89 }, "QiiQCommunic", "QiiQ Communications Inc." }, { { 0x0C, 0x2E, 0x57 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x0C, 0x2F, 0xB0 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -14572,6 +14596,7 @@ { { 0x0C, 0x4F, 0x5A }, "ASART", "ASA-RT s.r.l." }, { { 0x0C, 0x4F, 0x9B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x0C, 0x51, 0x01 }, "Apple", "Apple, Inc." }, + { { 0x0C, 0x51, 0x41 }, "NXPSemicondu", "NXP Semiconductors Taiwan Ltd." }, { { 0x0C, 0x51, 0x7E }, "Apple", "Apple, Inc." }, { { 0x0C, 0x51, 0xF7 }, "ChauvinArnou", "Chauvin Arnoux" }, { { 0x0C, 0x52, 0x03 }, "AgmGroup", "Agm Group Limited" }, @@ -14703,13 +14728,14 @@ { { 0x0C, 0x9A, 0x42 }, "FnLinkTechno", "Fn-Link Technology Limited" }, { { 0x0C, 0x9A, 0xE6 }, "SzDjiTechnol", "Sz Dji Technology Co.,Ltd" }, { { 0x0C, 0x9B, 0x13 }, "MagicMobileT", "Shanghai Magic Mobile Telecommunication Co.Ltd." }, - { { 0x0C, 0x9B, 0x78 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x0C, 0x9B, 0x78 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x0C, 0x9D, 0x56 }, "ConsortContr", "Consort Controls Ltd" }, { { 0x0C, 0x9D, 0x92 }, "ASUSTekCOMPU", "ASUSTek COMPUTER INC." }, { { 0x0C, 0x9E, 0x91 }, "Sankosha", "Sankosha Corporation" }, { { 0x0C, 0x9F, 0x71 }, "DolphinElect", "Dolphin Electronics (DongGuan) Co., Ltd." }, { { 0x0C, 0xA0, 0x6C }, "IndustrialCy", "Industrial Cyber Sensing Inc." }, { { 0x0C, 0xA1, 0x38 }, "BLiNQNetwork", "BLiNQ Networks Inc." }, + { { 0x0C, 0xA2, 0x80 }, "FNLINKTECHNO", "FN-LINK TECHNOLOGY Ltd." }, { { 0x0C, 0xA2, 0xF4 }, "ChameleonTec", "Chameleon Technology (UK) Limited" }, { { 0x0C, 0xA3, 0xB2 }, "Apple", "Apple, Inc." }, { { 0x0C, 0xA4, 0x02 }, "AlcatelLucen", "Alcatel-Lucent IPD" }, @@ -14747,6 +14773,7 @@ { { 0x0C, 0xB9, 0x12 }, "JMDATA", "JM-DATA GmbH" }, { { 0x0C, 0xB9, 0x37 }, "UbeeInteract", "Ubee Interactive Co., Limited" }, { { 0x0C, 0xB9, 0x83 }, "HonorDevice", "Honor Device Co., Ltd." }, + { { 0x0C, 0xBC, 0x35 }, "NetisTechnol", "Netis Technology Co., Ltd." }, { { 0x0C, 0xBC, 0x9F }, "Apple", "Apple, Inc." }, { { 0x0C, 0xBD, 0x51 }, "TCTmobile", "TCT mobile ltd" }, { { 0x0C, 0xBD, 0x75 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, @@ -14820,6 +14847,7 @@ { { 0x0C, 0xE5, 0xA3 }, "SharkNinja", "SharkNinja" }, { { 0x0C, 0xE5, 0xB5 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x0C, 0xE5, 0xD3 }, "DHelectronic", "DH electronics GmbH" }, + { { 0x0C, 0xE6, 0x23 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x0C, 0xE6, 0x7C }, "RealmeChongq", "Realme Chongqing Mobile Telecommunications Corp.,Ltd." }, { { 0x0C, 0xE7, 0x09 }, "Sentyron", "Sentyron B.V" }, { { 0x0C, 0xE7, 0x25 }, "Microsoft", "Microsoft Corporation" }, @@ -14832,7 +14860,7 @@ { { 0x0C, 0xEC, 0x80 }, "TexasInstrum", "Texas Instruments" }, { { 0x0C, 0xEC, 0x84 }, "TINNOMobileT", "Shenzhen TINNO Mobile Technology Corp." }, { { 0x0C, 0xEC, 0x8D }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, - { { 0x0C, 0xED, 0x71 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x0C, 0xED, 0x71 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x0C, 0xED, 0xC8 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x0C, 0xEE, 0x20 }, "Fbc", "Fbc" }, { { 0x0C, 0xEE, 0x99 }, "AmazonTechno", "Amazon Technologies Inc." }, @@ -14911,6 +14939,7 @@ { { 0x10, 0x18, 0x49 }, "WeifangGoert", "Weifang Goertek Electronics Co.,Ltd" }, { { 0x10, 0x18, 0x9E }, "ElmoMotionCo", "Elmo Motion Control" }, { { 0x10, 0x19, 0x65 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, + { { 0x10, 0x19, 0x88 }, "MotherComput", "Mother Computer Inc." }, { { 0x10, 0x1A, 0x92 }, "AkebonoBrake", "Akebono Brake Industry Co.,Ltd." }, { { 0x10, 0x1B, 0x54 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x10, 0x1C, 0x0C }, "Apple", "Apple, Inc." }, @@ -14918,6 +14947,7 @@ { { 0x10, 0x1D, 0x6E }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x10, 0x1D, 0xC0 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x10, 0x1E, 0xDA }, "IngenicoTerm", "Ingenico Terminals Sas" }, + { { 0x10, 0x1E, 0xF4 }, "kiwimooreSem", "kiwimoore (Quzhou) Semiconductor Co.,Ltd" }, { { 0x10, 0x1F, 0x74 }, "HewlettPacka", "Hewlett Packard" }, { { 0x10, 0x20, 0xBA }, "Espressif", "Espressif Inc." }, { { 0x10, 0x22, 0x79 }, "ZeroDesktop", "ZeroDesktop, Inc." }, @@ -14954,6 +14984,7 @@ { { 0x10, 0x30, 0x25 }, "Apple", "Apple, Inc." }, { { 0x10, 0x30, 0x34 }, "Cara", "Cara Systems" }, { { 0x10, 0x30, 0x47 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x10, 0x30, 0x89 }, "Resideo", "Resideo" }, { { 0x10, 0x32, 0x1D }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x10, 0x32, 0x2C }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x10, 0x32, 0x7E }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -14969,6 +15000,7 @@ { { 0x10, 0x39, 0x4E }, "Hisensebroad", "Hisense broadband multimedia technology Co.,Ltd" }, { { 0x10, 0x39, 0xE9 }, "JuniperNetwo", "Juniper Networks" }, { { 0x10, 0x3A, 0x5D }, "Emerson", "Emerson" }, + { { 0x10, 0x3B, 0x54 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x10, 0x3B, 0x59 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x10, 0x3C, 0x59 }, "zte", "zte corporation" }, { { 0x10, 0x3D, 0x0A }, "HuiZhouGaosh", "Hui Zhou Gaoshengda Technology Co.,LTD" }, @@ -15108,7 +15140,9 @@ { { 0x10, 0x91, 0xA8 }, "Espressif", "Espressif Inc." }, { { 0x10, 0x91, 0xD1 }, "Intel", "Intel Corporate" }, { { 0x10, 0x92, 0x66 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x10, 0x93, 0x27 }, "GIGABYTETECH", "GIGA-BYTE TECHNOLOGY CO. , Ltd." }, { { 0x10, 0x93, 0x97 }, "Commscope", "Commscope" }, + { { 0x10, 0x93, 0xC9 }, "KingsignalTe", "Kingsignal Technology Co., Ltd." }, { { 0x10, 0x93, 0xE9 }, "Apple", "Apple, Inc." }, { { 0x10, 0x94, 0x97 }, "LogitechHong", "Logitech Hong Kong" }, { { 0x10, 0x94, 0xBB }, "Apple", "Apple, Inc." }, @@ -15146,6 +15180,7 @@ { { 0x10, 0xA4, 0x50 }, "Kwikset", "Kwikset" }, { { 0x10, 0xA4, 0xB9 }, "BaiduOnlineN", "Baidu Online Network Technology (Beijing) Co., Ltd" }, { { 0x10, 0xA4, 0xBE }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, + { { 0x10, 0xA4, 0xC9 }, "Apple", "Apple, Inc." }, { { 0x10, 0xA4, 0xDA }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x10, 0xA5, 0x1D }, "Intel", "Intel Corporate" }, { { 0x10, 0xA5, 0x62 }, "ItonTechnolo", "Iton Technology Corp." }, @@ -15206,6 +15241,7 @@ { { 0x10, 0xC4, 0xCA }, "HUMAX", "HUMAX Co., Ltd." }, { { 0x10, 0xC5, 0x86 }, "BioSoundLab", "Bio Sound Lab Co., Ltd." }, { { 0x10, 0xC5, 0x95 }, "Lenovo", "Lenovo" }, + { { 0x10, 0xC5, 0xFA }, "ZyxelCommuni", "Zyxel Communications Corporation" }, { { 0x10, 0xC6, 0x0C }, "DominoUK", "Domino UK Ltd" }, { { 0x10, 0xC6, 0x1F }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x10, 0xC6, 0x5E }, "AdaptIP", "Adapt-IP" }, @@ -15266,6 +15302,7 @@ { { 0x10, 0xE7, 0xC6 }, "HewlettPacka", "Hewlett Packard" }, { { 0x10, 0xE8, 0x3A }, "FiberxDistri", "Fiberx Distribuidora De Produtos De Telecomunicacao Ltda" }, { { 0x10, 0xE8, 0x40 }, "ZoweeTechnol", "Zowee Technology(Heyuan) Co., Ltd." }, + { { 0x10, 0xE8, 0x64 }, "Nucode", "Nucode Co., Ltd." }, { { 0x10, 0xE8, 0x78 }, "Nokia", "Nokia" }, { { 0x10, 0xE8, 0xA7 }, "WNC", "WNC Corporation" }, { { 0x10, 0xE8, 0xEE }, "PhaseSpace", "PhaseSpace" }, @@ -15305,6 +15342,7 @@ { { 0x14, 0x01, 0x52 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x14, 0x01, 0x9C }, "Ubyon", "Ubyon Inc." }, { { 0x14, 0x02, 0xEC }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x14, 0x03, 0x38 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x14, 0x04, 0x67 }, "SNKTechnolog", "SNK Technologies Co.,Ltd." }, { { 0x14, 0x05, 0x89 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x14, 0x06, 0x4C }, "VoglElectron", "Vogl Electronic GmbH" }, @@ -15490,8 +15528,10 @@ { { 0x14, 0x75, 0x5B }, "Intel", "Intel Corporate" }, { { 0x14, 0x75, 0x90 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x14, 0x75, 0xE5 }, "ELMAX", "ELMAX Srl" }, + { { 0x14, 0x76, 0x49 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x14, 0x77, 0x40 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x14, 0x78, 0x0B }, "VarexImaging", "Varex Imaging Deutschland AG" }, + { { 0x14, 0x78, 0x30 }, "NVIDIA", "NVIDIA Corporation" }, { { 0x14, 0x79, 0xF3 }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0x14, 0x7A, 0xE4 }, "Apple", "Apple, Inc." }, { { 0x14, 0x7B, 0xAC }, "Nokia", "Nokia" }, @@ -15594,6 +15634,7 @@ { { 0x14, 0xB4, 0x57 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x14, 0xB4, 0x84 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x14, 0xB5, 0xCD }, "LiteonTechno", "Liteon Technology Corporation" }, + { { 0x14, 0xB6, 0xEB }, "CJintelligen", "CJ intelligent technology LTD." }, { { 0x14, 0xB7, 0x3D }, "ARCHEANTechn", "ARCHEAN Technologies" }, { { 0x14, 0xB7, 0xF8 }, "VantivaUSA", "Vantiva USA LLC" }, { { 0x14, 0xB8, 0x37 }, "YOUHUATechno", "Shenzhen YOUHUA Technology Co., Ltd" }, @@ -15637,6 +15678,7 @@ { { 0x14, 0xD1, 0x1F }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x14, 0xD1, 0x69 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x14, 0xD1, 0x9E }, "Apple", "Apple, Inc." }, + { { 0x14, 0xD1, 0xD4 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x14, 0xD4, 0x24 }, "AzureWaveTec", "AzureWave Technology Inc." }, { { 0x14, 0xD4, 0xFE }, "Commscope", "Commscope" }, { { 0x14, 0xD5, 0x37 }, "AllInspireHe", "All Inspire Health Inc." }, @@ -15659,9 +15701,11 @@ { { 0x14, 0xDD, 0xE5 }, "Mpmkvvcl", "Mpmkvvcl" }, { { 0x14, 0xDE, 0x39 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x14, 0xE0, 0x1D }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x14, 0xE1, 0xC9 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x14, 0xE2, 0x2A }, "Cisco", "Cisco Systems, Inc" }, { { 0x14, 0xE2, 0x89 }, "Abietec", "Abietec Inc." }, { { 0x14, 0xE4, 0xEC }, "mLogic", "mLogic LLC" }, + { { 0x14, 0xE6, 0x02 }, "EMTEKStorage", "Shenzhen EMTEK Storage Technology Co.,Ltd" }, { { 0x14, 0xE6, 0xE4 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x14, 0xE7, 0xC8 }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, { { 0x14, 0xE9, 0xB2 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, @@ -15716,6 +15760,7 @@ { { 0x18, 0x0F, 0x76 }, "DLinkInterna", "D-Link International" }, { { 0x18, 0x10, 0x4E }, "CedintUpm", "Cedint-Upm" }, { { 0x18, 0x11, 0x71 }, "GuangzhouDoc", "Guangzhou Doctorpai Education & Technology Co.,Ltd" }, + { { 0x18, 0x12, 0x0C }, "ZhouhaiIntel", "Zhouhai Intelligence(Shenzhen).,Ltd" }, { { 0x18, 0x12, 0x12 }, "CeptonTechno", "Cepton Technologies" }, { { 0x18, 0x13, 0x2D }, "zte", "zte corporation" }, { { 0x18, 0x14, 0x20 }, "TebSas", "Teb Sas" }, @@ -15807,7 +15852,7 @@ { { 0x18, 0x48, 0xBE }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x18, 0x48, 0xCA }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x18, 0x48, 0xD8 }, "FastbackNetw", "Fastback Networks" }, - { { 0x18, 0x49, 0xF8 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x18, 0x49, 0xF8 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x18, 0x4A, 0x53 }, "Apple", "Apple, Inc." }, { { 0x18, 0x4A, 0x6F }, "AlcatelLucen", "Alcatel-Lucent Shanghai Bell Co., Ltd" }, { { 0x18, 0x4B, 0x0D }, "RuckusWirele", "Ruckus Wireless" }, @@ -15989,12 +16034,14 @@ { { 0x18, 0xB2, 0x09 }, "TorreyPinesL", "Torrey Pines Logic, Inc" }, { { 0x18, 0xB3, 0xBA }, "Netlogic", "Netlogic AB" }, { { 0x18, 0xB4, 0x30 }, "NestLabs", "Nest Labs Inc." }, + { { 0x18, 0xB4, 0xFE }, "TozedKangwei", "Tozed Kangwei Tech Co., Ltd" }, { { 0x18, 0xB5, 0x91 }, "IStorm", "I-Storm" }, { { 0x18, 0xB6, 0x57 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x18, 0xB6, 0xCC }, "We", "We Corporation Inc." }, { { 0x18, 0xB6, 0xF7 }, "NewPosTechno", "New Pos Technology Limited" }, { { 0x18, 0xB7, 0x9E }, "Invoxia", "Invoxia" }, { { 0x18, 0xB8, 0x1F }, "Commscope", "Commscope" }, + { { 0x18, 0xB8, 0x3D }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x18, 0xB8, 0x42 }, "Apple", "Apple, Inc." }, { { 0x18, 0xB9, 0x05 }, "HongKongBouf", "Hong Kong Bouffalo Lab Limited" }, { { 0x18, 0xB9, 0x6E }, "DongguanLies", "Dongguan Liesheng Electronic Co., Ltd." }, @@ -16032,8 +16079,10 @@ { { 0x18, 0xCF, 0x5E }, "LiteonTechno", "Liteon Technology Corporation" }, { { 0x18, 0xD0, 0x71 }, "Dasan", "Dasan Co., Ltd." }, { { 0x18, 0xD0, 0xC5 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, + { { 0x18, 0xD0, 0xE1 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x18, 0xD2, 0x25 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0x18, 0xD2, 0x76 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x18, 0xD3, 0xCF }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x18, 0xD5, 0xB6 }, "SMGHoldings", "SMG Holdings LLC" }, { { 0x18, 0xD6, 0x1C }, "TINNOMobileT", "Shenzhen TINNO Mobile Technology Corp." }, { { 0x18, 0xD6, 0x6A }, "Inmarsat", "Inmarsat" }, @@ -16084,6 +16133,7 @@ { { 0x18, 0xF1, 0xD8 }, "Apple", "Apple, Inc." }, { { 0x18, 0xF2, 0x2C }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x18, 0xF2, 0x92 }, "Shannon", "Shannon Systems" }, + { { 0x18, 0xF3, 0xC2 }, "EbotDigitalT", "Ebot Digital Technoloy Co., Limited" }, { { 0x18, 0xF4, 0x6A }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, { { 0x18, 0xF4, 0x6B }, "TelenorConne", "Telenor Connexion AB" }, { { 0x18, 0xF5, 0x8B }, "GlobalReachT", "GlobalReach Technology EMEA Ltd" }, @@ -16156,21 +16206,24 @@ { { 0x1C, 0x1F, 0xF1 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x1C, 0x20, 0xDB }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x1C, 0x21, 0x56 }, "Smappee", "Smappee NV" }, + { { 0x1C, 0x22, 0x26 }, "Cisco", "Cisco Systems, Inc" }, { { 0x1C, 0x22, 0x85 }, "SerratureMer", "Serrature Meroni SpA" }, { { 0x1C, 0x23, 0x2C }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x1C, 0x23, 0x4F }, "EDMIEurope", "EDMI Europe Ltd" }, { { 0x1C, 0x23, 0xA2 }, "FRITZ!Techno", "FRITZ! Technology GmbH" }, { { 0x1C, 0x24, 0xCD }, "AskeyCompute", "Askey Computer Corp" }, { { 0x1C, 0x24, 0xEB }, "Burlywood", "Burlywood" }, + { { 0x1C, 0x25, 0x75 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x1C, 0x25, 0xE1 }, "ChinaMobileI", "China Mobile IOT Company Limited" }, { { 0x1C, 0x27, 0x04 }, "zte", "zte corporation" }, { { 0x1C, 0x27, 0xDD }, "DatangGohigh", "Datang Gohighsec(zhejiang)Information Technology Co.,Ltd." }, { { 0x1C, 0x28, 0xAF }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x1C, 0x29, 0x04 }, "Espressif", "Espressif Inc." }, { { 0x1C, 0x2A, 0x8B }, "Nokia", "Nokia" }, { { 0x1C, 0x2A, 0xA3 }, "HongRuiOptic", "Shenzhen HongRui Optical Technology Co., Ltd." }, { { 0x1C, 0x2A, 0xB0 }, "XiaomiElectr", "Beijing Xiaomi Electronics Co.,Ltd" }, { { 0x1C, 0x2C, 0xE0 }, "MountainView", "Shanghai Mountain View Silicon" }, - { { 0x1C, 0x2D, 0x60 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x1C, 0x2D, 0x60 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x1C, 0x2E, 0x1B }, "SuzhouTremen", "Suzhou Tremenet Communication Technology Co., Ltd." }, { { 0x1C, 0x2F, 0xA2 }, "GuangzhouShi", "Guangzhou Shiyuan Electronic Technology Company Limited" }, { { 0x1C, 0x30, 0x03 }, "HewlettPacka", "Hewlett Packard Enterprise" }, @@ -16221,6 +16274,7 @@ { { 0x1C, 0x48, 0xCE }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0x1C, 0x48, 0xF9 }, "GNNetcom", "GN Netcom A/S" }, { { 0x1C, 0x49, 0x7B }, "GemtekTechno", "Gemtek Technology Co., Ltd." }, + { { 0x1C, 0x4A, 0x3B }, "AcctonTechno", "Accton Technology Corporation" }, { { 0x1C, 0x4A, 0xF7 }, "Amon", "Amon Inc" }, { { 0x1C, 0x4B, 0xB9 }, "SmgEnterpris", "Smg Enterprise, Llc" }, { { 0x1C, 0x4B, 0xD6 }, "AzureWaveTec", "AzureWave Technology Inc." }, @@ -16325,6 +16379,7 @@ { { 0x1C, 0x83, 0xB0 }, "LinkedIP", "Linked IP GmbH" }, { { 0x1C, 0x83, 0xEC }, "UbeeInteract", "Ubee Interactive co, Limited." }, { { 0x1C, 0x84, 0x64 }, "FormosaWirel", "Formosa Wireless Communication Corp." }, + { { 0x1C, 0x84, 0xA6 }, "Cisco", "Cisco Systems, Inc" }, { { 0x1C, 0x86, 0x0B }, "TaiyingTechn", "Guangdong Taiying Technology Co.,Ltd" }, { { 0x1C, 0x86, 0x82 }, "Apple", "Apple, Inc." }, { { 0x1C, 0x86, 0x9A }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -16357,7 +16412,7 @@ { { 0x1C, 0x97, 0x3D }, "PRICOMDesign", "PRICOM Design" }, { { 0x1C, 0x97, 0xC5 }, "Ynomia", "Ynomia Pty Ltd" }, { { 0x1C, 0x97, 0xFB }, "CoolBitX", "CoolBitX Ltd." }, - { { 0x1C, 0x98, 0x4B }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x1C, 0x98, 0x4B }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x1C, 0x98, 0xC1 }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, { { 0x1C, 0x98, 0xEC }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x1C, 0x99, 0x4C }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, @@ -16455,6 +16510,7 @@ { { 0x1C, 0xE4, 0xDD }, "TechnicolorT", "Technicolor (China) Technology Co., Ltd." }, { { 0x1C, 0xE5, 0x04 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x1C, 0xE5, 0x7F }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x1C, 0xE5, 0x87 }, "CiscoMeraki", "Cisco Meraki" }, { { 0x1C, 0xE6, 0x1D }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x1C, 0xE6, 0x2B }, "Apple", "Apple, Inc." }, { { 0x1C, 0xE6, 0x39 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -16512,7 +16568,7 @@ { { 0x20, 0x0B, 0xCF }, "Nintendo", "Nintendo Co.,Ltd" }, { { 0x20, 0x0C, 0x86 }, "GXIndia", "GX India Pvt Ltd" }, { { 0x20, 0x0C, 0xC8 }, "Netgear", "Netgear" }, - { { 0x20, 0x0D, 0x3D }, "QuectelWirel", "Quectel Wireless Solutions Co., Ltd." }, + { { 0x20, 0x0D, 0x3D }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, { { 0x20, 0x0D, 0xB0 }, "FourSeasGlob", "Shenzhen Four Seas Global Link Network Technology Co., Ltd." }, { { 0x20, 0x0E, 0x0F }, "PanasonicMar", "Panasonic Marketing Middle East & Africa FZE" }, { { 0x20, 0x0E, 0x2B }, "Apple", "Apple, Inc." }, @@ -16557,6 +16613,7 @@ { { 0x20, 0x21, 0xA5 }, "LGElectronic", "LG Electronics (Mobile Communications)" }, { { 0x20, 0x23, 0x51 }, "TPLink", "TP-Link Systems Inc" }, { { 0x20, 0x25, 0x64 }, "Pegatron", "Pegatron Corporation" }, + { { 0x20, 0x25, 0x65 }, "Espressif", "Espressif Inc." }, { { 0x20, 0x25, 0x98 }, "Teleview", "Teleview" }, { { 0x20, 0x25, 0xCC }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x20, 0x25, 0xD2 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, @@ -16567,6 +16624,7 @@ { { 0x20, 0x2A, 0xC5 }, "PetiteEn", "Petite-En" }, { { 0x20, 0x2B, 0x20 }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, { { 0x20, 0x2B, 0xC1 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x20, 0x2C, 0x05 }, "ZhejiangDahu", "Zhejiang Dahua Zhilian Co.,Ltd" }, { { 0x20, 0x2C, 0xB7 }, "KongYueElect", "Kong Yue Electronics & Information Industry (Xinhui) Ltd." }, { { 0x20, 0x2D, 0x07 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x20, 0x2D, 0x23 }, "CollinearNet", "Collinear Networks Inc." }, @@ -16635,6 +16693,7 @@ { { 0x20, 0x50, 0x0F }, "FiberGroep", "Fiber Groep B.V." }, { { 0x20, 0x50, 0xE7 }, "AMPAKTechnol", "AMPAK Technology,Inc." }, { { 0x20, 0x51, 0xF5 }, "EardaTechnol", "Earda Technologies co Ltd" }, + { { 0x20, 0x52, 0x1D }, "Apple", "Apple, Inc." }, { { 0x20, 0x53, 0x83 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x20, 0x53, 0x8D }, "HonHaiPrecis", "Hon Hai Precision Industry Co., Ltd." }, { { 0x20, 0x53, 0xCA }, "RiskTechnolo", "Risk Technology Ltd" }, @@ -16648,6 +16707,7 @@ { { 0x20, 0x58, 0x43 }, "WNC", "WNC Corporation" }, { { 0x20, 0x58, 0x69 }, "RuckusWirele", "Ruckus Wireless" }, { { 0x20, 0x59, 0xA0 }, "ParagonTechn", "Paragon Technologies Inc." }, + { { 0x20, 0x59, 0xD1 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x20, 0x5A, 0x00 }, "Coval", "Coval" }, { { 0x20, 0x5A, 0x1D }, "zte", "zte corporation" }, { { 0x20, 0x5A, 0x8F }, "HikeenTechno", "Shenzhen Hikeen Technology Co.,LTD" }, @@ -16673,6 +16733,7 @@ { { 0x20, 0x67, 0xB1 }, "Pluto", "Pluto inc." }, { { 0x20, 0x67, 0xE0 }, "iCommSemicon", "Shenzhen iComm Semiconductor CO.,LTD" }, { { 0x20, 0x68, 0x9D }, "LiteonTechno", "Liteon Technology Corporation" }, + { { 0x20, 0x68, 0xAA }, "PotronTechno", "Potron Technology Co.,Ltd.," }, { { 0x20, 0x69, 0x80 }, "Apple", "Apple, Inc." }, { { 0x20, 0x6A, 0x8A }, "WistronInfoc", "Wistron Infocomm (Zhongshan) Corporation" }, { { 0x20, 0x6A, 0x94 }, "HitronTechno", "Hitron Technologies. Inc" }, @@ -16680,7 +16741,7 @@ { { 0x20, 0x6B, 0xD5 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0x20, 0x6B, 0xE7 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x20, 0x6B, 0xF4 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, - { { 0x20, 0x6C, 0x8A }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x20, 0x6C, 0x8A }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x20, 0x6D, 0x31 }, "Firewalla", "Firewalla Inc" }, { { 0x20, 0x6E, 0x9C }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x20, 0x6E, 0xF1 }, "Espressif", "Espressif Inc." }, @@ -16708,6 +16769,7 @@ { { 0x20, 0x82, 0x6A }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0x20, 0x82, 0xC0 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x20, 0x83, 0xF8 }, "AdvancedDigi", "Advanced Digital Broadcast SA" }, + { { 0x20, 0x84, 0x5F }, "Apple", "Apple, Inc." }, { { 0x20, 0x84, 0xF5 }, "YufeiInnovat", "Yufei Innovation Software(Shenzhen) Co., Ltd." }, { { 0x20, 0x85, 0x8C }, "Assa", "Assa" }, { { 0x20, 0x87, 0x56 }, "Siemens", "Siemens Ag" }, @@ -16745,7 +16807,7 @@ { { 0x20, 0x9B, 0xE6 }, "GuangzhouShi", "Guangzhou Shiyuan Electronic Technology Company Limited" }, { { 0x20, 0x9C, 0xB4 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x20, 0x9E, 0x79 }, "UniversalEle", "Universal Electronics, Inc." }, - { { 0x20, 0x9E, 0xF7 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x20, 0x9E, 0xF7 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x20, 0xA1, 0x71 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x20, 0xA2, 0x00 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x20, 0xA2, 0xE4 }, "Apple", "Apple, Inc." }, @@ -16768,6 +16830,7 @@ { { 0x20, 0xAA, 0x4B }, "CiscoLinksys", "Cisco-Linksys, LLC" }, { { 0x20, 0xAB, 0x37 }, "Apple", "Apple, Inc." }, { { 0x20, 0xAB, 0x48 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x20, 0xAB, 0x53 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x20, 0xAC, 0x9C }, "ChinaTelecom", "China Telecom Corporation Limited" }, { { 0x20, 0xAD, 0x56 }, "AUMOVIO", "AUMOVIO Systems, Inc." }, { { 0x20, 0xAE, 0xB6 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -16819,6 +16882,7 @@ { { 0x20, 0xD3, 0x90 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x20, 0xD5, 0xAB }, "KoreaInfocom", "Korea Infocom Co.,Ltd." }, { { 0x20, 0xD5, 0xBF }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x20, 0xD5, 0xC2 }, "EspressifPte", "Espressif Systems (Singapore) Pte. Ltd" }, { { 0x20, 0xD6, 0x07 }, "Nokia", "Nokia Corporation" }, { { 0x20, 0xD7, 0x5A }, "PoshMobile", "Posh Mobile Limited" }, { { 0x20, 0xD7, 0x78 }, "TexasInstrum", "Texas Instruments" }, @@ -16865,7 +16929,7 @@ { { 0x20, 0xF3, 0x07 }, "zte", "zte corporation" }, { { 0x20, 0xF3, 0x75 }, "Commscope", "Commscope" }, { { 0x20, 0xF3, 0xA3 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0x20, 0xF4, 0x1B }, "Bilianelectr", "Shenzhen Bilian electronic CO.,LTD" }, + { { 0x20, 0xF4, 0x1B }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, { { 0x20, 0xF4, 0x4F }, "Nokia", "Nokia" }, { { 0x20, 0xF4, 0x52 }, "IUVSoftwareD", "Shanghai IUV Software Development Co. Ltd" }, { { 0x20, 0xF4, 0x78 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, @@ -16941,8 +17005,9 @@ { { 0x24, 0x1E, 0x2B }, "ZhejiangCain", "Zhejiang Cainiao Supply Chain Management Co., Ltd" }, { { 0x24, 0x1E, 0xEB }, "Apple", "Apple, Inc." }, { { 0x24, 0x1F, 0x2C }, "Calsys", "Calsys, Inc." }, + { { 0x24, 0x1F, 0x49 }, "NXPSemicondu", "NXP Semiconductors Taiwan Ltd." }, { { 0x24, 0x1F, 0xA0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0x24, 0x1F, 0xBD }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x24, 0x1F, 0xBD }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x24, 0x20, 0xC7 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x24, 0x21, 0x24 }, "Nokia", "Nokia" }, { { 0x24, 0x21, 0x5E }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, @@ -16999,9 +17064,11 @@ { { 0x24, 0x46, 0xC8 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x24, 0x46, 0xE4 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x24, 0x47, 0x0E }, "PentronicAB", "PentronicAB" }, + { { 0x24, 0x47, 0x50 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x24, 0x48, 0x45 }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, { { 0x24, 0x48, 0x85 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x24, 0x49, 0x7B }, "InnovativeCo", "Innovative Converged Devices Inc" }, + { { 0x24, 0x4A, 0xF8 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x24, 0x4B, 0x03 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x24, 0x4B, 0x81 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x24, 0x4B, 0xF1 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -17099,7 +17166,8 @@ { { 0x24, 0x7F, 0x3C }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x24, 0x80, 0x00 }, "WestcontrolA", "Westcontrol AS" }, { { 0x24, 0x81, 0x3B }, "Cisco", "Cisco Systems, Inc" }, - { { 0x24, 0x81, 0x85 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x24, 0x81, 0x4E }, "Amd", "Amd" }, + { { 0x24, 0x81, 0x85 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x24, 0x81, 0xAA }, "KSHInternati", "KSH International Co., Ltd." }, { { 0x24, 0x81, 0xC7 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x24, 0x82, 0x8A }, "ProwaveTechn", "Prowave Technologies Ltd." }, @@ -17132,6 +17200,7 @@ { { 0x24, 0x9E, 0x7D }, "RoborockTech", "Beijing Roborock Technology Co., Ltd." }, { { 0x24, 0x9E, 0xAB }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x24, 0x9F, 0x89 }, "TexasInstrum", "Texas Instruments" }, + { { 0x24, 0xA0, 0x2D }, "worldeliteel", "shenzhen worldelite electronics co., LTD" }, { { 0x24, 0xA0, 0x74 }, "Apple", "Apple, Inc." }, { { 0x24, 0xA1, 0x60 }, "Espressif", "Espressif Inc." }, { { 0x24, 0xA1, 0x86 }, "Commscope", "Commscope" }, @@ -17149,7 +17218,7 @@ { { 0x24, 0xA7, 0x99 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x24, 0xA7, 0xDC }, "SkyUk", "Sky Uk Limited" }, { { 0x24, 0xA8, 0x7D }, "PanasonicAut", "Panasonic Automotive Systems Asia Pacific(Thailand)Co.,Ltd." }, - { { 0x24, 0xA9, 0x37 }, "PUREStorage", "PURE Storage" }, + { { 0x24, 0xA9, 0x37 }, "Everpure", "Everpure, Inc." }, { { 0x24, 0xAB, 0x81 }, "Apple", "Apple, Inc." }, { { 0x24, 0xAC, 0xAC }, "PolarElectro", "Polar Electro Oy" }, { { 0x24, 0xAE, 0xCC }, "HonorDevice", "Honor Device Co., Ltd." }, @@ -17173,6 +17242,7 @@ { { 0x24, 0xB8, 0x8C }, "Crenus", "Crenus Co.,Ltd." }, { { 0x24, 0xB8, 0xD2 }, "OpzoonTechno", "Opzoon Technology Co.,Ltd." }, { { 0x24, 0xBA, 0x13 }, "RisoKagaku", "Riso Kagaku Corporation" }, + { { 0x24, 0xBA, 0x23 }, "Cisco", "Cisco Systems, Inc" }, { { 0x24, 0xBA, 0x30 }, "TechnicalCon", "Technical Consumer Products, Inc." }, { { 0x24, 0xBA, 0x79 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0x24, 0xBB, 0xC1 }, "AbsoluteAnal", "Absolute Analysis" }, @@ -17287,6 +17357,7 @@ { { 0x24, 0xF6, 0x77 }, "Apple", "Apple, Inc." }, { { 0x24, 0xF6, 0x8D }, "Nokia", "Nokia" }, { { 0x24, 0xFA, 0xD4 }, "MoreStarTech", "ShenZhen More Star Technology Co.,LTD" }, + { { 0x24, 0xFA, 0xD6 }, "Emstone", "Emstone" }, { { 0x24, 0xFA, 0xF3 }, "FlexemTechno", "Shanghai Flexem Technology Co.,Ltd." }, { { 0x24, 0xFB, 0x65 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x24, 0xFB, 0xE3 }, "HP", "HP Inc." }, @@ -17491,6 +17562,7 @@ { { 0x28, 0x7E, 0x80 }, "HuiZhouGaosh", "Hui Zhou Gaoshengda Technology Co.,LTD" }, { { 0x28, 0x7F, 0xCF }, "Intel", "Intel Corporate" }, { { 0x28, 0x80, 0x23 }, "HewlettPacka", "Hewlett Packard" }, + { { 0x28, 0x80, 0x6E }, "PirelliTyre", "Pirelli Tyre S.p.A." }, { { 0x28, 0x80, 0x88 }, "Netgear", "Netgear" }, { { 0x28, 0x80, 0x8A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x28, 0x80, 0xA2 }, "InseegoWirel", "Inseego Wireless, Inc" }, @@ -17562,6 +17634,7 @@ { { 0x28, 0xAF, 0x0A }, "SiriusXMRadi", "Sirius XM Radio Inc" }, { { 0x28, 0xAF, 0x21 }, "zte", "zte corporation" }, { { 0x28, 0xAF, 0x42 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x28, 0xAF, 0xE5 }, "CDataTechnol", "Shenzhen C-Data Technology Co., Ltd." }, { { 0x28, 0xAF, 0xFD }, "Cisco", "Cisco Systems, Inc" }, { { 0x28, 0xB0, 0xCC }, "Xenyadoo", "Xenya d.o.o." }, { { 0x28, 0xB1, 0x33 }, "SHINEMANTech", "SHINEMAN(SHENZHEN) Tech. Cor., Ltd." }, @@ -17571,6 +17644,7 @@ { { 0x28, 0xB2, 0xBD }, "Intel", "Intel Corporate" }, { { 0x28, 0xB3, 0x71 }, "RuckusWirele", "Ruckus Wireless" }, { { 0x28, 0xB3, 0xAB }, "GenmarkAutom", "Genmark Automation" }, + { { 0x28, 0xB3, 0xAF }, "Qualynxus", "Qualynxus Inc" }, { { 0x28, 0xB4, 0x46 }, "ChuangweiRgb", "Shenzhen Chuangwei-Rgb Electronics Co.,Ltd" }, { { 0x28, 0xB4, 0x48 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x28, 0xB4, 0xFB }, "SprocommTech", "Sprocomm Technologies CO.,LTD." }, @@ -17581,6 +17655,7 @@ { { 0x28, 0xB9, 0xD9 }, "Radisys", "Radisys Corporation" }, { { 0x28, 0xBA, 0x18 }, "NextNav", "NextNav, LLC" }, { { 0x28, 0xBA, 0xB5 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x28, 0xBA, 0xB9 }, "AcmeLighting", "Acme Lighting" }, { { 0x28, 0xBB, 0x59 }, "RNETTechnolo", "RNET Technologies, Inc." }, { { 0x28, 0xBB, 0xB2 }, "Infinixmobil", "Infinix mobility limited" }, { { 0x28, 0xBB, 0xED }, "BouffaloLab", "Bouffalo Lab (Nanjing) Co., Ltd." }, @@ -17594,6 +17669,7 @@ { { 0x28, 0xBE, 0xF3 }, "FujianStarNe", "Fujian Star-Net Communication Co.,Ltd" }, { { 0x28, 0xBF, 0x89 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0x28, 0xC0, 0x1B }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, + { { 0x28, 0xC0, 0x39 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x28, 0xC0, 0xDA }, "JuniperNetwo", "Juniper Networks" }, { { 0x28, 0xC1, 0x3C }, "HonHaiPrecis", "Hon Hai Precision Industry Co., Ltd." }, { { 0x28, 0xC1, 0xA0 }, "Apple", "Apple, Inc." }, @@ -17673,6 +17749,7 @@ { { 0x28, 0xE7, 0x1D }, "AristaNetwor", "Arista Networks" }, { { 0x28, 0xE7, 0x94 }, "MicrotimeCom", "Microtime Computer Inc." }, { { 0x28, 0xE7, 0xCF }, "Apple", "Apple, Inc." }, + { { 0x28, 0xE9, 0x71 }, "EMMicroelect", "EM Microelectronic" }, { { 0x28, 0xE9, 0x8E }, "MitsubishiEl", "Mitsubishi Electric Corporation" }, { { 0x28, 0xEA, 0x0B }, "Microsoft", "Microsoft Corporation" }, { { 0x28, 0xEA, 0x2D }, "Apple", "Apple, Inc." }, @@ -17694,12 +17771,13 @@ { { 0x28, 0xF0, 0x76 }, "Apple", "Apple, Inc." }, { { 0x28, 0xF1, 0x0E }, "Dell", "Dell Inc." }, { { 0x28, 0xF3, 0x58 }, "2CTrifonov", "2C - Trifonov & Co" }, - { { 0x28, 0xF3, 0x66 }, "Bilianelectr", "Shenzhen Bilian electronic CO.,LTD" }, + { { 0x28, 0xF3, 0x66 }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, { { 0x28, 0xF4, 0x9B }, "Leetek", "Leetek" }, { { 0x28, 0xF5, 0x2B }, "FNLINKTECHNO", "FN-LINK TECHNOLOGY Ltd." }, { { 0x28, 0xF5, 0x32 }, "ADDEngineeri", "ADD-Engineering BV" }, { { 0x28, 0xF5, 0xD1 }, "Commscope", "Commscope" }, { { 0x28, 0xF6, 0x06 }, "Syes", "Syes srl" }, + { { 0x28, 0xF7, 0x9A }, "LXSemicon", "LX Semicon co.,Ltd." }, { { 0x28, 0xF7, 0xD6 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0x28, 0xFA, 0x19 }, "JingxunSoftw", "Shenzhen Jingxun Software Telecommunication Technology Co.,Ltd" }, { { 0x28, 0xFA, 0x7A }, "ZhejiangTmal", "Zhejiang Tmall Technology Co., Ltd." }, @@ -17796,6 +17874,7 @@ { { 0x2C, 0x28, 0x2D }, "BbkEducation", "Bbk Educational Electronics Corp.,Ltd." }, { { 0x2C, 0x28, 0xB7 }, "Ruiyingtechn", "Hangzhou Ruiying technology co., LTD" }, { { 0x2C, 0x29, 0x97 }, "Microsoft", "Microsoft Corporation" }, + { { 0x2C, 0x2B, 0x86 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x2C, 0x2B, 0xDB }, "eero", "eero inc." }, { { 0x2C, 0x2B, 0xF9 }, "LGInnotek", "LG Innotek" }, { { 0x2C, 0x2D, 0x48 }, "CommendInter", "Commend International GmbH" }, @@ -17834,6 +17913,7 @@ { { 0x2C, 0x3F, 0x0B }, "CiscoMeraki", "Cisco Meraki" }, { { 0x2C, 0x3F, 0x38 }, "Cisco", "Cisco Systems, Inc" }, { { 0x2C, 0x3F, 0x3E }, "AlgeTiming", "Alge-Timing GmbH" }, + { { 0x2C, 0x3F, 0x87 }, "Private", "Private" }, { { 0x2C, 0x40, 0x2B }, "SmartiBlueTe", "Smart iBlue Technology Limited" }, { { 0x2C, 0x40, 0x53 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x2C, 0x41, 0x38 }, "HewlettPacka", "Hewlett Packard" }, @@ -18098,8 +18178,10 @@ { { 0x2C, 0xE3, 0x10 }, "Stratacache", "Stratacache" }, { { 0x2C, 0xE3, 0x8E }, "Cisco", "Cisco Systems, Inc" }, { { 0x2C, 0xE4, 0x12 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, + { { 0x2C, 0xE5, 0xBD }, "Ubiquiti", "Ubiquiti Inc" }, { { 0x2C, 0xE6, 0x4D }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, { { 0x2C, 0xE6, 0xCC }, "RuckusWirele", "Ruckus Wireless" }, + { { 0x2C, 0xE7, 0xA7 }, "SJIT", "SJIT Co., Ltd." }, { { 0x2C, 0xE8, 0x71 }, "AlertMetalgu", "Alert Metalguard ApS" }, { { 0x2C, 0xEA, 0x7F }, "Dell", "Dell Inc." }, { { 0x2C, 0xEA, 0xDA }, "ICCIntellige", "ICC Intelligent Platforms GmbH" }, @@ -18147,7 +18229,7 @@ { { 0x30, 0x05, 0x3F }, "JTI", "JTI Co.,Ltd." }, { { 0x30, 0x05, 0x5C }, "Brotherindus", "Brother industries, LTD." }, { { 0x30, 0x07, 0x4D }, "SamsungElect", "Samsung Electro-Mechanics(Thailand)" }, - { { 0x30, 0x07, 0x5C }, "43403", "43403" }, + { { 0x30, 0x07, 0x5C }, "NetisTechnol", "Netis Technology Co., Ltd." }, { { 0x30, 0x07, 0xA3 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x30, 0x08, 0x4D }, "TrumpfHüttin", "Trumpf Hüttinger" }, { { 0x30, 0x09, 0x16 }, "Apple", "Apple, Inc." }, @@ -18291,6 +18373,7 @@ { { 0x30, 0x61, 0x12 }, "PAV", "PAV GmbH" }, { { 0x30, 0x61, 0x18 }, "Paradom", "Paradom Inc." }, { { 0x30, 0x61, 0xA2 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x30, 0x62, 0x22 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x30, 0x63, 0x6B }, "Apple", "Apple, Inc." }, { { 0x30, 0x63, 0x71 }, "ShenzhenshiX", "Shenzhenshi Xinzhongxin Technology Co.Ltd" }, { { 0x30, 0x63, 0xCF }, "ZhejiangCain", "Zhejiang Cainiao Supply Chain Management Co., Ltd" }, @@ -18419,6 +18502,7 @@ { { 0x30, 0xB6, 0x4F }, "JuniperNetwo", "Juniper Networks" }, { { 0x30, 0xB7, 0xD4 }, "HitronTechno", "Hitron Technologies. Inc" }, { { 0x30, 0xB8, 0x51 }, "Siemens", "Siemens AG" }, + { { 0x30, 0xB8, 0x9A }, "KryonTechnol", "Kryon Technology Private Limited" }, { { 0x30, 0xB9, 0x30 }, "zte", "zte corporation" }, { { 0x30, 0xB9, 0xB0 }, "IntracomAsia", "Intracom Asia Co., Ltd" }, { { 0x30, 0xBB, 0x43 }, "SixiNetworks", "Sixi Networks Co., Ltd" }, @@ -18481,6 +18565,7 @@ { { 0x30, 0xE0, 0x90 }, "Genevisio", "Genevisio Ltd." }, { { 0x30, 0xE1, 0x71 }, "HewlettPacka", "Hewlett Packard" }, { { 0x30, 0xE1, 0xF1 }, "Intelbras", "Intelbras" }, + { { 0x30, 0xE2, 0x26 }, "Apple", "Apple, Inc." }, { { 0x30, 0xE2, 0x71 }, "FsasTechnolo", "Fsas Technologies Inc." }, { { 0x30, 0xE2, 0x83 }, "TexasInstrum", "Texas Instruments" }, { { 0x30, 0xE3, 0x7A }, "Intel", "Intel Corporate" }, @@ -18497,7 +18582,7 @@ { { 0x30, 0xEB, 0x15 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x30, 0xEB, 0x1F }, "SkylabM&CTec", "Skylab M&C Technology Co.,Ltd" }, { { 0x30, 0xEB, 0x25 }, "IntekDigital", "Intek Digital" }, - { { 0x30, 0xEB, 0x5A }, "LandisGyr", "Landis + Gyr" }, + { { 0x30, 0xEB, 0x5A }, "LandisGyr", "Landis+Gyr S.A." }, { { 0x30, 0xEC, 0x7C }, "AlongElectro", "Shenzhen Along Electronics Co., Ltd" }, { { 0x30, 0xEC, 0xA3 }, "AlfatronElec", "Alfatron Electronics INC" }, { { 0x30, 0xED, 0x96 }, "LSMecapion", "LS Mecapion" }, @@ -18520,7 +18605,7 @@ { { 0x30, 0xF7, 0x7F }, "SMobileDevic", "S Mobile Devices Limited" }, { { 0x30, 0xF7, 0xC5 }, "Apple", "Apple, Inc." }, { { 0x30, 0xF7, 0xD7 }, "ThreadTechno", "Thread Technology Co., Ltd" }, - { { 0x30, 0xF8, 0x56 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x30, 0xF8, 0x56 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x30, 0xF9, 0x47 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x30, 0xF9, 0x4B }, "UniversalEle", "Universal Electronics, Inc." }, { { 0x30, 0xF9, 0xED }, "Sony", "Sony Corporation" }, @@ -18533,6 +18618,7 @@ { { 0x30, 0xFC, 0x8C }, "VantivaConne", "Vantiva - Connected Home" }, { { 0x30, 0xFC, 0xEB }, "LGElectronic", "LG Electronics (Mobile Communications)" }, { { 0x30, 0xFD, 0x11 }, "Macrotech", "Macrotech (Usa) Inc." }, + { { 0x30, 0xFD, 0x34 }, "COMMANDONetw", "COMMANDO Networks Pvt Ltd." }, { { 0x30, 0xFD, 0x38 }, "Google", "Google, Inc." }, { { 0x30, 0xFD, 0x65 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x30, 0xFE, 0x31 }, "Nokia", "Nokia" }, @@ -18554,6 +18640,7 @@ { { 0x34, 0x08, 0xE1 }, "TexasInstrum", "Texas Instruments" }, { { 0x34, 0x09, 0x62 }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, { { 0x34, 0x09, 0xC9 }, "DongguanHuay", "Dongguan Huayin Electronic Technology Co., Ltd." }, + { { 0x34, 0x09, 0xE9 }, "HarmanBecker", "Harman/Becker Automotive Systems GmbH" }, { { 0x34, 0x0A, 0x22 }, "TopAccessEle", "Top-Access Electronics Co Ltd" }, { { 0x34, 0x0A, 0x33 }, "DLinkInterna", "D-Link International" }, { { 0x34, 0x0A, 0x98 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -18577,6 +18664,7 @@ { { 0x34, 0x14, 0x5F }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x34, 0x14, 0xB5 }, "TexasInstrum", "Texas Instruments" }, { { 0x34, 0x15, 0x13 }, "TexasInstrum", "Texas Instruments" }, + { { 0x34, 0x15, 0x30 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0x34, 0x15, 0x93 }, "RuckusWirele", "Ruckus Wireless" }, { { 0x34, 0x15, 0x9E }, "Apple", "Apple, Inc." }, { { 0x34, 0x17, 0x36 }, "iCommSemicon", "Shenzhen iComm Semiconductor CO.,LTD" }, @@ -18630,6 +18718,7 @@ { { 0x34, 0x31, 0xC4 }, "AVM", "AVM GmbH" }, { { 0x34, 0x32, 0xE6 }, "PanasonicInd", "Panasonic Industrial Devices Europe GmbH" }, { { 0x34, 0x36, 0x07 }, "PinewavePte", "Pinewave Pte. Ltd." }, + { { 0x34, 0x36, 0x38 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x34, 0x36, 0x3B }, "Apple", "Apple, Inc." }, { { 0x34, 0x36, 0x54 }, "zte", "zte corporation" }, { { 0x34, 0x37, 0x59 }, "zte", "zte corporation" }, @@ -18652,6 +18741,7 @@ { { 0x34, 0x42, 0x62 }, "Apple", "Apple, Inc." }, { { 0x34, 0x46, 0x6F }, "HiTEMEnginee", "HiTEM Engineering" }, { { 0x34, 0x46, 0xEC }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0x34, 0x47, 0x63 }, "Comtrend", "Comtrend Corporation" }, { { 0x34, 0x47, 0x9A }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0x34, 0x47, 0xD4 }, "QuanjingInte", "Chengdu Quanjing Intelligent Technology Co.,Ltd" }, { { 0x34, 0x48, 0xED }, "Dell", "Dell Inc." }, @@ -18678,10 +18768,11 @@ { { 0x34, 0x51, 0xC9 }, "Apple", "Apple, Inc." }, { { 0x34, 0x53, 0xD2 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x34, 0x54, 0x3C }, "TakaokaToko", "Takaoka Toko Co.,Ltd." }, + { { 0x34, 0x54, 0xEF }, "Cisco", "Cisco Systems, Inc" }, { { 0x34, 0x55, 0x06 }, "GeniusTechno", "Guangdong Genius Technology Co., Ltd." }, { { 0x34, 0x55, 0x94 }, "FujianStarNe", "Fujian Star-Net Communication Co.,Ltd" }, { { 0x34, 0x55, 0xE5 }, "SJIT", "SJIT Co., Ltd." }, - { { 0x34, 0x56, 0xED }, "GoerdynaGrou", "Goerdyna Group Co., Ltd" }, + { { 0x34, 0x56, 0xED }, "GoerdynaGrou", "Goerdyna Group Co., Ltd." }, { { 0x34, 0x56, 0xFE }, "CiscoMeraki", "Cisco Meraki" }, { { 0x34, 0x57, 0x60 }, "MitraStarTec", "MitraStar Technology Corp." }, { { 0x34, 0x58, 0x40 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -18739,7 +18830,7 @@ { { 0x34, 0x73, 0x79 }, "xFusionDigit", "xFusion Digital Technologies Co., Limited" }, { { 0x34, 0x75, 0x63 }, "RfLinkTechno", "Shenzhen Rf-Link Technology Co.,Ltd." }, { { 0x34, 0x75, 0xC7 }, "Avaya", "Avaya Inc" }, - { { 0x34, 0x76, 0xC5 }, "IODataDevice", "I-O Data Device,Inc." }, + { { 0x34, 0x76, 0xC5 }, "IOData", "I-O Data, Inc." }, { { 0x34, 0x78, 0x39 }, "zte", "zte corporation" }, { { 0x34, 0x78, 0x77 }, "ONetCommunic", "O-Net Communications (Shenzhen) Limited" }, { { 0x34, 0x78, 0xD7 }, "GioneeCommun", "Gionee Communication Equipment Co.,Ltd." }, @@ -18765,7 +18856,7 @@ { { 0x34, 0x84, 0xE4 }, "TexasInstrum", "Texas Instruments" }, { { 0x34, 0x85, 0x11 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x34, 0x85, 0x18 }, "Espressif", "Espressif Inc." }, - { { 0x34, 0x85, 0x84 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x34, 0x85, 0x84 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x34, 0x86, 0x2A }, "HeinzLackman", "Heinz Lackmann GmbH & Co KG" }, { { 0x34, 0x86, 0x5D }, "Espressif", "Espressif Inc." }, { { 0x34, 0x86, 0xDA }, "HonorDevice", "Honor Device Co., Ltd." }, @@ -18785,6 +18876,7 @@ { { 0x34, 0x8F, 0x27 }, "RuckusWirele", "Ruckus Wireless" }, { { 0x34, 0x90, 0xEA }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x34, 0x91, 0x6F }, "UserGate", "UserGate Ltd." }, + { { 0x34, 0x91, 0xF0 }, "DjiBaiwangTe", "Dji Baiwang Technology Co Ltd" }, { { 0x34, 0x92, 0xC2 }, "SquareRoute", "Square Route Co., Ltd." }, { { 0x34, 0x93, 0x42 }, "TTE", "TTE Corporation" }, { { 0x34, 0x93, 0x6F }, "JuniperNetwo", "Juniper Networks" }, @@ -18809,6 +18901,7 @@ { { 0x34, 0x9F, 0x7B }, "Canon", "Canon Inc." }, { { 0x34, 0xA1, 0x37 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x34, 0xA1, 0x83 }, "AWare", "AWare, Inc" }, + { { 0x34, 0xA2, 0x7D }, "UnisyueTechn", "Unisyue Technologies Co;LTD" }, { { 0x34, 0xA2, 0xA2 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x34, 0xA3, 0x4E }, "NevadaNano", "NevadaNano" }, { { 0x34, 0xA3, 0x95 }, "Apple", "Apple, Inc." }, @@ -18822,6 +18915,7 @@ { { 0x34, 0xA7, 0xBA }, "FischerInter", "Fischer International Systems Corporation" }, { { 0x34, 0xA8, 0x43 }, "KYOCERADispl", "KYOCERA Display Corporation" }, { { 0x34, 0xA8, 0x4E }, "Cisco", "Cisco Systems, Inc" }, + { { 0x34, 0xA8, 0xA0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x34, 0xA8, 0xDB }, "SenArchApS", "SenArch ApS" }, { { 0x34, 0xA8, 0xEB }, "Apple", "Apple, Inc." }, { { 0x34, 0xAA, 0x31 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, @@ -18831,6 +18925,7 @@ { { 0x34, 0xAB, 0x37 }, "Apple", "Apple, Inc." }, { { 0x34, 0xAB, 0x95 }, "Espressif", "Espressif Inc." }, { { 0x34, 0xAC, 0x11 }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, + { { 0x34, 0xAC, 0x2F }, "zte", "zte corporation" }, { { 0x34, 0xAD, 0x61 }, "Celestica", "Celestica Inc." }, { { 0x34, 0xAD, 0xE4 }, "ChintPower", "Shanghai Chint Power Systems Co., Ltd." }, { { 0x34, 0xAF, 0x2C }, "Nintendo", "Nintendo Co., Ltd." }, @@ -18841,6 +18936,7 @@ { { 0x34, 0xB2, 0x0A }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x34, 0xB3, 0x54 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x34, 0xB4, 0x72 }, "Espressif", "Espressif Inc." }, + { { 0x34, 0xB4, 0xF0 }, "HasselbladTr", "Hasselblad (Shenzhen) Trading CompanyLimited" }, { { 0x34, 0xB5, 0x71 }, "Plds", "Plds" }, { { 0x34, 0xB5, 0xA3 }, "CigShanghai", "Cig Shanghai Co Ltd" }, { { 0x34, 0xB7, 0xDA }, "Espressif", "Espressif Inc." }, @@ -18866,6 +18962,7 @@ { { 0x34, 0xC1, 0x03 }, "HuamuTechnol", "Hangzhou Huamu Technology Co.,Ltd." }, { { 0x34, 0xC1, 0xE9 }, "UlakCommunic", "Ulak Communications Inc." }, { { 0x34, 0xC2, 0x32 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x34, 0xC3, 0x86 }, "Apple", "Apple, Inc." }, { { 0x34, 0xC3, 0xAC }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x34, 0xC3, 0xD2 }, "FnLinkTechno", "Fn-Link Technology Limited" }, { { 0x34, 0xC3, 0xFD }, "Cisco", "Cisco Systems, Inc" }, @@ -18950,6 +19047,7 @@ { { 0x34, 0xEF, 0x44 }, "2Wire", "2Wire Inc" }, { { 0x34, 0xEF, 0x8B }, "NTTDOCOMOBUS", "NTT DOCOMO BUSINESS, Inc." }, { { 0x34, 0xEF, 0xB6 }, "EdgecoreNetw", "Edgecore Networks Corporation" }, + { { 0x34, 0xEF, 0xD7 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x34, 0xF0, 0x15 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0x34, 0xF0, 0x43 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x34, 0xF0, 0x84 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -18991,6 +19089,7 @@ { { 0x38, 0x01, 0x9F }, "FastTechnolo", "Shenzhen Fast Technologies Co.,Ltd" }, { { 0x38, 0x02, 0xDE }, "Sercomm", "Sercomm Corporation." }, { { 0x38, 0x02, 0xE3 }, "YichenTechno", "Yichen (Shenzhen) Technology Co.,Ltd" }, + { { 0x38, 0x04, 0x84 }, "Apple", "Apple, Inc." }, { { 0x38, 0x05, 0x46 }, "FoctekPhoton", "Foctek Photonics, Inc." }, { { 0x38, 0x05, 0xAC }, "PillerGroup", "Piller Group GmbH" }, { { 0x38, 0x06, 0xB4 }, "ADC", "A.D.C. GmbH" }, @@ -19022,6 +19121,7 @@ { { 0x38, 0x14, 0xA1 }, "LGInnotek", "LG Innotek" }, { { 0x38, 0x16, 0x5A }, "zte", "zte corporation" }, { { 0x38, 0x16, 0x72 }, "SuperElectro", "Shenzhen SuperElectron Technology Co.,Ltd." }, + { { 0x38, 0x16, 0xB3 }, "HP", "HP Inc." }, { { 0x38, 0x16, 0xD1 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x38, 0x17, 0x30 }, "UlrichLipper", "Ulrich Lippert GmbH & Co KG" }, { { 0x38, 0x17, 0x66 }, "Promzakaz", "Promzakaz Ltd." }, @@ -19074,6 +19174,7 @@ { { 0x38, 0x30, 0xF9 }, "LGElectronic", "LG Electronics (Mobile Communications)" }, { { 0x38, 0x31, 0x5A }, "Rinnai", "Rinnai" }, { { 0x38, 0x31, 0xAC }, "Weg", "Weg" }, + { { 0x38, 0x32, 0x7A }, "Routerboardc", "Routerboard.com" }, { { 0x38, 0x33, 0xC5 }, "Microsoft", "Microsoft Corporation" }, { { 0x38, 0x35, 0xFB }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x38, 0x37, 0x8B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -19083,10 +19184,12 @@ { { 0x38, 0x39, 0x6C }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x38, 0x39, 0x8F }, "SiliconLabor", "Silicon Laboratories" }, { { 0x38, 0x39, 0xCD }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, + { { 0x38, 0x39, 0xDD }, "Nokia", "Nokia" }, { { 0x38, 0x3B, 0x26 }, "JiangsuQinhe", "Jiangsu Qinheng Co., Ltd." }, { { 0x38, 0x3B, 0xC8 }, "2Wire", "2Wire Inc" }, { { 0x38, 0x3C, 0x9C }, "FujianNewlan", "Fujian Newland Payment Technology Co.,Ltd." }, { { 0x38, 0x3D, 0x5B }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, + { { 0x38, 0x3E, 0x51 }, "Espressif", "Espressif Inc." }, { { 0x38, 0x3F, 0x10 }, "DBLTechnolog", "DBL Technology Ltd." }, { { 0x38, 0x3F, 0xB3 }, "VantivaUSA", "Vantiva USA LLC" }, { { 0x38, 0x3F, 0xE8 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -19161,10 +19264,13 @@ { { 0x38, 0x6E, 0xA2 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0x38, 0x6E, 0xB2 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x38, 0x6F, 0x6B }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, + { { 0x38, 0x6F, 0xF4 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x38, 0x70, 0x0C }, "Commscope", "Commscope" }, + { { 0x38, 0x70, 0x35 }, "Nintendo", "Nintendo Co.,Ltd" }, { { 0x38, 0x70, 0xF2 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x38, 0x71, 0xDE }, "Apple", "Apple, Inc." }, { { 0x38, 0x72, 0xC0 }, "Comtrend", "Comtrend Corporation" }, + { { 0x38, 0x73, 0x6E }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x38, 0x76, 0x05 }, "Inogeni", "Inogeni" }, { { 0x38, 0x76, 0xCA }, "SmartIntelli", "Shenzhen Smart Intelligent Technology Co.Ltd" }, { { 0x38, 0x76, 0xD1 }, "Euronda", "Euronda SpA" }, @@ -19229,6 +19335,7 @@ { { 0x38, 0x9E, 0x4C }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x38, 0x9E, 0x80 }, "zte", "zte corporation" }, { { 0x38, 0x9F, 0x5A }, "CKurTV", "C-Kur TV Inc." }, + { { 0x38, 0x9F, 0x77 }, "SuzhouRetron", "Suzhou Retronic Interconnect Technologies Co.,Ltd" }, { { 0x38, 0x9F, 0x83 }, "OTN", "OTN Systems N.V." }, { { 0x38, 0xA0, 0x67 }, "NokiaSolutio", "Nokia Solutions and Networks GmbH & Co. KG" }, { { 0x38, 0xA2, 0x8C }, "RfLinkTechno", "Shenzhen Rf-Link Technology Co.,Ltd." }, @@ -19280,11 +19387,12 @@ { { 0x38, 0xBC, 0x1A }, "MEIZUTechnol", "MEIZU Technology Co., Ltd." }, { { 0x38, 0xBC, 0x61 }, "Starkoff", "Starkoff Co., Ltd." }, { { 0x38, 0xBD, 0x7A }, "HewlettPacka", "Hewlett Packard Enterprise" }, - { { 0x38, 0xBE, 0xAB }, "AltoBeam", "AltoBeam (China) Inc." }, + { { 0x38, 0xBE, 0xAB }, "AltoBeam", "AltoBeam Inc." }, { { 0x38, 0xBF, 0x2F }, "Espec", "Espec Corp." }, { { 0x38, 0xBF, 0x33 }, "NECCASIOMobi", "NEC CASIO Mobile Communications" }, { { 0x38, 0xC0, 0x96 }, "Alpsalpine", "Alpsalpine Co,.Ltd" }, { { 0x38, 0xC0, 0xEA }, "Fortinet", "Fortinet, Inc." }, + { { 0x38, 0xC2, 0x2D }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x38, 0xC2, 0xBA }, "CctvNeotech", "Cctv Neotech" }, { { 0x38, 0xC4, 0x3A }, "Apple", "Apple, Inc." }, { { 0x38, 0xC4, 0xE8 }, "NSSSp", "NSS Sp. z o.o." }, @@ -19296,6 +19404,7 @@ { { 0x38, 0xC8, 0x5C }, "CiscoSPVTG", "Cisco SPVTG" }, { { 0x38, 0xC9, 0x86 }, "Apple", "Apple, Inc." }, { { 0x38, 0xC9, 0xA9 }, "SMARTHighRel", "SMART High Reliability Solutions, Inc." }, + { { 0x38, 0xC9, 0xB1 }, "zte", "zte corporation" }, { { 0x38, 0xCA, 0x73 }, "MiaoMingInte", "Shenzhen MiaoMing Intelligent Technology Co.,Ltd" }, { { 0x38, 0xCA, 0x84 }, "HP", "HP Inc." }, { { 0x38, 0xCA, 0x97 }, "ContourDesig", "Contour Design LLC" }, @@ -19392,6 +19501,7 @@ { { 0x3A, 0x02, 0x92 }, "VideoElectro", "Video Electronics Standards Association" }, { { 0x3A, 0x0E, 0x75 }, "Kevcom", "Kevcom Llc" }, { { 0x3A, 0x1E, 0xC0 }, "Genesis", "Genesis" }, + { { 0x3A, 0x27, 0xA5 }, "WootwareComp", "Wootware Computers (Pty) Ltd" }, { { 0x3A, 0x35, 0x41 }, "RaspberryPi", "Raspberry Pi (Trading) Ltd" }, { { 0x3A, 0x5A, 0x27 }, "LongsysElect", "Shenzhen Longsys Electronics Co.,Ltd." }, { { 0x3A, 0x5E, 0x03 }, "CirrusDataSo", "Cirrus Data Solutions, Inc" }, @@ -19469,7 +19579,7 @@ { { 0x3C, 0x20, 0x93 }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, { { 0x3C, 0x20, 0xF6 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x3C, 0x21, 0x9C }, "Intel", "Intel Corporate" }, - { { 0x3C, 0x22, 0x7F }, "QuectelWirel", "Quectel Wireless Solutions Co., Ltd." }, + { { 0x3C, 0x22, 0x7F }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, { { 0x3C, 0x22, 0xFB }, "Apple", "Apple, Inc." }, { { 0x3C, 0x24, 0x0A }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x3C, 0x25, 0xD7 }, "Nokia", "Nokia Corporation" }, @@ -19498,7 +19608,7 @@ { { 0x3C, 0x31, 0x78 }, "Qolsys", "Qolsys Inc." }, { { 0x3C, 0x31, 0x8A }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x3C, 0x32, 0xB9 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, - { { 0x3C, 0x33, 0x00 }, "Bilianelectr", "Shenzhen Bilian electronic CO.,LTD" }, + { { 0x3C, 0x33, 0x00 }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, { { 0x3C, 0x33, 0x32 }, "DLink", "D-Link Corporation" }, { { 0x3C, 0x34, 0x64 }, "Apple", "Apple, Inc." }, { { 0x3C, 0x35, 0x56 }, "Cognitec", "Cognitec Systems GmbH" }, @@ -19599,6 +19709,7 @@ { { 0x3C, 0x71, 0xBF }, "Espressif", "Espressif Inc." }, { { 0x3C, 0x74, 0x37 }, "Rim", "Rim" }, { { 0x3C, 0x75, 0x4A }, "Commscope", "Commscope" }, + { { 0x3C, 0x75, 0xDE }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0x3C, 0x76, 0x25 }, "zte", "zte corporation" }, { { 0x3C, 0x77, 0x87 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x3C, 0x77, 0xE6 }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, @@ -19763,12 +19874,13 @@ { { 0x3C, 0xD1, 0x6E }, "TelepowerCom", "Telepower Communication Co., Ltd" }, { { 0x3C, 0xD1, 0xC9 }, "GroupeSEB", "Groupe SEB" }, { { 0x3C, 0xD2, 0xE5 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, + { { 0x3C, 0xD3, 0x5C }, "LunaInnovati", "Luna Innovations" }, { { 0x3C, 0xD4, 0xD6 }, "WirelessWERX", "WirelessWERX, Inc" }, { { 0x3C, 0xD7, 0xDA }, "SKMtekmicroe", "SK Mtek microelectronics(shenzhen)limited" }, { { 0x3C, 0xD9, 0x2B }, "HewlettPacka", "Hewlett Packard" }, { { 0x3C, 0xD9, 0xCE }, "EclipseWiFi", "Eclipse WiFi" }, { { 0x3C, 0xDA, 0x2A }, "zte", "zte corporation" }, - { { 0x3C, 0xDA, 0x6D }, "TiandyTechno", "Tiandy Technologies CO.,LTD" }, + { { 0x3C, 0xDA, 0x6D }, "TiandyTechno", "Tiandy Technologies Co.,LTD" }, { { 0x3C, 0xDC, 0x75 }, "Espressif", "Espressif Inc." }, { { 0x3C, 0xDC, 0xBC }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x3C, 0xDD, 0x57 }, "Apple", "Apple, Inc." }, @@ -19862,7 +19974,7 @@ { { 0x40, 0x16, 0xFA }, "EKMMetering", "EKM Metering" }, { { 0x40, 0x17, 0xE2 }, "IntaiTechnol", "Intai Technology Corp." }, { { 0x40, 0x17, 0xF6 }, "TkhSecurityS", "Tkh Security,S.L.U." }, - { { 0x40, 0x18, 0xB1 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x40, 0x18, 0xB1 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x40, 0x18, 0xD7 }, "Smartronix", "Smartronix, Inc." }, { { 0x40, 0x19, 0x20 }, "Movon", "Movon Corporation" }, { { 0x40, 0x1A, 0x58 }, "WNC", "WNC Corporation" }, @@ -19884,6 +19996,7 @@ { { 0x40, 0x27, 0x0B }, "Mobileeco", "Mobileeco Co., Ltd" }, { { 0x40, 0x27, 0xA8 }, "CiscoMeraki", "Cisco Meraki" }, { { 0x40, 0x28, 0x14 }, "RFIEngineeri", "RFI Engineering" }, + { { 0x40, 0x2A, 0x6C }, "ZhejiangHyxi", "Zhejiang Hyxi Technology Co.,Ltd." }, { { 0x40, 0x2A, 0x8F }, "HighFlyingEl", "Shanghai High-Flying Electronics Technology Co., Ltd" }, { { 0x40, 0x2B, 0x50 }, "Commscope", "Commscope" }, { { 0x40, 0x2B, 0x69 }, "KumhoElectri", "Kumho Electric Inc." }, @@ -19911,7 +20024,7 @@ { { 0x40, 0x3C, 0xFC }, "Apple", "Apple, Inc." }, { { 0x40, 0x3D, 0xEC }, "HUMAX", "HUMAX Co., Ltd." }, { { 0x40, 0x3E, 0x22 }, "VusionGroup", "VusionGroup" }, - { { 0x40, 0x3F, 0x43 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x40, 0x3F, 0x43 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x40, 0x3F, 0x8C }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x40, 0x40, 0x22 }, "Ziv", "Ziv" }, { { 0x40, 0x40, 0x28 }, "Ziv", "Ziv" }, @@ -19958,6 +20071,7 @@ { { 0x40, 0x56, 0x62 }, "GuoTengSheng", "GuoTengShengHua Electronics LTD." }, { { 0x40, 0x58, 0x46 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0x40, 0x58, 0x99 }, "LogitechFarE", "Logitech Far East" }, + { { 0x40, 0x59, 0x25 }, "KaonBroadban", "Kaon Broadband CO., LTD." }, { { 0x40, 0x5A, 0x9B }, "Anovo", "Anovo" }, { { 0x40, 0x5A, 0xDD }, "ActionsMicro", "Actions Microelectronics" }, { { 0x40, 0x5B, 0x7F }, "Broadcom", "Broadcom Limited" }, @@ -19982,6 +20096,7 @@ { { 0x40, 0x64, 0xDC }, "Xspeedlnform", "X-speed lnformation Technology Co.,Ltd" }, { { 0x40, 0x65, 0xA3 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x40, 0x66, 0x7A }, "mediolaconne", "mediola - connected living AG" }, + { { 0x40, 0x67, 0x68 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x40, 0x67, 0x9B }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x40, 0x68, 0x26 }, "ThalesUK", "Thales UK Limited" }, { { 0x40, 0x68, 0xF9 }, "SuperElectro", "Shenzhen SuperElectron Technology Co.,Ltd." }, @@ -20029,9 +20144,10 @@ { { 0x40, 0x86, 0xCB }, "DLink", "D-Link Corporation" }, { { 0x40, 0x87, 0xE5 }, "WuQiTechnolo", "Wu Qi Technologies,Inc." }, { { 0x40, 0x88, 0x05 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, - { { 0x40, 0x88, 0x2F }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x40, 0x88, 0x2F }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x40, 0x88, 0xE0 }, "ErenebenInfo", "Beijing Ereneben Information Technology Limited Shenzhen Branch" }, { { 0x40, 0x89, 0xA8 }, "WiredIQ", "WiredIQ, LLC" }, + { { 0x40, 0x89, 0xC2 }, "Apple", "Apple, Inc." }, { { 0x40, 0x89, 0xC6 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x40, 0x8A, 0x9A }, "TITENG", "TITENG CO., Ltd." }, { { 0x40, 0x8B, 0x07 }, "ActiontecEle", "Actiontec Electronics, Inc" }, @@ -20072,6 +20188,7 @@ { { 0x40, 0x9F, 0xC7 }, "BAEKCHUNI&C", "BAEKCHUN I&C Co., Ltd." }, { { 0x40, 0xA1, 0x08 }, "MotorolaMobi", "Motorola (Wuhan) Mobility Technologies Communication Co., Ltd." }, { { 0x40, 0xA2, 0xDB }, "AmazonTechno", "Amazon Technologies Inc." }, + { { 0x40, 0xA2, 0xE5 }, "3onedataTech", "3onedata Technology Co. Ltd." }, { { 0x40, 0xA3, 0xCC }, "Intel", "Intel Corporate" }, { { 0x40, 0xA4, 0x4A }, "Google", "Google, Inc." }, { { 0x40, 0xA5, 0x3B }, "Nokia", "Nokia" }, @@ -20097,7 +20214,7 @@ { { 0x40, 0xB0, 0xA1 }, "Valcom", "Valcom Co.,Ltd." }, { { 0x40, 0xB0, 0xFA }, "LGElectronic", "LG Electronics (Mobile Communications)" }, { { 0x40, 0xB1, 0x5C }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0x40, 0xB2, 0x15 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x40, 0xB2, 0x15 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x40, 0xB2, 0xC8 }, "NortelNetwor", "Nortel Networks" }, { { 0x40, 0xB3, 0x0E }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, { { 0x40, 0xB3, 0x1E }, "UniversalEle", "Universal Electronics, Inc." }, @@ -20181,7 +20298,7 @@ { { 0x40, 0xE1, 0x71 }, "JiangsuHuito", "Jiangsu Huitong Group Co.,Ltd." }, { { 0x40, 0xE1, 0xE4 }, "NokiaSolutio", "Nokia Solutions and Networks GmbH & Co. KG" }, { { 0x40, 0xE2, 0x30 }, "AzureWaveTec", "AzureWave Technology Inc." }, - { { 0x40, 0xE3, 0x17 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x40, 0xE3, 0x17 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x40, 0xE3, 0xD6 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x40, 0xE6, 0x4B }, "Apple", "Apple, Inc." }, { { 0x40, 0xE7, 0x30 }, "DEYStorage", "DEY Storage Systems, Inc." }, @@ -20294,12 +20411,13 @@ { { 0x44, 0x27, 0x45 }, "LGInnotek", "LG Innotek" }, { { 0x44, 0x27, 0xF3 }, "70mai", "70mai Co.,Ltd." }, { { 0x44, 0x28, 0xA3 }, "Jiangsufulia", "Jiangsu fulian Communication Technology Co., Ltd." }, - { { 0x44, 0x29, 0x1E }, "AltoBeam", "AltoBeam (China) Inc." }, + { { 0x44, 0x29, 0x1E }, "AltoBeam", "AltoBeam Inc." }, { { 0x44, 0x29, 0x38 }, "NietZscheent", "NietZsche enterprise Co.Ltd." }, { { 0x44, 0x2A, 0x60 }, "Apple", "Apple, Inc." }, { { 0x44, 0x2A, 0xFF }, "E3Technology", "E3 Technology, Inc." }, { { 0x44, 0x2B, 0x03 }, "Cisco", "Cisco Systems, Inc" }, { { 0x44, 0x2C, 0x05 }, "AMPAKTechnol", "AMPAK Technology, Inc." }, + { { 0x44, 0x2D, 0x49 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x44, 0x30, 0x3F }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x44, 0x31, 0x92 }, "HewlettPacka", "Hewlett Packard" }, { { 0x44, 0x32, 0x1D }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -20307,7 +20425,7 @@ { { 0x44, 0x32, 0x62 }, "zte", "zte corporation" }, { { 0x44, 0x32, 0xC2 }, "GOAL", "GOAL Co., Ltd." }, { { 0x44, 0x32, 0xC8 }, "VantivaUSA", "Vantiva USA LLC" }, - { { 0x44, 0x33, 0x4C }, "Bilianelectr", "Shenzhen Bilian electronic CO.,LTD" }, + { { 0x44, 0x33, 0x4C }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, { { 0x44, 0x34, 0x8F }, "MxtIndustria", "Mxt Industrial Ltda" }, { { 0x44, 0x34, 0xA7 }, "Commscope", "Commscope" }, { { 0x44, 0x35, 0x6F }, "Neterix", "Neterix Ltd" }, @@ -20369,11 +20487,13 @@ { { 0x44, 0x4F, 0x8E }, "WiZ", "WiZ" }, { { 0x44, 0x51, 0xDB }, "RaytheonBBNT", "Raytheon BBN Technologies" }, { { 0x44, 0x54, 0xC0 }, "ThompsonAero", "Thompson Aerospace" }, + { { 0x44, 0x55, 0x2B }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x44, 0x55, 0xB1 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x44, 0x55, 0xC4 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x44, 0x56, 0x8D }, "PNCTechnolog", "PNC Technologies Co., Ltd." }, { { 0x44, 0x56, 0xB7 }, "SpawnLabs", "Spawn Labs, Inc" }, { { 0x44, 0x56, 0xE2 }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, + { { 0x44, 0x57, 0x9F }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0x44, 0x58, 0x29 }, "CiscoSPVTG", "Cisco SPVTG" }, { { 0x44, 0x59, 0x25 }, "Square", "Square Inc." }, { { 0x44, 0x59, 0x43 }, "zte", "zte corporation" }, @@ -20383,6 +20503,7 @@ { { 0x44, 0x5B, 0xED }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x44, 0x5C, 0xE9 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x44, 0x5D, 0x5E }, "CoolkitTechn", "SHENZHEN Coolkit Technology CO.,LTD" }, + { { 0x44, 0x5E, 0x82 }, "ZyxelCommuni", "Zyxel Communications Corporation" }, { { 0x44, 0x5E, 0xCD }, "Razer", "Razer Inc" }, { { 0x44, 0x5E, 0xF3 }, "Tonalite", "Tonalite Holding B.V." }, { { 0x44, 0x5F, 0x7A }, "ShihlinElect", "Shihlin Electric & Engineering Corp." }, @@ -20392,6 +20513,7 @@ { { 0x44, 0x61, 0xDF }, "SkyquadElect", "Skyquad Electronics & Appliances Pvt. Ltd." }, { { 0x44, 0x62, 0x46 }, "Comat", "Comat AG" }, { { 0x44, 0x63, 0x70 }, "LCFCElectron", "LCFC(Hefei) Electronics Technology co., ltd" }, + { { 0x44, 0x63, 0xB6 }, "Apple", "Apple, Inc." }, { { 0x44, 0x63, 0xC2 }, "ZyxelCommuni", "Zyxel Communications Corporation" }, { { 0x44, 0x64, 0x3C }, "Cisco", "Cisco Systems, Inc" }, { { 0x44, 0x65, 0x0D }, "AmazonTechno", "Amazon Technologies Inc." }, @@ -20455,6 +20577,7 @@ { { 0x44, 0x88, 0xCB }, "CamcoTechnol", "Camco Technologies NV" }, { { 0x44, 0x89, 0x6D }, "TellescomInd", "Tellescom Industria E Comercio Em Telecomunicacao" }, { { 0x44, 0x8A, 0x5B }, "MicroStarINT", "Micro-Star INT'L CO., LTD." }, + { { 0x44, 0x8A, 0x7F }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x44, 0x8C, 0x00 }, "RealmeChongq", "Realme Chongqing Mobile Telecommunications Corp.,Ltd." }, { { 0x44, 0x8C, 0x52 }, "KTIS", "KTIS CO., Ltd" }, { { 0x44, 0x8C, 0xAB }, "FlitlinkVien", "Beijing Flitlink Vientiane Technology Co., LTD" }, @@ -20527,6 +20650,7 @@ { { 0x44, 0xB4, 0x23 }, "HanwhaVision", "Hanwha Vision Vietnam Company Limited" }, { { 0x44, 0xB4, 0x33 }, "tide", "tide.co.,ltd" }, { { 0x44, 0xB4, 0x62 }, "FlextronicsT", "Flextronics Tech.(Ind) Pvt Ltd" }, + { { 0x44, 0xB4, 0xA0 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x44, 0xB4, 0xB2 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x44, 0xB5, 0x9C }, "TenetNetwork", "Tenet Networks Private Limited" }, { { 0x44, 0xB6, 0xBE }, "Cisco", "Cisco Systems, Inc" }, @@ -20583,6 +20707,7 @@ { { 0x44, 0xD6, 0xE1 }, "SnuzaInterna", "Snuza International Pty. Ltd." }, { { 0x44, 0xD7, 0x7E }, "RobertBosch", "Robert Bosch GmbH" }, { { 0x44, 0xD7, 0x91 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x44, 0xD7, 0xB7 }, "eero", "eero inc." }, { { 0x44, 0xD8, 0x32 }, "AzureWaveTec", "AzureWave Technology Inc." }, { { 0x44, 0xD8, 0x78 }, "HuiZhouGaosh", "Hui Zhou Gaoshengda Technology Co.,LTD" }, { { 0x44, 0xD8, 0x84 }, "Apple", "Apple, Inc." }, @@ -20590,6 +20715,7 @@ { { 0x44, 0xD9, 0xE7 }, "Ubiquiti", "Ubiquiti Inc" }, { { 0x44, 0xDA, 0x30 }, "Apple", "Apple, Inc." }, { { 0x44, 0xDB, 0x60 }, "NanjingBaihe", "Nanjing Baihezhengliu Technology Co., Ltd" }, + { { 0x44, 0xDB, 0xBE }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x44, 0xDB, 0xD2 }, "YealinkNetwo", "Yealink(Xiamen) Network Technology Co.,Ltd." }, { { 0x44, 0xDC, 0x4E }, "ItelMobile", "Itel Mobile Limited" }, { { 0x44, 0xDC, 0x91 }, "PlanexCommun", "Planex Communications Inc." }, @@ -20597,11 +20723,12 @@ { { 0x44, 0xDF, 0x65 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0x44, 0xE0, 0x8E }, "CiscoSPVTG", "Cisco SPVTG" }, { { 0x44, 0xE1, 0x37 }, "Commscope", "Commscope" }, + { { 0x44, 0xE2, 0x13 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0x44, 0xE2, 0xF1 }, "NewRadioTech", "NewRadio Technologies Co. , Ltd." }, { { 0x44, 0xE2, 0xF8 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x44, 0xE4, 0x9A }, "Omnitronics", "Omnitronics Pty Ltd" }, { { 0x44, 0xE4, 0xD9 }, "Cisco", "Cisco Systems, Inc" }, - { { 0x44, 0xE4, 0xE6 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x44, 0xE4, 0xE6 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x44, 0xE4, 0xEE }, "WNC", "WNC Corporation" }, { { 0x44, 0xE5, 0x17 }, "Intel", "Intel Corporate" }, { { 0x44, 0xE5, 0x9B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -20609,11 +20736,13 @@ { { 0x44, 0xE6, 0x6E }, "Apple", "Apple, Inc." }, { { 0x44, 0xE6, 0xB0 }, "ChinaMobileI", "China Mobile IOT Company Limited" }, { { 0x44, 0xE7, 0x61 }, "Infinixmobil", "Infinix mobility limited" }, + { { 0x44, 0xE8, 0x53 }, "Apple", "Apple, Inc." }, { { 0x44, 0xE8, 0xA5 }, "MyrekaTechno", "Myreka Technologies Sdn. Bhd." }, { { 0x44, 0xE9, 0x68 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x44, 0xE9, 0xDD }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x44, 0xEA, 0x30 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x44, 0xEA, 0x4B }, "Actlas", "Actlas Inc." }, + { { 0x44, 0xEA, 0x54 }, "UdisenseDbaN", "Udisense Dba Nanit" }, { { 0x44, 0xEA, 0xD8 }, "TexasInstrum", "Texas Instruments" }, { { 0x44, 0xEB, 0x2E }, "Alpsalpine", "Alpsalpine Co,.Ltd" }, { { 0x44, 0xEC, 0xCE }, "JuniperNetwo", "Juniper Networks" }, @@ -20712,6 +20841,7 @@ { { 0x48, 0x2E, 0x72 }, "Cisco", "Cisco Systems, Inc" }, { { 0x48, 0x2F, 0x6B }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x48, 0x2F, 0xD7 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x48, 0x31, 0x06 }, "NVIDIA", "NVIDIA Corporation" }, { { 0x48, 0x31, 0x33 }, "RobertBoschE", "Robert Bosch Elektronika Kft." }, { { 0x48, 0x31, 0x77 }, "Nintendo", "Nintendo Co.,Ltd" }, { { 0x48, 0x31, 0xB7 }, "Espressif", "Espressif Inc." }, @@ -20722,6 +20852,7 @@ { { 0x48, 0x35, 0x2E }, "WolckNetwork", "Shenzhen Wolck Network Product Co.,LTD" }, { { 0x48, 0x35, 0x43 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0x48, 0x35, 0x84 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0x48, 0x35, 0xAB }, "Apple", "Apple, Inc." }, { { 0x48, 0x36, 0x5F }, "Wintecronics", "Wintecronics Ltd." }, { { 0x48, 0x38, 0x71 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x48, 0x38, 0xB6 }, "AuhuiTaoyunT", "Auhui Taoyun Technology Co., Ltd" }, @@ -20731,6 +20862,7 @@ { { 0x48, 0x3C, 0x0C }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x48, 0x3D, 0x32 }, "SyscorContro", "Syscor Controls & Automation" }, { { 0x48, 0x3E, 0x5E }, "SernetTechno", "Sernet (Suzhou) Technologies Corporation" }, + { { 0x48, 0x3F, 0x72 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x48, 0x3F, 0xDA }, "Espressif", "Espressif Inc." }, { { 0x48, 0x3F, 0xE9 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x48, 0x40, 0xD5 }, "Intel", "Intel Corporate" }, @@ -20837,10 +20969,12 @@ { { 0x48, 0x7B, 0x6B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x48, 0x7D, 0x2E }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x48, 0x7E, 0x48 }, "EardaTechnol", "Earda Technologies co Ltd" }, + { { 0x48, 0x7F, 0x80 }, "FRITZ!Techno", "FRITZ! Technology GmbH" }, { { 0x48, 0x80, 0x02 }, "Cisco", "Cisco Systems, Inc" }, { { 0x48, 0x81, 0x4E }, "E&MSOLUTION", "E&M SOLUTION CO,.Ltd" }, { { 0x48, 0x81, 0xD4 }, "RuijieNetwor", "Ruijie Networks Co.,LTD" }, { { 0x48, 0x82, 0x44 }, "LifeFitnessD", "Life Fitness / Div. of Brunswick" }, + { { 0x48, 0x82, 0xDF }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x48, 0x82, 0xF2 }, "AppelElektro", "Appel Elektronik GmbH" }, { { 0x48, 0x83, 0x6F }, "EMMicroelect", "EM Microelectronic" }, { { 0x48, 0x83, 0xB4 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, @@ -20868,6 +21002,7 @@ { { 0x48, 0x8F, 0x4C }, "trolinkTechn", "shenzhen trolink Technology Co.,Ltd" }, { { 0x48, 0x8F, 0x5A }, "Routerboardc", "Routerboard.com" }, { { 0x48, 0x90, 0x2F }, "LGElectronic", "LG Electronics (Mobile Communications)" }, + { { 0x48, 0x90, 0xF0 }, "Dell", "Dell Inc." }, { { 0x48, 0x91, 0x53 }, "WeinmannGerä", "Weinmann Geräte für Medizin GmbH + Co. KG" }, { { 0x48, 0x91, 0xD5 }, "Cisco", "Cisco Systems, Inc" }, { { 0x48, 0x91, 0xF6 }, "Reachsoftwar", "Shenzhen Reach software technology CO.,LTD" }, @@ -20878,8 +21013,9 @@ { { 0x48, 0x98, 0xAB }, "WistronInfoC", "Wistron InfoComm(Chongqing)Co.,Ltd." }, { { 0x48, 0x98, 0xCA }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, { { 0x48, 0x9A, 0x42 }, "Technomate", "Technomate Ltd" }, + { { 0x48, 0x9A, 0x58 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x48, 0x9A, 0x5B }, "iCommSemicon", "Shenzhen iComm Semiconductor CO.,LTD" }, - { { 0x48, 0x9B, 0xD5 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x48, 0x9B, 0xD5 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x48, 0x9B, 0xE0 }, "RealmeChongq", "Realme Chongqing Mobile Telecommunications Corp.,Ltd." }, { { 0x48, 0x9B, 0xE2 }, "SCIInnovatio", "SCI Innovations Ltd" }, { { 0x48, 0x9D, 0x18 }, "Flashbay", "Flashbay Limited" }, @@ -20916,6 +21052,7 @@ { { 0x48, 0xAA, 0xBB }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x48, 0xAD, 0x08 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x48, 0xAD, 0x9A }, "Intel", "Intel Corporate" }, + { { 0x48, 0xAF, 0xF3 }, "Espressif", "Espressif Inc." }, { { 0x48, 0xB0, 0x2D }, "NVIDIA", "NVIDIA Corporation" }, { { 0x48, 0xB2, 0x53 }, "Marketaxess", "Marketaxess Corporation" }, { { 0x48, 0xB2, 0x5D }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -20996,6 +21133,7 @@ { { 0x48, 0xE1, 0xCA }, "Apple", "Apple, Inc." }, { { 0x48, 0xE1, 0xE9 }, "MerossTechno", "Chengdu Meross Technology Co., Ltd." }, { { 0x48, 0xE2, 0x44 }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, + { { 0x48, 0xE2, 0x7E }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x48, 0xE2, 0xAD }, "HumaxNetwork", "Humax Networks" }, { { 0x48, 0xE3, 0xC3 }, "JENOPTIKAdva", "JENOPTIK Advanced Systems GmbH" }, { { 0x48, 0xE5, 0x33 }, "SunnovoInter", "Sunnovo International Limited" }, @@ -21057,10 +21195,11 @@ { { 0x4A, 0x72, 0x06 }, "CAIRE", "CAIRE, Inc." }, { { 0x4A, 0x7F, 0x74 }, "INTEC", "INTEC Inc." }, { { 0x4A, 0xAD, 0xCE }, "CodanArgus", "Codan Argus Ag" }, + { { 0x4A, 0xB4, 0x7B }, "faytechTech", "faytech Tech. Co., Ltd." }, { { 0x4A, 0xC0, 0x3F }, "HikstorageTe", "Wuhan Hikstorage Technology Co.,Ltd" }, { { 0x4A, 0xCA, 0x3E }, "Zeus", "Zeus" }, { { 0x4A, 0xDA, 0x10 }, "EmotivaAudio", "Emotiva Audio Corp" }, - { { 0x4A, 0xE0, 0x3F }, "Superxoncomm", "Chengdu Superxon communication Technology Co. Ltd." }, + { { 0x4A, 0xE0, 0x3F }, "SuperxonComm", "Chengdu Superxon Communication Technology Co., Ltd." }, { { 0x4A, 0xE5, 0x68 }, "leapio", "leapio" }, { { 0x4A, 0xED, 0x1D }, "AsteraLabs", "Astera Labs Inc" }, { { 0x4A, 0xF5, 0x7D }, "ASAMeV", "ASAM e.V." }, @@ -21071,6 +21210,7 @@ { { 0x4C, 0x02, 0x2E }, "CmrKorea", "Cmr Korea Co., Ltd" }, { { 0x4C, 0x02, 0x89 }, "LexComputech", "Lex Computech Co., Ltd" }, { { 0x4C, 0x03, 0x4F }, "Intel", "Intel Corporate" }, + { { 0x4C, 0x05, 0x73 }, "MokaGlobal", "Moka Global Limited" }, { { 0x4C, 0x06, 0x17 }, "TaicangT&WEl", "Taicang T&W Electronics" }, { { 0x4C, 0x06, 0x8A }, "BaslerElectr", "Basler Electric Company" }, { { 0x4C, 0x06, 0xB7 }, "ProDVXEurope", "ProDVX Europe B.V." }, @@ -21080,7 +21220,7 @@ { { 0x4C, 0x09, 0xD4 }, "Arcadyan", "Arcadyan Corporation" }, { { 0x4C, 0x09, 0xFA }, "FrontierSmar", "Frontier Smart Technologies Ltd" }, { { 0x4C, 0x0A, 0x3D }, "Adnacom", "Adnacom Inc." }, - { { 0x4C, 0x0A, 0x4E }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x4C, 0x0A, 0x4E }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x4C, 0x0B, 0x3A }, "TCTmobile", "TCT mobile ltd" }, { { 0x4C, 0x0B, 0xBE }, "Microsoft", "Microsoft" }, { { 0x4C, 0x0D, 0xEE }, "JabilCircuit", "Jabil Circuit (Shanghai) Ltd." }, @@ -21119,7 +21259,7 @@ { { 0x4C, 0x22, 0x58 }, "cozybit", "cozybit, Inc." }, { { 0x4C, 0x22, 0xC9 }, "zte", "zte corporation" }, { { 0x4C, 0x22, 0xF3 }, "Arcadyan", "Arcadyan Corporation" }, - { { 0x4C, 0x23, 0x1A }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x4C, 0x23, 0x1A }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x4C, 0x23, 0x38 }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, { { 0x4C, 0x24, 0x98 }, "TexasInstrum", "Texas Instruments" }, { { 0x4C, 0x24, 0xCE }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, @@ -21155,6 +21295,7 @@ { { 0x4C, 0x3B, 0xDF }, "Microsoft", "Microsoft Corporation" }, { { 0x4C, 0x3C, 0x16 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x4C, 0x3C, 0x8F }, "JingxunTechn", "Shenzhen Jingxun Technology Co., Ltd." }, + { { 0x4C, 0x3C, 0xE2 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x4C, 0x3F, 0xA7 }, "uGridNetwork", "uGrid Network Inc." }, { { 0x4C, 0x3F, 0xD3 }, "TexasInstrum", "Texas Instruments" }, { { 0x4C, 0x40, 0x88 }, "SanshinElect", "Sanshin Electronics Co.,Ltd." }, @@ -21162,6 +21303,7 @@ { { 0x4C, 0x43, 0x41 }, "Calix", "Calix Inc." }, { { 0x4C, 0x43, 0xF6 }, "SzDjiTechnol", "Sz Dji Technology Co.,Ltd" }, { { 0x4C, 0x44, 0x5B }, "Intel", "Intel Corporate" }, + { { 0x4C, 0x45, 0x53 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x4C, 0x45, 0x76 }, "ChinaMobileI", "China Mobile(Hangzhou) Information Technology Co.,Ltd." }, { { 0x4C, 0x46, 0xD1 }, "GuangzhouVSo", "Guangzhou V-Solution Telecommunication Technology Co.,Ltd." }, { { 0x4C, 0x48, 0xDA }, "AutelanTechn", "Beijing Autelan Technology Co.,Ltd" }, @@ -21254,6 +21396,7 @@ { { 0x4C, 0x79, 0x75 }, "Apple", "Apple, Inc." }, { { 0x4C, 0x79, 0xBA }, "Intel", "Intel Corporate" }, { { 0x4C, 0x7A, 0x48 }, "NipponSeiki", "Nippon Seiki (Europe) B.V." }, + { { 0x4C, 0x7A, 0x88 }, "Cisco", "Cisco Systems, Inc" }, { { 0x4C, 0x7B, 0x35 }, "UnionmanTech", "Unionman Technology Co.,Ltd" }, { { 0x4C, 0x7C, 0x5F }, "Apple", "Apple, Inc." }, { { 0x4C, 0x7C, 0xD9 }, "Apple", "Apple, Inc." }, @@ -21261,6 +21404,7 @@ { { 0x4C, 0x80, 0x4F }, "ArmstrongMon", "Armstrong Monitoring Corp" }, { { 0x4C, 0x80, 0x93 }, "Intel", "Intel Corporate" }, { { 0x4C, 0x80, 0xBA }, "TianyuInform", "Wuhan Tianyu Information Industry Co., Ltd." }, + { { 0x4C, 0x80, 0xFB }, "Google", "Google, Inc." }, { { 0x4C, 0x81, 0x20 }, "TaicangT&WEl", "Taicang T&W Electronics" }, { { 0x4C, 0x81, 0x25 }, "ZOWEETECHNOL", "ZOWEE TECHNOLOGY(HEYUAN)Co.,Ltd" }, { { 0x4C, 0x82, 0x0C }, "Apple", "Apple, Inc." }, @@ -21268,6 +21412,7 @@ { { 0x4C, 0x82, 0xA9 }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, { { 0x4C, 0x82, 0xCF }, "DishTechnolo", "Dish Technologies Corp" }, { { 0x4C, 0x83, 0xDE }, "CiscoSPVTG", "Cisco SPVTG" }, + { { 0x4C, 0x83, 0xFE }, "MercuryCommu", "Shenzhen Mercury Communication Technologies Co.,Ltd." }, { { 0x4C, 0x85, 0x8A }, "Buffalo", "Buffalo.Inc" }, { { 0x4C, 0x87, 0x5D }, "Bose", "Bose Corporation" }, { { 0x4C, 0x88, 0x9E }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -21383,6 +21528,7 @@ { { 0x4C, 0xCD, 0xB6 }, "Apple", "Apple, Inc." }, { { 0x4C, 0xCE, 0x2D }, "Danlaw", "Danlaw Inc" }, { { 0x4C, 0xCF, 0x7C }, "HP", "HP Inc." }, + { { 0x4C, 0xD0, 0x12 }, "Apple", "Apple, Inc." }, { { 0x4C, 0xD0, 0x8A }, "HUMAX", "HUMAX Co., Ltd." }, { { 0x4C, 0xD0, 0xCB }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x4C, 0xD0, 0xDD }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -21417,6 +21563,7 @@ { { 0x4C, 0xE1, 0xBB }, "ZhuhaiHiFocu", "Zhuhai HiFocus Technology Co., Ltd." }, { { 0x4C, 0xE2, 0x0F }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x4C, 0xE2, 0xF1 }, "Udino", "Udino srl" }, + { { 0x4C, 0xE4, 0xB6 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x4C, 0xE5, 0xAE }, "TianjinBeebo", "Tianjin Beebox Intelligent Technology Co.,Ltd." }, { { 0x4C, 0xE6, 0x50 }, "Apple", "Apple, Inc." }, { { 0x4C, 0xE6, 0x5E }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -21482,17 +21629,19 @@ { { 0x50, 0x09, 0x59 }, "VantivaUSA", "Vantiva USA LLC" }, { { 0x50, 0x09, 0xE5 }, "Drimsys", "Drimsys,Inc" }, { { 0x50, 0x0A, 0x52 }, "HuiwanTechno", "Huiwan Technologies Co. Ltd" }, - { { 0x50, 0x0A, 0x9C }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x50, 0x0A, 0x9C }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x50, 0x0B, 0x23 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x50, 0x0B, 0x26 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x50, 0x0B, 0x32 }, "FoxdaTechnol", "Foxda Technology Industrial(ShenZhen)Co.,LTD" }, { { 0x50, 0x0B, 0x88 }, "Moxa", "Moxa.Inc" }, + { { 0x50, 0x0E, 0x5B }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, { { 0x50, 0x0E, 0x6D }, "TrafficCastI", "TrafficCast International" }, { { 0x50, 0x0F, 0x59 }, "STMicrolectr", "STMicrolectronics International NV" }, { { 0x50, 0x0F, 0x80 }, "Cisco", "Cisco Systems, Inc" }, { { 0x50, 0x0F, 0xC6 }, "solum", "solum" }, { { 0x50, 0x0F, 0xF5 }, "TendaTechnol", "Tenda Technology Co.,Ltd.Dongguan branch" }, { { 0x50, 0x11, 0xEB }, "SilverNet", "SilverNet Ltd" }, + { { 0x50, 0x12, 0x5C }, "Sony", "Sony Corporation" }, { { 0x50, 0x13, 0x1D }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x50, 0x13, 0x65 }, "VolaNetworks", "Vola Networks Inc." }, { { 0x50, 0x13, 0x95 }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, @@ -21557,7 +21706,7 @@ { { 0x50, 0x32, 0x75 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x50, 0x33, 0x8B }, "TexasInstrum", "Texas Instruments" }, { { 0x50, 0x33, 0xF0 }, "YichenTechno", "Yichen (Shenzhen) Technology Co.Ltd" }, - { { 0x50, 0x37, 0xCD }, "QuectelWirel", "Quectel Wireless Solutions Co., Ltd." }, + { { 0x50, 0x37, 0xCD }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, { { 0x50, 0x38, 0x2F }, "ASEGroupChun", "ASE Group Chung-Li" }, { { 0x50, 0x38, 0xAB }, "Prove", "Prove" }, { { 0x50, 0x39, 0x2F }, "IngramMicroS", "Ingram Micro Services" }, @@ -21565,6 +21714,7 @@ { { 0x50, 0x3A, 0x0F }, "ALLWinner", "ALL Winner (Hong Kong) Limited" }, { { 0x50, 0x3A, 0x7D }, "AlphaTechInt", "AlphaTech PLC Int’l Co., Ltd." }, { { 0x50, 0x3A, 0xA0 }, "MercuryCommu", "Shenzhen Mercury Communication Technologies Co.,Ltd." }, + { { 0x50, 0x3B, 0x70 }, "Apple", "Apple, Inc." }, { { 0x50, 0x3C, 0xC4 }, "LenovoMobile", "Lenovo Mobile Communication Technology Ltd." }, { { 0x50, 0x3C, 0xCA }, "TecnoMobile", "Tecno Mobile Limited" }, { { 0x50, 0x3C, 0xEA }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, @@ -21579,11 +21729,12 @@ { { 0x50, 0x3F, 0x50 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x50, 0x3F, 0x56 }, "SyncmoldEnte", "Syncmold Enterprise Corp" }, { { 0x50, 0x3F, 0x98 }, "Cmitech", "Cmitech" }, + { { 0x50, 0x40, 0x35 }, "VantivaUSA", "Vantiva USA LLC" }, { { 0x50, 0x40, 0x61 }, "Nokia", "Nokia" }, { { 0x50, 0x40, 0x74 }, "Alarmcom", "Alarm.com" }, { { 0x50, 0x41, 0x1C }, "AMPAKTechnol", "AMPAK Technology,Inc." }, { { 0x50, 0x41, 0x72 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0x50, 0x41, 0xB9 }, "IODataDevice", "I-O Data Device,Inc." }, + { { 0x50, 0x41, 0xB9 }, "IOData", "I-O Data, Inc." }, { { 0x50, 0x42, 0x89 }, "zte", "zte corporation" }, { { 0x50, 0x43, 0x48 }, "ThingsMatrix", "ThingsMatrix Inc." }, { { 0x50, 0x43, 0xB9 }, "OktoInformRU", "OktoInform RUS" }, @@ -21691,6 +21842,7 @@ { { 0x50, 0x7B, 0x91 }, "SigmastarTec", "Sigmastar Technology Ltd." }, { { 0x50, 0x7B, 0x9D }, "LCFCElectron", "LCFC(Hefei) Electronics Technology co., ltd" }, { { 0x50, 0x7C, 0x6F }, "Intel", "Intel Corporate" }, + { { 0x50, 0x7C, 0x90 }, "HuamiInforma", "Huami (Shenzhen) Information Technology Co., Ltd" }, { { 0x50, 0x7D, 0x02 }, "Biodit", "Biodit" }, { { 0x50, 0x7E, 0x5D }, "Arcadyan", "Arcadyan Corporation" }, { { 0x50, 0x80, 0x4A }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, @@ -21726,6 +21878,7 @@ { { 0x50, 0x92, 0xB9 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x50, 0x93, 0x4F }, "GradualTecno", "Gradual Tecnologia Ltda." }, { { 0x50, 0x93, 0xCE }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x50, 0x95, 0x46 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x50, 0x95, 0x51 }, "Commscope", "Commscope" }, { { 0x50, 0x97, 0x07 }, "XiamenPapera", "Xiamen Paperang Technology Co.,Ltd." }, { { 0x50, 0x97, 0x44 }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, @@ -21812,6 +21965,7 @@ { { 0x50, 0xCF, 0x56 }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0x50, 0xD0, 0x65 }, "ESYLUX", "ESYLUX GmbH" }, { { 0x50, 0xD0, 0x6D }, "BirdBuddy", "Bird Buddy" }, + { { 0x50, 0xD1, 0xD7 }, "ALLWinner", "ALL Winner (Hong Kong) Limited" }, { { 0x50, 0xD2, 0x13 }, "CviLux", "CviLux Corporation" }, { { 0x50, 0xD2, 0x74 }, "Steffes", "Steffes Corporation" }, { { 0x50, 0xD2, 0xF5 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, @@ -21880,6 +22034,7 @@ { { 0x50, 0xF7, 0x22 }, "Cisco", "Cisco Systems, Inc" }, { { 0x50, 0xF7, 0xED }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x50, 0xF8, 0xA5 }, "eWBM", "eWBM Co., Ltd." }, + { { 0x50, 0xF8, 0xAD }, "NanjingQinhe", "Nanjing Qinheng Microelectronics Co., Ltd." }, { { 0x50, 0xF9, 0x08 }, "Wizardlab", "Wizardlab Co., Ltd." }, { { 0x50, 0xF9, 0x58 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x50, 0xFA, 0x84 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, @@ -21903,6 +22058,7 @@ { { 0x54, 0x04, 0xA6 }, "ASUSTekCOMPU", "ASUSTek COMPUTER INC." }, { { 0x54, 0x05, 0x36 }, "Vivago", "Vivago Oy" }, { { 0x54, 0x05, 0x5F }, "AlcatelLucen", "Alcatel Lucent" }, + { { 0x54, 0x05, 0x83 }, "ItelMobile", "Itel Mobile Limited" }, { { 0x54, 0x05, 0x93 }, "WOORIELEC", "WOORI ELEC Co.,Ltd" }, { { 0x54, 0x05, 0xDB }, "LCFCElectron", "LCFC(Hefei) Electronics Technology co., ltd" }, { { 0x54, 0x06, 0x8B }, "NingboDeliKe", "Ningbo Deli Kebei Technology Co.LTD" }, @@ -22003,6 +22159,7 @@ { { 0x54, 0x3A, 0xD6 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x54, 0x3A, 0xDF }, "QualfiberTec", "Qualfiber Technology Co.,Ltd" }, { { 0x54, 0x3B, 0x30 }, "duagon", "duagon AG" }, + { { 0x54, 0x3C, 0xED }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x54, 0x3D, 0x37 }, "RuckusWirele", "Ruckus Wireless" }, { { 0x54, 0x3D, 0x60 }, "Arcadyan", "Arcadyan Corporation" }, { { 0x54, 0x3D, 0x92 }, "WirelessTekT", "Wireless-Tek Technology Limited" }, @@ -22154,6 +22311,7 @@ { { 0x54, 0xA2, 0x45 }, "Digisol", "Digisol Systems Limited" }, { { 0x54, 0xA2, 0x74 }, "Cisco", "Cisco Systems, Inc" }, { { 0x54, 0xA3, 0x1B }, "LinkworldTec", "Shenzhen Linkworld Technology Co,.LTD" }, + { { 0x54, 0xA3, 0x56 }, "Annapurnalab", "Annapurna labs" }, { { 0x54, 0xA3, 0xFA }, "BQTSolutions", "BQT Solutions (Australia)Pty Ltd" }, { { 0x54, 0xA5, 0x1B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x54, 0xA5, 0x4B }, "NSCCommunica", "NSC Communications Siberia Ltd" }, @@ -22272,6 +22430,7 @@ { { 0x54, 0xF0, 0xB1 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x54, 0xF1, 0x5F }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, { { 0x54, 0xF2, 0x01 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x54, 0xF2, 0x83 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x54, 0xF2, 0x94 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x54, 0xF2, 0x9F }, "HunanFnLinkT", "Hunan Fn-Link Technology Limited" }, { { 0x54, 0xF5, 0xB6 }, "OrientalPaci", "Oriental Pacific International Limited" }, @@ -22312,6 +22471,7 @@ { { 0x58, 0x0A, 0x20 }, "Cisco", "Cisco Systems, Inc" }, { { 0x58, 0x0A, 0xD4 }, "Apple", "Apple, Inc." }, { { 0x58, 0x0D, 0x0D }, "GreeElectric", "Gree Electric Appliances, Inc. Of Zhuhai" }, + { { 0x58, 0x0E, 0x85 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x58, 0x0F, 0xA5 }, "Apple", "Apple, Inc." }, { { 0x58, 0x10, 0x31 }, "HonHaiPrecis", "Hon Hai Precision IND.CO.,LTD" }, { { 0x58, 0x10, 0x8C }, "Intelbras", "Intelbras" }, @@ -22408,9 +22568,9 @@ { { 0x58, 0x56, 0xC2 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x58, 0x56, 0xE8 }, "Commscope", "Commscope" }, { { 0x58, 0x57, 0x0D }, "DanfossSolar", "Danfoss Solar Inverters" }, - { { 0x58, 0x58, 0xCD }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x58, 0x58, 0xCD }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x58, 0x59, 0x24 }, "NanjingSimon", "Nanjing Simon Info Tech Co.,Ltd." }, - { { 0x58, 0x59, 0xC2 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x58, 0x59, 0xC2 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x58, 0x5B, 0x69 }, "Tvt", "Tvt Co., Ltd" }, { { 0x58, 0x5F, 0xF6 }, "zte", "zte corporation" }, { { 0x58, 0x60, 0x10 }, "zovotonelect", "shenzhen zovoton electronic co.,ltd" }, @@ -22433,6 +22593,7 @@ { { 0x58, 0x6A, 0xB1 }, "H3CTechnolog", "Hangzhou H3C Technologies Co., Limited" }, { { 0x58, 0x6B, 0x14 }, "Apple", "Apple, Inc." }, { { 0x58, 0x6C, 0x25 }, "Intel", "Intel Corporate" }, + { { 0x58, 0x6D, 0x0C }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x58, 0x6D, 0x67 }, "Intel", "Intel Corporate" }, { { 0x58, 0x6D, 0x8F }, "CiscoLinksys", "Cisco-Linksys, LLC" }, { { 0x58, 0x6E, 0xD6 }, "Private", "Private" }, @@ -22483,6 +22644,7 @@ { { 0x58, 0x8D, 0x39 }, "MitsubishiEl", "Mitsubishi Electric Automation (China) Ltd." }, { { 0x58, 0x8D, 0x64 }, "XianClevbeeT", "Xi'an Clevbee Technology Co.,Ltd" }, { { 0x58, 0x8E, 0x81 }, "SiliconLabor", "Silicon Laboratories" }, + { { 0x58, 0x8F, 0xA7 }, "LGInnotek", "LG Innotek" }, { { 0x58, 0x8F, 0xCF }, "EzvizSoftwar", "Hangzhou Ezviz Software Co.,Ltd." }, { { 0x58, 0x90, 0x43 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x58, 0x91, 0x53 }, "ChinaMobileI", "China Mobile IOT Company Limited" }, @@ -22582,6 +22744,7 @@ { { 0x58, 0xD3, 0x12 }, "zte", "zte corporation" }, { { 0x58, 0xD3, 0x49 }, "Apple", "Apple, Inc." }, { { 0x58, 0xD3, 0x91 }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, + { { 0x58, 0xD4, 0x69 }, "AristaNetwor", "Arista Networks" }, { { 0x58, 0xD5, 0x0A }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x58, 0xD5, 0x33 }, "HuaqinTechno", "Huaqin Technology Co.,Ltd" }, { { 0x58, 0xD5, 0x6E }, "DLinkInterna", "D-Link International" }, @@ -22672,13 +22835,14 @@ { { 0x5C, 0x07, 0xA6 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x5C, 0x09, 0x47 }, "Apple", "Apple, Inc." }, { { 0x5C, 0x09, 0x79 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x5C, 0x0A, 0x11 }, "DongguanLies", "Dongguan Liesheng Electronic Co., Ltd." }, { { 0x5C, 0x0A, 0x5B }, "SamsungElect", "Samsung Electro Mechanics Co., Ltd." }, { { 0x5C, 0x0B, 0x3B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x5C, 0x0B, 0xCA }, "TunstallNord", "Tunstall Nordic AB" }, { { 0x5C, 0x0C, 0x0E }, "GuizhouHuaxi", "Guizhou Huaxintong Semiconductor Technology Co Ltd" }, { { 0x5C, 0x0C, 0xBB }, "CELIZION", "CELIZION Inc." }, { { 0x5C, 0x0C, 0xE6 }, "Nintendo", "Nintendo Co.,Ltd" }, - { { 0x5C, 0x0E, 0x8B }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x5C, 0x0E, 0x8B }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x5C, 0x0F, 0xFB }, "AminoCommuni", "Amino Communications Ltd" }, { { 0x5C, 0x10, 0x1E }, "zte", "zte corporation" }, { { 0x5C, 0x10, 0xC5 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -22712,6 +22876,7 @@ { { 0x5C, 0x22, 0xC4 }, "DaeEunEletro", "Dae Eun Eletronics Co., Ltd" }, { { 0x5C, 0x22, 0xDA }, "VantivaUSA", "Vantiva USA LLC" }, { { 0x5C, 0x23, 0x16 }, "SquirrelsRes", "Squirrels Research Labs LLC" }, + { { 0x5C, 0x23, 0xC2 }, "Apple", "Apple, Inc." }, { { 0x5C, 0x24, 0x1F }, "QingdaoHaier", "Qingdao Haier Technology Co.,Ltd" }, { { 0x5C, 0x24, 0x43 }, "OSungTelecom", "O-Sung Telecom Co., Ltd." }, { { 0x5C, 0x24, 0x79 }, "Baltech", "Baltech AG" }, @@ -22755,6 +22920,7 @@ { { 0x5C, 0x3E, 0x1B }, "Apple", "Apple, Inc." }, { { 0x5C, 0x40, 0x58 }, "JeffersonAud", "Jefferson Audio Video Systems, Inc." }, { { 0x5C, 0x40, 0x71 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, + { { 0x5C, 0x40, 0x97 }, "AcctonTechno", "Accton Technology Corporation" }, { { 0x5C, 0x40, 0xE3 }, "Novaon", "Novaon" }, { { 0x5C, 0x41, 0x5A }, "Amazoncom", "Amazon.com, LLC" }, { { 0x5C, 0x41, 0xE7 }, "WiatecIntern", "Wiatec International Ltd." }, @@ -22775,6 +22941,7 @@ { { 0x5C, 0x4D, 0xBF }, "zte", "zte corporation" }, { { 0x5C, 0x4E, 0xEE }, "AltoBeam", "AltoBeam Inc." }, { { 0x5C, 0x50, 0x15 }, "Cisco", "Cisco Systems, Inc" }, + { { 0x5C, 0x50, 0xD3 }, "KnitSound", "Knit Sound Company" }, { { 0x5C, 0x50, 0xD9 }, "Apple", "Apple, Inc." }, { { 0x5C, 0x51, 0x36 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x5C, 0x51, 0x4F }, "Intel", "Intel Corporate" }, @@ -22881,6 +23048,7 @@ { { 0x5C, 0x8D, 0x2D }, "WellpayInfor", "Shanghai Wellpay Information Technology Co., Ltd" }, { { 0x5C, 0x8D, 0x4E }, "Apple", "Apple, Inc." }, { { 0x5C, 0x8D, 0xE5 }, "DeltaElectro", "Delta Electronics, Inc." }, + { { 0x5C, 0x8D, 0xFD }, "Clariphotoni", "Clariphotonics CO., Ltd" }, { { 0x5C, 0x8E, 0x10 }, "TimeWatchInf", "TimeWatch Infocom Pvt. Ltd." }, { { 0x5C, 0x8E, 0x8B }, "LinghaiElect", "Shenzhen Linghai Electronics Co.,Ltd" }, { { 0x5C, 0x8F, 0x40 }, "TecnoMobile", "Tecno Mobile Limited" }, @@ -22922,6 +23090,7 @@ { { 0x5C, 0xA8, 0x6A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x5C, 0xA9, 0x31 }, "UbeeInteract", "Ubee Interactive Co., Limited" }, { { 0x5C, 0xA9, 0x33 }, "LumaHome", "Luma Home" }, + { { 0x5C, 0xAA, 0xA2 }, "Celestica", "Celestica Inc." }, { { 0x5C, 0xAA, 0xFD }, "Sonos", "Sonos, Inc." }, { { 0x5C, 0xAC, 0x3D }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x5C, 0xAC, 0x4C }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, @@ -22951,7 +23120,7 @@ { { 0x5C, 0xB9, 0x01 }, "HewlettPacka", "Hewlett Packard" }, { { 0x5C, 0xBA, 0x2C }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x5C, 0xBA, 0x37 }, "Microsoft", "Microsoft Corporation" }, - { { 0x5C, 0xBA, 0x75 }, "QuectelWirel", "Quectel Wireless Solutions Co., Ltd." }, + { { 0x5C, 0xBA, 0x75 }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, { { 0x5C, 0xBA, 0xEF }, "ChongqingFug", "Chongqing Fugui Electronics Co.,Ltd." }, { { 0x5C, 0xBB, 0xEE }, "zte", "zte corporation" }, { { 0x5C, 0xBD, 0x9A }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -22970,6 +23139,7 @@ { { 0x5C, 0xC5, 0xD4 }, "Intel", "Intel Corporate" }, { { 0x5C, 0xC6, 0xD0 }, "SkyworthDigi", "Skyworth Digital Technology(Shenzhen) Co.,Ltd" }, { { 0x5C, 0xC6, 0xE9 }, "EdifierInter", "Edifier International" }, + { { 0x5C, 0xC7, 0x86 }, "TengxinElect", "ShenZhen Tengxin Electronics Manufacturing Co.,Ltd." }, { { 0x5C, 0xC7, 0x87 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x5C, 0xC7, 0xC1 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x5C, 0xC7, 0xD7 }, "AzroadTechno", "Azroad Technology Company Limited" }, @@ -23023,7 +23193,7 @@ { { 0x5C, 0xE5, 0x0C }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0x5C, 0xE6, 0x88 }, "VECOSEurope", "VECOS Europe B.V." }, { { 0x5C, 0xE7, 0x47 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0x5C, 0xE7, 0x53 }, "Private", "Private" }, + { { 0x5C, 0xE7, 0x53 }, "Intellirocks", "Shenzhen Intellirocks Tech. Co. Ltd." }, { { 0x5C, 0xE7, 0xA0 }, "Nokia", "Nokia" }, { { 0x5C, 0xE7, 0xBF }, "NewSingulari", "New Singularity International Technical Development Co.,Ltd" }, { { 0x5C, 0xE8, 0x83 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -23118,11 +23288,12 @@ { { 0x60, 0x1B, 0x52 }, "VodafoneItal", "Vodafone Italia S.p.A." }, { { 0x60, 0x1D, 0x0F }, "MidniteSolar", "Midnite Solar" }, { { 0x60, 0x1D, 0x16 }, "MedEngHoldin", "Med-Eng Holdings ULC" }, - { { 0x60, 0x1D, 0x56 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x60, 0x1D, 0x56 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x60, 0x1D, 0x91 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x60, 0x1D, 0x9D }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, { { 0x60, 0x1E, 0x02 }, "EltexAlatau", "EltexAlatau" }, { { 0x60, 0x1E, 0x98 }, "AxevastTechn", "Axevast Technology" }, + { { 0x60, 0x1F, 0x56 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x60, 0x21, 0x01 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0x60, 0x21, 0x03 }, "I4Vine", "I4Vine, Inc" }, { { 0x60, 0x21, 0xC0 }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, @@ -23141,7 +23312,7 @@ { { 0x60, 0x2A, 0x54 }, "CardioTek", "CardioTek B.V." }, { { 0x60, 0x2A, 0xD0 }, "CiscoSPVTG", "Cisco SPVTG" }, { { 0x60, 0x2B, 0x58 }, "EMMicroelect", "EM Microelectronic" }, - { { 0x60, 0x2D, 0x74 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x60, 0x2D, 0x74 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x60, 0x2E, 0x20 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x60, 0x2E, 0xD5 }, "Apple", "Apple, Inc." }, { { 0x60, 0x30, 0xB3 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -23226,6 +23397,7 @@ { { 0x60, 0x60, 0x1F }, "SzDjiTechnol", "Sz Dji Technology Co.,Ltd" }, { { 0x60, 0x61, 0x34 }, "ArcadeCommun", "Arcade Communications Ltd." }, { { 0x60, 0x61, 0xDF }, "ZmetaResearc", "Z-meta Research LLC" }, + { { 0x60, 0x62, 0x9A }, "JuniperNetwo", "Juniper Networks" }, { { 0x60, 0x63, 0x4C }, "DLinkInterna", "D-Link International" }, { { 0x60, 0x63, 0xF9 }, "Ciholas", "Ciholas, Inc." }, { { 0x60, 0x63, 0xFD }, "TranscendCom", "Transcend Communication Beijing Co.,Ltd." }, @@ -23268,6 +23440,7 @@ { { 0x60, 0x76, 0x88 }, "Velodyne", "Velodyne" }, { { 0x60, 0x77, 0x71 }, "TexasInstrum", "Texas Instruments" }, { { 0x60, 0x77, 0xE2 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x60, 0x79, 0xC9 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x60, 0x7A, 0xD8 }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, { { 0x60, 0x7D, 0x09 }, "LuxsharePrec", "Luxshare Precision Industry Co., Ltd" }, { { 0x60, 0x7D, 0xDD }, "ShichuangyiE", "Shenzhen Shichuangyi Electronics Co.,Ltd" }, @@ -23408,7 +23581,9 @@ { { 0x60, 0xD0, 0x2C }, "RuckusWirele", "Ruckus Wireless" }, { { 0x60, 0xD0, 0x39 }, "Apple", "Apple, Inc." }, { { 0x60, 0xD0, 0xA9 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x60, 0xD1, 0x78 }, "Cisco", "Cisco Systems, Inc" }, { { 0x60, 0xD1, 0xAA }, "VishalTeleco", "Vishal Telecommunications Pvt Ltd" }, + { { 0x60, 0xD1, 0xD8 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x60, 0xD2, 0x1C }, "SunnovoInter", "Sunnovo International Limited" }, { { 0x60, 0xD2, 0x48 }, "Commscope", "Commscope" }, { { 0x60, 0xD2, 0x62 }, "Tzukuri", "Tzukuri Pty Ltd" }, @@ -23434,6 +23609,7 @@ { { 0x60, 0xDB, 0xEF }, "UnifySoftwar", "Unify Software and Solutions GmbH & Co. KG" }, { { 0x60, 0xDC, 0x0D }, "TaiwanShinKo", "Taiwan Shin Kong Security Co., Ltd" }, { { 0x60, 0xDC, 0x81 }, "AltoBeam", "AltoBeam Inc." }, + { { 0x60, 0xDD, 0x10 }, "AngxunTechno", "Shenzhen Angxun Technology Co.,Ltd" }, { { 0x60, 0xDD, 0x70 }, "Apple", "Apple, Inc." }, { { 0x60, 0xDD, 0x8E }, "Intel", "Intel Corporate" }, { { 0x60, 0xDE, 0x18 }, "Apple", "Apple, Inc." }, @@ -23456,6 +23632,7 @@ { { 0x60, 0xE9, 0xAA }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, { { 0x60, 0xEB, 0x5A }, "AsterfusionD", "Asterfusion Data Technologies Co.,Ltd" }, { { 0x60, 0xEB, 0x69 }, "QuantaComput", "Quanta Computer Inc." }, + { { 0x60, 0xEB, 0xB4 }, "GeniusTechno", "Guangdong Genius Technology Co., Ltd." }, { { 0x60, 0xEE, 0x5C }, "FastTechnolo", "Shenzhen Fast Technologies Co.,Ltd" }, { { 0x60, 0xEF, 0xAB }, "SiliconLabor", "Silicon Laboratories" }, { { 0x60, 0xEF, 0xC6 }, "ChimaTechnol", "Shenzhen Chima Technologies Co Limited" }, @@ -23473,12 +23650,15 @@ { { 0x60, 0xF4, 0x94 }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, { { 0x60, 0xF5, 0x49 }, "Apple", "Apple, Inc." }, { { 0x60, 0xF5, 0x9C }, "CRUDataport", "CRU-Dataport" }, + { { 0x60, 0xF6, 0x20 }, "Sonos", "Sonos Inc." }, { { 0x60, 0xF6, 0x73 }, "Terumo", "Terumo Corporation" }, { { 0x60, 0xF6, 0x77 }, "Intel", "Intel Corporate" }, { { 0x60, 0xF7, 0x23 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0x60, 0xF8, 0x1D }, "Apple", "Apple, Inc." }, { { 0x60, 0xF8, 0xF2 }, "Synaptec", "Synaptec" }, + { { 0x60, 0xF9, 0x1C }, "ChinaDragonT", "China Dragon Technology Limited" }, { { 0x60, 0xFA, 0x9D }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x60, 0xFA, 0xA7 }, "Mtc", "Shenzhen Mtc Co Ltd" }, { { 0x60, 0xFA, 0xB1 }, "Kempower", "Kempower Oyj" }, { { 0x60, 0xFA, 0xCD }, "Apple", "Apple, Inc." }, { { 0x60, 0xFB, 0x00 }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, @@ -23592,6 +23772,7 @@ { { 0x64, 0x41, 0xE6 }, "Apple", "Apple, Inc." }, { { 0x64, 0x42, 0x12 }, "WaterWorldIn", "Shenzhen Water World Information Co.,Ltd." }, { { 0x64, 0x42, 0x14 }, "SwisscomEner", "Swisscom Energy Solutions AG" }, + { { 0x64, 0x42, 0xC2 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x64, 0x43, 0x46 }, "QuickNetwork", "GuangDong Quick Network Computer CO.,LTD" }, { { 0x64, 0x44, 0x7B }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0x64, 0x44, 0xD5 }, "TDTech", "TD Tech" }, @@ -23623,6 +23804,7 @@ { { 0x64, 0x55, 0x7F }, "NSFOCUSInfor", "NSFOCUS Information Technology Co., Ltd." }, { { 0x64, 0x55, 0xB1 }, "Commscope", "Commscope" }, { { 0x64, 0x56, 0x01 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, + { { 0x64, 0x56, 0xB5 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x64, 0x57, 0x25 }, "HuiZhouGaosh", "Hui Zhou Gaoshengda Technology Co.,LTD" }, { { 0x64, 0x57, 0xBA }, "Intel", "Intel Corporate" }, { { 0x64, 0x57, 0xE5 }, "Royaltech", "Beijing Royaltech Co.,Ltd" }, @@ -23699,6 +23881,7 @@ { { 0x64, 0x7B, 0xD4 }, "TexasInstrum", "Texas Instruments" }, { { 0x64, 0x7C, 0x34 }, "UbeeInteract", "Ubee Interactive Co., Limited" }, { { 0x64, 0x7C, 0xE8 }, "PaloAltoNetw", "Palo Alto Networks" }, + { { 0x64, 0x7D, 0x4D }, "Arcadyan", "Arcadyan Corporation" }, { { 0x64, 0x7D, 0x81 }, "YokotaIndust", "Yokota Industrial Co,.Ltd" }, { { 0x64, 0x7F, 0xDA }, "TEKTELICComm", "TEKTELIC Communications Inc." }, { { 0x64, 0x80, 0x8B }, "VGControls", "VG Controls, Inc." }, @@ -23721,6 +23904,7 @@ { { 0x64, 0x90, 0xC1 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0x64, 0x95, 0x6C }, "LGElectronic", "LG Electronics" }, { { 0x64, 0x97, 0x14 }, "eero", "eero inc." }, + { { 0x64, 0x97, 0x46 }, "AzureWaveTec", "AzureWave Technology Inc." }, { { 0x64, 0x98, 0x29 }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, { { 0x64, 0x98, 0x9E }, "TrinnovAudio", "Trinnov Audio" }, { { 0x64, 0x99, 0x5D }, "Lge", "Lge" }, @@ -23738,6 +23922,7 @@ { { 0x64, 0x9D, 0x38 }, "Google", "Google, Inc." }, { { 0x64, 0x9D, 0x99 }, "FsCom", "Fs Com Inc" }, { { 0x64, 0x9E, 0x31 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, + { { 0x64, 0x9E, 0x58 }, "MMDevices", "MM Devices Pty. Ltd." }, { { 0x64, 0x9E, 0xF3 }, "Cisco", "Cisco Systems, Inc" }, { { 0x64, 0x9F, 0xF7 }, "Kone", "Kone OYj" }, { { 0x64, 0xA0, 0xAC }, "Adtran", "Adtran Inc" }, @@ -23769,6 +23954,7 @@ { { 0x64, 0xB0, 0xE8 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x64, 0xB2, 0x1D }, "PhycomTech", "Chengdu Phycom Tech Co., Ltd." }, { { 0x64, 0xB2, 0xB4 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, + { { 0x64, 0xB2, 0xE4 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x64, 0xB3, 0x10 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x64, 0xB3, 0x70 }, "PowerCommSol", "PowerComm Solutions LLC" }, { { 0x64, 0xB3, 0x79 }, "JiangsuVisco", "Jiangsu Viscore Technologies Co.,Ltd" }, @@ -23793,6 +23979,7 @@ { { 0x64, 0xBE, 0x63 }, "STORDIS", "STORDIS GmbH" }, { { 0x64, 0xBF, 0x6B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x64, 0xC0, 0x1A }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, + { { 0x64, 0xC0, 0x45 }, "Apple", "Apple, Inc." }, { { 0x64, 0xC1, 0x7E }, "cheilelectri", "cheilelectric" }, { { 0x64, 0xC2, 0x69 }, "eero", "eero inc." }, { { 0x64, 0xC2, 0xDE }, "LGElectronic", "LG Electronics (Mobile Communications)" }, @@ -23806,9 +23993,11 @@ { { 0x64, 0xC6, 0xAF }, "AXERRANetwor", "AXERRA Networks Ltd" }, { { 0x64, 0xC6, 0xD2 }, "SeikoEpson", "Seiko Epson Corporation" }, { { 0x64, 0xC7, 0x53 }, "Apple", "Apple, Inc." }, + { { 0x64, 0xC7, 0xF1 }, "PremierD", "Premier-D LLC" }, { { 0x64, 0xC9, 0x01 }, "INVENTEC", "INVENTEC Corporation" }, { { 0x64, 0xC9, 0x05 }, "Apple", "Apple, Inc." }, { { 0x64, 0xC9, 0x44 }, "LARKTechnolo", "LARK Technologies, Inc" }, + { { 0x64, 0xC9, 0xF1 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x64, 0xCA, 0x80 }, "RealmeChongq", "Realme Chongqing Mobile Telecommunications Corp.,Ltd." }, { { 0x64, 0xCB, 0x5D }, "SIATeleSet", "SIA \"TeleSet\"" }, { { 0x64, 0xCB, 0x9F }, "TecnoMobile", "Tecno Mobile Limited" }, @@ -23834,6 +24023,8 @@ { { 0x64, 0xD4, 0xDA }, "Intel", "Intel Corporate" }, { { 0x64, 0xD4, 0xF0 }, "Netvue，Inc", "Netvue，Inc." }, { { 0x64, 0xD5, 0x62 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0x64, 0xD6, 0x08 }, "AilyworldTec", "Shenzhen Ailyworld Technology Co.,Ltd." }, + { { 0x64, 0xD6, 0x67 }, "IkotekTechno", "Shanghai Ikotek Technology Co.,Ltd" }, { { 0x64, 0xD6, 0x9A }, "Intel", "Intel Corporate" }, { { 0x64, 0xD7, 0xC0 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x64, 0xD8, 0x14 }, "Cisco", "Cisco Systems, Inc" }, @@ -23943,6 +24134,7 @@ { { 0x68, 0x1A, 0xA4 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x68, 0x1A, 0xB2 }, "zte", "zte corporation" }, { { 0x68, 0x1B, 0xEF }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x68, 0x1C, 0x52 }, "Cisco", "Cisco Systems, Inc" }, { { 0x68, 0x1C, 0xA2 }, "Rosewill", "Rosewill Inc." }, { { 0x68, 0x1D, 0x4C }, "KontroneSyst", "Kontron eSystems GmbH" }, { { 0x68, 0x1D, 0x64 }, "SunwaveCommu", "Sunwave Communications Co., Ltd" }, @@ -23975,6 +24167,7 @@ { { 0x68, 0x2C, 0x7B }, "Cisco", "Cisco Systems, Inc" }, { { 0x68, 0x2D, 0x83 }, "DingheCommun", "Shenzhen Dinghe Communication Company" }, { { 0x68, 0x2D, 0xDC }, "ChangjiangEl", "Wuhan Changjiang Electro-Communication Equipment CO.,LTD" }, + { { 0x68, 0x2E, 0x3C }, "Ubiquiti", "Ubiquiti Inc" }, { { 0x68, 0x2F, 0x67 }, "Apple", "Apple, Inc." }, { { 0x68, 0x30, 0x36 }, "Apple", "Apple, Inc." }, { { 0x68, 0x30, 0x45 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -23990,6 +24183,7 @@ { { 0x68, 0x39, 0x43 }, "ittim", "ittim" }, { { 0x68, 0x3A, 0x1E }, "CiscoMeraki", "Cisco Meraki" }, { { 0x68, 0x3A, 0x48 }, "SAMJIN", "SAMJIN Co., Ltd." }, + { { 0x68, 0x3B, 0x09 }, "Apple", "Apple, Inc." }, { { 0x68, 0x3B, 0x1E }, "Countwise", "Countwise LTD" }, { { 0x68, 0x3B, 0x78 }, "Cisco", "Cisco Systems, Inc" }, { { 0x68, 0x3C, 0x7D }, "MagicIntelli", "Magic Intelligence Technology Limited" }, @@ -24012,6 +24206,7 @@ { { 0x68, 0x45, 0xF1 }, "ToshibaClien", "Toshiba Client Solutions Co., Ltd." }, { { 0x68, 0x47, 0x24 }, "EMMicroelect", "EM Microelectronic" }, { { 0x68, 0x47, 0x49 }, "TexasInstrum", "Texas Instruments" }, + { { 0x68, 0x47, 0xC5 }, "Intel", "Intel Corporate" }, { { 0x68, 0x48, 0x98 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x68, 0x48, 0xB4 }, "AltoBeam", "AltoBeam Inc." }, { { 0x68, 0x49, 0x83 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -24046,6 +24241,7 @@ { { 0x68, 0x55, 0xD4 }, "SeikoEpson", "Seiko Epson Corporation" }, { { 0x68, 0x57, 0x2D }, "TuyaSmart", "Tuya Smart Inc." }, { { 0x68, 0x58, 0x11 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, + { { 0x68, 0x58, 0x92 }, "NXPSemicondu", "NXP Semiconductors Taiwan Ltd." }, { { 0x68, 0x58, 0xA0 }, "HonorDevice", "Honor Device Co., Ltd." }, { { 0x68, 0x58, 0xC5 }, "ZFTRWAutomot", "ZF TRW Automotive" }, { { 0x68, 0x59, 0x32 }, "SunitecEnter", "Sunitec Enterprise Co.,Ltd" }, @@ -24122,6 +24318,7 @@ { { 0x68, 0x8A, 0xF0 }, "zte", "zte corporation" }, { { 0x68, 0x8B, 0x0F }, "ChinaMobileI", "China Mobile IOT Company Limited" }, { { 0x68, 0x8B, 0xF4 }, "AristaNetwor", "Arista Network, Inc." }, + { { 0x68, 0x8D, 0x2B }, "GsdVietNamTe", "Gsd Viet Nam Technology Company Limited" }, { { 0x68, 0x8D, 0xB6 }, "Aetek", "Aetek Inc." }, { { 0x68, 0x8F, 0x2E }, "HitronTechno", "Hitron Technologies. Inc" }, { { 0x68, 0x8F, 0x84 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -24149,6 +24346,7 @@ { { 0x68, 0x9C, 0x5E }, "AcSiPTechnol", "AcSiP Technology Corp." }, { { 0x68, 0x9C, 0x70 }, "Apple", "Apple, Inc." }, { { 0x68, 0x9C, 0xE2 }, "Cisco", "Cisco Systems, Inc" }, + { { 0x68, 0x9D, 0xD2 }, "Espressif", "Espressif Inc." }, { { 0x68, 0x9E, 0x0B }, "Cisco", "Cisco Systems, Inc" }, { { 0x68, 0x9E, 0x19 }, "TexasInstrum", "Texas Instruments" }, { { 0x68, 0x9E, 0x29 }, "zte", "zte corporation" }, @@ -24308,6 +24506,7 @@ { { 0x6A, 0x1F, 0x6C }, "iPass", "iPass, Inc." }, { { 0x6A, 0x40, 0x65 }, "OpenConnecti", "Open Connectivity Foundation" }, { { 0x6A, 0x5C, 0x35 }, "Secrétariatg", "Secrétariat général de la défense et de la sécurité nationale" }, + { { 0x6A, 0x61, 0xEE }, "NanjingEtlch", "Nanjing Etlchips Microelectronics Technology Co., LTD" }, { { 0x6A, 0x62, 0x1E }, "DIFIConsorti", "DIFI Consortium" }, { { 0x6A, 0x71, 0xE6 }, "FuelCloud", "FuelCloud" }, { { 0x6A, 0x73, 0x7D }, "25GEthernetC", "25G Ethernet Consortium" }, @@ -24321,7 +24520,7 @@ { { 0x6C, 0x02, 0x73 }, "JinYunVideoE", "Shenzhen Jin Yun Video Equipment Co., Ltd." }, { { 0x6C, 0x02, 0xE0 }, "HP", "HP Inc." }, { { 0x6C, 0x03, 0x09 }, "Cisco", "Cisco Systems, Inc" }, - { { 0x6C, 0x03, 0x70 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x6C, 0x03, 0x70 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x6C, 0x03, 0xB5 }, "Cisco", "Cisco Systems, Inc" }, { { 0x6C, 0x04, 0x60 }, "RBHAccessTec", "RBH Access Technologies Inc." }, { { 0x6C, 0x04, 0x7A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -24419,6 +24618,8 @@ { { 0x6C, 0x3C, 0x53 }, "SoundHawk", "SoundHawk Corp" }, { { 0x6C, 0x3C, 0x7C }, "Canon", "Canon Inc." }, { { 0x6C, 0x3C, 0x8C }, "Dell", "Dell Inc." }, + { { 0x6C, 0x3D, 0x7D }, "VantivaUSA", "Vantiva USA LLC" }, + { { 0x6C, 0x3D, 0xD8 }, "EspressifPte", "Espressif Systems (Singapore) Pte. Ltd" }, { { 0x6C, 0x3E, 0x51 }, "MindrayNorth", "Mindray North America" }, { { 0x6C, 0x3E, 0x6D }, "Apple", "Apple, Inc." }, { { 0x6C, 0x3E, 0x9C }, "KEKnestelEle", "KE Knestel Elektronik GmbH" }, @@ -24503,6 +24704,7 @@ { { 0x6C, 0x6E, 0x07 }, "CeLink", "Ce Link Limited" }, { { 0x6C, 0x6E, 0xFE }, "CoreLogic", "Core Logic Inc." }, { { 0x6C, 0x6F, 0x18 }, "Stereotaxis", "Stereotaxis, Inc." }, + { { 0x6C, 0x70, 0x28 }, "LandisGyr", "Landis+Gyr S.A." }, { { 0x6C, 0x70, 0x39 }, "Novar", "Novar GmbH" }, { { 0x6C, 0x70, 0x9F }, "Apple", "Apple, Inc." }, { { 0x6C, 0x70, 0xCB }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -24512,6 +24714,7 @@ { { 0x6C, 0x71, 0xD9 }, "AzureWaveTec", "AzureWave Technology Inc." }, { { 0x6C, 0x72, 0x20 }, "DLinkInterna", "D-Link International" }, { { 0x6C, 0x72, 0x4A }, "OnkyoTechnol", "Onkyo Technology K.K." }, + { { 0x6C, 0x72, 0xB8 }, "LCFCElectron", "LCFC(Hefei) Electronics Technology co., ltd" }, { { 0x6C, 0x72, 0xE2 }, "amitek", "amitek" }, { { 0x6C, 0x72, 0xE7 }, "Apple", "Apple, Inc." }, { { 0x6C, 0x75, 0x0D }, "WiFiSONG", "WiFiSONG" }, @@ -24553,6 +24756,7 @@ { { 0x6C, 0x91, 0x88 }, "Nokia", "Nokia" }, { { 0x6C, 0x92, 0xBF }, "IEIT", "IEIT SYSTEMS Co., Ltd." }, { { 0x6C, 0x92, 0xCF }, "Broadcom", "Broadcom Limited" }, + { { 0x6C, 0x92, 0xF6 }, "AristaNetwor", "Arista Networks" }, { { 0x6C, 0x93, 0x13 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x6C, 0x93, 0x54 }, "YaojinTechno", "Yaojin Technology (Shenzhen) Co., LTD." }, { { 0x6C, 0x93, 0x92 }, "BEKOTechnolo", "BEKO Technologies GmbH" }, @@ -24574,10 +24778,12 @@ { { 0x6C, 0x9C, 0xED }, "Cisco", "Cisco Systems, Inc" }, { { 0x6C, 0x9E, 0x7C }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0x6C, 0xA0, 0x42 }, "SiliconLabor", "Silicon Laboratories" }, + { { 0x6C, 0xA0, 0xAF }, "CmPartner", "Cm Partner Inc." }, { { 0x6C, 0xA0, 0xB4 }, "SkyUk", "Sky Uk Limited" }, { { 0x6C, 0xA1, 0x00 }, "Intel", "Intel Corporate" }, { { 0x6C, 0xA3, 0x1E }, "ItelMobile", "Itel Mobile Limited" }, { { 0x6C, 0xA3, 0x67 }, "Avlinkpro", "Avlinkpro" }, + { { 0x6C, 0xA3, 0xD3 }, "PeplinkInter", "Peplink International Ltd." }, { { 0x6C, 0xA4, 0x01 }, "essensys", "essensys plc" }, { { 0x6C, 0xA4, 0xD1 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0x6C, 0xA6, 0x04 }, "Commscope", "Commscope" }, @@ -24647,6 +24853,7 @@ { { 0x6C, 0xC7, 0xEC }, "SamsungElect", "Samsung Electro-Mechanics(Thailand)" }, { { 0x6C, 0xC8, 0x40 }, "Espressif", "Espressif Inc." }, { { 0x6C, 0xCA, 0x08 }, "Commscope", "Commscope" }, + { { 0x6C, 0xCB, 0x7F }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, { { 0x6C, 0xCD, 0xD6 }, "Netgear", "Netgear" }, { { 0x6C, 0xCE, 0x44 }, "1More", "1More" }, { { 0x6C, 0xCF, 0x39 }, "StarFiveSemi", "Shanghai StarFive Semiconductor Co., Ltd." }, @@ -24670,6 +24877,7 @@ { { 0x6C, 0xD8, 0x69 }, "GuangzhouSat", "Guangzhou Sat Infrared Co.,LTD" }, { { 0x6C, 0xD8, 0xFB }, "QorvoUtrecht", "Qorvo Utrecht B.V." }, { { 0x6C, 0xD9, 0x4C }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, + { { 0x6C, 0xDA, 0x1D }, "SuntonTechno", "Sunton Technology (M) Sdn. Bhd" }, { { 0x6C, 0xDC, 0x6A }, "Promethean", "Promethean Limited" }, { { 0x6C, 0xDD, 0x30 }, "Cisco", "Cisco Systems, Inc" }, { { 0x6C, 0xDD, 0xBC }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -24681,6 +24889,7 @@ { { 0x6C, 0xE2, 0x0C }, "SDICMicroele", "Hangzhou SDIC Microelectronics Inc." }, { { 0x6C, 0xE2, 0xD3 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0x6C, 0xE3, 0xB6 }, "NeraTelecomm", "Nera Telecommunications Ltd." }, + { { 0x6C, 0xE4, 0x0D }, "RaisecomTech", "Raisecom Technology CO., LTD" }, { { 0x6C, 0xE4, 0xA4 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x6C, 0xE4, 0xCE }, "VilligerSecu", "Villiger Security Solutions AG" }, { { 0x6C, 0xE4, 0xDA }, "NECPlatforms", "NEC Platforms, Ltd." }, @@ -24776,6 +24985,7 @@ { { 0x70, 0x21, 0x7F }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x70, 0x22, 0xFE }, "Apple", "Apple, Inc." }, { { 0x70, 0x23, 0x93 }, "Polytech", "Polytech A/S" }, + { { 0x70, 0x24, 0x6E }, "ZhejiangLaib", "Zhejiang Laibao Display Technology Co., Ltd." }, { { 0x70, 0x25, 0x26 }, "Nokia", "Nokia" }, { { 0x70, 0x25, 0x59 }, "CyberTANTech", "CyberTAN Technology Inc." }, { { 0x70, 0x26, 0x05 }, "SONYVisualPr", "SONY Visual Products Inc." }, @@ -24805,6 +25015,7 @@ { { 0x70, 0x30, 0x5E }, "NanjingZhong", "Nanjing Zhongke Menglian Information Technology Co.,LTD" }, { { 0x70, 0x31, 0x7F }, "Apple", "Apple, Inc." }, { { 0x70, 0x31, 0x87 }, "ACX", "ACX GmbH" }, + { { 0x70, 0x32, 0x0C }, "RuckusWirele", "Ruckus Wireless" }, { { 0x70, 0x32, 0x17 }, "Intel", "Intel Corporate" }, { { 0x70, 0x32, 0xD5 }, "AthenaWirele", "Athena Wireless Communications Inc" }, { { 0x70, 0x35, 0x09 }, "Cisco", "Cisco Systems, Inc" }, @@ -24848,6 +25059,7 @@ { { 0x70, 0x4C, 0xA2 }, "Apple", "Apple, Inc." }, { { 0x70, 0x4C, 0xA5 }, "Fortinet", "Fortinet, Inc." }, { { 0x70, 0x4C, 0xB6 }, "SuperElectro", "Shenzhen SuperElectron Technology Co.,Ltd." }, + { { 0x70, 0x4C, 0xC1 }, "TokyoElectro", "Tokyo Electron Miyagi Limited" }, { { 0x70, 0x4C, 0xED }, "TMRG", "TMRG, Inc." }, { { 0x70, 0x4D, 0x7B }, "ASUSTekCOMPU", "ASUSTek COMPUTER INC." }, { { 0x70, 0x4D, 0xE7 }, "TecnoMobile", "Tecno Mobile Limited" }, @@ -24947,6 +25159,7 @@ { { 0x70, 0x7D, 0xAF }, "Plucent", "Plucent AB" }, { { 0x70, 0x7D, 0xB9 }, "Cisco", "Cisco Systems, Inc" }, { { 0x70, 0x7E, 0x43 }, "Commscope", "Commscope" }, + { { 0x70, 0x7E, 0xDA }, "GsdVietNamTe", "Gsd Viet Nam Technology Company Limited" }, { { 0x70, 0x7E, 0xDE }, "Nastec", "Nastec Ltd." }, { { 0x70, 0x7F, 0xF2 }, "Telechips", "Telechips, Inc." }, { { 0x70, 0x81, 0x05 }, "Cisco", "Cisco Systems, Inc" }, @@ -24954,6 +25167,7 @@ { { 0x70, 0x81, 0xEB }, "Apple", "Apple, Inc." }, { { 0x70, 0x82, 0x0E }, "aselectronic", "as electronics GmbH" }, { { 0x70, 0x82, 0x8E }, "OleumTech", "OleumTech Corporation" }, + { { 0x70, 0x85, 0x36 }, "Arcadyan", "Arcadyan Corporation" }, { { 0x70, 0x85, 0x40 }, "SkyworthDigi", "Skyworth Digital Technology(Shenzhen) Co.,Ltd" }, { { 0x70, 0x85, 0x6C }, "RuijieNetwor", "Ruijie Networks Co.,LTD" }, { { 0x70, 0x85, 0xC2 }, "ASRockIncorp", "ASRock Incorporation" }, @@ -25000,6 +25214,7 @@ { { 0x70, 0x9E, 0x86 }, "X6D", "X6D Limited" }, { { 0x70, 0x9F, 0x2D }, "zte", "zte corporation" }, { { 0x70, 0x9F, 0xA9 }, "TecnoMobile", "Tecno Mobile Limited" }, + { { 0x70, 0x9F, 0xEC }, "CUVelocity", "CU Velocity" }, { { 0x70, 0xA0, 0x4B }, "Intel", "Intel Corporate" }, { { 0x70, 0xA1, 0x91 }, "TrendsetterM", "Trendsetter Medical, LLC" }, { { 0x70, 0xA2, 0xB3 }, "Apple", "Apple, Inc." }, @@ -25163,6 +25378,7 @@ { { 0x74, 0x09, 0xAC }, "Quext", "Quext, LLC" }, { { 0x74, 0x0A, 0xBC }, "LightwaveRFT", "LightwaveRF Technology Ltd" }, { { 0x74, 0x0A, 0xE1 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0x74, 0x0B, 0x12 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x74, 0x0B, 0xB0 }, "HirschmannAu", "Hirschmann Automation and Control GmbH" }, { { 0x74, 0x0C, 0xEE }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x74, 0x0E, 0xA4 }, "Apple", "Apple, Inc." }, @@ -25206,6 +25422,7 @@ { { 0x74, 0x27, 0xEA }, "ElitegroupCo", "Elitegroup Computer Systems Co.,Ltd." }, { { 0x74, 0x28, 0x57 }, "MayfieldRobo", "Mayfield Robotics" }, { { 0x74, 0x28, 0x69 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0x74, 0x28, 0xAE }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x74, 0x29, 0x17 }, "Apple", "Apple, Inc." }, { { 0x74, 0x29, 0x20 }, "MCXPROKft", "MCX-PRO Kft." }, { { 0x74, 0x29, 0x59 }, "Apple", "Apple, Inc." }, @@ -25276,6 +25493,7 @@ { { 0x74, 0x4D, 0x79 }, "Arrive", "Arrive Systems Inc." }, { { 0x74, 0x4D, 0xBD }, "Espressif", "Espressif Inc." }, { { 0x74, 0x4D, 0xDC }, "SonimTechnol", "Sonim Technologies, Inc" }, + { { 0x74, 0x4F, 0x80 }, "AmosElectron", "shenzhen Amos Electronics Co.,Ltd" }, { { 0x74, 0x50, 0x4E }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0x74, 0x50, 0xCD }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x74, 0x51, 0xBA }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, @@ -25300,6 +25518,7 @@ { { 0x74, 0x5D, 0x43 }, "BSHHausgerät", "BSH Hausgeräte GmbH" }, { { 0x74, 0x5D, 0x68 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0x74, 0x5E, 0x1C }, "Pioneer", "Pioneer Corporation" }, + { { 0x74, 0x5E, 0xB4 }, "Yokowo", "Yokowo Co., Ltd." }, { { 0x74, 0x5F, 0x00 }, "SamsungSemic", "Samsung Semiconductor Inc." }, { { 0x74, 0x5F, 0x90 }, "LAMTechnolog", "LAM Technologies" }, { { 0x74, 0x5F, 0xAE }, "TslPpl", "Tsl Ppl" }, @@ -25313,7 +25532,7 @@ { { 0x74, 0x65, 0xD1 }, "Atlinks", "Atlinks" }, { { 0x74, 0x66, 0x30 }, "TmiYtti", "T:mi Ytti" }, { { 0x74, 0x67, 0x5F }, "CompalInform", "Compal Information(Kunshan)Co.,Ltd." }, - { { 0x74, 0x67, 0xF7 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x74, 0x67, 0xF7 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x74, 0x68, 0x59 }, "SunitecTechn", "Sunitec Technology Co.,Limited" }, { { 0x74, 0x69, 0x4A }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, { { 0x74, 0x6A, 0x3A }, "Aperi", "Aperi Corporation" }, @@ -25350,6 +25569,7 @@ { { 0x74, 0x78, 0x27 }, "Dell", "Dell Inc." }, { { 0x74, 0x78, 0x47 }, "Interdiscipl", "Interdisciplinary Consulting Corporation" }, { { 0x74, 0x78, 0xA6 }, "Fortinet", "Fortinet, Inc." }, + { { 0x74, 0x78, 0xDE }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0x74, 0x7A, 0x90 }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x74, 0x7B, 0x7A }, "ETH", "ETH Inc." }, { { 0x74, 0x7D, 0x24 }, "Phicomm", "Phicomm (Shanghai) Co., Ltd." }, @@ -25381,6 +25601,7 @@ { { 0x74, 0x8A, 0x0D }, "Commscope", "Commscope" }, { { 0x74, 0x8A, 0x28 }, "HMDGlobal", "HMD Global Oy" }, { { 0x74, 0x8A, 0x69 }, "KoreaImageTe", "Korea Image Technology Co., Ltd" }, + { { 0x74, 0x8B, 0x23 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x74, 0x8B, 0x29 }, "Micobiomed", "Micobiomed" }, { { 0x74, 0x8B, 0x34 }, "SmartSystemT", "Shanghai Smart System Technology Co., Ltd" }, { { 0x74, 0x8D, 0x08 }, "Apple", "Apple, Inc." }, @@ -25463,6 +25684,7 @@ { { 0x74, 0xB9, 0xEB }, "JinQianMaoTe", "JinQianMao Technology Co.,Ltd." }, { { 0x74, 0xBA, 0xDB }, "LongconnElec", "Longconn Electornics(shenzhen)Co.,Ltd" }, { { 0x74, 0xBB, 0xD3 }, "xemeCommunic", "Shenzhen xeme Communication Co., Ltd." }, + { { 0x74, 0xBC, 0x6B }, "Intel", "Intel Corporate" }, { { 0x74, 0xBE, 0x08 }, "ATEKProducts", "ATEK Products, LLC" }, { { 0x74, 0xBE, 0xF3 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x74, 0xBF, 0xA1 }, "Hyunteck", "Hyunteck" }, @@ -25500,8 +25722,10 @@ { { 0x74, 0xD4, 0x35 }, "GigaByteTech", "Giga-Byte Technology Co.,Ltd." }, { { 0x74, 0xD4, 0xDD }, "QuantaComput", "Quanta Computer Inc." }, { { 0x74, 0xD5, 0x58 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, + { { 0x74, 0xD5, 0x9C }, "fluidiQbyMag", "fluidiQ by Magnalytix" }, { { 0x74, 0xD5, 0xB8 }, "Infraeo", "Infraeo Inc" }, { { 0x74, 0xD5, 0xC6 }, "MicrochipTec", "Microchip Technologies Inc" }, + { { 0x74, 0xD5, 0xE8 }, "Apple", "Apple, Inc." }, { { 0x74, 0xD6, 0x37 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x74, 0xD6, 0x54 }, "Gint", "Gint" }, { { 0x74, 0xD6, 0x75 }, "WYMATecnolog", "WYMA Tecnologia" }, @@ -25523,6 +25747,7 @@ { { 0x74, 0xDB, 0xD1 }, "Ebay", "Ebay Inc" }, { { 0x74, 0xDC, 0x13 }, "TelinkMicro", "Telink Micro LLC" }, { { 0x74, 0xDD, 0xCB }, "ChinaLeadshi", "China Leadshine Technology Co.,Ltd" }, + { { 0x74, 0xDD, 0xF0 }, "ShenZhenTend", "Shen Zhen Tenda Technology Co.,Ltd" }, { { 0x74, 0xDE, 0x2B }, "LiteonTechno", "Liteon Technology Corporation" }, { { 0x74, 0xDF, 0xBF }, "LiteonTechno", "Liteon Technology Corporation" }, { { 0x74, 0xE0, 0x6E }, "Ergophone", "Ergophone GmbH" }, @@ -25601,7 +25826,7 @@ { { 0x78, 0x04, 0x73 }, "TexasInstrum", "Texas Instruments" }, { { 0x78, 0x04, 0x7A }, "EdgeNetworks", "Edge Networks LLC" }, { { 0x78, 0x04, 0xE3 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, - { { 0x78, 0x05, 0x41 }, "QueclinkWire", "Queclink Wireless Solutions Co., Ltd" }, + { { 0x78, 0x05, 0x41 }, "QueclinkWire", "Queclink Wireless Solutions Co., Ltd." }, { { 0x78, 0x05, 0x5F }, "WYCTechnolog", "Shenzhen WYC Technology Co., Ltd." }, { { 0x78, 0x05, 0x8C }, "mMaxCommunic", "mMax Communications, Inc." }, { { 0x78, 0x06, 0xC9 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -25612,6 +25837,7 @@ { { 0x78, 0x0A, 0x57 }, "Lightningsem", "Shanghai Lightningsemi Technology Co.,Ltd." }, { { 0x78, 0x0A, 0xC7 }, "BaofengTV", "Baofeng TV Co., Ltd." }, { { 0x78, 0x0B, 0x8C }, "Private", "Private" }, + { { 0x78, 0x0C, 0x26 }, "Trafag", "Trafag AG" }, { { 0x78, 0x0C, 0x48 }, "HongKongYiha", "Hong Kong Yihao Electronic Technology Co., Limited" }, { { 0x78, 0x0C, 0x71 }, "InseegoWirel", "Inseego Wireless, Inc" }, { { 0x78, 0x0C, 0xB8 }, "Intel", "Intel Corporate" }, @@ -25680,6 +25906,7 @@ { { 0x78, 0x2E, 0x03 }, "GeniusTechno", "Guangdong Genius Technology Co., Ltd." }, { { 0x78, 0x2E, 0x56 }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0x78, 0x2E, 0xEF }, "Nokia", "Nokia Corporation" }, + { { 0x78, 0x2F, 0x02 }, "HonorDevice", "Honor Device Co., Ltd." }, { { 0x78, 0x2F, 0x17 }, "Xlab", "Xlab Co.,Ltd" }, { { 0x78, 0x30, 0x3B }, "StephenTechn", "Stephen Technologies Co.,Limited" }, { { 0x78, 0x30, 0x5D }, "zte", "zte corporation" }, @@ -25729,8 +25956,10 @@ { { 0x78, 0x47, 0xE3 }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, { { 0x78, 0x48, 0x2C }, "StartUsa", "Start Usa, Inc." }, { { 0x78, 0x48, 0x59 }, "HewlettPacka", "Hewlett Packard" }, + { { 0x78, 0x48, 0xFC }, "SystemLoco", "System Loco Ltd" }, { { 0x78, 0x49, 0x1D }, "WillBurt", "The Will-Burt Company" }, { { 0x78, 0x49, 0x46 }, "CambridgeMob", "Cambridge Mobile Telematics, Inc." }, + { { 0x78, 0x49, 0xD7 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x78, 0x4B, 0x08 }, "froboticsacq", "f.robotics acquisitions ltd" }, { { 0x78, 0x4B, 0x87 }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x78, 0x4F, 0x24 }, "TaicangT&WEl", "Taicang T&W Electronics" }, @@ -25806,6 +26035,7 @@ { { 0x78, 0x71, 0x04 }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, { { 0x78, 0x71, 0x9C }, "Commscope", "Commscope" }, { { 0x78, 0x72, 0x5D }, "Cisco", "Cisco Systems, Inc" }, + { { 0x78, 0x74, 0x62 }, "Intel", "Intel Corporate" }, { { 0x78, 0x75, 0x3E }, "Apple", "Apple, Inc." }, { { 0x78, 0x76, 0x89 }, "eero", "eero inc." }, { { 0x78, 0x76, 0xD9 }, "EXARAGroup", "EXARA Group" }, @@ -25815,7 +26045,7 @@ { { 0x78, 0x7A, 0x6F }, "JuiceTechnol", "Juice Technology AG" }, { { 0x78, 0x7B, 0x8A }, "Apple", "Apple, Inc." }, { { 0x78, 0x7D, 0x48 }, "ItelMobile", "Itel Mobile Limited" }, - { { 0x78, 0x7D, 0x53 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x78, 0x7D, 0x53 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x78, 0x7D, 0xF3 }, "SterliteTech", "Sterlite Technologies Limited" }, { { 0x78, 0x7E, 0x42 }, "zte", "zte corporation" }, { { 0x78, 0x7E, 0x61 }, "Apple", "Apple, Inc." }, @@ -25862,7 +26092,7 @@ { { 0x78, 0x96, 0x6E }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x78, 0x96, 0x82 }, "zte", "zte corporation" }, { { 0x78, 0x96, 0x84 }, "Commscope", "Commscope" }, - { { 0x78, 0x96, 0xA3 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x78, 0x96, 0xA3 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x78, 0x97, 0xC3 }, "DingxinInfor", "Dingxin Information Technology Co.,Ltd" }, { { 0x78, 0x98, 0xE8 }, "DLinkInterna", "D-Link International" }, { { 0x78, 0x98, 0xFD }, "Q9Networks", "Q9 Networks Inc." }, @@ -25910,6 +26140,7 @@ { { 0x78, 0xAE, 0x0C }, "FarSouthNetw", "Far South Networks" }, { { 0x78, 0xAF, 0x08 }, "Intel", "Intel Corporate" }, { { 0x78, 0xAF, 0x58 }, "Gimasi", "Gimasi Sa" }, + { { 0x78, 0xAF, 0xB8 }, "SDMCTechnolo", "Shenzhen SDMC Technology CP,.LTD" }, { { 0x78, 0xAF, 0xE4 }, "Comau", "Comau S.p.A" }, { { 0x78, 0xB2, 0x13 }, "DWnetTechnol", "DWnet Technologies(Suzhou) Corporation" }, { { 0x78, 0xB2, 0x8D }, "TenglingTech", "Beijing Tengling Technology CO.Ltd" }, @@ -25919,6 +26150,7 @@ { { 0x78, 0xB4, 0x6A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x78, 0xB5, 0x54 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x78, 0xB5, 0xD2 }, "EverTreasure", "Ever Treasure Industrial Limited" }, + { { 0x78, 0xB5, 0xF2 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x78, 0xB6, 0xC1 }, "AOBOTelecom", "AOBO Telecom Co.,Ltd" }, { { 0x78, 0xB6, 0xEC }, "ScufGamingIn", "Scuf Gaming International LLC" }, { { 0x78, 0xB6, 0xFE }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -26059,6 +26291,7 @@ { { 0x7A, 0x84, 0xF0 }, "McDowellSign", "McDowell Signal Processing, LLC (dba McDSP)" }, { { 0x7A, 0x8D, 0xD1 }, "TePSEG", "TePS'EG" }, { { 0x7A, 0xAB, 0x77 }, "Orange", "Orange" }, + { { 0x7A, 0xB2, 0x30 }, "EuropeanTele", "European Telecommunications Standards Institute" }, { { 0x7A, 0xF9, 0x55 }, "Relay", "Relay, Inc." }, { { 0x7A, 0xFD, 0x44 }, "RosenbergerH", "Rosenberger Hochfrequenztechnik GmbH & Co. KG" }, { { 0x7C, 0x00, 0x4D }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -26099,6 +26332,7 @@ { { 0x7C, 0x16, 0x89 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x7C, 0x17, 0x79 }, "EMMicroelect", "EM Microelectronic" }, { { 0x7C, 0x18, 0xCD }, "ETRON", "E-TRON Co.,Ltd." }, + { { 0x7C, 0x19, 0xE3 }, "Google", "Google, Inc." }, { { 0x7C, 0x1A, 0x03 }, "8Locations", "8Locations Co., Ltd." }, { { 0x7C, 0x1A, 0xC0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x7C, 0x1A, 0xFC }, "DalianEdific", "Dalian Co-Edifice Video Technology Co., Ltd" }, @@ -26175,6 +26409,7 @@ { { 0x7C, 0x4B, 0x78 }, "RedSunSynthe", "Red Sun Synthesis Pte Ltd" }, { { 0x7C, 0x4C, 0x58 }, "ScaleComputi", "Scale Computing, Inc." }, { { 0x7C, 0x4C, 0xA5 }, "SkyUk", "Sky Uk Limited" }, + { { 0x7C, 0x4D, 0x4A }, "ZhiyueXingch", "Zhiyue Xingchen(shanghai) Intelligent Terminal Co.,Ltd." }, { { 0x7C, 0x4D, 0x8F }, "HP", "HP Inc." }, { { 0x7C, 0x4E, 0x09 }, "SkyworthWire", "Shenzhen Skyworth Wireless Technology Co.,Ltd" }, { { 0x7C, 0x4F, 0x7D }, "Sawwave", "Sawwave" }, @@ -26193,6 +26428,7 @@ { { 0x7C, 0x57, 0x3C }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x7C, 0x57, 0x4E }, "COBI", "COBI GmbH" }, { { 0x7C, 0x57, 0x58 }, "HP", "HP Inc." }, + { { 0x7C, 0x59, 0xB1 }, "Apple", "Apple, Inc." }, { { 0x7C, 0x5A, 0x1C }, "Sophos", "Sophos Ltd" }, { { 0x7C, 0x5A, 0x67 }, "JNC", "JNC Systems, Inc." }, { { 0x7C, 0x5C, 0x8D }, "EMMicroelect", "EM Microelectronic" }, @@ -26221,6 +26457,7 @@ { { 0x7C, 0x6A, 0x8A }, "SINOBONDERTe", "SINOBONDER Technology Co., Ltd." }, { { 0x7C, 0x6A, 0xB3 }, "IbcTechnolog", "Ibc Technologies Inc." }, { { 0x7C, 0x6A, 0xC3 }, "GatesAir", "GatesAir, Inc" }, + { { 0x7C, 0x6A, 0xD7 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0x7C, 0x6A, 0xDB }, "SafeToneTech", "SafeTone Technology Co.,Ltd" }, { { 0x7C, 0x6A, 0xF3 }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, { { 0x7C, 0x6B, 0x33 }, "TenyuTech", "Tenyu Tech Co. Ltd." }, @@ -26235,6 +26472,7 @@ { { 0x7C, 0x6D, 0x62 }, "Apple", "Apple, Inc." }, { { 0x7C, 0x6D, 0xA6 }, "SuperwaveGro", "Superwave Group LLC" }, { { 0x7C, 0x6D, 0xF8 }, "Apple", "Apple, Inc." }, + { { 0x7C, 0x6E, 0x47 }, "HuizhouGuang", "Huizhou Guangshijia Communication Technology Co., Ltd." }, { { 0x7C, 0x6F, 0x06 }, "CaterpillarT", "Caterpillar Trimble Control Technologies" }, { { 0x7C, 0x6F, 0xF8 }, "ACTODigitalV", "ShenZhen ACTO Digital Video Technology Co.,Ltd." }, { { 0x7C, 0x70, 0xDB }, "Intel", "Intel Corporate" }, @@ -26278,6 +26516,7 @@ { { 0x7C, 0x89, 0x31 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x7C, 0x89, 0x56 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x7C, 0x89, 0xC1 }, "PaloAltoNetw", "Palo Alto Networks" }, + { { 0x7C, 0x8A, 0x3C }, "QingdaoIntel", "Qingdao Intelligent&Precise Electronics Co.,Ltd." }, { { 0x7C, 0x8A, 0xE1 }, "CompalInform", "Compal Information (Kunshan) Co., Ltd." }, { { 0x7C, 0x8B, 0xB5 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x7C, 0x8B, 0xC1 }, "Infinixmobil", "Infinix mobility limited" }, @@ -26292,11 +26531,12 @@ { { 0x7C, 0x94, 0x2A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x7C, 0x94, 0x9F }, "iCommSemicon", "Shenzhen iComm Semiconductor CO.,LTD" }, { { 0x7C, 0x94, 0xB2 }, "PhilipsHealt", "Philips Healthcare PCCI" }, - { { 0x7C, 0x95, 0xB1 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x7C, 0x95, 0xB1 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x7C, 0x95, 0xF3 }, "Cisco", "Cisco Systems, Inc" }, { { 0x7C, 0x96, 0xD2 }, "Fihonestcomm", "Fihonest communication co.,Ltd" }, { { 0x7C, 0x97, 0x63 }, "Openmaticssr", "Openmatics s.r.o." }, { { 0x7C, 0x97, 0xE1 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0x7C, 0x98, 0x24 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x7C, 0x99, 0x2E }, "Notionlnform", "Shanghai Notion lnformatio Technology Co.,Ltd." }, { { 0x7C, 0x99, 0x46 }, "SectorAlarmT", "Sector Alarm Tech S.L." }, { { 0x7C, 0x9A, 0x1D }, "Apple", "Apple, Inc." }, @@ -26304,6 +26544,7 @@ { { 0x7C, 0x9A, 0x9B }, "VSEvalencias", "VSE valencia smart energy" }, { { 0x7C, 0x9E, 0xBD }, "Espressif", "Espressif Inc." }, { { 0x7C, 0x9F, 0x07 }, "CigShanghai", "Cig Shanghai Co Ltd" }, + { { 0x7C, 0xA0, 0x5E }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x7C, 0xA1, 0x5D }, "GNReSound", "GN ReSound A/S" }, { { 0x7C, 0xA1, 0x77 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x7C, 0xA1, 0xAE }, "Apple", "Apple, Inc." }, @@ -26312,7 +26553,7 @@ { { 0x7C, 0xA2, 0x3E }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x7C, 0xA2, 0x9B }, "DSignT", "D.SignT GmbH & Co. KG" }, { { 0x7C, 0xA4, 0x49 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, - { { 0x7C, 0xA4, 0xF7 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x7C, 0xA4, 0xF7 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x7C, 0xA5, 0x3E }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x7C, 0xA5, 0x8F }, "QikaiElectro", "shenzhen Qikai Electronic Co., Ltd." }, { { 0x7C, 0xA6, 0x1D }, "Mhl", "Mhl, Llc" }, @@ -26330,7 +26571,7 @@ { { 0x7C, 0xAD, 0x4F }, "Cisco", "Cisco Systems, Inc" }, { { 0x7C, 0xAD, 0x74 }, "Cisco", "Cisco Systems, Inc" }, { { 0x7C, 0xAF, 0x77 }, "Nokia", "Nokia" }, - { { 0x7C, 0xB0, 0x3E }, "OSRAM", "OSRAM GmbH" }, + { { 0x7C, 0xB0, 0x3E }, "Inventronics", "Inventronics GmbH" }, { { 0x7C, 0xB0, 0x73 }, "RealmeChongq", "Realme Chongqing Mobile Telecommunications Corp.,Ltd." }, { { 0x7C, 0xB0, 0xC2 }, "Intel", "Intel Corporate" }, { { 0x7C, 0xB1, 0x5D }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -26409,6 +26650,7 @@ { { 0x7C, 0xD3, 0xE5 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x7C, 0xD4, 0x4D }, "MoorewattEne", "Shanghai Moorewatt Energy Technology Co.,Ltd" }, { { 0x7C, 0xD4, 0xA8 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, + { { 0x7C, 0xD5, 0x44 }, "Espressif", "Espressif Inc." }, { { 0x7C, 0xD5, 0x66 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x7C, 0xD6, 0x2C }, "Apple", "Apple, Inc." }, { { 0x7C, 0xD6, 0x61 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, @@ -26533,6 +26775,7 @@ { { 0x80, 0x19, 0x67 }, "ReallytekInf", "Shanghai Reallytek Information Technology Co.,Ltd" }, { { 0x80, 0x19, 0x70 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x80, 0x19, 0xFE }, "JianLingTech", "JianLing Technology CO., LTD" }, + { { 0x80, 0x1A, 0x23 }, "AltoBeam", "AltoBeam Inc." }, { { 0x80, 0x1D, 0x39 }, "Apple", "Apple, Inc." }, { { 0x80, 0x1D, 0xAA }, "Avaya", "Avaya Inc" }, { { 0x80, 0x1F, 0x02 }, "EdimaxTechno", "Edimax Technology Co. Ltd." }, @@ -26591,12 +26834,14 @@ { { 0x80, 0x3E, 0x48 }, "GongjinElect", "Shenzhen Gongjin Electronics Co.,Lt" }, { { 0x80, 0x3E, 0x4F }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, { { 0x80, 0x3F, 0x5D }, "WinstarsTech", "Winstars Technology Ltd" }, + { { 0x80, 0x3F, 0xD4 }, "Apple", "Apple, Inc." }, { { 0x80, 0x3F, 0xD6 }, "bytesatwork", "bytes at work AG" }, { { 0x80, 0x40, 0x05 }, "COROSSportsT", "Guangdong COROS Sports Technology Co.,Ltd" }, { { 0x80, 0x41, 0x26 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x80, 0x41, 0x4E }, "BbkEducation", "Bbk Educational Electronics Corp.,Ltd." }, { { 0x80, 0x42, 0x7C }, "AdolfTedsen", "Adolf Tedsen GmbH & Co. KG" }, { { 0x80, 0x43, 0x3F }, "JuniperNetwo", "Juniper Networks" }, + { { 0x80, 0x43, 0x5E }, "Luminys", "Luminys Systems Corporation" }, { { 0x80, 0x44, 0xFD }, "ChinaMobileI", "China Mobile (Hangzhou) Information Technology Co., Ltd." }, { { 0x80, 0x45, 0x6B }, "Espressif", "Espressif Inc." }, { { 0x80, 0x45, 0xDD }, "Intel", "Intel Corporate" }, @@ -26614,12 +26859,14 @@ { { 0x80, 0x4B, 0x20 }, "VentilationC", "Ventilation Control" }, { { 0x80, 0x4B, 0x50 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x80, 0x4C, 0x5D }, "NXPSemicondu", "NXP Semiconductor (Tianjin) LTD." }, + { { 0x80, 0x4D, 0xCB }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x80, 0x4E, 0x70 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x80, 0x4E, 0x81 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x80, 0x4F, 0x58 }, "ThinkEco", "ThinkEco, Inc." }, { { 0x80, 0x50, 0x1B }, "Nokia", "Nokia Corporation" }, { { 0x80, 0x50, 0x67 }, "WDTechnology", "W & D Technology Corporation" }, { { 0x80, 0x50, 0xF6 }, "ItelMobile", "Itel Mobile Limited" }, + { { 0x80, 0x53, 0xE0 }, "Espressif", "Espressif Inc." }, { { 0x80, 0x54, 0x2D }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x80, 0x54, 0x6A }, "GongjinElect", "Shenzhen Gongjin Electronics Co.,Lt" }, { { 0x80, 0x54, 0x9C }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -26700,6 +26947,7 @@ { { 0x80, 0x7D, 0x1B }, "Neosystem", "Neosystem Co. Ltd." }, { { 0x80, 0x7D, 0x3A }, "Espressif", "Espressif Inc." }, { { 0x80, 0x7D, 0xE3 }, "ChongqingSic", "Chongqing Sichuan Instrument Microcircuit Co.LTD." }, + { { 0x80, 0x7D, 0xF9 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x80, 0x7E, 0xB4 }, "SuperElectro", "Shenzhen SuperElectron Technology Co.,Ltd." }, { { 0x80, 0x7F, 0xF8 }, "JuniperNetwo", "Juniper Networks" }, { { 0x80, 0x80, 0x2C }, "Fortinet", "Fortinet, Inc." }, @@ -26717,6 +26965,7 @@ { { 0x80, 0x86, 0xF2 }, "Intel", "Intel Corporate" }, { { 0x80, 0x88, 0x00 }, "zte", "zte corporation" }, { { 0x80, 0x89, 0x17 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, + { { 0x80, 0x89, 0x43 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x80, 0x8A, 0x8B }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0x80, 0x8A, 0xBD }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x80, 0x8A, 0xF7 }, "Nanoleaf", "Nanoleaf" }, @@ -26734,7 +26983,7 @@ { { 0x80, 0x93, 0x93 }, "Xapt", "Xapt GmbH" }, { { 0x80, 0x94, 0x6C }, "TokyoRadar", "Tokyo Radar Corporation" }, { { 0x80, 0x95, 0x3A }, "Apple", "Apple, Inc." }, - { { 0x80, 0x95, 0x62 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x80, 0x95, 0x62 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x80, 0x96, 0x21 }, "Lenovo", "Lenovo" }, { { 0x80, 0x96, 0x98 }, "Apple", "Apple, Inc." }, { { 0x80, 0x96, 0xB1 }, "Commscope", "Commscope" }, @@ -26745,6 +26994,7 @@ { { 0x80, 0x99, 0xCF }, "TexasInstrum", "Texas Instruments" }, { { 0x80, 0x99, 0xE7 }, "Sony", "Sony Corporation" }, { { 0x80, 0x9B, 0x20 }, "Intel", "Intel Corporate" }, + { { 0x80, 0x9B, 0x31 }, "XinLinkInter", "Xin Link Internaitonal Co Limited" }, { { 0x80, 0x9D, 0x65 }, "FNLINKTECHNO", "FN-LINK TECHNOLOGY Ltd." }, { { 0x80, 0x9F, 0x9B }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, { { 0x80, 0x9F, 0xAB }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, @@ -26837,6 +27087,7 @@ { { 0x80, 0xD0, 0x9B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x80, 0xD1, 0x0A }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, { { 0x80, 0xD1, 0x60 }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, + { { 0x80, 0xD1, 0x75 }, "iPanelTV", "iPanel.TV Inc." }, { { 0x80, 0xD1, 0x8B }, "IconvergeTec", "Hangzhou I'converge Technology Co.,Ltd" }, { { 0x80, 0xD1, 0xCE }, "Apple", "Apple, Inc." }, { { 0x80, 0xD2, 0x1D }, "AzureWaveTec", "AzureWave Technology Inc." }, @@ -26851,6 +27102,7 @@ { { 0x80, 0xDA, 0x13 }, "eero", "eero inc." }, { { 0x80, 0xDA, 0xBC }, "Megafone", "Megafone Limited" }, { { 0x80, 0xDA, 0xC2 }, "VantivaUSA", "Vantiva USA LLC" }, + { { 0x80, 0xDA, 0xCE }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x80, 0xDB, 0x17 }, "JuniperNetwo", "Juniper Networks" }, { { 0x80, 0xDB, 0x31 }, "PowerQuotien", "Power Quotient International Co., Ltd." }, { { 0x80, 0xDE, 0xCC }, "HYBE", "HYBE Co.,LTD" }, @@ -26902,6 +27154,7 @@ { { 0x84, 0x00, 0x2D }, "Pegatron", "Pegatron Corporation" }, { { 0x84, 0x00, 0x55 }, "VusionGroup", "VusionGroup" }, { { 0x84, 0x00, 0xD2 }, "Sony", "Sony Corporation" }, + { { 0x84, 0x00, 0xEC }, "ShellyEurope", "Shelly Europe LTD" }, { { 0x84, 0x01, 0x12 }, "KaonGroup", "Kaon Group Co., Ltd." }, { { 0x84, 0x01, 0x6E }, "HonorDevice", "Honor Device Co., Ltd." }, { { 0x84, 0x01, 0xA7 }, "GreywareAuto", "Greyware Automation Products, Inc" }, @@ -26943,6 +27196,7 @@ { { 0x84, 0x1B, 0x77 }, "Intel", "Intel Corporate" }, { { 0x84, 0x1C, 0x70 }, "zte", "zte corporation" }, { { 0x84, 0x1D, 0xE8 }, "CJintelligen", "CJ intelligent technology LTD." }, + { { 0x84, 0x1E, 0x1A }, "SanyaMuyuTec", "Sanya Muyu Technology Co., Ltd" }, { { 0x84, 0x1E, 0x26 }, "KERNELI", "KERNEL-I Co.,LTD" }, { { 0x84, 0x1E, 0xA3 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x84, 0x1F, 0xE8 }, "Espressif", "Espressif Inc." }, @@ -26962,6 +27216,7 @@ { { 0x84, 0x26, 0x7A }, "TaideZhilian", "Guangdong Taide Zhilian Technology Co.,Ltd" }, { { 0x84, 0x26, 0x90 }, "ThoughtScien", "Beijing Thought Science Co.,Ltd." }, { { 0x84, 0x27, 0x12 }, "SiliconLabor", "Silicon Laboratories" }, + { { 0x84, 0x27, 0x89 }, "Apple", "Apple, Inc." }, { { 0x84, 0x27, 0xB6 }, "ChinaMobileI", "China Mobile IOT Company Limited" }, { { 0x84, 0x27, 0xCE }, "CorporationP", "Corporation of the Presiding Bishop of The Church of Jesus Christ of Latter-day Saints" }, { { 0x84, 0x28, 0x59 }, "AmazonTechno", "Amazon Technologies Inc." }, @@ -26997,6 +27252,7 @@ { { 0x84, 0x3B, 0x10 }, "Lvswitches", "Lvswitches Inc." }, { { 0x84, 0x3C, 0x4C }, "RobertBosch", "Robert Bosch SRL" }, { { 0x84, 0x3C, 0x99 }, "zte", "zte corporation" }, + { { 0x84, 0x3C, 0xFC }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x84, 0x3D, 0xC6 }, "Cisco", "Cisco Systems, Inc" }, { { 0x84, 0x3E, 0x03 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x84, 0x3E, 0x1D }, "HuiZhouGaosh", "Hui Zhou Gaoshengda Technology Co.,LTD" }, @@ -27032,6 +27288,7 @@ { { 0x84, 0x56, 0x9C }, "CohoData", "Coho Data, Inc.," }, { { 0x84, 0x57, 0x33 }, "Microsoft", "Microsoft Corporation" }, { { 0x84, 0x57, 0x87 }, "DVRC&C", "DVR C&C Co., Ltd." }, + { { 0x84, 0x57, 0xEB }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x84, 0x57, 0xF7 }, "MetaPlatform", "Meta Platforms, Inc." }, { { 0x84, 0x5A, 0x3E }, "Cisco", "Cisco Systems, Inc" }, { { 0x84, 0x5A, 0x81 }, "ffly4u", "ffly4u" }, @@ -27081,18 +27338,20 @@ { { 0x84, 0x79, 0x33 }, "profichip", "profichip GmbH" }, { { 0x84, 0x79, 0x73 }, "BaudDataComm", "Shanghai Baud Data Communication Co.,Ltd." }, { { 0x84, 0x7A, 0x88 }, "HTC", "HTC Corporation" }, - { { 0x84, 0x7A, 0xB6 }, "AltoBeam", "AltoBeam (China) Inc." }, + { { 0x84, 0x7A, 0xB6 }, "AltoBeam", "AltoBeam Inc." }, { { 0x84, 0x7A, 0xDF }, "FujianStarNe", "Fujian Star-Net Communication Co.,Ltd" }, { { 0x84, 0x7B, 0x57 }, "Intel", "Intel Corporate" }, { { 0x84, 0x7B, 0xEB }, "Dell", "Dell Inc." }, { { 0x84, 0x7C, 0x9B }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, { { 0x84, 0x7C, 0xEE }, "Cisco", "Cisco Systems, Inc" }, { { 0x84, 0x7D, 0x50 }, "HolleyMeteri", "Holley Metering Limited" }, + { { 0x84, 0x7D, 0x7E }, "Cisco", "Cisco Systems, Inc" }, { { 0x84, 0x7E, 0x40 }, "TexasInstrum", "Texas Instruments" }, { { 0x84, 0x7F, 0x3D }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, { { 0x84, 0x80, 0x2D }, "Cisco", "Cisco Systems, Inc" }, { { 0x84, 0x80, 0x94 }, "Meter", "Meter, Inc." }, { { 0x84, 0x81, 0x02 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, + { { 0x84, 0x81, 0xEA }, "BaudDataComm", "Shanghai Baud Data Communication Co.,Ltd." }, { { 0x84, 0x82, 0x1B }, "PROXSGPte", "PROX SG Pte Ltd" }, { { 0x84, 0x82, 0xF4 }, "HuasunUnicre", "Beijing Huasun Unicreate Technology Co., Ltd" }, { { 0x84, 0x83, 0x19 }, "ZeroZeroTech", "Hangzhou Zero Zero Technology Co., Ltd." }, @@ -27106,6 +27365,7 @@ { { 0x84, 0x86, 0x87 }, "weiyuantechn", "weiyuantechnology" }, { { 0x84, 0x86, 0xF3 }, "GreenvityCom", "Greenvity Communications" }, { { 0x84, 0x87, 0xFF }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, + { { 0x84, 0x88, 0x32 }, "GuangzhouShi", "Guangzhou Shiyuan Electronic Technology Company Limited" }, { { 0x84, 0x88, 0xE1 }, "Apple", "Apple, Inc." }, { { 0x84, 0x89, 0xAD }, "Apple", "Apple, Inc." }, { { 0x84, 0x8A, 0x59 }, "HisiliconTec", "Hisilicon Technologies Co., Ltd" }, @@ -27151,6 +27411,7 @@ { { 0x84, 0xA1, 0xD1 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x84, 0xA2, 0x4D }, "BirdsEyePriv", "Birds Eye Systems Private Limited" }, { { 0x84, 0xA3, 0x29 }, "Arcadyan", "Arcadyan Corporation" }, + { { 0x84, 0xA3, 0x4B }, "BarrotTechno", "Barrot Technology Co.,Ltd." }, { { 0x84, 0xA3, 0xB5 }, "Propulsion", "Propulsion systems" }, { { 0x84, 0xA4, 0x23 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x84, 0xA4, 0x66 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -27199,6 +27460,7 @@ { { 0x84, 0xBB, 0x69 }, "Commscope", "Commscope" }, { { 0x84, 0xBE, 0x52 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x84, 0xBE, 0x8B }, "GeekerTechno", "Chengdu Geeker Technology Co., Ltd." }, + { { 0x84, 0xC0, 0x65 }, "Nintendo", "Nintendo Co.,Ltd" }, { { 0x84, 0xC0, 0xEF }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x84, 0xC1, 0xC1 }, "JuniperNetwo", "Juniper Networks" }, { { 0x84, 0xC2, 0xE4 }, "JiangsuQinhe", "Jiangsu Qinheng Co., Ltd." }, @@ -27209,6 +27471,7 @@ { { 0x84, 0xC7, 0x27 }, "Gnodal", "Gnodal Ltd" }, { { 0x84, 0xC7, 0x8F }, "APSNetworks", "APS Networks GmbH" }, { { 0x84, 0xC7, 0xA9 }, "C3Po", "C3Po S.A." }, + { { 0x84, 0xC7, 0xBB }, "Espressif", "Espressif Inc." }, { { 0x84, 0xC7, 0xE2 }, "VusionGroup", "VusionGroup" }, { { 0x84, 0xC7, 0xEA }, "Sony", "Sony Corporation" }, { { 0x84, 0xC8, 0x07 }, "ADVAOpticalN", "ADVA Optical Networking Ltd." }, @@ -27225,6 +27488,7 @@ { { 0x84, 0xD0, 0xDB }, "JuanIntellig", "Guangdong Juan Intelligent Technology Joint Stock Co., Ltd." }, { { 0x84, 0xD1, 0x5A }, "TCTmobile", "TCT mobile ltd" }, { { 0x84, 0xD1, 0xC1 }, "Intel", "Intel Corporate" }, + { { 0x84, 0xD3, 0x03 }, "ChipseaTechn", "Chipsea Technologies (Shenzhen) Crop." }, { { 0x84, 0xD3, 0x28 }, "Apple", "Apple, Inc." }, { { 0x84, 0xD3, 0x2A }, "Ieee19051", "Ieee 1905.1" }, { { 0x84, 0xD3, 0x43 }, "Calix", "Calix Inc." }, @@ -27248,6 +27512,7 @@ { { 0x84, 0xDB, 0xAC }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x84, 0xDB, 0xFC }, "Nokia", "Nokia" }, { { 0x84, 0xDD, 0x20 }, "TexasInstrum", "Texas Instruments" }, + { { 0x84, 0xDD, 0x84 }, "Cisco", "Cisco Systems, Inc" }, { { 0x84, 0xDD, 0xB7 }, "CilagInterna", "Cilag GmbH International" }, { { 0x84, 0xDE, 0x3D }, "CrystalVisio", "Crystal Vision Ltd" }, { { 0x84, 0xDF, 0x0C }, "Net2Grid", "Net2Grid Bv" }, @@ -27258,9 +27523,11 @@ { { 0x84, 0xE3, 0x42 }, "TuyaSmart", "Tuya Smart Inc." }, { { 0x84, 0xE4, 0xD9 }, "NEEDtechnolo", "Shenzhen NEED technology Ltd." }, { { 0x84, 0xE5, 0x85 }, "EMMicroelect", "EM Microelectronic" }, + { { 0x84, 0xE5, 0x9E }, "YOUHUATechno", "Shenzhen YOUHUA Technology Co., Ltd" }, { { 0x84, 0xE5, 0xD8 }, "UNIPOEIoTTec", "Guangdong UNIPOE IoT Technology Co.,Ltd." }, { { 0x84, 0xE6, 0x29 }, "Bluwan", "Bluwan SA" }, { { 0x84, 0xE6, 0x57 }, "SonyInteract", "Sony Interactive Entertainment Inc." }, + { { 0x84, 0xE6, 0xB3 }, "Tiinlab", "Tiinlab Corporation" }, { { 0x84, 0xE7, 0x14 }, "LiangHerngEn", "Liang Herng Enterprise,Co.Ltd." }, { { 0x84, 0xE8, 0x92 }, "ActiontecEle", "Actiontec Electronics, Inc" }, { { 0x84, 0xE8, 0xCB }, "Buffalo", "Buffalo.Inc" }, @@ -27312,6 +27579,7 @@ { { 0x88, 0x01, 0xF2 }, "VitecSystemE", "Vitec System Engineering Inc." }, { { 0x88, 0x01, 0xF9 }, "TexasInstrum", "Texas Instruments" }, { { 0x88, 0x02, 0x64 }, "PascalAudio", "Pascal Audio" }, + { { 0x88, 0x03, 0x48 }, "SercommPhili", "Sercomm Philippines Inc" }, { { 0x88, 0x03, 0x4C }, "WeifangGoert", "Weifang Goertek Electronics Co.,Ltd" }, { { 0x88, 0x03, 0x55 }, "Arcadyan", "Arcadyan Corporation" }, { { 0x88, 0x03, 0xE9 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, @@ -27321,12 +27589,14 @@ { { 0x88, 0x09, 0x07 }, "MKTSystemtec", "MKT Systemtechnik GmbH & Co. KG" }, { { 0x88, 0x09, 0xAF }, "Masimo", "Masimo Corporation" }, { { 0x88, 0x0A, 0xA3 }, "JuniperNetwo", "Juniper Networks" }, + { { 0x88, 0x0A, 0xBD }, "NexphotonTec", "Wuhan Nexphoton Technology Co.,Ltd" }, { { 0x88, 0x0C, 0xE0 }, "TexasInstrum", "Texas Instruments" }, { { 0x88, 0x0E, 0x85 }, "BoomtechIndu", "Shenzhen Boomtech Industrial Corporation" }, { { 0x88, 0x0F, 0x10 }, "HuamiInforma", "Huami Information Technology Co.,Ltd." }, { { 0x88, 0x0F, 0x62 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x88, 0x0F, 0xA2 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0x88, 0x0F, 0xB6 }, "JabilCircuit", "Jabil Circuits India Pvt Ltd,-EHTP unit" }, + { { 0x88, 0x10, 0x32 }, "Apple", "Apple, Inc." }, { { 0x88, 0x10, 0x36 }, "PanodicElect", "Panodic(ShenZhen) Electronics Limted" }, { { 0x88, 0x10, 0x8F }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x88, 0x11, 0x96 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -27341,6 +27611,7 @@ { { 0x88, 0x15, 0x66 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x88, 0x15, 0xC5 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x88, 0x17, 0xA3 }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, + { { 0x88, 0x17, 0xA8 }, "Apple", "Apple, Inc." }, { { 0x88, 0x18, 0xAE }, "Tamron", "Tamron Co., Ltd" }, { { 0x88, 0x18, 0xF1 }, "Nokia", "Nokia" }, { { 0x88, 0x19, 0x08 }, "Apple", "Apple, Inc." }, @@ -27350,6 +27621,7 @@ { { 0x88, 0x1D, 0xFC }, "Cisco", "Cisco Systems, Inc" }, { { 0x88, 0x1E, 0x59 }, "Onion", "Onion Corporation" }, { { 0x88, 0x1E, 0x5A }, "Apple", "Apple, Inc." }, + { { 0x88, 0x1E, 0xC8 }, "BouffaloLab", "Bouffalo Lab (Nanjing) Co., Ltd." }, { { 0x88, 0x1F, 0xA1 }, "Apple", "Apple, Inc." }, { { 0x88, 0x20, 0x0D }, "Apple", "Apple, Inc." }, { { 0x88, 0x20, 0x12 }, "LMITechnolog", "LMI Technologies" }, @@ -27367,7 +27639,7 @@ { { 0x88, 0x25, 0x2C }, "Arcadyan", "Arcadyan Corporation" }, { { 0x88, 0x25, 0x93 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x88, 0x26, 0x3F }, "ZhejiangUniv", "Zhejiang Uniview Technologies Co.,Ltd." }, - { { 0x88, 0x28, 0x7D }, "AltoBeam", "AltoBeam (China) Inc." }, + { { 0x88, 0x28, 0x7D }, "AltoBeam", "AltoBeam Inc." }, { { 0x88, 0x28, 0xB3 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x88, 0x28, 0xFB }, "JuniperNetwo", "Juniper Networks" }, { { 0x88, 0x29, 0x49 }, "RenesasElect", "Renesas Electronics (Penang) Sdn. Bhd." }, @@ -27454,7 +27726,7 @@ { { 0x88, 0x5A, 0x23 }, "Celestica", "Celestica Inc." }, { { 0x88, 0x5A, 0x85 }, "WNC", "WNC Corporation" }, { { 0x88, 0x5A, 0x92 }, "Cisco", "Cisco Systems, Inc" }, - { { 0x88, 0x5B, 0xDD }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x88, 0x5B, 0xDD }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x88, 0x5C, 0x47 }, "AlcatelLucen", "Alcatel Lucent" }, { { 0x88, 0x5D, 0xFB }, "zte", "zte corporation" }, { { 0x88, 0x5E, 0x54 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -27509,12 +27781,13 @@ { { 0x88, 0x7A, 0xBC }, "Cisco", "Cisco Systems, Inc" }, { { 0x88, 0x7B, 0x2C }, "zte", "zte corporation" }, { { 0x88, 0x7C, 0xC1 }, "ZebronicsInd", "Zebronics India Pvt Ltd" }, - { { 0x88, 0x7E, 0x25 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x88, 0x7E, 0x25 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x88, 0x7E, 0x9B }, "Apple", "Apple, Inc." }, { { 0x88, 0x7F, 0x03 }, "ComperTechno", "Comper Technology Investment Limited" }, { { 0x88, 0x7F, 0xD5 }, "zte", "zte corporation" }, { { 0x88, 0x81, 0x87 }, "UmeoxInnovat", "Umeox Innovations Co.,Ltd" }, { { 0x88, 0x81, 0xB9 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0x88, 0x82, 0x25 }, "TelinkMicro", "Telink Micro LLC" }, { { 0x88, 0x82, 0x79 }, "RBLINKIntell", "Shenzhen RB-LINK Intelligent Technology Co.Ltd" }, { { 0x88, 0x83, 0x22 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x88, 0x83, 0x5D }, "FnLinkTechno", "Fn-Link Technology Limited" }, @@ -27609,6 +27882,7 @@ { { 0x88, 0xB8, 0xD0 }, "DongguanKopp", "Dongguan Koppo Electronic Co.,Ltd" }, { { 0x88, 0xB9, 0x45 }, "Apple", "Apple, Inc." }, { { 0x88, 0xB9, 0x51 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, + { { 0x88, 0xB9, 0xB8 }, "NXPSemicondu", "NXP Semiconductors Taiwan Ltd." }, { { 0x88, 0xBA, 0x74 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x88, 0xBA, 0x7F }, "Qfiednet", "Qfiednet Co., Ltd." }, { { 0x88, 0xBC, 0xAC }, "ZebraTechnol", "Zebra Technologies Inc." }, @@ -27623,11 +27897,13 @@ { { 0x88, 0xC0, 0x93 }, "Gigamedia", "Gigamedia" }, { { 0x88, 0xC1, 0x74 }, "zte", "zte corporation" }, { { 0x88, 0xC2, 0x27 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x88, 0xC2, 0x2D }, "Buffalo", "Buffalo.Inc" }, { { 0x88, 0xC2, 0x42 }, "Poynt", "Poynt Co." }, { { 0x88, 0xC2, 0x55 }, "TexasInstrum", "Texas Instruments" }, { { 0x88, 0xC3, 0x44 }, "Google", "Google, Inc." }, { { 0x88, 0xC3, 0x6E }, "Erenebenlnfo", "Beijing Ereneben lnformation Technology Limited" }, { { 0x88, 0xC3, 0x97 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, + { { 0x88, 0xC3, 0xB2 }, "Rotek", "Rotek Llc" }, { { 0x88, 0xC3, 0xB3 }, "Sovico", "Sovico" }, { { 0x88, 0xC3, 0xE5 }, "BetopTechono", "Betop Techonologies" }, { { 0x88, 0xC4, 0x8E }, "UneeviuTechn", "Uneeviu Technologies India Private Limited" }, @@ -27697,6 +27973,7 @@ { { 0x88, 0xF0, 0x77 }, "Cisco", "Cisco Systems, Inc" }, { { 0x88, 0xF1, 0x55 }, "Espressif", "Espressif Inc." }, { { 0x88, 0xF2, 0xBD }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, + { { 0x88, 0xF2, 0xCE }, "Apple", "Apple, Inc." }, { { 0x88, 0xF3, 0xD5 }, "ZyxelCommuni", "Zyxel Communications Corporation" }, { { 0x88, 0xF4, 0x88 }, "celloncommun", "cellon communications technology(shenzhen)Co.,Ltd." }, { { 0x88, 0xF4, 0x90 }, "JetmobilePte", "Jetmobile Pte Ltd" }, @@ -27786,7 +28063,9 @@ { { 0x8C, 0x1E, 0xCF }, "UnionmanTech", "Unionman Technology Co.,Ltd" }, { { 0x8C, 0x1E, 0xD9 }, "UnigroupTsin", "Beijing Unigroup Tsingteng Microsystem Co., LTD." }, { { 0x8C, 0x1F, 0x94 }, "RFSurgicalSy", "RF Surgical System Inc." }, + { { 0x8C, 0x20, 0xF1 }, "OpenAI", "OpenAI" }, { { 0x8C, 0x21, 0x0A }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, + { { 0x8C, 0x21, 0x14 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x8C, 0x22, 0xD2 }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, { { 0x8C, 0x25, 0x05 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x8C, 0x25, 0x5E }, "VoltServer", "VoltServer" }, @@ -27814,6 +28093,7 @@ { { 0x8C, 0x35, 0x92 }, "GuangzhouShi", "Guangzhou Shiyuan Electronic Technology Company Limited" }, { { 0x8C, 0x36, 0x7A }, "PaloAltoNetw", "Palo Alto Networks" }, { { 0x8C, 0x37, 0xB7 }, "HosinGlobalE", "Hosin Global Electronics Co.,Ltd" }, + { { 0x8C, 0x39, 0x57 }, "TelinkMicro", "Telink Micro LLC" }, { { 0x8C, 0x39, 0x5C }, "Bit4id", "Bit4id Srl" }, { { 0x8C, 0x3A, 0x7E }, "UniversalEle", "Universal Electronics, Inc." }, { { 0x8C, 0x3A, 0xE3 }, "LGElectronic", "LG Electronics (Mobile Communications)" }, @@ -27837,7 +28117,7 @@ { { 0x8C, 0x47, 0x7F }, "NambooSoluti", "NambooSolution" }, { { 0x8C, 0x47, 0xBE }, "Dell", "Dell Inc." }, { { 0x8C, 0x49, 0x62 }, "Roku", "Roku, Inc" }, - { { 0x8C, 0x49, 0x7A }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x8C, 0x49, 0x7A }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x8C, 0x49, 0xB6 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0x8C, 0x49, 0xCF }, "Private", "Private" }, { { 0x8C, 0x4A, 0xEE }, "GigaTms", "Giga Tms Inc" }, @@ -28008,6 +28288,7 @@ { { 0x8C, 0x9B, 0x2D }, "Plantronics", "Plantronics, Inc." }, { { 0x8C, 0x9F, 0x3B }, "QingdaoHisen", "Qingdao Hisense Communications Co.,Ltd." }, { { 0x8C, 0xA0, 0x48 }, "NeTopChipTec", "Beijing NeTopChip Technology Co.,LTD" }, + { { 0x8C, 0xA2, 0xF5 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x8C, 0xA2, 0xFD }, "Starry", "Starry, Inc." }, { { 0x8C, 0xA3, 0x99 }, "ServercomPri", "Servercom (India) Private Limited" }, { { 0x8C, 0xA3, 0xEC }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -28019,6 +28300,7 @@ { { 0x8C, 0xA9, 0x6D }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x8C, 0xA9, 0x6F }, "D&MHoldings", "D&M Holdings Inc." }, { { 0x8C, 0xA9, 0x82 }, "Intel", "Intel Corporate" }, + { { 0x8C, 0xA9, 0xFD }, "CopperMounta", "Copper Mountain Technologies" }, { { 0x8C, 0xAA, 0xB5 }, "Espressif", "Espressif Inc." }, { { 0x8C, 0xAA, 0xCE }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x8C, 0xAB, 0x8E }, "FeixunCommun", "Shanghai Feixun Communication Co.,Ltd." }, @@ -28045,6 +28327,7 @@ { { 0x8C, 0xBF, 0xA6 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x8C, 0xBF, 0xEA }, "Espressif", "Espressif Inc." }, { { 0x8C, 0xC1, 0x21 }, "PanasonicAVC", "Panasonic Corporation AVC Networks Company" }, + { { 0x8C, 0xC2, 0x46 }, "Apple", "Apple, Inc." }, { { 0x8C, 0xC5, 0x73 }, "XsightLabs", "Xsight Labs LTD." }, { { 0x8C, 0xC5, 0x8C }, "ElskyTechnol", "ShenZhen Elsky Technology Co.,LTD" }, { { 0x8C, 0xC5, 0xB4 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, @@ -28105,6 +28388,7 @@ { { 0x8C, 0xE7, 0x48 }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, { { 0x8C, 0xE7, 0x8C }, "DKNetworks", "DK Networks" }, { { 0x8C, 0xE7, 0xB3 }, "SonardyneInt", "Sonardyne International Ltd" }, + { { 0x8C, 0xE8, 0x07 }, "BouffaloLab", "Bouffalo Lab (Nanjing) Co., Ltd." }, { { 0x8C, 0xE9, 0xB4 }, "ZhejiangDahu", "Zhejiang Dahua Technology Co., Ltd." }, { { 0x8C, 0xE9, 0xEE }, "Intel", "Intel Corporate" }, { { 0x8C, 0xE9, 0xFF }, "Dell", "Dell Inc." }, @@ -28171,6 +28455,7 @@ { { 0x90, 0x0A, 0x75 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0x90, 0x0A, 0x84 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0x90, 0x0B, 0xC1 }, "SprocommTech", "Sprocomm Technologies CO.,Ltd" }, + { { 0x90, 0x0C, 0x0F }, "Flumeio", "Flume-io, Inc." }, { { 0x90, 0x0C, 0xB4 }, "AlinketElect", "Alinket Electronic Technology Co., Ltd" }, { { 0x90, 0x0C, 0xC8 }, "Google", "Google, Inc." }, { { 0x90, 0x0D, 0x66 }, "DigimoreElec", "Digimore Electronics Co., Ltd" }, @@ -28204,6 +28489,7 @@ { { 0x90, 0x1D, 0x27 }, "zte", "zte corporation" }, { { 0x90, 0x1E, 0xDD }, "GreatCompute", "Great Computer Corporation" }, { { 0x90, 0x1F, 0x09 }, "SiliconLabor", "Silicon Laboratories" }, + { { 0x90, 0x1F, 0x94 }, "TPLink", "TP-Link Systems Inc." }, { { 0x90, 0x20, 0x3A }, "BYDPrecision", "BYD Precision Manufacture Co.,Ltd" }, { { 0x90, 0x20, 0x83 }, "GeneralEngin", "General Engine Management Systems Ltd." }, { { 0x90, 0x20, 0xC2 }, "HewlettPacka", "Hewlett Packard Enterprise" }, @@ -28351,6 +28637,7 @@ { { 0x90, 0x74, 0x2E }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0x90, 0x74, 0x9D }, "IRayTechnolo", "IRay Technology Co., Ltd." }, { { 0x90, 0x74, 0xAE }, "AzureWaveTec", "AzureWave Technology Inc." }, + { { 0x90, 0x74, 0xF2 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x90, 0x75, 0xBC }, "NokiaShangha", "Nokia Shanghai Bell Co., Ltd." }, { { 0x90, 0x75, 0xDE }, "ZebraTechnol", "Zebra Technologies Inc." }, { { 0x90, 0x76, 0x9F }, "MercuryCommu", "Shenzhen Mercury Communication Technologies Co.,Ltd." }, @@ -28404,6 +28691,7 @@ { { 0x90, 0x90, 0x3C }, "TrisonTechno", "Trison Technology Corporation" }, { { 0x90, 0x90, 0x60 }, "RsiVideoTech", "Rsi Video Technologies" }, { { 0x90, 0x91, 0x64 }, "ChongQingLav", "ChongQing Lavid Technology Co., Ltd." }, + { { 0x90, 0x91, 0x6E }, "nForeTechnol", "nFore Technology Co., Ltd." }, { { 0x90, 0x92, 0x2C }, "ChangzhiCity", "Changzhi City Zhouyi Hengtong Information Security Co.,Ltd." }, { { 0x90, 0x92, 0xB4 }, "DiehlBGTDefe", "Diehl BGT Defence GmbH & Co. KG" }, { { 0x90, 0x93, 0x5A }, "Commscope", "Commscope" }, @@ -28461,10 +28749,12 @@ { { 0x90, 0xB0, 0xED }, "Apple", "Apple, Inc." }, { { 0x90, 0xB1, 0x1C }, "Dell", "Dell Inc." }, { { 0x90, 0xB1, 0x34 }, "Commscope", "Commscope" }, + { { 0x90, 0xB1, 0x41 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x90, 0xB1, 0x44 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x90, 0xB1, 0x76 }, "Intel", "Intel Corporate" }, { { 0x90, 0xB1, 0xE0 }, "NebulaLinkTe", "Beijing Nebula Link Technology Co., Ltd" }, { { 0x90, 0xB2, 0x1F }, "Apple", "Apple, Inc." }, + { { 0x90, 0xB3, 0x39 }, "Espressif", "Espressif Inc." }, { { 0x90, 0xB4, 0xDD }, "ZptR&D", "Zpt R&D" }, { { 0x90, 0xB5, 0x7F }, "iCommSemicon", "Shenzhen iComm Semiconductor CO.,LTD" }, { { 0x90, 0xB6, 0x22 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -28472,7 +28762,7 @@ { { 0x90, 0xB6, 0x85 }, "WeifangGoert", "Weifang Goertek Electronics Co.,Ltd" }, { { 0x90, 0xB6, 0x86 }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0x90, 0xB7, 0x90 }, "Apple", "Apple, Inc." }, - { { 0x90, 0xB8, 0x32 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x90, 0xB8, 0x32 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x90, 0xB8, 0xD0 }, "Joyent", "Joyent, Inc." }, { { 0x90, 0xB8, 0xE0 }, "YanrayTechno", "Shenzhen Yanray Technology Co.,Ltd" }, { { 0x90, 0xB9, 0x31 }, "Apple", "Apple, Inc." }, @@ -28491,6 +28781,7 @@ { { 0x90, 0xC7, 0x92 }, "Commscope", "Commscope" }, { { 0x90, 0xC7, 0xD8 }, "zte", "zte corporation" }, { { 0x90, 0xC9, 0x52 }, "Durin", "Durin, Inc" }, + { { 0x90, 0xC9, 0x7E }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x90, 0xC9, 0x9B }, "TesorionNede", "Tesorion Nederland B.V." }, { { 0x90, 0xCA, 0xFA }, "Google", "Google, Inc." }, { { 0x90, 0xCB, 0xA3 }, "TecnoMobile", "Tecno Mobile Limited" }, @@ -28510,6 +28801,7 @@ { { 0x90, 0xD3, 0xCF }, "AskeyCompute", "Askey Computer Corp" }, { { 0x90, 0xD4, 0x32 }, "zte", "zte corporation" }, { { 0x90, 0xD4, 0x73 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, + { { 0x90, 0xD5, 0x29 }, "AcctonTechno", "Accton Technology Corporation" }, { { 0x90, 0xD6, 0x89 }, "HuahaoFangzh", "Huahao Fangzhou Technology Co.,Ltd" }, { { 0x90, 0xD7, 0x33 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x90, 0xD7, 0x4F }, "Bookeen", "Bookeen" }, @@ -28566,11 +28858,13 @@ { { 0x90, 0xF3, 0xB7 }, "KirisunCommu", "Kirisun Communications Co., Ltd." }, { { 0x90, 0xF3, 0xB8 }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0x90, 0xF4, 0xC1 }, "RandMcNally", "Rand McNally" }, + { { 0x90, 0xF5, 0x10 }, "TechnologieO", "Technologie Optic.ca Inc." }, { { 0x90, 0xF6, 0x44 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x90, 0xF6, 0x52 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0x90, 0xF7, 0x21 }, "IndiNatus", "IndiNatus (IndiNatus India Private Limited)" }, { { 0x90, 0xF7, 0x2F }, "PhillipsMach", "Phillips Machine & Welding Co., Inc." }, { { 0x90, 0xF7, 0xB2 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, + { { 0x90, 0xF8, 0x0C }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0x90, 0xF8, 0x2E }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x90, 0xF8, 0x61 }, "ublox", "u-blox AG" }, { { 0x90, 0xF8, 0x91 }, "KaonGroup", "Kaon Group Co., Ltd." }, @@ -28616,8 +28910,10 @@ { { 0x94, 0x0D, 0x2D }, "UniversalEle", "Universal Electronics, Inc." }, { { 0x94, 0x0D, 0x4B }, "Cisco", "Cisco Systems, Inc" }, { { 0x94, 0x0E, 0x2A }, "NXPSemicondu", "NXP Semiconductors Taiwan Ltd." }, + { { 0x94, 0x0E, 0x5F }, "Apple", "Apple, Inc." }, { { 0x94, 0x0E, 0x6B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x94, 0x0E, 0xE7 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0x94, 0x0F, 0x3B }, "AskeyCompute", "Askey Computer Corp" }, { { 0x94, 0x10, 0x3E }, "BelkinIntern", "Belkin International Inc." }, { { 0x94, 0x10, 0x42 }, "FanoxElectro", "Fanox Electronic S.L." }, { { 0x94, 0x10, 0x5A }, "Dell", "Dell Inc." }, @@ -28635,6 +28931,7 @@ { { 0x94, 0x19, 0x3A }, "Elvaco", "Elvaco AB" }, { { 0x94, 0x1C, 0x56 }, "ActiontecEle", "Actiontec Electronics, Inc" }, { { 0x94, 0x1D, 0x1C }, "TLabWest", "TLab West Systems AB" }, + { { 0x94, 0x1D, 0xD4 }, "Google", "Google, Inc." }, { { 0x94, 0x1F, 0x3A }, "Ambiq", "Ambiq" }, { { 0x94, 0x1F, 0xA2 }, "YuXinSemicon", "Wuhan YuXin Semiconductor Co., Ltd." }, { { 0x94, 0x20, 0x53 }, "Nokia", "Nokia Corporation" }, @@ -28705,6 +29002,7 @@ { { 0x94, 0x47, 0x88 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x94, 0x47, 0xB0 }, "EswinComputi", "Beijing Eswin Computing Technology Co., Ltd" }, { { 0x94, 0x49, 0x96 }, "WiSilica", "WiSilica Inc" }, + { { 0x94, 0x49, 0xF6 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x94, 0x4A, 0x09 }, "BitWiseContr", "BitWise Controls" }, { { 0x94, 0x4A, 0x0C }, "Sercomm", "Sercomm Corporation." }, { { 0x94, 0x4B, 0xF8 }, "Tozo", "Tozo Inc" }, @@ -28736,6 +29034,7 @@ { { 0x94, 0x5A, 0xFC }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0x94, 0x5B, 0x7E }, "TrilobitLtda", "Trilobit Ltda." }, { { 0x94, 0x5C, 0x9A }, "Apple", "Apple, Inc." }, + { { 0x94, 0x5D, 0xBF }, "NokiaSolutio", "Nokia Solutions and Networks India Private Limited" }, { { 0x94, 0x5F, 0x34 }, "RenesasElect", "Renesas Electronics (Penang) Sdn. Bhd." }, { { 0x94, 0x60, 0x10 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x94, 0x60, 0xD5 }, "HewlettPacka", "Hewlett Packard Enterprise" }, @@ -28776,6 +29075,7 @@ { { 0x94, 0x7F, 0x1D }, "FastrainTech", "Shenzhen Fastrain Technology Co., Ltd." }, { { 0x94, 0x7F, 0xD8 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x94, 0x81, 0xA4 }, "AzurayTechno", "Azuray Technologies" }, + { { 0x94, 0x82, 0xB2 }, "GLIntelligen", "GL Intelligence" }, { { 0x94, 0x83, 0xC4 }, "GLTechnologi", "GL Technologies (Hong Kong) Limited" }, { { 0x94, 0x85, 0x7A }, "EvantageIndu", "Evantage Industries Corp" }, { { 0x94, 0x86, 0xCD }, "SeoulElectro", "Seoul Electronics&Telecom" }, @@ -28816,7 +29116,7 @@ { { 0x94, 0x99, 0x01 }, "YITOADigital", "Shenzhen YITOA Digital Appliance CO.,LTD" }, { { 0x94, 0x99, 0x90 }, "VTCTelecommu", "VTC Telecommunications" }, { { 0x94, 0x9A, 0xA9 }, "Microsoft", "Microsoft Corporation" }, - { { 0x94, 0x9B, 0x2C }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x94, 0x9B, 0x2C }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x94, 0x9B, 0xFD }, "TransNewTech", "Trans New Technology, Inc." }, { { 0x94, 0x9C, 0x55 }, "AltaDataTech", "Alta Data Technologies" }, { { 0x94, 0x9C, 0xBE }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -28850,6 +29150,7 @@ { { 0x94, 0xAB, 0xDE }, "OMXTechnolog", "OMX Technology - FZE" }, { { 0x94, 0xAB, 0xFE }, "Nokia", "Nokia" }, { { 0x94, 0xAC, 0xCA }, "trivumtechno", "trivum technologies GmbH" }, + { { 0x94, 0xAD, 0x05 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x94, 0xAD, 0x23 }, "Apple", "Apple, Inc." }, { { 0x94, 0xAE, 0x61 }, "AlcatelLucen", "Alcatel Lucent" }, { { 0x94, 0xAE, 0xE3 }, "BeldenHirsch", "Belden Hirschmann industries (Suzhou) Limited" }, @@ -29024,9 +29325,11 @@ { { 0x98, 0x04, 0x5F }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x98, 0x06, 0x3A }, "HomeControlS", "Home Control Singapore Pte Ltd" }, { { 0x98, 0x06, 0x3C }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0x98, 0x06, 0xA3 }, "GsdVietNamTe", "Gsd Viet Nam Technology Company Limited" }, { { 0x98, 0x07, 0x09 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x98, 0x07, 0x2D }, "TexasInstrum", "Texas Instruments" }, { { 0x98, 0x08, 0x02 }, "Orbis", "Orbis Bv" }, + { { 0x98, 0x08, 0x18 }, "AltoBeam", "AltoBeam Inc." }, { { 0x98, 0x09, 0xCF }, "OnePlusTechn", "OnePlus Technology (Shenzhen) Co., Ltd" }, { { 0x98, 0x0A, 0x4B }, "NokiaSolutio", "Nokia Solutions and Networks GmbH & Co. KG" }, { { 0x98, 0x0C, 0x33 }, "SiliconLabor", "Silicon Laboratories" }, @@ -29081,6 +29384,7 @@ { { 0x98, 0x29, 0x3F }, "FujianStartC", "Fujian Start Computer Equipment Co.,Ltd" }, { { 0x98, 0x29, 0xA6 }, "CompalInform", "Compal Information (Kunshan) Co., Ltd." }, { { 0x98, 0x2A, 0x0A }, "Intelbras", "Intelbras" }, + { { 0x98, 0x2A, 0xC3 }, "SiliconLabor", "Silicon Laboratories" }, { { 0x98, 0x2A, 0xFD }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x98, 0x2B, 0xA6 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0x98, 0x2C, 0xBC }, "Intel", "Intel Corporate" }, @@ -29190,6 +29494,7 @@ { { 0x98, 0x74, 0x3D }, "JunKaiHengye", "Shenzhen Jun Kai Hengye Technology Co. Ltd" }, { { 0x98, 0x74, 0xDA }, "Infinixmobil", "Infinix mobility limited" }, { { 0x98, 0x75, 0x1A }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0x98, 0x75, 0x52 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x98, 0x75, 0x96 }, "EMMicroelect", "EM Microelectronic" }, { { 0x98, 0x76, 0xB6 }, "Adafruit", "Adafruit" }, { { 0x98, 0x77, 0x70 }, "PepDigitalTe", "Pep Digital Technology (Guangzhou) Co., Ltd" }, @@ -29276,7 +29581,7 @@ { { 0x98, 0xAF, 0x65 }, "Intel", "Intel Corporate" }, { { 0x98, 0xB0, 0x39 }, "Nokia", "Nokia" }, { { 0x98, 0xB0, 0x8B }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, - { { 0x98, 0xB1, 0x77 }, "LandisGyr", "Landis + Gyr" }, + { { 0x98, 0xB1, 0x77 }, "LandisGyr", "Landis+Gyr S.A." }, { { 0x98, 0xB3, 0x79 }, "Apple", "Apple, Inc." }, { { 0x98, 0xB3, 0xEF }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x98, 0xB6, 0xE9 }, "Nintendo", "Nintendo Co.,Ltd" }, @@ -29297,7 +29602,9 @@ { { 0x98, 0xBF, 0xF4 }, "MARKIN", "MARKIN co., Ltd." }, { { 0x98, 0xC0, 0x8A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x98, 0xC0, 0xEB }, "GlobalRegenc", "Global Regency Ltd" }, + { { 0x98, 0xC3, 0x77 }, "Espressif", "Espressif Inc." }, { { 0x98, 0xC3, 0xD2 }, "NingboSanxin", "Ningbo Sanxing Medical Electric Co.,Ltd" }, + { { 0x98, 0xC5, 0xB3 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0x98, 0xC5, 0xDB }, "Ericsson", "Ericsson AB" }, { { 0x98, 0xC7, 0xA4 }, "HSFiberCommu", "Shenzhen HS Fiber Communication Equipment CO., LTD" }, { { 0x98, 0xC8, 0x1C }, "Baytec", "Baytec Limited" }, @@ -29407,6 +29714,7 @@ { { 0x98, 0xFF, 0xD0 }, "LenovoMobile", "Lenovo Mobile Communication Technology Ltd." }, { { 0x9A, 0x1B, 0x22 }, "InfoCore", "InfoCore Co.,Ltd." }, { { 0x9A, 0x56, 0x4B }, "Cubix", "Cubix Corporation" }, + { { 0x9A, 0x5C, 0xC3 }, "NuCOMMIntern", "NuCOMM International Ltd." }, { { 0x9A, 0xAD, 0xCA }, "Credo", "Credo" }, { { 0x9A, 0xB2, 0xF8 }, "SFFCommittee", "SFF Committee" }, { { 0x9A, 0xD2, 0x63 }, "FirmTek", "FirmTek, LLC" }, @@ -29442,7 +29750,7 @@ { { 0x9C, 0x19, 0xC2 }, "DongguanLies", "Dongguan Liesheng Electronic Co., Ltd." }, { { 0x9C, 0x1A, 0x25 }, "Apple", "Apple, Inc." }, { { 0x9C, 0x1C, 0x12 }, "HewlettPacka", "Hewlett Packard Enterprise" }, - { { 0x9C, 0x1C, 0x37 }, "AltoBeam", "AltoBeam (China) Inc." }, + { { 0x9C, 0x1C, 0x37 }, "AltoBeam", "AltoBeam Inc." }, { { 0x9C, 0x1C, 0x6D }, "HefeiDatangS", "Hefei Datang Storage Technology Co.,Ltd" }, { { 0x9C, 0x1D, 0x36 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x9C, 0x1D, 0x58 }, "TexasInstrum", "Texas Instruments" }, @@ -29518,6 +29826,7 @@ { { 0x9C, 0x4A, 0x7B }, "Nokia", "Nokia Corporation" }, { { 0x9C, 0x4B, 0x6B }, "iFlightTechn", "iFlight Technology Company Limited" }, { { 0x9C, 0x4C, 0xAE }, "MesaLabs", "Mesa Labs" }, + { { 0x9C, 0x4D, 0xC2 }, "Cisco", "Cisco Systems, Inc" }, { { 0x9C, 0x4E, 0x20 }, "Cisco", "Cisco Systems, Inc" }, { { 0x9C, 0x4E, 0x36 }, "Intel", "Intel Corporate" }, { { 0x9C, 0x4E, 0x8E }, "ALT", "ALT Systems Ltd" }, @@ -29557,7 +29866,7 @@ { { 0x9C, 0x5C, 0x8D }, "FiremaxIndús", "Firemax Indústria E Comércio De Produtos Eletrônicos Ltda" }, { { 0x9C, 0x5C, 0x8E }, "ASUSTekCOMPU", "ASUSTek COMPUTER INC." }, { { 0x9C, 0x5C, 0xF9 }, "Sony", "Sony Corporation" }, - { { 0x9C, 0x5D, 0x12 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0x9C, 0x5D, 0x12 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x9C, 0x5D, 0x95 }, "VTCElectroni", "VTC Electronics Corp." }, { { 0x9C, 0x5E, 0x73 }, "CalibreUK", "Calibre UK LTD" }, { { 0x9C, 0x5F, 0x5A }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, @@ -29610,11 +29919,13 @@ { { 0x9C, 0x7A, 0x03 }, "Ciena", "Ciena Corporation" }, { { 0x9C, 0x7B, 0xD2 }, "NEOLABConver", "NEOLAB Convergence" }, { { 0x9C, 0x7B, 0xEF }, "HewlettPacka", "Hewlett Packard" }, + { { 0x9C, 0x7C, 0x1E }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, { { 0x9C, 0x7D, 0xA3 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x9C, 0x7D, 0xC0 }, "Tech4homeLda", "Tech4home, Lda" }, { { 0x9C, 0x7F, 0x57 }, "UNICMemoryTe", "UNIC Memory Technology Co Ltd" }, { { 0x9C, 0x7F, 0x64 }, "NanjingQinhe", "Nanjing Qinheng Microelectronics Co., Ltd." }, { { 0x9C, 0x7F, 0x81 }, "FastTechnolo", "Shenzhen Fast Technologies Co.,Ltd" }, + { { 0x9C, 0x80, 0x3D }, "TCTmobile", "TCT mobile ltd" }, { { 0x9C, 0x80, 0x7D }, "SYSCABLEKore", "SYSCABLE Korea Inc." }, { { 0x9C, 0x80, 0xDF }, "Arcadyan", "Arcadyan Corporation" }, { { 0x9C, 0x82, 0x3F }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -29643,6 +29954,7 @@ { { 0x9C, 0x8E, 0x9C }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0x9C, 0x8E, 0xCD }, "AmcrestTechn", "Amcrest Technologies" }, { { 0x9C, 0x8E, 0xDC }, "Teracom", "Teracom Limited" }, + { { 0x9C, 0x8F, 0xA9 }, "Genexis", "Genexis B.V." }, { { 0x9C, 0x90, 0x19 }, "Beyless", "Beyless" }, { { 0x9C, 0x92, 0x4F }, "Apple", "Apple, Inc." }, { { 0x9C, 0x93, 0x4E }, "Xerox", "Xerox Corporation" }, @@ -29654,6 +29966,7 @@ { { 0x9C, 0x95, 0x6E }, "MicrochipTec", "Microchip Technology Inc." }, { { 0x9C, 0x95, 0xF8 }, "SmartDoor", "SmartDoor Systems, LLC" }, { { 0x9C, 0x96, 0x13 }, "LenovoFuture", "Lenovo Future Communication Technology (Chongqing) Company Limited" }, + { { 0x9C, 0x96, 0x1B }, "IFTERJerzyTa", "IFTER Jerzy Taczalski" }, { { 0x9C, 0x97, 0x1B }, "Intel", "Intel Corporate" }, { { 0x9C, 0x97, 0x26 }, "VantivaTechn", "Vantiva Technologies Belgium" }, { { 0x9C, 0x97, 0x74 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -29712,6 +30025,7 @@ { { 0x9C, 0xB8, 0xB4 }, "AMPAKTechnol", "AMPAK Technology,Inc." }, { { 0x9C, 0xBA, 0xC9 }, "TelitCommuni", "Telit Communication s.p.a" }, { { 0x9C, 0xBB, 0x98 }, "ShenZhenRNDE", "Shen Zhen RND Electronic Co.,LTD" }, + { { 0x9C, 0xBC, 0xA6 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0x9C, 0xBC, 0xF0 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0x9C, 0xBD, 0x6E }, "DERA", "DERA Co., Ltd" }, { { 0x9C, 0xBD, 0x9D }, "SkyDisk", "SkyDisk, Inc." }, @@ -29763,6 +30077,7 @@ { { 0x9C, 0xDB, 0xAF }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0x9C, 0xDB, 0xCB }, "FunshionOnli", "Funshion Online Technologies Co.,Ltd" }, { { 0x9C, 0xDC, 0x71 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0x9C, 0xDC, 0x99 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0x9C, 0xDD, 0x1F }, "IntelligentS", "Intelligent Steward Co.,Ltd" }, { { 0x9C, 0xDE, 0x4D }, "MLvision", "ML vision Co.,LTD" }, { { 0x9C, 0xDE, 0xF0 }, "JiangxiRisou", "Jiangxi Risound Electronics Co.,LTD" }, @@ -29808,6 +30123,7 @@ { { 0x9C, 0xF8, 0xB8 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0x9C, 0xF8, 0xDB }, "eyunmeitechn", "shenzhen eyunmei technology co,.ltd" }, { { 0x9C, 0xF9, 0x38 }, "AREVANP", "AREVA NP GmbH" }, + { { 0x9C, 0xF9, 0xA1 }, "JuniperNetwo", "Juniper Networks" }, { { 0x9C, 0xFA, 0x3C }, "DaeyoungElec", "Daeyoung Electronics" }, { { 0x9C, 0xFA, 0x76 }, "Apple", "Apple, Inc." }, { { 0x9C, 0xFA, 0x96 }, "T3Technology", "T3 Technology Co., Ltd." }, @@ -29943,6 +30259,7 @@ { { 0xA0, 0x4C, 0xC1 }, "Helixtech", "Helixtech Corp." }, { { 0xA0, 0x4E, 0x01 }, "CENTRALENGIN", "CENTRAL ENGINEERING co.,ltd." }, { { 0xA0, 0x4E, 0x04 }, "Nokia", "Nokia Corporation" }, + { { 0xA0, 0x4E, 0x8D }, "CiscoMeraki", "Cisco Meraki" }, { { 0xA0, 0x4E, 0xA7 }, "Apple", "Apple, Inc." }, { { 0xA0, 0x4E, 0xCF }, "Apple", "Apple, Inc." }, { { 0xA0, 0x4F, 0x52 }, "Intel", "Intel Corporate" }, @@ -30072,6 +30389,7 @@ { { 0xA0, 0x9B, 0x12 }, "ChinaMobileI", "China Mobile IOT Company Limited" }, { { 0xA0, 0x9B, 0x17 }, "TaicangT&WEl", "Taicang T&W Electronics" }, { { 0xA0, 0x9B, 0xBD }, "TotalAviatio", "Total Aviation Solutions Pty Ltd" }, + { { 0xA0, 0x9C, 0x19 }, "CigShanghai", "Cig Shanghai Co Ltd" }, { { 0xA0, 0x9D, 0x22 }, "Apple", "Apple, Inc." }, { { 0xA0, 0x9D, 0x86 }, "AlcatelLucen", "Alcatel-Lucent Shanghai Bell Co., Ltd" }, { { 0xA0, 0x9D, 0x91 }, "SoundBridge", "SoundBridge" }, @@ -30108,6 +30426,7 @@ { { 0xA0, 0xB0, 0x86 }, "HirschmannAu", "Hirschmann Automation and Control GmbH" }, { { 0xA0, 0xB0, 0xBD }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xA0, 0xB1, 0x00 }, "CandoElectro", "ShenZhen Cando Electronics Co.,Ltd" }, + { { 0xA0, 0xB1, 0x5C }, "Google", "Google, Inc." }, { { 0xA0, 0xB3, 0x39 }, "Intel", "Intel Corporate" }, { { 0xA0, 0xB3, 0xCC }, "HewlettPacka", "Hewlett Packard" }, { { 0xA0, 0xB4, 0x0F }, "Apple", "Apple, Inc." }, @@ -30140,8 +30459,10 @@ { { 0xA0, 0xC6, 0xA5 }, "LierdaScienc", "Lierda Science & Technology Group Co., Ltd" }, { { 0xA0, 0xC6, 0xEC }, "ANYKTechnolo", "ShenZhen ANYK Technology Co.,LTD" }, { { 0xA0, 0xC7, 0xD2 }, "Cisco", "Cisco Systems, Inc" }, + { { 0xA0, 0xC9, 0x26 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xA0, 0xC9, 0x8B }, "NokiaSolutio", "Nokia Solutions and Networks GmbH & Co. KG" }, { { 0xA0, 0xC9, 0xA0 }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, + { { 0xA0, 0xCA, 0x4A }, "AltoBeam", "AltoBeam Inc." }, { { 0xA0, 0xCA, 0xA5 }, "Intelligence", "Intelligence Technology Of Cec Co., Ltd" }, { { 0xA0, 0xCB, 0xFD }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xA0, 0xCC, 0x2B }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, @@ -30295,6 +30616,7 @@ { { 0xA4, 0x25, 0x1B }, "Avaya", "Avaya Inc" }, { { 0xA4, 0x26, 0x18 }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, { { 0xA4, 0x26, 0x55 }, "LTIMotion", "LTI Motion (Shanghai) Co., Ltd." }, + { { 0xA4, 0x26, 0xCA }, "Intel", "Intel Corporate" }, { { 0xA4, 0x27, 0xA5 }, "PaloAltoNetw", "Palo Alto Networks" }, { { 0xA4, 0x28, 0xB7 }, "YangtzeMemor", "Yangtze Memory Technologies Co., Ltd." }, { { 0xA4, 0x29, 0x02 }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, @@ -30320,6 +30642,7 @@ { { 0xA4, 0x35, 0x2D }, "TRIZNetworks", "TRIZ Networks corp." }, { { 0xA4, 0x36, 0xC7 }, "LGInnotek", "LG Innotek" }, { { 0xA4, 0x37, 0x3E }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0xA4, 0x37, 0xE6 }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0xA4, 0x38, 0x31 }, "RFelementssr", "RF elements s.r.o." }, { { 0xA4, 0x38, 0xCC }, "Nintendo", "Nintendo Co.,Ltd" }, { { 0xA4, 0x38, 0xFC }, "PlasticLogic", "Plastic Logic" }, @@ -30339,6 +30662,7 @@ { { 0xA4, 0x40, 0x27 }, "zte", "zte corporation" }, { { 0xA4, 0x40, 0x3D }, "BaseusTechno", "Shenzhen Baseus Technology Co., Ltd." }, { { 0xA4, 0x42, 0x3B }, "Intel", "Intel Corporate" }, + { { 0xA4, 0x42, 0x80 }, "Apple", "Apple, Inc." }, { { 0xA4, 0x43, 0x1B }, "DreamtekInte", "Dreamtek Intelligent Technology Co., Ltd" }, { { 0xA4, 0x43, 0x43 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xA4, 0x43, 0x80 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -30409,7 +30733,7 @@ { { 0xA4, 0x6E, 0xA7 }, "DxAntenna", "Dx Antenna Co.,Ltd." }, { { 0xA4, 0x70, 0xD6 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0xA4, 0x71, 0x74 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0xA4, 0x73, 0xAB }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xA4, 0x73, 0xAB }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xA4, 0x75, 0xB9 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xA4, 0x77, 0x33 }, "Google", "Google, Inc." }, { { 0xA4, 0x77, 0x58 }, "NingboFreewi", "Ningbo Freewings Technologies Co.,Ltd" }, @@ -30466,7 +30790,7 @@ { { 0xA4, 0x97, 0x33 }, "AskeyCompute", "Askey Computer Corp" }, { { 0xA4, 0x97, 0x5C }, "VTechTelecom", "VTech Telecommunications Ltd." }, { { 0xA4, 0x97, 0x8A }, "Lear", "Lear" }, - { { 0xA4, 0x97, 0x91 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xA4, 0x97, 0x91 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xA4, 0x97, 0xB1 }, "ChongqingFug", "Chongqing Fugui Electronics Co.,Ltd." }, { { 0xA4, 0x97, 0xBB }, "HitachiIndus", "Hitachi Industrial Equipment Systems Co.,Ltd" }, { { 0xA4, 0x98, 0x13 }, "Commscope", "Commscope" }, @@ -30559,7 +30883,7 @@ { { 0xA4, 0xC7, 0x4B }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xA4, 0xC7, 0x88 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xA4, 0xC7, 0xDE }, "CambridgeInd", "Cambridge Industries(Group) Co.,Ltd." }, - { { 0xA4, 0xC7, 0xF6 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xA4, 0xC7, 0xF6 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xA4, 0xC9, 0x39 }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0xA4, 0xCA, 0xA0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xA4, 0xCB, 0x8F }, "Espressif", "Espressif Inc." }, @@ -30592,6 +30916,7 @@ { { 0xA4, 0xD9, 0x31 }, "Apple", "Apple, Inc." }, { { 0xA4, 0xD9, 0x90 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xA4, 0xD9, 0xA4 }, "neXusIDSolut", "neXus ID Solutions AB" }, + { { 0xA4, 0xD9, 0xC6 }, "AirproTechno", "Airpro Technology Ltd" }, { { 0xA4, 0xDA, 0x32 }, "TexasInstrum", "Texas Instruments" }, { { 0xA4, 0xDA, 0x3F }, "Bionics", "Bionics Corp." }, { { 0xA4, 0xDA, 0xD4 }, "YamatoDenki", "Yamato Denki Co.,Ltd." }, @@ -30623,11 +30948,11 @@ { { 0xA4, 0xE9, 0x91 }, "SistemasAudi", "Sistemas Audiovisuales Itelsis S.L." }, { { 0xA4, 0xE9, 0xA3 }, "HonestTechno", "Honest Technology Co., Ltd" }, { { 0xA4, 0xEA, 0x4F }, "VusionGroup", "VusionGroup" }, - { { 0xA4, 0xEA, 0x8E }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xA4, 0xEA, 0x8E }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xA4, 0xEB, 0xD3 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xA4, 0xED, 0x4E }, "Commscope", "Commscope" }, { { 0xA4, 0xEE, 0x57 }, "SeikoEpson", "Seiko Epson Corporation" }, - { { 0xA4, 0xEF, 0x15 }, "AltoBeam", "AltoBeam (China) Inc." }, + { { 0xA4, 0xEF, 0x15 }, "AltoBeam", "AltoBeam Inc." }, { { 0xA4, 0xEF, 0x52 }, "Telewave", "Telewave Co., Ltd." }, { { 0xA4, 0xF0, 0x0F }, "Espressif", "Espressif Inc." }, { { 0xA4, 0xF0, 0x1F }, "Canon", "Canon Inc." }, @@ -30697,6 +31022,7 @@ { { 0xA8, 0x1F, 0x79 }, "YinglingInno", "Yingling Innovations Pte. Ltd." }, { { 0xA8, 0x1F, 0xAF }, "KryptonPolsk", "Krypton Polska" }, { { 0xA8, 0x20, 0x66 }, "Apple", "Apple, Inc." }, + { { 0xA8, 0x21, 0x3A }, "TalentTechno", "Shenzhen Talent Technology Comapny Limited 深圳市泰霖科技有限公司" }, { { 0xA8, 0x21, 0xC8 }, "phoenixtelec", "shenzhen phoenix telecom technology Co.,Ltd." }, { { 0xA8, 0x23, 0x16 }, "Nokia", "Nokia" }, { { 0xA8, 0x23, 0xFE }, "LGElectronic", "LG Electronics" }, @@ -30953,7 +31279,7 @@ { { 0xA8, 0xC2, 0x66 }, "HUMAX", "HUMAX Co., Ltd." }, { { 0xA8, 0xC4, 0x07 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xA8, 0xC5, 0x6F }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, - { { 0xA8, 0xC6, 0x47 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xA8, 0xC6, 0x47 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xA8, 0xC8, 0x3A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xA8, 0xC8, 0x7F }, "Roqos", "Roqos, Inc." }, { { 0xA8, 0xC9, 0x8A }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, @@ -30978,6 +31304,7 @@ { { 0xA8, 0xD4, 0x98 }, "AviraOperati", "Avira Operations GmbH & Co. KG" }, { { 0xA8, 0xD4, 0xE0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xA8, 0xD5, 0x79 }, "ChushangScie", "Beijing Chushang Science and Technology Co.,Ltd" }, + { { 0xA8, 0xD6, 0xD9 }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, { { 0xA8, 0xD8, 0x28 }, "AscensiaDiab", "Ascensia Diabetes Care" }, { { 0xA8, 0xD8, 0x61 }, "ItelMobile", "Itel Mobile Limited" }, { { 0xA8, 0xD8, 0x8A }, "Wyconn", "Wyconn" }, @@ -31061,6 +31388,7 @@ { { 0xAC, 0x04, 0x25 }, "ballb", "ball-b GmbH Co KG" }, { { 0xAC, 0x04, 0x81 }, "JiangsuHuaxi", "Jiangsu Huaxing Electronics Co., Ltd." }, { { 0xAC, 0x04, 0xAA }, "GoPro", "GoPro" }, + { { 0xAC, 0x04, 0xE6 }, "NTXElectroni", "NTX Electronics YangZhou co.,LTD" }, { { 0xAC, 0x05, 0xC7 }, "Intel", "Intel Corporate" }, { { 0xAC, 0x06, 0x13 }, "Senselogix", "Senselogix Ltd" }, { { 0xAC, 0x06, 0x50 }, "BaosightSoft", "Shanghai Baosight Software Co., Ltd" }, @@ -31115,6 +31443,7 @@ { { 0xAC, 0x23, 0x16 }, "Mist", "Mist Systems, Inc." }, { { 0xAC, 0x23, 0x34 }, "Infinixmobil", "Infinix mobility limited" }, { { 0xAC, 0x23, 0x3F }, "MinewTechnol", "Shenzhen Minew Technologies Co., Ltd." }, + { { 0xAC, 0x23, 0x6E }, "ApismoonElec", "Apismoon Electric Pte. Ltd." }, { { 0xAC, 0x24, 0x77 }, "TinnoMobileT", "Shenzhen Tinno Mobile Technology Corp" }, { { 0xAC, 0x27, 0x6E }, "Espressif", "Espressif Inc." }, { { 0xAC, 0x29, 0x29 }, "Infinixmobil", "Infinix mobility limited" }, @@ -31122,6 +31451,7 @@ { { 0xAC, 0x2A, 0x0C }, "CsrZhuzhouIn", "Csr Zhuzhou Institute Co.,Ltd." }, { { 0xAC, 0x2A, 0xA1 }, "Cisco", "Cisco Systems, Inc" }, { { 0xAC, 0x2B, 0x6E }, "Intel", "Intel Corporate" }, + { { 0xAC, 0x2B, 0xA2 }, "ChamberlainG", "The Chamberlain Group, Inc" }, { { 0xAC, 0x2D, 0xA3 }, "TXTR", "TXTR GmbH" }, { { 0xAC, 0x2D, 0xA9 }, "TecnoMobile", "Tecno Mobile Limited" }, { { 0xAC, 0x2F, 0xA8 }, "Humannix", "Humannix Co.,Ltd." }, @@ -31158,6 +31488,7 @@ { { 0xAC, 0x3E, 0xB1 }, "Google", "Google, Inc." }, { { 0xAC, 0x3F, 0xA4 }, "TaiyoYuden", "Taiyo Yuden Co.,Ltd" }, { { 0xAC, 0x40, 0x1E }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, + { { 0xAC, 0x40, 0xB5 }, "Lumiva", "Lumiva Inc." }, { { 0xAC, 0x40, 0xEA }, "C&TSolution", "C&T Solution Inc." }, { { 0xAC, 0x41, 0x22 }, "EclipseElect", "Eclipse Electronic Systems Inc." }, { { 0xAC, 0x41, 0x6A }, "AmazonTechno", "Amazon Technologies Inc." }, @@ -31180,7 +31511,7 @@ { { 0xAC, 0x4B, 0xC8 }, "JuniperNetwo", "Juniper Networks" }, { { 0xAC, 0x4C, 0xA5 }, "VantivaUSA", "Vantiva USA LLC" }, { { 0xAC, 0x4D, 0x16 }, "TexasInstrum", "Texas Instruments" }, - { { 0xAC, 0x4D, 0xD9 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xAC, 0x4D, 0xD9 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xAC, 0x4E, 0x2E }, "JingHanDaEle", "Shenzhen JingHanDa Electronics Co.Ltd" }, { { 0xAC, 0x4E, 0x65 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0xAC, 0x4E, 0x91 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -31263,7 +31594,7 @@ { { 0xAC, 0x7E, 0x01 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xAC, 0x7E, 0x8A }, "Cisco", "Cisco Systems, Inc" }, { { 0xAC, 0x7F, 0x3E }, "Apple", "Apple, Inc." }, - { { 0xAC, 0x7F, 0x8D }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xAC, 0x7F, 0x8D }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xAC, 0x80, 0x0A }, "Sony", "Sony Corporation" }, { { 0xAC, 0x80, 0xAE }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0xAC, 0x80, 0xD6 }, "Hexatronic", "Hexatronic AB" }, @@ -31285,6 +31616,7 @@ { { 0xAC, 0x86, 0x74 }, "OpenMesh", "Open Mesh, Inc." }, { { 0xAC, 0x86, 0x7E }, "CreateNewTec", "Create New Technology (HK) Limited Company" }, { { 0xAC, 0x86, 0xA3 }, "Apple", "Apple, Inc." }, + { { 0xAC, 0x87, 0x3F }, "BouffaloLab", "Bouffalo Lab (Nanjing) Co., Ltd." }, { { 0xAC, 0x87, 0x46 }, "HuizhouBYDEl", "Huizhou BYD Electronic Co., Ltd." }, { { 0xAC, 0x87, 0xA3 }, "Apple", "Apple, Inc." }, { { 0xAC, 0x88, 0x66 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, @@ -31326,7 +31658,7 @@ { { 0xAC, 0x9F, 0xC3 }, "Ring", "Ring LLC" }, { { 0xAC, 0xA0, 0x16 }, "Cisco", "Cisco Systems, Inc" }, { { 0xAC, 0xA0, 0x9D }, "JuniperNetwo", "Juniper Networks" }, - { { 0xAC, 0xA2, 0x13 }, "Bilianelectr", "Shenzhen Bilian electronic CO.,LTD" }, + { { 0xAC, 0xA2, 0x13 }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, { { 0xAC, 0xA2, 0x2C }, "BaycityTechn", "Baycity Technologies Ltd" }, { { 0xAC, 0xA3, 0x1E }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0xAC, 0xA3, 0x2F }, "SolidigmTech", "Solidigm Technology" }, @@ -31442,10 +31774,12 @@ { { 0xAC, 0xE4, 0x03 }, "VistengTechn", "Shenzhen Visteng Technology CO.,LTD" }, { { 0xAC, 0xE4, 0x2E }, "SKhynix", "SK hynix" }, { { 0xAC, 0xE4, 0xB5 }, "Apple", "Apple, Inc." }, + { { 0xAC, 0xE4, 0xD8 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xAC, 0xE5, 0xF0 }, "DopplerLabs", "Doppler Labs" }, { { 0xAC, 0xE6, 0x06 }, "HonorDevice", "Honor Device Co., Ltd." }, { { 0xAC, 0xE6, 0x4B }, "BaojiaBatter", "Shenzhen Baojia Battery Technology Co., Ltd." }, { { 0xAC, 0xE6, 0xBB }, "Google", "Google, Inc." }, + { { 0xAC, 0xE6, 0xFB }, "Apple", "Apple, Inc." }, { { 0xAC, 0xE7, 0x7B }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, { { 0xAC, 0xE8, 0x7B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xAC, 0xE8, 0x7E }, "BytemarkComp", "Bytemark Computer Consulting Ltd" }, @@ -31458,7 +31792,7 @@ { { 0xAC, 0xEB, 0xE6 }, "Espressif", "Espressif Inc." }, { { 0xAC, 0xEC, 0x80 }, "Commscope", "Commscope" }, { { 0xAC, 0xEC, 0x85 }, "eero", "eero inc." }, - { { 0xAC, 0xED, 0x32 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xAC, 0xED, 0x32 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xAC, 0xED, 0x5C }, "Intel", "Intel Corporate" }, { { 0xAC, 0xEE, 0x3B }, "6harmonics", "6harmonics Inc" }, { { 0xAC, 0xEE, 0x64 }, "SuperElectro", "Shenzhen SuperElectron Technology Co.,Ltd." }, @@ -31477,6 +31811,7 @@ { { 0xAC, 0xF7, 0x0D }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0xAC, 0xF7, 0xF3 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xAC, 0xF8, 0x5C }, "HigonIntegra", "Chengdu Higon Integrated Circuit Design Co,. Ltd." }, + { { 0xAC, 0xF8, 0x96 }, "eero", "eero inc." }, { { 0xAC, 0xF8, 0xCC }, "Commscope", "Commscope" }, { { 0xAC, 0xF9, 0x32 }, "NXPSemicondu", "NXP Semiconductor (Tianjin) LTD." }, { { 0xAC, 0xF9, 0x70 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -31496,6 +31831,7 @@ { { 0xB0, 0x02, 0x47 }, "AMPAKTechnol", "AMPAK Technology, Inc." }, { { 0xB0, 0x02, 0x7E }, "MullerServic", "Muller Services" }, { { 0xB0, 0x05, 0x94 }, "LiteonTechno", "Liteon Technology Corporation" }, + { { 0xB0, 0x06, 0xEC }, "NexquomePte", "Nexquome Pte Limited" }, { { 0xB0, 0x08, 0x75 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB0, 0x08, 0xBF }, "VitalConnect", "Vital Connect, Inc." }, { { 0xB0, 0x09, 0xD3 }, "Avizia", "Avizia" }, @@ -31520,6 +31856,7 @@ { { 0xB0, 0x1B, 0x4B }, "InvisibleFun", "Invisible Fun Studio Limited" }, { { 0xB0, 0x1B, 0x7C }, "Ontrol", "Ontrol A.S." }, { { 0xB0, 0x1B, 0xD2 }, "LeShiZhiXinE", "Le Shi Zhi Xin Electronic Technology (Tianjin) Limited" }, + { { 0xB0, 0x1B, 0xFC }, "Cisco", "Cisco Systems, Inc" }, { { 0xB0, 0x1C, 0x0C }, "ChuangweiRgb", "Shenzhen Chuangwei-Rgb Electronics Co.,Ltd" }, { { 0xB0, 0x1C, 0x91 }, "Elim", "Elim Co" }, { { 0xB0, 0x1F, 0x29 }, "Helvetia", "Helvetia INC." }, @@ -31534,7 +31871,7 @@ { { 0xB0, 0x25, 0xAA }, "AIstoneGloba", "AIstone Global Limited" }, { { 0xB0, 0x26, 0x28 }, "Broadcom", "Broadcom Limited" }, { { 0xB0, 0x26, 0x80 }, "Cisco", "Cisco Systems, Inc" }, - { { 0xB0, 0x27, 0xCF }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xB0, 0x27, 0xCF }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xB0, 0x28, 0x5B }, "JUHUATechnol", "JUHUA Technology Inc." }, { { 0xB0, 0x2A, 0x1F }, "WingtechGrou", "Wingtech Group (HongKong）Limited" }, { { 0xB0, 0x2A, 0x43 }, "Google", "Google, Inc." }, @@ -31623,6 +31960,7 @@ { { 0xB0, 0x60, 0x88 }, "Intel", "Intel Corporate" }, { { 0xB0, 0x61, 0xA9 }, "YealinkNetwo", "Yealink(Xiamen) Network Technology Co.,Ltd." }, { { 0xB0, 0x61, 0xC7 }, "EricssonLGEn", "Ericsson-LG Enterprise" }, + { { 0xB0, 0x61, 0xEB }, "SiliconLabor", "Silicon Laboratories" }, { { 0xB0, 0x64, 0xE0 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xB0, 0x65, 0x3A }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0xB0, 0x65, 0x63 }, "RailwayCommu", "Shanghai Railway Communication Factory" }, @@ -31673,6 +32011,7 @@ { { 0xB0, 0x81, 0x01 }, "HonorDevice", "Honor Device Co., Ltd." }, { { 0xB0, 0x81, 0x84 }, "Espressif", "Espressif Inc." }, { { 0xB0, 0x81, 0xD8 }, "Isys", "I-sys Corp" }, + { { 0xB0, 0x82, 0xAB }, "WellandTechn", "Guangdong Welland Technology Co.,Ltd" }, { { 0xB0, 0x82, 0xE2 }, "ASUSTekCOMPU", "ASUSTek COMPUTER INC." }, { { 0xB0, 0x83, 0xD6 }, "Commscope", "Commscope" }, { { 0xB0, 0x83, 0xFE }, "Dell", "Dell Inc." }, @@ -31762,12 +32101,14 @@ { { 0xB0, 0xB8, 0xD5 }, "NanjingNengr", "Nanjing Nengrui Auto Equipment CO.,Ltd" }, { { 0xB0, 0xB9, 0x8A }, "Netgear", "Netgear" }, { { 0xB0, 0xBB, 0x8B }, "WavetelTechn", "Wavetel Technology Limited" }, + { { 0xB0, 0xBB, 0xA9 }, "Apple", "Apple, Inc." }, { { 0xB0, 0xBB, 0xE5 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xB0, 0xBC, 0x7A }, "HarmanBecker", "Harman/Becker Automotive Systems GmbH" }, { { 0xB0, 0xBC, 0x8E }, "SkyMirr", "SkyMirr" }, { { 0xB0, 0xBD, 0x1B }, "DongguanLies", "Dongguan Liesheng Electronic Co., Ltd." }, { { 0xB0, 0xBD, 0x6D }, "EchostreamsI", "Echostreams Innovative Solutions" }, { { 0xB0, 0xBD, 0xA1 }, "ZakladElektr", "Zaklad Elektroniczny Sims" }, + { { 0xB0, 0xBE, 0x45 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0xB0, 0xBE, 0x76 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0xB0, 0xBE, 0x83 }, "Apple", "Apple, Inc." }, { { 0xB0, 0xBF, 0x99 }, "Wizitdongdo", "Wizitdongdo" }, @@ -31811,6 +32152,7 @@ { { 0xB0, 0xD5, 0x9D }, "ZoweeTechnol", "Shenzhen Zowee Technology Co., Ltd" }, { { 0xB0, 0xD5, 0xCC }, "TexasInstrum", "Texas Instruments" }, { { 0xB0, 0xD5, 0xFB }, "Google", "Google, Inc." }, + { { 0xB0, 0xD6, 0x16 }, "SuperMicroCo", "Super Micro Computer, Inc." }, { { 0xB0, 0xD7, 0x7E }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB0, 0xD7, 0xC5 }, "Logipix", "Logipix Ltd" }, { { 0xB0, 0xD7, 0xCC }, "Tridonic", "Tridonic GmbH & Co KG" }, @@ -31846,6 +32188,7 @@ { { 0xB0, 0xEA, 0xBC }, "AskeyCompute", "Askey Computer Corp" }, { { 0xB0, 0xEB, 0x57 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB0, 0xEB, 0x7F }, "JuniperNetwo", "Juniper Networks" }, + { { 0xB0, 0xEC, 0x69 }, "Apple", "Apple, Inc." }, { { 0xB0, 0xEC, 0x71 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xB0, 0xEC, 0x8F }, "GmxSas", "Gmx Sas" }, { { 0xB0, 0xEC, 0xDD }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -31874,9 +32217,11 @@ { { 0xB0, 0xFB, 0xDD }, "SuperElectro", "Shenzhen SuperElectron Technology Co.,Ltd." }, { { 0xB0, 0xFC, 0x0D }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xB0, 0xFC, 0x36 }, "CyberTANTech", "CyberTAN Technology Inc." }, + { { 0xB0, 0xFC, 0x4B }, "PhatenTech", "Shenzhen Phaten Tech. LTD" }, { { 0xB0, 0xFC, 0x88 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xB0, 0xFE, 0xBD }, "Private", "Private" }, { { 0xB0, 0xFE, 0xE5 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0xB0, 0xFF, 0x0D }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, { { 0xB4, 0x00, 0x16 }, "IngenicoTerm", "Ingenico Terminals Sas" }, { { 0xB4, 0x00, 0x9C }, "CableWorld", "CableWorld Ltd." }, { { 0xB4, 0x01, 0x42 }, "GCIScienceTe", "GCI Science & Technology Co.,LTD" }, @@ -31905,6 +32250,7 @@ { { 0xB4, 0x0E, 0xDE }, "Intel", "Intel Corporate" }, { { 0xB4, 0x0F, 0x3B }, "TendaTechnol", "Tenda Technology Co.,Ltd.Dongguan branch" }, { { 0xB4, 0x0F, 0xB3 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, + { { 0xB4, 0x10, 0x1C }, "ImilabTechno", "Shanghai Imilab Technology Co.Ltd" }, { { 0xB4, 0x10, 0x7A }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xB4, 0x10, 0x7B }, "TexasInstrum", "Texas Instruments" }, { { 0xB4, 0x13, 0x24 }, "Google", "Google, Inc." }, @@ -31939,6 +32285,7 @@ { { 0xB4, 0x23, 0xA2 }, "Google", "Google, Inc." }, { { 0xB4, 0x24, 0xE7 }, "CodetekTechn", "Codetek Technology Co.,Ltd" }, { { 0xB4, 0x26, 0x5D }, "TaicangT&WEl", "Taicang T&W Electronics" }, + { { 0xB4, 0x28, 0x02 }, "Intel", "Intel Corporate" }, { { 0xB4, 0x28, 0x75 }, "FutechoSolut", "Futecho Solutions Private Limited" }, { { 0xB4, 0x28, 0xF1 }, "EPrime", "E-Prime Co., Ltd." }, { { 0xB4, 0x29, 0x3D }, "UrovoTechnol", "Shenzhen Urovo Technology Co.,Ltd." }, @@ -31947,7 +32294,7 @@ { { 0xB4, 0x2B, 0xB9 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB4, 0x2C, 0x92 }, "ZhejiangWeir", "Zhejiang Weirong Electronic Co., Ltd" }, { { 0xB4, 0x2C, 0xBE }, "DirectPaymen", "Direct Payment Solutions Limited" }, - { { 0xB4, 0x2D, 0x56 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xB4, 0x2D, 0x56 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xB4, 0x2E, 0x99 }, "GigaByteTech", "Giga-Byte Technology Co.,Ltd." }, { { 0xB4, 0x2E, 0xF8 }, "ElineTechnol", "Eline Technology co.Ltd" }, { { 0xB4, 0x2F, 0x03 }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, @@ -32044,6 +32391,7 @@ { { 0xB4, 0x6E, 0x08 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB4, 0x6E, 0x10 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0xB4, 0x6F, 0x2D }, "WahooFitness", "Wahoo Fitness" }, + { { 0xB4, 0x6F, 0x78 }, "AcctonTechno", "Accton Technology Corporation" }, { { 0xB4, 0x70, 0x64 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xB4, 0x72, 0xD4 }, "zte", "zte corporation" }, { { 0xB4, 0x73, 0x56 }, "TreebearNetw", "Hangzhou Treebear Networking Co., Ltd." }, @@ -32063,6 +32411,7 @@ { { 0xB4, 0x7C, 0x9C }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xB4, 0x7C, 0xA6 }, "zte", "zte corporation" }, { { 0xB4, 0x7D, 0x76 }, "KNSGroup", "KNS Group LLC" }, + { { 0xB4, 0x7E, 0x9F }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xB4, 0x7F, 0x5E }, "ForesightMan", "Foresight Manufacture (S) Pte Ltd" }, { { 0xB4, 0x81, 0x07 }, "ChuangweiRgb", "Shenzhen Chuangwei-Rgb Electronics Co.,Ltd" }, { { 0xB4, 0x81, 0xBF }, "MetaNetworks", "Meta-Networks, LLC" }, @@ -32110,12 +32459,13 @@ { { 0xB4, 0xA2, 0x5C }, "CambiumNetwo", "Cambium Networks Limited" }, { { 0xB4, 0xA3, 0x05 }, "XiamenYaxonN", "Xiamen Yaxon Network Co., Ltd." }, { { 0xB4, 0xA3, 0x82 }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, - { { 0xB4, 0xA3, 0xBD }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xB4, 0xA3, 0xBD }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xB4, 0xA4, 0xB5 }, "ZenEye", "Zen Eye Co.,Ltd" }, { { 0xB4, 0xA4, 0xE3 }, "Cisco", "Cisco Systems, Inc" }, { { 0xB4, 0xA5, 0xA9 }, "MODI", "MODI GmbH" }, { { 0xB4, 0xA5, 0xAC }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0xB4, 0xA5, 0xEF }, "Sercomm", "Sercomm Corporation." }, + { { 0xB4, 0xA6, 0x4A }, "Espressif", "Espressif Inc." }, { { 0xB4, 0xA6, 0x78 }, "ZhejiangTmal", "Zhejiang Tmall Technology Co., Ltd." }, { { 0xB4, 0xA7, 0xC6 }, "ServercomPri", "Servercom (India) Private Limited" }, { { 0xB4, 0xA8, 0x28 }, "ConcoxInform", "Shenzhen Concox Information Technology Co., Ltd" }, @@ -32176,7 +32526,7 @@ { { 0xB4, 0xC5, 0x56 }, "KenmyondIndu", "Shanghai Kenmyond Industrial Network Equipment Co., Ltd" }, { { 0xB4, 0xC6, 0x2E }, "MolexCMS", "Molex CMS" }, { { 0xB4, 0xC6, 0xF8 }, "AxilspotComm", "Axilspot Communication" }, - { { 0xB4, 0xC7, 0x99 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xB4, 0xC7, 0x99 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xB4, 0xC8, 0x10 }, "Umpi", "Umpi srl" }, { { 0xB4, 0xC9, 0xB9 }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, { { 0xB4, 0xCA, 0xDD }, "Cisco", "Cisco Systems, Inc" }, @@ -32189,10 +32539,12 @@ { { 0xB4, 0xCE, 0x40 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xB4, 0xCE, 0xF6 }, "HTC", "HTC Corporation" }, { { 0xB4, 0xCE, 0xFE }, "JamesCzekaj", "James Czekaj" }, + { { 0xB4, 0xCF, 0x49 }, "WNC", "WNC Corporation" }, { { 0xB4, 0xCF, 0xDB }, "JiuzhouElect", "Shenzhen Jiuzhou Electric Co.,LTD" }, { { 0xB4, 0xCF, 0xE0 }, "Sichuantiany", "Sichuan tianyi kanghe communications co., LTD" }, { { 0xB4, 0xD0, 0xA9 }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0xB4, 0xD1, 0x35 }, "Cloudistics", "Cloudistics" }, + { { 0xB4, 0xD1, 0xF6 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB4, 0xD2, 0x86 }, "Telechips", "Telechips, Inc." }, { { 0xB4, 0xD3, 0x1A }, "LysoraTechno", "Lysora Technology Inc." }, { { 0xB4, 0xD5, 0xBD }, "Intel", "Intel Corporate" }, @@ -32265,7 +32617,7 @@ { { 0xB4, 0xF9, 0x49 }, "optilinknetw", "optilink networks pvt ltd" }, { { 0xB4, 0xF9, 0x5D }, "JuniperNetwo", "Juniper Networks" }, { { 0xB4, 0xFA, 0x48 }, "Apple", "Apple, Inc." }, - { { 0xB4, 0xFB, 0xE3 }, "AltoBeam", "AltoBeam (China) Inc." }, + { { 0xB4, 0xFB, 0xE3 }, "AltoBeam", "AltoBeam Inc." }, { { 0xB4, 0xFB, 0xE4 }, "Ubiquiti", "Ubiquiti Inc" }, { { 0xB4, 0xFB, 0xF9 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB4, 0xFC, 0x75 }, "SEMAElectron", "SEMA Electronics(HK) CO.,LTD" }, @@ -32273,6 +32625,7 @@ { { 0xB4, 0xFE, 0x8C }, "CentroSicure", "Centro Sicurezza Italia SpA" }, { { 0xB4, 0xFF, 0x98 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB8, 0x00, 0x18 }, "Htel", "Htel" }, + { { 0xB8, 0x00, 0x5B }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xB8, 0x01, 0x1F }, "Apple", "Apple, Inc." }, { { 0xB8, 0x02, 0xA4 }, "Aeonsemi", "Aeonsemi, Inc." }, { { 0xB8, 0x03, 0x05 }, "Intel", "Intel Corporate" }, @@ -32288,6 +32641,7 @@ { { 0xB8, 0x0B, 0x9A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB8, 0x0B, 0x9D }, "ROPEXIndustr", "ROPEX Industrie-Elektronik GmbH" }, { { 0xB8, 0x0B, 0xDA }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, + { { 0xB8, 0x0C, 0x68 }, "HonorDevice", "Honor Device Co., Ltd." }, { { 0xB8, 0x0E, 0x1D }, "PAXComputerT", "PAX Computer Technology(Shenzhen) Ltd." }, { { 0xB8, 0x10, 0xD4 }, "Masimo", "Masimo Corporation" }, { { 0xB8, 0x11, 0x4B }, "Cisco", "Cisco Systems, Inc" }, @@ -32306,9 +32660,10 @@ { { 0xB8, 0x18, 0x6F }, "OrientalMoto", "Oriental Motor Co., Ltd." }, { { 0xB8, 0x19, 0x04 }, "NokiaShangha", "Nokia Shanghai Bell Co., Ltd." }, { { 0xB8, 0x19, 0x99 }, "Nesys", "Nesys" }, + { { 0xB8, 0x1B, 0xCB }, "SunmiTechnol", "Shanghai Sunmi Technology Co.,Ltd." }, { { 0xB8, 0x1D, 0x1F }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB8, 0x1D, 0xAA }, "LGElectronic", "LG Electronics (Mobile Communications)" }, - { { 0xB8, 0x1E, 0x0B }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xB8, 0x1E, 0x0B }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xB8, 0x1E, 0x61 }, "TellescomInd", "Tellescom Industria E Comercio Em Telecomunicacao" }, { { 0xB8, 0x1E, 0x9E }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xB8, 0x1E, 0xA4 }, "LiteonTechno", "Liteon Technology Corporation" }, @@ -32342,6 +32697,7 @@ { { 0xB8, 0x31, 0xB5 }, "Microsoft", "Microsoft Corporation" }, { { 0xB8, 0x32, 0x41 }, "TianyuInform", "Wuhan Tianyu Information Industry Co., Ltd." }, { { 0xB8, 0x32, 0x8F }, "eero", "eero inc." }, + { { 0xB8, 0x34, 0x46 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0xB8, 0x36, 0xD8 }, "Videoswitch", "Videoswitch" }, { { 0xB8, 0x37, 0x4A }, "Apple", "Apple, Inc." }, { { 0xB8, 0x37, 0x4B }, "HewlettPacka", "Hewlett Packard Enterprise" }, @@ -32382,7 +32738,7 @@ { { 0xB8, 0x4D, 0xEE }, "Hisensebroad", "Hisense broadband multimedia technology Co.,Ltd" }, { { 0xB8, 0x4F, 0xA7 }, "Apple", "Apple, Inc." }, { { 0xB8, 0x4F, 0xD5 }, "Microsoft", "Microsoft Corporation" }, - { { 0xB8, 0x50, 0x01 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xB8, 0x50, 0x01 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xB8, 0x50, 0xD8 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0xB8, 0x51, 0x1D }, "Telechips", "Telechips, Inc" }, { { 0xB8, 0x51, 0xA9 }, "Nokia", "Nokia" }, @@ -32453,7 +32809,7 @@ { { 0xB8, 0x7B, 0xD4 }, "Google", "Google, Inc." }, { { 0xB8, 0x7C, 0x6F }, "NXPManagemen", "NXP (China) Management Ltd." }, { { 0xB8, 0x7C, 0xD0 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, - { { 0xB8, 0x7C, 0xF2 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xB8, 0x7C, 0xF2 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xB8, 0x7E, 0x39 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0xB8, 0x7E, 0x40 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xB8, 0x7E, 0xE5 }, "Intelbras", "Intelbras" }, @@ -32461,6 +32817,7 @@ { { 0xB8, 0x80, 0x4F }, "TexasInstrum", "Texas Instruments" }, { { 0xB8, 0x81, 0x98 }, "Intel", "Intel Corporate" }, { { 0xB8, 0x81, 0xFA }, "Apple", "Apple, Inc." }, + { { 0xB8, 0x82, 0x68 }, "HopestarTech", "Shenzhen Hopestar Technology Co.,Ltd." }, { { 0xB8, 0x82, 0xF2 }, "WNC", "WNC Corporation" }, { { 0xB8, 0x83, 0x03 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0xB8, 0x84, 0x11 }, "Shokz", "Shenzhen Shokz Co., Ltd." }, @@ -32563,6 +32920,7 @@ { { 0xB8, 0xBA, 0x66 }, "Microsoft", "Microsoft Corporation" }, { { 0xB8, 0xBA, 0x68 }, "XianJizhongD", "Xi'an Jizhong Digital Communication Co.,Ltd" }, { { 0xB8, 0xBA, 0x72 }, "Cynove", "Cynove" }, + { { 0xB8, 0xBB, 0x11 }, "EspressifPte", "Espressif Systems (Singapore) Pte. Ltd" }, { { 0xB8, 0xBB, 0x23 }, "NufrontCSC", "Guangdong Nufront CSC Co., Ltd" }, { { 0xB8, 0xBB, 0x6D }, "ENERES", "ENERES Co.,Ltd." }, { { 0xB8, 0xBB, 0xAF }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -32606,6 +32964,7 @@ { { 0xB8, 0xD0, 0x8F }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, { { 0xB8, 0xD0, 0xF0 }, "Fcnt", "Fcnt Llc" }, { { 0xB8, 0xD3, 0x09 }, "CoxCommunica", "Cox Communications, Inc" }, + { { 0xB8, 0xD3, 0xEF }, "UnisemBerhad", "Unisem (M) Berhad" }, { { 0xB8, 0xD4, 0x3E }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0xB8, 0xD4, 0x9D }, "MSevenSystem", "M Seven System Ltd." }, { { 0xB8, 0xD4, 0xBC }, "zte", "zte corporation" }, @@ -32628,7 +32987,7 @@ { { 0xB8, 0xDA, 0xF7 }, "AdvancedPhot", "Advanced Photonics, Inc." }, { { 0xB8, 0xDB, 0x1C }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, { { 0xB8, 0xDB, 0x38 }, "Google", "Google, Inc." }, - { { 0xB8, 0xDC, 0x28 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xB8, 0xDC, 0x28 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xB8, 0xDC, 0x7D }, "VusionGroup", "VusionGroup" }, { { 0xB8, 0xDC, 0x87 }, "IAI", "IAI Corporation" }, { { 0xB8, 0xDD, 0x71 }, "zte", "zte corporation" }, @@ -32683,6 +33042,7 @@ { { 0xB8, 0xFC, 0x9A }, "LeShiZhiXinE", "Le Shi Zhi Xin Electronic Technology (Tianjin) Limited" }, { { 0xB8, 0xFD, 0x32 }, "ZhejiangROIC", "Zhejiang ROICX Microelectronics" }, { { 0xB8, 0xFE, 0x90 }, "Cisco", "Cisco Systems, Inc" }, + { { 0xB8, 0xFE, 0x96 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xB8, 0xFF, 0x61 }, "Apple", "Apple, Inc." }, { { 0xB8, 0xFF, 0x6F }, "TyprotechTec", "Shanghai Typrotech Technology Co.Ltd" }, { { 0xB8, 0xFF, 0xB3 }, "MitraStarTec", "MitraStar Technology Corp." }, @@ -32733,6 +33093,7 @@ { { 0xBC, 0x12, 0x5E }, "WisVideo", "Beijing WisVideo INC." }, { { 0xBC, 0x13, 0xA8 }, "YOUHUATechno", "Shenzhen YOUHUA Technology Co., Ltd" }, { { 0xBC, 0x14, 0x01 }, "HitronTechno", "Hitron Technologies. Inc" }, + { { 0xBC, 0x14, 0x69 }, "PhyplusTechn", "Phyplus Technology (Shanghai) Co., Ltd" }, { { 0xBC, 0x14, 0x85 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xBC, 0x14, 0xEF }, "ITONTechnolo", "ITON Technology Limited" }, { { 0xBC, 0x15, 0x41 }, "Nokia", "Nokia" }, @@ -32757,6 +33118,7 @@ { { 0xBC, 0x22, 0xFB }, "RFIndustries", "RF Industries" }, { { 0xBC, 0x23, 0x92 }, "BYDPrecision", "BYD Precision Manufacture Company Ltd." }, { { 0xBC, 0x24, 0x11 }, "ProxmoxServe", "Proxmox Server Solutions GmbH" }, + { { 0xBC, 0x24, 0x92 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0xBC, 0x25, 0xE0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xBC, 0x25, 0xF0 }, "3DDisplayTec", "3D Display Technologies Co., Ltd." }, { { 0xBC, 0x26, 0x1D }, "HongKongTeco", "Hong Kong Tecon Technology" }, @@ -32791,8 +33153,9 @@ { { 0xBC, 0x33, 0x29 }, "SonyInteract", "Sony Interactive Entertainment Inc." }, { { 0xBC, 0x33, 0x40 }, "CiscoMeraki", "Cisco Meraki" }, { { 0xBC, 0x33, 0xAC }, "SiliconLabor", "Silicon Laboratories" }, + { { 0xBC, 0x33, 0xDB }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xBC, 0x34, 0xCA }, "Inovance", "Inovance" }, - { { 0xBC, 0x34, 0xD6 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xBC, 0x34, 0xD6 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xBC, 0x35, 0x1E }, "TuyaSmart", "Tuya Smart Inc." }, { { 0xBC, 0x35, 0xE5 }, "Hydro", "Hydro Systems Company" }, { { 0xBC, 0x37, 0xD3 }, "Apple", "Apple, Inc." }, @@ -33036,6 +33399,7 @@ { { 0xBC, 0xC7, 0x46 }, "HonHaiPrecis", "Hon Hai Precision IND.CO.,LTD" }, { { 0xBC, 0xC7, 0xDA }, "EardaTechnol", "Earda Technologies co Ltd" }, { { 0xBC, 0xC8, 0x10 }, "CiscoSPVTG", "Cisco SPVTG" }, + { { 0xBC, 0xC8, 0xCC }, "SeikoEpson", "Seiko Epson Corporation" }, { { 0xBC, 0xCA, 0xB5 }, "Commscope", "Commscope" }, { { 0xBC, 0xCD, 0x45 }, "Voismart", "Voismart" }, { { 0xBC, 0xCD, 0x7F }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -33092,7 +33456,7 @@ { { 0xBC, 0xF2, 0x92 }, "Plantronics", "Plantronics, Inc." }, { { 0xBC, 0xF2, 0xAF }, "devolo", "devolo AG" }, { { 0xBC, 0xF2, 0xE5 }, "PowerfulDevi", "Powerful Devices" }, - { { 0xBC, 0xF3, 0x10 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xBC, 0xF3, 0x10 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xBC, 0xF4, 0x5F }, "zte", "zte corporation" }, { { 0xBC, 0xF4, 0x99 }, "RockwellAuto", "Rockwell Automation" }, { { 0xBC, 0xF4, 0xD4 }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, @@ -33123,6 +33487,7 @@ { { 0xC0, 0x06, 0xC3 }, "TPLink", "TP-Link Systems Inc" }, { { 0xC0, 0x07, 0x4A }, "Brita", "Brita GmbH" }, { { 0xC0, 0x09, 0x25 }, "FNLINKTECHNO", "FN-LINK TECHNOLOGY Ltd." }, + { { 0xC0, 0x0A, 0xCA }, "SafeSquare", "SafeSquare GmbH" }, { { 0xC0, 0x0D, 0x7E }, "Additech", "Additech, Inc." }, { { 0xC0, 0x10, 0xB1 }, "HMDGlobal", "HMD Global Oy" }, { { 0xC0, 0x11, 0x73 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, @@ -33203,6 +33568,7 @@ { { 0xC0, 0x3D, 0xD9 }, "MitraStarTec", "MitraStar Technology Corp." }, { { 0xC0, 0x3E, 0x0F }, "SkyUk", "Sky Uk Limited" }, { { 0xC0, 0x3E, 0x50 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0xC0, 0x3E, 0x75 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC0, 0x3E, 0xBA }, "Dell", "Dell Inc." }, { { 0xC0, 0x3F, 0x0E }, "Netgear", "Netgear" }, { { 0xC0, 0x3F, 0x2A }, "Biscotti", "Biscotti, Inc." }, @@ -33235,6 +33601,7 @@ { { 0xC0, 0x4E, 0x30 }, "Espressif", "Espressif Inc." }, { { 0xC0, 0x4E, 0x8A }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC0, 0x50, 0x64 }, "ShennanCircu", "Shennan Circuits Co.,Ltd" }, + { { 0xC0, 0x50, 0x97 }, "EG4Electroni", "EG4 Electronics" }, { { 0xC0, 0x51, 0x5C }, "zte", "zte corporation" }, { { 0xC0, 0x51, 0x7E }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, { { 0xC0, 0x51, 0xF3 }, "CigShanghai", "Cig Shanghai Co Ltd" }, @@ -33246,6 +33613,7 @@ { { 0xC0, 0x56, 0xE3 }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, { { 0xC0, 0x57, 0x24 }, "HonorDevice", "Honor Device Co., Ltd." }, { { 0xC0, 0x57, 0xBC }, "Avaya", "Avaya Inc" }, + { { 0xC0, 0x58, 0x2E }, "Cisco", "Cisco Systems, Inc" }, { { 0xC0, 0x58, 0xA7 }, "Pico", "Pico Systems Co., Ltd." }, { { 0xC0, 0x5B, 0x44 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0xC0, 0x5B, 0xBD }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -33256,6 +33624,7 @@ { { 0xC0, 0x5F, 0x87 }, "LegrandINTEL", "Legrand INTELLIGENT ELECTRICAL(HUIZHOU)CO.,LTD." }, { { 0xC0, 0x61, 0x18 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0xC0, 0x61, 0x3D }, "BioIntelliSe", "BioIntelliSense, Inc." }, + { { 0xC0, 0x61, 0x94 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xC0, 0x62, 0x6B }, "Cisco", "Cisco Systems, Inc" }, { { 0xC0, 0x62, 0xF2 }, "Cotytech", "Beijing Cotytech Co.,LTD" }, { { 0xC0, 0x63, 0x69 }, "BinxinTechno", "Binxin Technology(Zhejiang) Ltd." }, @@ -33408,11 +33777,13 @@ { { 0xC0, 0xC5, 0x69 }, "LynucCncTech", "Shanghai Lynuc Cnc Technology Co.,Ltd" }, { { 0xC0, 0xC6, 0x87 }, "CiscoSPVTG", "Cisco SPVTG" }, { { 0xC0, 0xC7, 0x0A }, "RuckusWirele", "Ruckus Wireless" }, + { { 0xC0, 0xC7, 0xB5 }, "Infinixmobil", "Infinix mobility limited" }, { { 0xC0, 0xC7, 0xDB }, "Apple", "Apple, Inc." }, { { 0xC0, 0xC9, 0x46 }, "MitsuyaLabor", "Mitsuya Laboratories Inc." }, { { 0xC0, 0xC9, 0x76 }, "TINNOMobileT", "Shenzhen TINNO Mobile Technology Corp." }, { { 0xC0, 0xC9, 0x89 }, "EdgecoreAmer", "Edgecore Americas Networking Corporation" }, { { 0xC0, 0xC9, 0xE3 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, + { { 0xC0, 0xCA, 0xA2 }, "Essys", "Essys" }, { { 0xC0, 0xCB, 0x38 }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, { { 0xC0, 0xCB, 0xF1 }, "MobiwireMobi", "Mobiwire Mobiles (NingBo) Co., LTD" }, { { 0xC0, 0xCC, 0x42 }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, @@ -33486,6 +33857,7 @@ { { 0xC0, 0xF9, 0xB0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC0, 0xF9, 0xD2 }, "arkonatechno", "arkona technologies GmbH" }, { { 0xC0, 0xFB, 0xC1 }, "ItelMobile", "Itel Mobile Limited" }, + { { 0xC0, 0xFD, 0x6F }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xC0, 0xFD, 0x84 }, "zte", "zte corporation" }, { { 0xC0, 0xFF, 0xA8 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC0, 0xFF, 0xD4 }, "Netgear", "Netgear" }, @@ -33520,13 +33892,14 @@ { { 0xC4, 0x0F, 0x08 }, "Intel", "Intel Corporate" }, { { 0xC4, 0x0F, 0x09 }, "Hermeselectr", "Hermes electronic GmbH" }, { { 0xC4, 0x0F, 0xA6 }, "SernetTechno", "Sernet (Suzhou) Technologies Corporation" }, + { { 0xC4, 0x10, 0x62 }, "CornetTechno", "Cornet Technology India Pvt Ltd" }, { { 0xC4, 0x10, 0x8A }, "RuckusWirele", "Ruckus Wireless" }, { { 0xC4, 0x11, 0xE0 }, "BullGroup", "Bull Group Co., Ltd" }, { { 0xC4, 0x12, 0x34 }, "Apple", "Apple, Inc." }, { { 0xC4, 0x12, 0xEC }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC4, 0x12, 0xF5 }, "DLinkInterna", "D-Link International" }, { { 0xC4, 0x13, 0x75 }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, - { { 0xC4, 0x13, 0xE2 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xC4, 0x13, 0xE2 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xC4, 0x14, 0x11 }, "Apple", "Apple, Inc." }, { { 0xC4, 0x14, 0x3C }, "Cisco", "Cisco Systems, Inc" }, { { 0xC4, 0x14, 0xA2 }, "CiscoMeraki", "Cisco Meraki" }, @@ -33585,6 +33958,7 @@ { { 0xC4, 0x39, 0x60 }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, { { 0xC4, 0x3A, 0x35 }, "FnLinkTechno", "Fn-Link Technology Limited" }, { { 0xC4, 0x3A, 0x9F }, "Siconix", "Siconix Inc." }, + { { 0xC4, 0x3A, 0xA5 }, "AzureWaveTec", "AzureWave Technology Inc." }, { { 0xC4, 0x3A, 0xBE }, "Sony", "Sony Corporation" }, { { 0xC4, 0x3C, 0x3C }, "Cybelec", "Cybelec Sa" }, { { 0xC4, 0x3C, 0xB0 }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, @@ -33670,6 +34044,7 @@ { { 0xC4, 0x67, 0xD1 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC4, 0x68, 0xD0 }, "VTechTelecom", "VTech Telecommunications Ltd." }, { { 0xC4, 0x69, 0x3E }, "TurbulenceDe", "Turbulence Design Inc." }, + { { 0xC4, 0x69, 0x40 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xC4, 0x69, 0xF0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC4, 0x6A, 0xB7 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xC4, 0x6B, 0xB4 }, "myIDkey", "myIDkey" }, @@ -33699,6 +34074,7 @@ { { 0xC4, 0x79, 0x05 }, "ZhejiangUniv", "Zhejiang Uniview Technologies Co.,Ltd." }, { { 0xC4, 0x79, 0x81 }, "Ehya", "Ehya LTD" }, { { 0xC4, 0x79, 0x9F }, "HaiguangSmar", "Haiguang Smart Device Co.,Ltd." }, + { { 0xC4, 0x7A, 0x5D }, "Panmnesia", "Panmnesia Inc." }, { { 0xC4, 0x7B, 0x2F }, "JoinHopeImag", "Beijing JoinHope Image Technology Ltd." }, { { 0xC4, 0x7B, 0x80 }, "Protempis", "Protempis, LLC" }, { { 0xC4, 0x7B, 0xA3 }, "NAVIS", "NAVIS Inc." }, @@ -33757,6 +34133,7 @@ { { 0xC4, 0x9D, 0x08 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xC4, 0x9D, 0xED }, "Microsoft", "Microsoft Corporation" }, { { 0xC4, 0x9E, 0x41 }, "G24Power", "G24 Power Limited" }, + { { 0xC4, 0x9E, 0x7E }, "Espressif", "Espressif Inc." }, { { 0xC4, 0x9F, 0x4C }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC4, 0x9F, 0xF3 }, "MciaoTechnol", "Mciao Technologies, Inc." }, { { 0xC4, 0xA0, 0x52 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, @@ -33770,6 +34147,7 @@ { { 0xC4, 0xA8, 0x16 }, "eero", "eero inc." }, { { 0xC4, 0xA8, 0x1D }, "DLinkInterna", "D-Link International" }, { { 0xC4, 0xA9, 0xB8 }, "XiamenshiCCh", "Xiamenshi C-Chip Technology Co.,Ltd" }, + { { 0xC4, 0xAA, 0x43 }, "Cisco", "Cisco Systems, Inc" }, { { 0xC4, 0xAA, 0x99 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC4, 0xAA, 0xA1 }, "SUMMITDEVELO", "SUMMIT DEVELOPMENT, spol.s r.o." }, { { 0xC4, 0xAA, 0xC4 }, "ZhejiangDahu", "Zhejiang Dahua Technology Co., Ltd." }, @@ -33797,6 +34175,7 @@ { { 0xC4, 0xBA, 0xA3 }, "WinicssecTec", "Beijing Winicssec Technologies Co., Ltd." }, { { 0xC4, 0xBB, 0x03 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xC4, 0xBB, 0x4C }, "ZebraInforma", "Zebra Information Tech Co. Ltd" }, + { { 0xC4, 0xBB, 0x89 }, "HighFlyingEl", "Shanghai High-Flying Electronics Technology Co.,Ltd" }, { { 0xC4, 0xBB, 0xEA }, "PakedgeDevic", "Pakedge Device and Software Inc" }, { { 0xC4, 0xBC, 0xD7 }, "NewRyatek", "New Ryatek" }, { { 0xC4, 0xBD, 0x6A }, "SKF", "SKF GmbH" }, @@ -33805,6 +34184,7 @@ { { 0xC4, 0xBE, 0x84 }, "TexasInstrum", "Texas Instruments" }, { { 0xC4, 0xBE, 0xD4 }, "Avaya", "Avaya Inc" }, { { 0xC4, 0xBF, 0x60 }, "TecnoMobile", "Tecno Mobile Limited" }, + { { 0xC4, 0xC0, 0x0A }, "Microsoft", "Microsoft Corporation" }, { { 0xC4, 0xC0, 0x63 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0xC4, 0xC0, 0xAE }, "MidoriElectr", "Midori Electronic Co., Ltd." }, { { 0xC4, 0xC1, 0x38 }, "OWLinkTechno", "OWLink Technology Inc" }, @@ -33820,6 +34200,7 @@ { { 0xC4, 0xCA, 0x2B }, "AristaNetwor", "Arista Networks" }, { { 0xC4, 0xCA, 0x67 }, "ChongqingZQZ", "Chongqing ZQZER Technology Co., LTD" }, { { 0xC4, 0xCA, 0xD9 }, "H3CTechnolog", "Hangzhou H3C Technologies Co., Limited" }, + { { 0xC4, 0xCB, 0x33 }, "GarminIntern", "Garmin International" }, { { 0xC4, 0xCB, 0x54 }, "FibocomAuto", "Fibocom Auto Inc." }, { { 0xC4, 0xCB, 0x6B }, "AiristaFlow", "Airista Flow, Inc." }, { { 0xC4, 0xCB, 0x76 }, "Microsoft", "Microsoft Corporation" }, @@ -34031,7 +34412,7 @@ { { 0xC8, 0x50, 0xE9 }, "RaisecomTech", "Raisecom Technology CO., LTD" }, { { 0xC8, 0x51, 0x42 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xC8, 0x51, 0x95 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0xC8, 0x51, 0xFB }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xC8, 0x51, 0xFB }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xC8, 0x52, 0x61 }, "Commscope", "Commscope" }, { { 0xC8, 0x53, 0x09 }, "LCFCElectron", "LCFC(Hefei) Electronics Technology co., ltd" }, { { 0xC8, 0x53, 0xE1 }, "DouyinVision", "Douyin Vision Co., Ltd" }, @@ -34059,8 +34440,8 @@ { { 0xC8, 0x64, 0xC7 }, "zte", "zte corporation" }, { { 0xC8, 0x66, 0x2C }, "HaitaiFangyu", "Beijing Haitai Fangyuan High Technology Co,.Ltd." }, { { 0xC8, 0x66, 0x4B }, "AperionTechn", "Aperion Technologies LLC" }, - { { 0xC8, 0x66, 0x5D }, "ExtremeNetwo", "Extreme Networks Headquarters" }, - { { 0xC8, 0x67, 0x5E }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xC8, 0x66, 0x5D }, "ExtremeNetwo", "Extreme Networks, Inc." }, + { { 0xC8, 0x67, 0x5E }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xC8, 0x68, 0xDE }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xC8, 0x69, 0xCD }, "Apple", "Apple, Inc." }, { { 0xC8, 0x6C, 0x1E }, "Display", "Display Systems Ltd" }, @@ -34112,6 +34493,7 @@ { { 0xC8, 0x87, 0x22 }, "Lumenpulse", "Lumenpulse" }, { { 0xC8, 0x87, 0x3B }, "NetOptics", "Net Optics" }, { { 0xC8, 0x89, 0xF3 }, "Apple", "Apple, Inc." }, + { { 0xC8, 0x8A, 0x7B }, "Espressif", "Espressif Inc." }, { { 0xC8, 0x8A, 0x83 }, "DongguanHuaH", "Dongguan HuaHong Electronics Co.,Ltd" }, { { 0xC8, 0x8A, 0x9A }, "Intel", "Intel Corporate" }, { { 0xC8, 0x8A, 0xD8 }, "ChinaDragonT", "China Dragon Technology Limited" }, @@ -34198,6 +34580,7 @@ { { 0xC8, 0xBA, 0x94 }, "SamsungElect", "Samsung Electro-Mechanics(Thailand)" }, { { 0xC8, 0xBA, 0xE9 }, "Qdis", "Qdis" }, { { 0xC8, 0xBB, 0x81 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, + { { 0xC8, 0xBB, 0xB4 }, "GsdVietNamTe", "Gsd Viet Nam Technology Company Limited" }, { { 0xC8, 0xBB, 0xD3 }, "Embrane", "Embrane" }, { { 0xC8, 0xBC, 0x9C }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xC8, 0xBC, 0xC8 }, "Apple", "Apple, Inc." }, @@ -34205,7 +34588,7 @@ { { 0xC8, 0xBD, 0x4D }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xC8, 0xBD, 0x69 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xC8, 0xBE, 0x19 }, "DLinkInterna", "D-Link International" }, - { { 0xC8, 0xBE, 0x35 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xC8, 0xBE, 0x35 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xC8, 0xBF, 0x4C }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0xC8, 0xBF, 0xFE }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xC8, 0xC1, 0x26 }, "ZPMIndustria", "ZPM Industria e Comercio Ltda" }, @@ -34222,6 +34605,7 @@ { { 0xC8, 0xC7, 0x91 }, "Zero1tv", "Zero1.tv GmbH" }, { { 0xC8, 0xC8, 0x3F }, "TexasInstrum", "Texas Instruments" }, { { 0xC8, 0xC8, 0x73 }, "Chipsen", "Chipsen Inc." }, + { { 0xC8, 0xC9, 0x92 }, "RoborockTech", "Beijing Roborock Technology Co., Ltd." }, { { 0xC8, 0xC9, 0xA3 }, "Espressif", "Espressif Inc." }, { { 0xC8, 0xCA, 0x63 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xC8, 0xCA, 0x79 }, "Ciena", "Ciena Corporation" }, @@ -34254,6 +34638,7 @@ { { 0xC8, 0xD9, 0x59 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0xC8, 0xD9, 0x95 }, "JuniperNetwo", "Juniper Networks" }, { { 0xC8, 0xD9, 0xD2 }, "HewlettPacka", "Hewlett Packard" }, + { { 0xC8, 0xDA, 0x29 }, "EspressifPte", "Espressif Systems (Singapore) Pte. Ltd" }, { { 0xC8, 0xDB, 0x26 }, "Logitech", "Logitech" }, { { 0xC8, 0xDD, 0x6A }, "Ohsung", "Ohsung" }, { { 0xC8, 0xDD, 0xC9 }, "LenovoMobile", "Lenovo Mobile Communication Technology Ltd." }, @@ -34277,6 +34662,7 @@ { { 0xC8, 0xE7, 0x76 }, "PTCOMTechnol", "PTCOM Technology" }, { { 0xC8, 0xE7, 0xD8 }, "MercuryCommu", "Mercury Communication Technologies Co.,Ltd." }, { { 0xC8, 0xE7, 0xF0 }, "JuniperNetwo", "Juniper Networks" }, + { { 0xC8, 0xE8, 0xAF }, "eero", "eero inc." }, { { 0xC8, 0xEA, 0xF8 }, "zte", "zte corporation" }, { { 0xC8, 0xEB, 0xEC }, "YOUHUATechno", "Shenzhen YOUHUA Technology Co., Ltd" }, { { 0xC8, 0xED, 0xFC }, "IdeaformIndu", "Shenzhen Ideaform Industrial Product Design Co., Ltd" }, @@ -34369,6 +34755,7 @@ { { 0xCC, 0x15, 0x31 }, "Intel", "Intel Corporate" }, { { 0xCC, 0x16, 0x7E }, "Cisco", "Cisco Systems, Inc" }, { { 0xCC, 0x18, 0x7B }, "Manzanita", "Manzanita Systems, Inc." }, + { { 0xCC, 0x19, 0x66 }, "EMMicroelect", "EM Microelectronic" }, { { 0xCC, 0x19, 0xA8 }, "PTInovaçãoeS", "PT Inovação e Sistemas SA" }, { { 0xCC, 0x1A, 0xA3 }, "AristaNetwor", "Arista Networks" }, { { 0xCC, 0x1A, 0xFA }, "zte", "zte corporation" }, @@ -34382,6 +34769,7 @@ { { 0xCC, 0x20, 0xAC }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xCC, 0x20, 0xE8 }, "Apple", "Apple, Inc." }, { { 0xCC, 0x21, 0x19 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0xCC, 0x21, 0x9D }, "Wangliantong", "Shenzhen Wangliantong Intelligent Technology Co.,Lte" }, { { 0xCC, 0x22, 0x18 }, "InnoDigital", "InnoDigital Co., Ltd." }, { { 0xCC, 0x22, 0x93 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xCC, 0x22, 0xDF }, "EMMicroelect", "EM Microelectronic" }, @@ -34421,6 +34809,7 @@ { { 0xCC, 0x36, 0xCF }, "Cisco", "Cisco Systems, Inc" }, { { 0xCC, 0x37, 0xAB }, "EdgecoreNetw", "Edgecore Networks Corporation" }, { { 0xCC, 0x38, 0xD0 }, "PaloAltoNetw", "Palo Alto Networks" }, + { { 0xCC, 0x38, 0xE1 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xCC, 0x39, 0x8C }, "Shiningtek", "Shiningtek" }, { { 0xCC, 0x3A, 0x61 }, "SamsungElect", "Samsung Electro Mechanics Co., Ltd." }, { { 0xCC, 0x3A, 0xDF }, "NeptuneTechn", "Neptune Technology Group Inc." }, @@ -34505,6 +34894,7 @@ { { 0xCC, 0x66, 0xB2 }, "Nokia", "Nokia" }, { { 0xCC, 0x67, 0xD8 }, "TelinSemicon", "Telin Semiconductor (Wuhan) Co.,Ltd" }, { { 0xCC, 0x68, 0xB6 }, "TPLink", "TP-Link Systems Inc" }, + { { 0xCC, 0x68, 0xC7 }, "Espressif", "Espressif Inc." }, { { 0xCC, 0x68, 0xE0 }, "Apple", "Apple, Inc." }, { { 0xCC, 0x69, 0xB0 }, "GlobalTraffi", "Global Traffic Technologies, LLC" }, { { 0xCC, 0x69, 0xFA }, "Apple", "Apple, Inc." }, @@ -34534,6 +34924,7 @@ { { 0xCC, 0x78, 0x5F }, "Apple", "Apple, Inc." }, { { 0xCC, 0x78, 0xAB }, "TexasInstrum", "Texas Instruments" }, { { 0xCC, 0x79, 0x4A }, "BLUProducts", "BLU Products Inc." }, + { { 0xCC, 0x79, 0xB8 }, "LunarEnergy", "Lunar Energy" }, { { 0xCC, 0x79, 0xCF }, "RfLinkTechno", "Shenzhen Rf-Link Technology Co.,Ltd." }, { { 0xCC, 0x79, 0xD7 }, "Cisco", "Cisco Systems, Inc" }, { { 0xCC, 0x7A, 0x30 }, "CMAXWireless", "CMAX Wireless Co., Ltd." }, @@ -34544,6 +34935,7 @@ { { 0xCC, 0x7D, 0x37 }, "Commscope", "Commscope" }, { { 0xCC, 0x7D, 0x5B }, "TelinkSemico", "Telink Semiconductor (Shanghai) Co., Ltd." }, { { 0xCC, 0x7E, 0x0F }, "Theben", "Theben AG" }, + { { 0xCC, 0x7E, 0x1F }, "Espressif", "Espressif Inc." }, { { 0xCC, 0x7E, 0xE7 }, "PanasonicAVC", "Panasonic Corporation AVC Networks Company" }, { { 0xCC, 0x7F, 0x75 }, "Cisco", "Cisco Systems, Inc" }, { { 0xCC, 0x7F, 0x76 }, "Cisco", "Cisco Systems, Inc" }, @@ -34575,6 +34967,7 @@ { { 0xCC, 0x90, 0x96 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xCC, 0x90, 0xE8 }, "YOUHUATechno", "Shenzhen YOUHUA Technology Co., Ltd" }, { { 0xCC, 0x91, 0x2B }, "TEConnectivi", "TE Connectivity Touch Solutions" }, + { { 0xCC, 0x91, 0x5B }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xCC, 0x93, 0x4A }, "SierraWirele", "Sierra Wireless, ULC" }, { { 0xCC, 0x94, 0x4A }, "PfeifferVacu", "Pfeiffer Vacuum GmbH" }, { { 0xCC, 0x94, 0x70 }, "KinestralTec", "Kinestral Technologies, Inc." }, @@ -34585,6 +34978,7 @@ { { 0xCC, 0x96, 0xE5 }, "Dell", "Dell Inc." }, { { 0xCC, 0x98, 0x8B }, "SONYVisualPr", "SONY Visual Products Inc." }, { { 0xCC, 0x98, 0x91 }, "Cisco", "Cisco Systems, Inc" }, + { { 0xCC, 0x98, 0xEF }, "OppoMobileTe", "Guangdong Oppo Mobile Telecommunications Corp.,Ltd" }, { { 0xCC, 0x99, 0x16 }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, { { 0xCC, 0x9C, 0x3E }, "CiscoMeraki", "Cisco Meraki" }, { { 0xCC, 0x9D, 0xA2 }, "EltexEnterpr", "Eltex Enterprise Ltd." }, @@ -34608,6 +35002,7 @@ { { 0xCC, 0xA4, 0xAF }, "SowellTechno", "Shenzhen Sowell Technology Co., LTD" }, { { 0xCC, 0xA6, 0x14 }, "AifaTechnolo", "Aifa Technology Corp." }, { { 0xCC, 0xA7, 0xC1 }, "Google", "Google, Inc." }, + { { 0xCC, 0xAA, 0x00 }, "Microsoft", "Microsoft Corporation" }, { { 0xCC, 0xAB, 0x2C }, "HUMAX", "HUMAX Co., Ltd." }, { { 0xCC, 0xAC, 0xFE }, "TelinkSemico", "Telink Semiconductor (Shanghai) Co., Ltd." }, { { 0xCC, 0xAF, 0x78 }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, @@ -34648,6 +35043,7 @@ { { 0xCC, 0xBF, 0x0C }, "FendaTechnol", "Shenzhen Fenda Technology Co., Ltd" }, { { 0xCC, 0xC0, 0x79 }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0xCC, 0xC1, 0x04 }, "AppliedTechn", "Applied Technical Systems" }, + { { 0xCC, 0xC2, 0x53 }, "zte", "zte corporation" }, { { 0xCC, 0xC2, 0xE0 }, "RaisecomTech", "Raisecom Technology CO., LTD" }, { { 0xCC, 0xC3, 0xEA }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0xCC, 0xC4, 0xB2 }, "TrolinkTechn", "Shenzhen Trolink Technology Co.,LTD" }, @@ -34759,6 +35155,7 @@ { { 0xD0, 0x05, 0x2A }, "Arcadyan", "Arcadyan Corporation" }, { { 0xD0, 0x05, 0xE4 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xD0, 0x06, 0x6A }, "CornelisNetw", "Cornelis Networks, Inc." }, + { { 0xD0, 0x06, 0x74 }, "SiemensIndus", "Siemens Industrial Automation Products Ltd., Chengdu" }, { { 0xD0, 0x07, 0x90 }, "TexasInstrum", "Texas Instruments" }, { { 0xD0, 0x07, 0xCA }, "JuniperNetwo", "Juniper Networks" }, { { 0xD0, 0x09, 0xC8 }, "Cisco", "Cisco Systems, Inc" }, @@ -34814,6 +35211,7 @@ { { 0xD0, 0x31, 0x10 }, "IngenicSemic", "Ingenic Semiconductor Co.,Ltd" }, { { 0xD0, 0x31, 0x69 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xD0, 0x32, 0xC3 }, "DLink", "D-Link Corporation" }, + { { 0xD0, 0x32, 0xE7 }, "TuyaSmart", "Tuya Smart Inc." }, { { 0xD0, 0x33, 0x11 }, "Apple", "Apple, Inc." }, { { 0xD0, 0x35, 0xE5 }, "EMMicroelect", "EM Microelectronic" }, { { 0xD0, 0x37, 0x42 }, "YulongComput", "Yulong Computer Telecommunication Scientific (Shenzhen) Co.,Ltd" }, @@ -34864,6 +35262,7 @@ { { 0xD0, 0x54, 0x2D }, "CambridgeInd", "Cambridge Industries(Group) Co.,Ltd." }, { { 0xD0, 0x54, 0x75 }, "SAVIControls", "SAVI Controls" }, { { 0xD0, 0x55, 0x09 }, "Nintendo", "Nintendo Co.,Ltd" }, + { { 0xD0, 0x55, 0x33 }, "PaloAltoNetw", "Palo Alto Networks" }, { { 0xD0, 0x55, 0xB2 }, "IntegratedDe", "Integrated Device Technology (Malaysia) Sdn. Bhd." }, { { 0xD0, 0x56, 0xBF }, "Amosense", "Amosense" }, { { 0xD0, 0x56, 0xF2 }, "Buffalo", "Buffalo.Inc" }, @@ -34936,6 +35335,7 @@ { { 0xD0, 0x77, 0xCE }, "EdgecoreNetw", "Edgecore Networks Corporation" }, { { 0xD0, 0x78, 0x80 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, { { 0xD0, 0x78, 0x9A }, "VantivaConne", "Vantiva - Connected Home" }, + { { 0xD0, 0x79, 0x2F }, "NewH3CIntell", "New H3C Intelligence Terminal Co., Ltd." }, { { 0xD0, 0x7A, 0xB5 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xD0, 0x7B, 0x6F }, "ZhuhaiYunmai", "Zhuhai Yunmai Technology Co.,Ltd" }, { { 0xD0, 0x7C, 0x2D }, "LeieIOTtechn", "Leie IOT technology Co., Ltd" }, @@ -34949,6 +35349,7 @@ { { 0xD0, 0x7F, 0xC4 }, "OuWeiTechnol", "Ou Wei Technology Co.，Ltd. of Shenzhen City" }, { { 0xD0, 0x81, 0x7A }, "Apple", "Apple, Inc." }, { { 0xD0, 0x81, 0xC5 }, "JuniperNetwo", "Juniper Networks" }, + { { 0xD0, 0x82, 0xE8 }, "TuyaSmart", "Tuya Smart Inc." }, { { 0xD0, 0x82, 0xEB }, "TuyaSmart", "Tuya Smart Inc." }, { { 0xD0, 0x83, 0xD4 }, "XtelWireless", "Xtel Wireless ApS" }, { { 0xD0, 0x84, 0x5D }, "B&CTransit", "B&C Transit, Inc." }, @@ -34967,6 +35368,7 @@ { { 0xD0, 0x8E, 0x79 }, "Dell", "Dell Inc." }, { { 0xD0, 0x91, 0x68 }, "ChuangweiRgb", "Shenzhen Chuangwei-Rgb Electronics Co.,Ltd" }, { { 0xD0, 0x92, 0x00 }, "FiRaConsorti", "FiRa Consortium" }, + { { 0xD0, 0x92, 0x82 }, "Apple", "Apple, Inc." }, { { 0xD0, 0x92, 0x88 }, "Powertek", "Powertek Limited" }, { { 0xD0, 0x92, 0x9E }, "Microsoft", "Microsoft Corporation" }, { { 0xD0, 0x92, 0xFA }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, @@ -34981,6 +35383,7 @@ { { 0xD0, 0x98, 0x9C }, "ConMet", "ConMet" }, { { 0xD0, 0x98, 0xB1 }, "GScoolinkMic", "GScoolink Microelectronics (Beijing) Co.,LTD" }, { { 0xD0, 0x99, 0xD5 }, "AlcatelLucen", "Alcatel-Lucent" }, + { { 0xD0, 0x9A, 0xAF }, "EspressifPte", "Espressif Systems (Singapore) Pte. Ltd" }, { { 0xD0, 0x9B, 0x05 }, "Emtronix", "Emtronix" }, { { 0xD0, 0x9C, 0x30 }, "FosterElectr", "Foster Electric Company, Limited" }, { { 0xD0, 0x9C, 0x7A }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, @@ -34994,6 +35397,7 @@ { { 0xD0, 0xA4, 0xB1 }, "Sonifex", "Sonifex Ltd." }, { { 0xD0, 0xA5, 0xA6 }, "Cisco", "Cisco Systems, Inc" }, { { 0xD0, 0xA6, 0x37 }, "Apple", "Apple, Inc." }, + { { 0xD0, 0xA6, 0x51 }, "AltoBeam", "AltoBeam Inc." }, { { 0xD0, 0xA9, 0xD3 }, "EMMicroelect", "EM Microelectronic" }, { { 0xD0, 0xAB, 0x4A }, "TelinkMicro", "Telink Micro LLC" }, { { 0xD0, 0xAB, 0xD5 }, "Intel", "Intel Corporate" }, @@ -35002,6 +35406,7 @@ { { 0xD0, 0xAE, 0xEC }, "AlphaNetwork", "Alpha Networks Inc." }, { { 0xD0, 0xAF, 0xB6 }, "LinktopTechn", "Linktop Technology Co., LTD" }, { { 0xD0, 0xB0, 0xCD }, "Moen", "Moen" }, + { { 0xD0, 0xB0, 0xDF }, "MimosaNetwor", "Mimosa Networks" }, { { 0xD0, 0xB1, 0x28 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xD0, 0xB1, 0xCA }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0xD0, 0xB2, 0x14 }, "PoeWit", "PoeWit Inc" }, @@ -35094,6 +35499,7 @@ { { 0xD0, 0xEA, 0x11 }, "Routerboardc", "Routerboard.com" }, { { 0xD0, 0xEA, 0x30 }, "NXPSemicondu", "NXP Semiconductors Taiwan Ltd." }, { { 0xD0, 0xEB, 0x03 }, "Zhehuatechno", "Zhehua technology limited" }, + { { 0xD0, 0xEB, 0x1A }, "Siemens", "Siemens AG" }, { { 0xD0, 0xEB, 0x9E }, "Seowoo", "Seowoo Inc." }, { { 0xD0, 0xEC, 0x35 }, "Cisco", "Cisco Systems, Inc" }, { { 0xD0, 0xED, 0xFF }, "ZfCvcs", "Zf Cvcs" }, @@ -35142,6 +35548,7 @@ { { 0xD4, 0x0A, 0xDC }, "QingdaoIntel", "Qingdao Intelligent&Precise Electronics Co.,Ltd." }, { { 0xD4, 0x0B, 0x1A }, "HTC", "HTC Corporation" }, { { 0xD4, 0x0B, 0xB9 }, "SolidSemecs", "Solid Semecs bv." }, + { { 0xD4, 0x0C, 0x9D }, "SiFlyAviatio", "SiFly Aviation, Inc" }, { { 0xD4, 0x0D, 0xAB }, "CudyTechnolo", "Shenzhen Cudy Technology Co., Ltd." }, { { 0xD4, 0x0E, 0x60 }, "Nanjingphxgc", "Nanjing phx-gctech Information Technology Co., Ltd" }, { { 0xD4, 0x0F, 0x9E }, "Apple", "Apple, Inc." }, @@ -35151,6 +35558,7 @@ { { 0xD4, 0x11, 0xA3 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xD4, 0x11, 0xD6 }, "ShotSpotter", "ShotSpotter, Inc." }, { { 0xD4, 0x12, 0x43 }, "AMPAKTechnol", "AMPAK Technology, Inc." }, + { { 0xD4, 0x12, 0x6E }, "Apple", "Apple, Inc." }, { { 0xD4, 0x12, 0x96 }, "AnobitTechno", "Anobit Technologies Ltd." }, { { 0xD4, 0x12, 0xBB }, "QuadrantComp", "Quadrant Components Inc. Ltd" }, { { 0xD4, 0x13, 0x68 }, "Intellirocks", "Shenzhen Intellirocks Tech. Co. Ltd." }, @@ -35191,6 +35599,7 @@ { { 0xD4, 0x2C, 0x3D }, "SkyLightDigi", "Sky Light Digital Limited" }, { { 0xD4, 0x2C, 0x44 }, "Cisco", "Cisco Systems, Inc" }, { { 0xD4, 0x2C, 0x46 }, "Buffalo", "Buffalo.Inc" }, + { { 0xD4, 0x2C, 0xA6 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xD4, 0x2D, 0xC5 }, "iPRO", "i-PRO Co., Ltd." }, { { 0xD4, 0x2D, 0xCC }, "Apple", "Apple, Inc." }, { { 0xD4, 0x2F, 0x23 }, "AkenoriPTE", "Akenori PTE Ltd" }, @@ -35263,6 +35672,7 @@ { { 0xD4, 0x53, 0xAF }, "VIGOSystem", "VIGO System S.A." }, { { 0xD4, 0x54, 0x8B }, "Intel", "Intel Corporate" }, { { 0xD4, 0x55, 0x56 }, "FiberMountai", "Fiber Mountain Inc." }, + { { 0xD4, 0x55, 0xAD }, "goe", "go-e GmbH" }, { { 0xD4, 0x55, 0xBE }, "FastTechnolo", "Shenzhen Fast Technologies Co.,Ltd" }, { { 0xD4, 0x57, 0x63 }, "Apple", "Apple, Inc." }, { { 0xD4, 0x58, 0x00 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, @@ -35449,6 +35859,7 @@ { { 0xD4, 0xB4, 0xC0 }, "Fortinet", "Fortinet, Inc." }, { { 0xD4, 0xB5, 0xCD }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xD4, 0xB6, 0x80 }, "LinkyumMicro", "Shanghai Linkyum Microeletronics Co.,Ltd" }, + { { 0xD4, 0xB6, 0xC9 }, "Nokia", "Nokia" }, { { 0xD4, 0xB7, 0x09 }, "zte", "zte corporation" }, { { 0xD4, 0xB7, 0x61 }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, { { 0xD4, 0xB7, 0xD0 }, "Ciena", "Ciena Corporation" }, @@ -35509,6 +35920,7 @@ { { 0xD4, 0xDF, 0x57 }, "AlpinionMedi", "Alpinion Medical Systems" }, { { 0xD4, 0xE0, 0x53 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0xD4, 0xE0, 0x8E }, "ValueHD", "ValueHD Corporation" }, + { { 0xD4, 0xE1, 0x3C }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0xD4, 0xE2, 0x2F }, "Roku", "Roku, Inc" }, { { 0xD4, 0xE2, 0xCB }, "VantivaUSA", "Vantiva USA LLC" }, { { 0xD4, 0xE3, 0x2C }, "SSiedleSohne", "S. Siedle & Sohne" }, @@ -35565,8 +35977,9 @@ { { 0xD8, 0x00, 0x93 }, "Aurender", "Aurender Inc." }, { { 0xD8, 0x01, 0xD0 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xD8, 0x01, 0xEB }, "InfinityElec", "Infinity Electronics Ltd" }, + { { 0xD8, 0x02, 0x5F }, "GuangzhouShi", "Guangzhou Shiyuan Electronic Technology Company Limited" }, { { 0xD8, 0x02, 0x8A }, "YOUHUATechno", "Shenzhen YOUHUA Technology Co., Ltd" }, - { { 0xD8, 0x02, 0xC0 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xD8, 0x02, 0xC0 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xD8, 0x03, 0x1A }, "Ezurio", "Ezurio, LLC" }, { { 0xD8, 0x03, 0x2A }, "Commtact", "Commtact Ltd" }, { { 0xD8, 0x05, 0x2E }, "Skyviia", "Skyviia Corporation" }, @@ -35629,6 +36042,7 @@ { { 0xD8, 0x25, 0xB0 }, "Rockeetech", "Rockeetech Systems Co.,Ltd." }, { { 0xD8, 0x25, 0xDF }, "CameUk", "Came Uk" }, { { 0xD8, 0x26, 0xB9 }, "CoagentElect", "Guangdong Coagent Electronics S&T Co.,Ltd." }, + { { 0xD8, 0x26, 0xD3 }, "eero", "eero inc." }, { { 0xD8, 0x26, 0xFA }, "JiangxiZhent", "Jiangxi Zhentian Technology CO.,LTD" }, { { 0xD8, 0x27, 0x0C }, "MaxTronicInt", "MaxTronic International Co., Ltd." }, { { 0xD8, 0x28, 0xC9 }, "GeneralElect", "General Electric Consumer and Industrial" }, @@ -35706,9 +36120,10 @@ { { 0xD8, 0x53, 0x9A }, "JuniperNetwo", "Juniper Networks" }, { { 0xD8, 0x53, 0xAD }, "CiscoMeraki", "Cisco Meraki" }, { { 0xD8, 0x53, 0xBC }, "LenovoInform", "Lenovo Information Products (Shenzhen)Co.,Ltd" }, + { { 0xD8, 0x54, 0x37 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xD8, 0x54, 0x3A }, "TexasInstrum", "Texas Instruments" }, { { 0xD8, 0x54, 0x82 }, "Oxit", "Oxit, LLC" }, - { { 0xD8, 0x54, 0xA2 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xD8, 0x54, 0xA2 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xD8, 0x54, 0xF2 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xD8, 0x55, 0x75 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xD8, 0x55, 0xA3 }, "zte", "zte corporation" }, @@ -35764,6 +36179,7 @@ { { 0xD8, 0x74, 0xDF }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xD8, 0x74, 0xEF }, "GuangzhouShi", "Guangzhou Shiyuan Electronic Technology Company Limited" }, { { 0xD8, 0x75, 0x33 }, "Nokia", "Nokia Corporation" }, + { { 0xD8, 0x76, 0x02 }, "Nxj", "Nxj Inc." }, { { 0xD8, 0x76, 0x0A }, "Escort", "Escort, Inc." }, { { 0xD8, 0x76, 0xAE }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xD8, 0x77, 0x66 }, "Nurivoice", "Nurivoice Co., Ltd" }, @@ -35786,7 +36202,7 @@ { { 0xD8, 0x80, 0xDC }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xD8, 0x81, 0xCE }, "Ahn", "Ahn Inc." }, { { 0xD8, 0x83, 0x32 }, "TaiXinSemico", "TaiXin Semiconductor Co., Ltd" }, - { { 0xD8, 0x84, 0x66 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xD8, 0x84, 0x66 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xD8, 0x85, 0x5E }, "zte", "zte corporation" }, { { 0xD8, 0x85, 0xAC }, "Espressif", "Espressif Inc." }, { { 0xD8, 0x87, 0xD5 }, "LeadcoreTech", "Leadcore Technology CO.,LTD" }, @@ -35838,6 +36254,7 @@ { { 0xD8, 0xA0, 0xE8 }, "zte", "zte corporation" }, { { 0xD8, 0xA1, 0x05 }, "Syslane", "Syslane, Co., Ltd." }, { { 0xD8, 0xA2, 0x5E }, "Apple", "Apple, Inc." }, + { { 0xD8, 0xA3, 0x12 }, "TaicangT&WEl", "Taicang T&W Electronics" }, { { 0xD8, 0xA3, 0x15 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0xD8, 0xA3, 0x5C }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xD8, 0xA4, 0x69 }, "Sonova", "Sonova AG" }, @@ -35889,6 +36306,7 @@ { { 0xD8, 0xC0, 0x68 }, "Netgenetech", "Netgenetech.co.,ltd." }, { { 0xD8, 0xC0, 0x6A }, "HunantvcomIn", "Hunantv.com Interactive Entertainment Media Co.,Ltd." }, { { 0xD8, 0xC0, 0xA6 }, "AzureWaveTec", "AzureWave Technology Inc." }, + { { 0xD8, 0xC2, 0x62 }, "Ubiquiti", "Ubiquiti Inc" }, { { 0xD8, 0xC3, 0xFB }, "Detracom", "Detracom" }, { { 0xD8, 0xC4, 0x6A }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0xD8, 0xC4, 0x97 }, "QuantaComput", "Quanta Computer Inc." }, @@ -35901,6 +36319,7 @@ { { 0xD8, 0xC7, 0xC8 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0xD8, 0xC8, 0x0C }, "TuyaSmart", "Tuya Smart Inc." }, { { 0xD8, 0xC8, 0xE9 }, "Phicomm", "Phicomm (Shanghai) Co., Ltd." }, + { { 0xD8, 0xC9, 0x60 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xD8, 0xC9, 0x9D }, "EaDisplay", "Ea Display Limited" }, { { 0xD8, 0xCA, 0x06 }, "TitanDataCen", "Titan DataCenters France" }, { { 0xD8, 0xCB, 0x8A }, "MicroStarINT", "Micro-Star INTL CO., LTD." }, @@ -35940,7 +36359,7 @@ { { 0xD8, 0xDF, 0x0D }, "beroNet", "beroNet GmbH" }, { { 0xD8, 0xDF, 0x7A }, "QuestSoftwar", "Quest Software, Inc." }, { { 0xD8, 0xE0, 0x04 }, "VodiaNetwork", "Vodia Networks Inc" }, - { { 0xD8, 0xE0, 0x16 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xD8, 0xE0, 0x16 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xD8, 0xE0, 0xB8 }, "Bulat", "Bulat Llc" }, { { 0xD8, 0xE0, 0xE1 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xD8, 0xE2, 0x3F }, "QingdaoHaier", "Qingdao Haier Technology Co.,Ltd" }, @@ -35960,6 +36379,7 @@ { { 0xD8, 0xEC, 0x5E }, "BelkinIntern", "Belkin International Inc." }, { { 0xD8, 0xEC, 0xE5 }, "ZyxelCommuni", "Zyxel Communications Corporation" }, { { 0xD8, 0xED, 0x1C }, "MagnaTechnol", "Magna Technology SL" }, + { { 0xD8, 0xED, 0xA8 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xD8, 0xEE, 0x42 }, "SichuanTiany", "Sichuan Tianyi Comheart Telecom Co.,LTD" }, { { 0xD8, 0xEE, 0x78 }, "MoogProtokra", "Moog Protokraft" }, { { 0xD8, 0xEF, 0x42 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -35978,6 +36398,7 @@ { { 0xD8, 0xF8, 0x83 }, "Intel", "Intel Corporate" }, { { 0xD8, 0xF8, 0xAF }, "Daontec", "Daontec" }, { { 0xD8, 0xFB, 0x11 }, "Axacore", "Axacore" }, + { { 0xD8, 0xFB, 0x58 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0xD8, 0xFB, 0x5E }, "AskeyCompute", "Askey Computer Corp" }, { { 0xD8, 0xFB, 0x68 }, "CloudCorner", "Cloud Corner Ltd." }, { { 0xD8, 0xFB, 0xD6 }, "AmazonTechno", "Amazon Technologies Inc." }, @@ -36020,6 +36441,7 @@ { { 0xDC, 0x08, 0xDA }, "AskeyCompute", "Askey Computer Corp" }, { { 0xDC, 0x09, 0x14 }, "TalkAPhone", "Talk-A-Phone Co." }, { { 0xDC, 0x09, 0x4C }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0xDC, 0x0A, 0x69 }, "Espressif", "Espressif Inc." }, { { 0xDC, 0x0B, 0x09 }, "Cisco", "Cisco Systems, Inc" }, { { 0xDC, 0x0B, 0x1A }, "ADBBroadband", "ADB Broadband Italia" }, { { 0xDC, 0x0B, 0x34 }, "LGElectronic", "LG Electronics (Mobile Communications)" }, @@ -36052,10 +36474,10 @@ { { 0xDC, 0x21, 0xB9 }, "Sentec", "Sentec Co.Ltd" }, { { 0xDC, 0x21, 0xE2 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xDC, 0x22, 0x6F }, "NanoICTechno", "HangZhou Nano IC Technologies Co., Ltd" }, - { { 0xDC, 0x23, 0x3B }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xDC, 0x23, 0x3B }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xDC, 0x27, 0x27 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xDC, 0x28, 0x34 }, "HAKKO", "HAKKO Corporation" }, - { { 0xDC, 0x29, 0x19 }, "AltoBeamTech", "AltoBeam (Xiamen) Technology Ltd, Co." }, + { { 0xDC, 0x29, 0x19 }, "AltoBeamTech", "AltoBeam(Xiamen)Technology Co., Ltd." }, { { 0xDC, 0x29, 0x3A }, "NuoshiTechno", "Shenzhen Nuoshi Technology Co., LTD." }, { { 0xDC, 0x2A, 0x14 }, "LongjingTech", "Shanghai Longjing Technology Co." }, { { 0xDC, 0x2A, 0xA1 }, "MedHab", "MedHab LLC" }, @@ -36281,9 +36703,9 @@ { { 0xDC, 0xB7, 0x2E }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xDC, 0xB7, 0xAC }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0xDC, 0xB7, 0xFC }, "AlpsElectric", "Alps Electric (Ireland) Ltd" }, - { { 0xDC, 0xB8, 0x08 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xDC, 0xB8, 0x08 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xDC, 0xB8, 0x7D }, "HewlettPacka", "Hewlett Packard Enterprise" }, - { { 0xDC, 0xBB, 0x3D }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xDC, 0xBB, 0x3D }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xDC, 0xBB, 0x96 }, "FullSolution", "Full Solution Telecom" }, { { 0xDC, 0xBD, 0x7A }, "GuangzhouShi", "Guangzhou Shiyuan Electronic Technology Company Limited" }, { { 0xDC, 0xBD, 0xCC }, "QuectelWirel", "Quectel Wireless Solutions Co.,Ltd." }, @@ -36330,6 +36752,7 @@ { { 0xDC, 0xD8, 0x7C }, "JingdongCent", "Beijing Jingdong Century Trading Co., LTD." }, { { 0xDC, 0xD8, 0x7F }, "JoinCyberTel", "Shenzhen JoinCyber Telecom Equipment Ltd" }, { { 0xDC, 0xD9, 0x16 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0xDC, 0xD9, 0xA8 }, "GuangzhouXra", "Guang zhou Xradio Technology Co., Ltd" }, { { 0xDC, 0xD9, 0xAE }, "NokiaShangha", "Nokia Shanghai Bell Co., Ltd." }, { { 0xDC, 0xDA, 0x0C }, "Espressif", "Espressif Inc." }, { { 0xDC, 0xDA, 0x4D }, "Celestica", "Celestica Inc." }, @@ -36338,9 +36761,10 @@ { { 0xDC, 0xDB, 0x27 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xDC, 0xDB, 0x70 }, "TonfunkSyste", "Tonfunk Systementwicklung und Service GmbH" }, { { 0xDC, 0xDC, 0x07 }, "TRP", "TRP Systems BV" }, - { { 0xDC, 0xDC, 0xC3 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xDC, 0xDC, 0xC3 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xDC, 0xDC, 0xE2 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xDC, 0xDD, 0x24 }, "EnergicaMoto", "Energica Motor Company SpA" }, + { { 0xDC, 0xDE, 0x4B }, "TranschanTec", "Shenzhen Transchan Technology Limited" }, { { 0xDC, 0xDE, 0x4F }, "GioneeCommun", "Gionee Communication Equipment Co Ltd" }, { { 0xDC, 0xDE, 0xCA }, "Akyllor", "Akyllor" }, { { 0xDC, 0xDE, 0xE3 }, "TexasInstrum", "Texas Instruments" }, @@ -36350,16 +36774,18 @@ { { 0xDC, 0xE1, 0xAD }, "WintopPhotoe", "Shenzhen Wintop Photoelectric Technology Co., Ltd" }, { { 0xDC, 0xE2, 0xAC }, "LumensDigita", "Lumens Digital Optics Inc." }, { { 0xDC, 0xE3, 0x05 }, "Ao", "Ao" }, + { { 0xDC, 0xE5, 0x41 }, "Apple", "Apple, Inc." }, { { 0xDC, 0xE5, 0x5B }, "Google", "Google, Inc." }, { { 0xDC, 0xE5, 0x78 }, "Experimental", "Experimental Factory of Scientific Engineering and Special Design Department" }, { { 0xDC, 0xE5, 0xD8 }, "zte", "zte corporation" }, - { { 0xDC, 0xE6, 0x50 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xDC, 0xE6, 0x50 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xDC, 0xE7, 0x1C }, "AUGElektroni", "AUG Elektronik GmbH" }, { { 0xDC, 0xE8, 0x38 }, "CKTelecom", "CK Telecom (Shenzhen) Limited" }, { { 0xDC, 0xE9, 0x94 }, "CloudNetwork", "Cloud Network Technology Singapore Pte. Ltd." }, { { 0xDC, 0xEA, 0xE7 }, "DLink", "D-Link Corporation" }, { { 0xDC, 0xEB, 0x4D }, "MotorolaMobi", "Motorola (Wuhan) Mobility Technologies Communication Co., Ltd." }, { { 0xDC, 0xEB, 0x53 }, "QianXiaoElec", "Wuhan QianXiao Elecronic Technology CO.,LTD" }, + { { 0xDC, 0xEB, 0x5D }, "ShandongSino", "Shandong Sinochip Semiconductors Co.,Ltd." }, { { 0xDC, 0xEB, 0x69 }, "VantivaUSA", "Vantiva USA LLC" }, { { 0xDC, 0xEB, 0x94 }, "Cisco", "Cisco Systems, Inc" }, { { 0xDC, 0xEC, 0x06 }, "HeimiNetwork", "Heimi Network Technology Co., Ltd." }, @@ -36434,7 +36860,7 @@ { { 0xE0, 0x19, 0xD8 }, "BhTechnologi", "Bh Technologies" }, { { 0xE0, 0x1A, 0xDF }, "Google", "Google, Inc." }, { { 0xE0, 0x1A, 0xEA }, "AlliedTelesi", "Allied Telesis, Inc." }, - { { 0xE0, 0x1C, 0x41 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xE0, 0x1C, 0x41 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xE0, 0x1C, 0xA7 }, "AristaNetwor", "Arista Networks" }, { { 0xE0, 0x1C, 0xEE }, "BravoTech", "Bravo Tech, Inc." }, { { 0xE0, 0x1C, 0xFC }, "DLinkInterna", "D-Link International" }, @@ -36466,6 +36892,7 @@ { { 0xE0, 0x28, 0x6D }, "AVMAudiovisu", "AVM Audiovisuelles Marketing und Computersysteme GmbH" }, { { 0xE0, 0x28, 0xB1 }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0xE0, 0x29, 0x67 }, "HMDGlobal", "HMD Global Oy" }, + { { 0xE0, 0x2A, 0x25 }, "Intellirocks", "Shenzhen Intellirocks Tech. Co. Ltd." }, { { 0xE0, 0x2A, 0x66 }, "Cisco", "Cisco Systems, Inc" }, { { 0xE0, 0x2A, 0x82 }, "UniversalGlo", "Universal Global Scientific Industrial., Ltd" }, { { 0xE0, 0x2A, 0xE6 }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, @@ -36563,6 +36990,7 @@ { { 0xE0, 0x69, 0x95 }, "Pegatron", "Pegatron Corporation" }, { { 0xE0, 0x69, 0xBA }, "Cisco", "Cisco Systems, Inc" }, { { 0xE0, 0x6A, 0x05 }, "YOUHUATechno", "Shenzhen YOUHUA Technology Co., Ltd" }, + { { 0xE0, 0x6A, 0x1B }, "ZidooTechnol", "Shenzhen Zidoo Technology Co., Ltd." }, { { 0xE0, 0x6C, 0x4E }, "TINNOMobileT", "Shenzhen TINNO Mobile Technology Corp." }, { { 0xE0, 0x6C, 0xA6 }, "CreotechQuan", "Creotech Quantum SA" }, { { 0xE0, 0x6C, 0xC5 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, @@ -36634,8 +37062,9 @@ { { 0xE0, 0x9D, 0x73 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0xE0, 0x9D, 0xB8 }, "PlanexCommun", "Planex Communications Inc." }, { { 0xE0, 0x9D, 0xFA }, "WananHongshe", "Wanan Hongsheng Electronic Co.Ltd" }, + { { 0xE0, 0x9E, 0xC1 }, "SiliconInnov", "Silicon Innovation Microelectronics Co.,Ltd." }, { { 0xE0, 0x9F, 0x2A }, "ItonTechnolo", "Iton Technology Corp." }, - { { 0xE0, 0xA1, 0x29 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xE0, 0xA1, 0x29 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xE0, 0xA1, 0x98 }, "NOJAPowerSwi", "NOJA Power Switchgear Pty Ltd" }, { { 0xE0, 0xA1, 0xCE }, "zte", "zte corporation" }, { { 0xE0, 0xA1, 0xD7 }, "Sfr", "Sfr" }, @@ -36667,6 +37096,7 @@ { { 0xE0, 0xB2, 0xF1 }, "FnLinkTechno", "Fn-Link Technology Limited" }, { { 0xE0, 0xB5, 0x2D }, "Apple", "Apple, Inc." }, { { 0xE0, 0xB5, 0x5F }, "Apple", "Apple, Inc." }, + { { 0xE0, 0xB6, 0x13 }, "AristaNetwor", "Arista Networks" }, { { 0xE0, 0xB6, 0x55 }, "XiaomiElectr", "Beijing Xiaomi Electronics Co., Ltd." }, { { 0xE0, 0xB6, 0x68 }, "zte", "zte corporation" }, { { 0xE0, 0xB7, 0x0A }, "Commscope", "Commscope" }, @@ -36755,6 +37185,7 @@ { { 0xE0, 0xDD, 0xC0 }, "vivoMobileCo", "vivo Mobile Communication Co., Ltd." }, { { 0xE0, 0xDE, 0xF2 }, "TexasInstrum", "Texas Instruments" }, { { 0xE0, 0xDF, 0x13 }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + { { 0xE0, 0xDF, 0xB7 }, "ZeicaLabsPte", "Zeica Labs Pte Ltd" }, { { 0xE0, 0xE0, 0xC2 }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0xE0, 0xE0, 0xFC }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xE0, 0xE1, 0xA9 }, "FourSeasGlob", "Shenzhen Four Seas Global Link Network Technology Co., Ltd." }, @@ -36820,8 +37251,9 @@ { { 0xE4, 0x12, 0x1D }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xE4, 0x12, 0x26 }, "AUMOVIOTechn", "AUMOVIO Technologies Romania S.R.L." }, { { 0xE4, 0x12, 0x89 }, "topsystem", "topsystem GmbH" }, + { { 0xE4, 0x13, 0x5C }, "Cisco", "Cisco Systems, Inc" }, { { 0xE4, 0x15, 0xF6 }, "TexasInstrum", "Texas Instruments" }, - { { 0xE4, 0x16, 0x13 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xE4, 0x16, 0x13 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xE4, 0x17, 0xD8 }, "8BitdoTechno", "8Bitdo Technology Hk Limited" }, { { 0xE4, 0x18, 0x6B }, "ZyxelCommuni", "Zyxel Communications Corporation" }, { { 0xE4, 0x19, 0x7F }, "eero", "eero inc." }, @@ -36893,7 +37325,8 @@ { { 0xE4, 0x42, 0xA6 }, "Intel", "Intel Corporate" }, { { 0xE4, 0x43, 0x4B }, "Dell", "Dell Inc." }, { { 0xE4, 0x43, 0x89 }, "Apple", "Apple, Inc." }, - { { 0xE4, 0x44, 0xE5 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xE4, 0x43, 0xCF }, "TPLink", "TP-Link Systems Inc." }, + { { 0xE4, 0x44, 0xE5 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xE4, 0x45, 0x19 }, "XiaomiElectr", "Beijing Xiaomi Electronics Co.,Ltd" }, { { 0xE4, 0x46, 0xB0 }, "FujitsuClien", "Fujitsu Client Computing Limited" }, { { 0xE4, 0x46, 0xBD }, "C&CTechnicTa", "C&C Technic Taiwan Co., Ltd." }, @@ -36946,6 +37379,7 @@ { { 0xE4, 0x61, 0xF4 }, "worldeliteel", "shenzhen worldelite electronics co., LTD" }, { { 0xE4, 0x62, 0x51 }, "HaoChengGrou", "Hao Cheng Group Limited" }, { { 0xE4, 0x62, 0xC4 }, "Cisco", "Cisco Systems, Inc" }, + { { 0xE4, 0x63, 0xFE }, "FujianStarNe", "Fujian Star-Net Communication Co.,Ltd" }, { { 0xE4, 0x64, 0x47 }, "EMMicroelect", "EM Microelectronic" }, { { 0xE4, 0x64, 0x49 }, "Commscope", "Commscope" }, { { 0xE4, 0x65, 0x64 }, "KtcTechnolog", "Shenzhen Ktc Technology Co.,Ltd" }, @@ -36966,6 +37400,7 @@ { { 0xE4, 0x6D, 0xAB }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0xE4, 0x6E, 0x8A }, "BYDLithiumBa", "BYD Lithium Battery Co., Ltd." }, { { 0xE4, 0x6F, 0x13 }, "DLinkInterna", "D-Link International" }, + { { 0xE4, 0x70, 0x10 }, "Apple", "Apple, Inc." }, { { 0xE4, 0x70, 0xB8 }, "Intel", "Intel Corporate" }, { { 0xE4, 0x71, 0x85 }, "Securifi", "Securifi Ltd" }, { { 0xE4, 0x72, 0x9D }, "NokiaShangha", "Nokia Shanghai Bell Co., Ltd." }, @@ -37093,6 +37528,7 @@ { { 0xE4, 0xBF, 0xFA }, "VantivaUSA", "Vantiva USA LLC" }, { { 0xE4, 0xC0, 0xCC }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0xE4, 0xC0, 0xE2 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, + { { 0xE4, 0xC0, 0xFE }, "Apple", "Apple, Inc." }, { { 0xE4, 0xC1, 0x46 }, "ObjetivosySe", "Objetivos y Servicios de Valor A" }, { { 0xE4, 0xC1, 0xF1 }, "SPOTMAUINFOR", "SHENZHEN SPOTMAU INFORMATION TECHNOLIGY CO., Ltd" }, { { 0xE4, 0xC2, 0xD1 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -37121,12 +37557,13 @@ { { 0xE4, 0xD3, 0x73 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xE4, 0xD3, 0xAA }, "Fcnt", "Fcnt Llc" }, { { 0xE4, 0xD3, 0xF1 }, "Cisco", "Cisco Systems, Inc" }, + { { 0xE4, 0xD4, 0x36 }, "NokiaSolutio", "Nokia Solutions and Networks India Private Limited" }, { { 0xE4, 0xD5, 0x3D }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, { { 0xE4, 0xD5, 0x8B }, "HikvisionDig", "Hangzhou Hikvision Digital Technology Co.,Ltd." }, { { 0xE4, 0xD7, 0x1D }, "OrayaTherape", "Oraya Therapeutics" }, { { 0xE4, 0xDA, 0xDF }, "TaicangT&WEl", "Taicang T&W Electronics" }, { { 0xE4, 0xDB, 0x6D }, "XiaomiElectr", "Beijing Xiaomi Electronics Co., Ltd." }, - { { 0xE4, 0xDB, 0xAE }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xE4, 0xDB, 0xAE }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xE4, 0xDC, 0x43 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xE4, 0xDC, 0x5F }, "Cofractal", "Cofractal, Inc." }, { { 0xE4, 0xDC, 0xCC }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -37178,7 +37615,7 @@ { { 0xE4, 0xFB, 0x8F }, "MobiwireMobi", "Mobiwire Mobiles (Ningbo) Co.,Ltd" }, { { 0xE4, 0xFC, 0x82 }, "JuniperNetwo", "Juniper Networks" }, { { 0xE4, 0xFD, 0x45 }, "Intel", "Intel Corporate" }, - { { 0xE4, 0xFD, 0x8C }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xE4, 0xFD, 0x8C }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xE4, 0xFD, 0xA1 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xE4, 0xFE, 0x43 }, "XiaomiMobile", "Beijing Xiaomi Mobile Software Co., Ltd" }, { { 0xE4, 0xFE, 0xD9 }, "EDMIEurope", "EDMI Europe Ltd" }, @@ -37221,6 +37658,7 @@ { { 0xE8, 0x13, 0x6E }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xE8, 0x14, 0x99 }, "YoquTechnolo", "Yoqu Technology(Shenzhen)Co.,Ltd." }, { { 0xE8, 0x15, 0x0E }, "Nokia", "Nokia Corporation" }, + { { 0xE8, 0x15, 0xFE }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0xE8, 0x16, 0x2B }, "IDEOSecurity", "IDEO Security Co., Ltd." }, { { 0xE8, 0x16, 0x56 }, "BroadLinkTec", "Hangzhou BroadLink Technology Co.,Ltd" }, { { 0xE8, 0x17, 0x11 }, "Vipstech", "Shenzhen Vipstech Co., Ltd" }, @@ -37299,6 +37737,7 @@ { { 0xE8, 0x4D, 0xEC }, "Xerox", "Xerox Corporation" }, { { 0xE8, 0x4E, 0x06 }, "EdupInternat", "Edup International (Hk) Co., Ltd" }, { { 0xE8, 0x4E, 0x84 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0xE8, 0x4E, 0xBA }, "Google", "Google, Inc." }, { { 0xE8, 0x4E, 0xCE }, "Nintendo", "Nintendo Co., Ltd." }, { { 0xE8, 0x4F, 0x25 }, "MurataManufa", "Murata Manufacturing Co., Ltd." }, { { 0xE8, 0x4F, 0x4B }, "DelosElectro", "Shenzhen Delos Electronic Co., Ltd" }, @@ -37519,6 +37958,7 @@ { { 0xE8, 0xD4, 0x83 }, "ULTIMATEEuro", "ULTIMATE Europe Transportation Equipment GmbH" }, { { 0xE8, 0xD4, 0xE0 }, "BenyWaveTech", "Beijing BenyWave Technology Co., Ltd." }, { { 0xE8, 0xD5, 0x2B }, "Google", "Google, Inc." }, + { { 0xE8, 0xD5, 0xA1 }, "EardaTechnol", "Earda Technologies co Ltd" }, { { 0xE8, 0xD7, 0x65 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xE8, 0xD7, 0x75 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xE8, 0xD8, 0x19 }, "AzureWaveTec", "AzureWave Technology Inc." }, @@ -37605,6 +38045,7 @@ { { 0xE8, 0xFD, 0x90 }, "Turbostor", "Turbostor" }, { { 0xE8, 0xFD, 0xE8 }, "CeLaLink", "CeLa Link Corporation" }, { { 0xE8, 0xFD, 0xF8 }, "HighFlyingEl", "Shanghai High-Flying Electronics Technology Co., Ltd" }, + { { 0xE8, 0xFE, 0xBE }, "Apple", "Apple, Inc." }, { { 0xE8, 0xFF, 0x98 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xE8, 0xFF, 0xF4 }, "Apple", "Apple, Inc." }, { { 0xEA, 0x11, 0x5D }, "AutovisionTe", "Autovision Technology Inc." }, @@ -37697,6 +38138,7 @@ { { 0xEC, 0x31, 0x4A }, "QuanjingInte", "Chengdu Quanjing Intelligent Technology Co.,Ltd" }, { { 0xEC, 0x31, 0x5F }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xEC, 0x31, 0x6D }, "Hansgrohe", "Hansgrohe" }, + { { 0xEC, 0x33, 0xCC }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0xEC, 0x34, 0xE2 }, "YasminaLabsT", "Yasmina Labs Trading FZE" }, { { 0xEC, 0x35, 0x32 }, "Tactrix", "Tactrix Inc." }, { { 0xEC, 0x35, 0x4D }, "WingtechMobi", "Wingtech Mobile Communications Co.,Ltd" }, @@ -37823,9 +38265,10 @@ { { 0xEC, 0x83, 0x6C }, "RMTech", "RM Tech Co., Ltd." }, { { 0xEC, 0x83, 0xB7 }, "PuwellCloudT", "Puwell Cloud Tech Limited" }, { { 0xEC, 0x83, 0xD5 }, "GIRD", "GIRD Systems Inc" }, - { { 0xEC, 0x84, 0x39 }, "Private", "Private" }, + { { 0xEC, 0x84, 0x39 }, "BitmainDevel", "Bitmain Development Pte. Ltd." }, { { 0xEC, 0x84, 0xB4 }, "CigShanghai", "Cig Shanghai Co Ltd" }, { { 0xEC, 0x85, 0x2F }, "Apple", "Apple, Inc." }, + { { 0xEC, 0x86, 0xC4 }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0xEC, 0x88, 0x8F }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, { { 0xEC, 0x88, 0x92 }, "MotorolaMobi", "Motorola Mobility LLC, a Lenovo Company" }, { { 0xEC, 0x89, 0x14 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -37880,6 +38323,7 @@ { { 0xEC, 0xA7, 0x8D }, "Cisco", "Cisco Systems, Inc" }, { { 0xEC, 0xA7, 0xAD }, "BarrotTechno", "Barrot Technology Co.,Ltd." }, { { 0xEC, 0xA8, 0x1F }, "VantivaUSA", "Vantiva USA LLC" }, + { { 0xEC, 0xA8, 0x54 }, "EFOCETechnol", "EFOCE Technology Co., Ltd." }, { { 0xEC, 0xA8, 0x6B }, "ElitegroupCo", "Elitegroup Computer Systems Co.,Ltd." }, { { 0xEC, 0xA9, 0x07 }, "Apple", "Apple, Inc." }, { { 0xEC, 0xA9, 0x40 }, "Commscope", "Commscope" }, @@ -37896,6 +38340,7 @@ { { 0xEC, 0xB0, 0xD2 }, "EMMicroelect", "EM Microelectronic" }, { { 0xEC, 0xB0, 0xE1 }, "Ciena", "Ciena Corporation" }, { { 0xEC, 0xB1, 0x06 }, "AcuroNetwork", "Acuro Networks, Inc" }, + { { 0xEC, 0xB1, 0x57 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xEC, 0xB1, 0xD7 }, "HewlettPacka", "Hewlett Packard" }, { { 0xEC, 0xB1, 0xE0 }, "EltexEnterpr", "Eltex Enterprise LTD" }, { { 0xEC, 0xB2, 0x93 }, "HewlettPacka", "Hewlett Packard Enterprise" }, @@ -37945,6 +38390,7 @@ { { 0xEC, 0xD0, 0x40 }, "GEAFarmTechn", "GEA Farm Technologies GmbH" }, { { 0xEC, 0xD0, 0x9F }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, { { 0xEC, 0xD1, 0x9A }, "ZhuhaiLiming", "Zhuhai Liming Industries Co., Ltd" }, + { { 0xEC, 0xD5, 0x08 }, "Apple", "Apple, Inc." }, { { 0xEC, 0xD6, 0x8A }, "JMicronIntel", "Shenzhen JMicron Intelligent Technology Developmen" }, { { 0xEC, 0xD9, 0x09 }, "Alpsalpine", "Alpsalpine Co,.Ltd" }, { { 0xEC, 0xD9, 0x25 }, "Rami", "Rami" }, @@ -38076,10 +38522,11 @@ { { 0xF0, 0x2A, 0x23 }, "CreativeNext", "Creative Next Design" }, { { 0xF0, 0x2A, 0x61 }, "WaldoNetwork", "Waldo Networks, Inc." }, { { 0xF0, 0x2B, 0x18 }, "NanjingJiaha", "Nanjing Jiahao Technology Co., Ltd." }, - { { 0xF0, 0x2B, 0x7C }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xF0, 0x2B, 0x7C }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xF0, 0x2C, 0x59 }, "ChipseaTechn", "Chipsea Technologies (Shenzhen) Crop." }, { { 0xF0, 0x2E, 0x51 }, "Casa", "Casa Systems" }, { { 0xF0, 0x2F, 0x4B }, "Apple", "Apple, Inc." }, + { { 0xF0, 0x2F, 0x50 }, "SEIRobotics", "Shenzhen SEI Robotics Co.,Ltd" }, { { 0xF0, 0x2F, 0x74 }, "ASUSTekCOMPU", "ASUSTek COMPUTER INC." }, { { 0xF0, 0x2F, 0x9E }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xF0, 0x2F, 0xA7 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -38104,6 +38551,7 @@ { { 0xF0, 0x3F, 0x95 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF0, 0x3F, 0xF8 }, "RLDrake", "R L Drake" }, { { 0xF0, 0x40, 0x7B }, "FiberhomeTel", "Fiberhome Telecommunication Technologies Co.,LTD" }, + { { 0xF0, 0x40, 0xD9 }, "Apple", "Apple, Inc." }, { { 0xF0, 0x40, 0xEC }, "Loopdesignla", "Loopdesignlab Pte. Ltd" }, { { 0xF0, 0x41, 0xC6 }, "HeatTech", "Heat Tech Company, Ltd." }, { { 0xF0, 0x42, 0x1C }, "Intel", "Intel Corporate" }, @@ -38151,7 +38599,7 @@ { { 0xF0, 0x62, 0x5A }, "RealmeChongq", "Realme Chongqing Mobile Telecommunications Corp.,Ltd." }, { { 0xF0, 0x62, 0x81 }, "ProCurveNetw", "ProCurve Networking by HP" }, { { 0xF0, 0x63, 0xF9 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, - { { 0xF0, 0x64, 0x26 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xF0, 0x64, 0x26 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xF0, 0x65, 0xAE }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xF0, 0x65, 0xC2 }, "YanfengViste", "Yanfeng Visteon Electronics Technology (Shanghai) Co.,Ltd." }, { { 0xF0, 0x65, 0xDD }, "PrimaxElectr", "Primax Electronics Ltd." }, @@ -38231,7 +38679,7 @@ { { 0xF0, 0x9B, 0xB8 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF0, 0x9C, 0xBB }, "RaonThink", "RaonThink Inc." }, { { 0xF0, 0x9C, 0xD7 }, "GuangzhouBlu", "Guangzhou Blue Cheetah Intelligent Technology Co., Ltd." }, - { { 0xF0, 0x9C, 0xE9 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xF0, 0x9C, 0xE9 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xF0, 0x9E, 0x4A }, "Intel", "Intel Corporate" }, { { 0xF0, 0x9E, 0x63 }, "Cisco", "Cisco Systems, Inc" }, { { 0xF0, 0x9E, 0x9E }, "Espressif", "Espressif Inc." }, @@ -38298,6 +38746,7 @@ { { 0xF0, 0xC4, 0x2F }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xF0, 0xC4, 0x78 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF0, 0xC5, 0x58 }, "UDElectronic", "U.D.Electronic Corp." }, + { { 0xF0, 0xC7, 0x1F }, "AristaNetwor", "Arista Networks" }, { { 0xF0, 0xC7, 0x25 }, "Apple", "Apple, Inc." }, { { 0xF0, 0xC7, 0x45 }, "TecnoMobile", "Tecno Mobile Limited" }, { { 0xF0, 0xC7, 0x7F }, "TexasInstrum", "Texas Instruments" }, @@ -38338,7 +38787,7 @@ { { 0xF0, 0xD9, 0xB2 }, "Exo", "Exo S.A." }, { { 0xF0, 0xDA, 0x7C }, "RlhIndustrie", "Rlh Industries,Inc." }, { { 0xF0, 0xDB, 0x2A }, "LannerElectr", "Lanner Electronics, Inc." }, - { { 0xF0, 0xDB, 0x30 }, "Yottabyte", "Yottabyte" }, + { { 0xF0, 0xDB, 0x30 }, "Vergeio", "Verge.io" }, { { 0xF0, 0xDB, 0xE2 }, "Apple", "Apple, Inc." }, { { 0xF0, 0xDB, 0xF8 }, "Apple", "Apple, Inc." }, { { 0xF0, 0xDC, 0xE2 }, "Apple", "Apple, Inc." }, @@ -38350,8 +38799,10 @@ { { 0xF0, 0xE5, 0xC3 }, "DrägerwerkaA", "Drägerwerk AG & Co. KG aA" }, { { 0xF0, 0xE7, 0x52 }, "HuajuxinSemi", "Shenzhen Huajuxin Semiconductor Co.,ltd" }, { { 0xF0, 0xE7, 0x7E }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, + { { 0xF0, 0xEA, 0xE1 }, "NanjingRISCV", "Nanjing RISC-V Institute Co., Ltd." }, { { 0xF0, 0xEB, 0xD0 }, "FeixunCommun", "Shanghai Feixun Communication Co.,Ltd." }, { { 0xF0, 0xEC, 0x39 }, "Essec", "Essec" }, + { { 0xF0, 0xEC, 0x80 }, "ZeroBoundary", "Zero Boundary Singularity Technology(Shenzhen)" }, { { 0xF0, 0xED, 0x19 }, "zte", "zte corporation" }, { { 0xF0, 0xED, 0x1E }, "BilkonBilgis", "Bilkon Bilgisayar Kontrollu Cih. Im.Ltd." }, { { 0xF0, 0xED, 0x51 }, "QingdaoIntel", "Qingdao Intelligent&Precise Electronics Co.,Ltd." }, @@ -38382,10 +38833,13 @@ { { 0xF0, 0xF7, 0xB3 }, "Phorm", "Phorm" }, { { 0xF0, 0xF7, 0xE7 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF0, 0xF7, 0xFC }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0xF0, 0xF8, 0x32 }, "Google", "Google, Inc." }, { { 0xF0, 0xF8, 0x42 }, "KEEBOX", "KEEBOX, Inc." }, { { 0xF0, 0xF8, 0x4A }, "Buffalo", "Buffalo.Inc" }, { { 0xF0, 0xF8, 0xF2 }, "TexasInstrum", "Texas Instruments" }, + { { 0xF0, 0xF9, 0x5D }, "AdityaInfote", "Aditya Infotech Ltd." }, { { 0xF0, 0xF9, 0xF7 }, "IES", "IES GmbH & Co. KG" }, + { { 0xF0, 0xFA, 0xBA }, "NVIDIA", "NVIDIA Corporation" }, { { 0xF0, 0xFA, 0xC7 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xF0, 0xFB, 0x7F }, "MellanoxTech", "Mellanox Technologies, Inc." }, { { 0xF0, 0xFC, 0x65 }, "SynaXGTechno", "SynaXG Technologies Pte. Ltd." }, @@ -38406,13 +38860,16 @@ { { 0xF4, 0x03, 0x2A }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xF4, 0x03, 0x2F }, "Reduxio", "Reduxio Systems" }, { { 0xF4, 0x03, 0x43 }, "HewlettPacka", "Hewlett Packard Enterprise" }, + { { 0xF4, 0x03, 0x93 }, "NanjingQinhe", "Nanjing Qinheng Microelectronics Co., Ltd." }, { { 0xF4, 0x04, 0x4C }, "ValenceTech", "ValenceTech Limited" }, { { 0xF4, 0x05, 0x95 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xF4, 0x06, 0x16 }, "Apple", "Apple, Inc." }, { { 0xF4, 0x06, 0x3C }, "TexasInstrum", "Texas Instruments" }, { { 0xF4, 0x06, 0x69 }, "Intel", "Intel Corporate" }, { { 0xF4, 0x06, 0x8D }, "devolo", "devolo AG" }, + { { 0xF4, 0x06, 0xA3 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xF4, 0x06, 0xA5 }, "BianfengNetw", "Hangzhou Bianfeng Networking Technology Co., Ltd." }, + { { 0xF4, 0x08, 0x55 }, "QingdaoHaier", "Qingdao Haier Technology Co.Ltd" }, { { 0xF4, 0x09, 0xD8 }, "SamsungElect", "Samsung Electro-Mechanics(Thailand)" }, { { 0xF4, 0x0A, 0x2E }, "SkyworthDigi", "Shenzhen Skyworth Digital Technology CO., Ltd" }, { { 0xF4, 0x0A, 0x4A }, "INDUSNETComm", "INDUSNET Communication Technology Co.,LTD" }, @@ -38459,6 +38916,7 @@ { { 0xF4, 0x24, 0x62 }, "SelcomElectr", "Selcom Electronics (Shanghai) Co., Ltd" }, { { 0xF4, 0x24, 0x8B }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF4, 0x25, 0x3C }, "eero", "eero inc." }, + { { 0xF4, 0x25, 0xFE }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF4, 0x26, 0x79 }, "Intel", "Intel Corporate" }, { { 0xF4, 0x27, 0x56 }, "DASANNewtork", "DASAN Newtork Solutions" }, { { 0xF4, 0x28, 0x33 }, "MMPC", "MMPC Inc." }, @@ -38534,8 +38992,9 @@ { { 0xF4, 0x52, 0x46 }, "AskeyCompute", "Askey Computer Corp" }, { { 0xF4, 0x52, 0x5B }, "AntareTechno", "Antare Technology Ltd" }, { { 0xF4, 0x52, 0x93 }, "Apple", "Apple, Inc." }, + { { 0xF4, 0x53, 0xE4 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF4, 0x54, 0x20 }, "TellescomInd", "Tellescom Industria E Comercio Em Telecomunicacao" }, - { { 0xF4, 0x54, 0x24 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xF4, 0x54, 0x24 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xF4, 0x54, 0x33 }, "RockwellAuto", "Rockwell Automation" }, { { 0xF4, 0x55, 0x95 }, "HENGBAO", "HENGBAO Corporation LTD." }, { { 0xF4, 0x55, 0x9C }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -38544,6 +39003,7 @@ { { 0xF4, 0x58, 0x42 }, "BoxxTV", "Boxx TV Ltd" }, { { 0xF4, 0x5B, 0x29 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF4, 0x5B, 0x73 }, "WanjiaanInte", "Wanjiaan Interconnected Technology Co., Ltd" }, + { { 0xF4, 0x5B, 0xB4 }, "Cisco", "Cisco Systems, Inc" }, { { 0xF4, 0x5C, 0x42 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xF4, 0x5C, 0x89 }, "Apple", "Apple, Inc." }, { { 0xF4, 0x5E, 0xAB }, "TexasInstrum", "Texas Instruments" }, @@ -38565,6 +39025,7 @@ { { 0xF4, 0x64, 0xB6 }, "Sercomm", "Sercomm Corporation." }, { { 0xF4, 0x65, 0x0B }, "Espressif", "Espressif Inc." }, { { 0xF4, 0x65, 0xA6 }, "Apple", "Apple, Inc." }, + { { 0xF4, 0x66, 0x39 }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, { { 0xF4, 0x67, 0x2D }, "TopstarTechn", "ShenZhen Topstar Technology Company" }, { { 0xF4, 0x68, 0x02 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF4, 0x69, 0x42 }, "AskeyCompute", "Askey Computer Corp" }, @@ -38580,7 +39041,7 @@ { { 0xF4, 0x6D, 0x3F }, "Intel", "Intel Corporate" }, { { 0xF4, 0x6D, 0xE2 }, "zte", "zte corporation" }, { { 0xF4, 0x6E, 0x24 }, "NECPersonalC", "NEC Personal Computers, Ltd." }, - { { 0xF4, 0x6E, 0x95 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xF4, 0x6E, 0x95 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xF4, 0x6E, 0xD6 }, "EMMicroelect", "EM Microelectronic" }, { { 0xF4, 0x6F, 0x4E }, "Echowell", "Echowell" }, { { 0xF4, 0x6F, 0xA4 }, "PhysikInstru", "Physik Instrumente GmbH & Co. KG" }, @@ -38634,6 +39095,7 @@ { { 0xF4, 0x96, 0x51 }, "NAKAYO", "NAKAYO Inc" }, { { 0xF4, 0x97, 0xC2 }, "Nebulon", "Nebulon Inc" }, { { 0xF4, 0x99, 0xAC }, "WEBERSchraub", "WEBER Schraubautomaten GmbH" }, + { { 0xF4, 0x9A, 0x7C }, "SupranettNet", "Hangzhou Supranett Network Technology Co.,Ltd." }, { { 0xF4, 0x9A, 0xB1 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0xF4, 0x9C, 0x12 }, "Structab", "Structab AB" }, { { 0xF4, 0x9D, 0x8A }, "FantasiaTrad", "Fantasia Trading LLC" }, @@ -38662,11 +39124,13 @@ { { 0xF4, 0xAF, 0xE7 }, "Apple", "Apple, Inc." }, { { 0xF4, 0xB0, 0xFF }, "BaudDataComm", "Shanghai Baud Data Communication Co.,Ltd." }, { { 0xF4, 0xB1, 0x64 }, "LightningTel", "Lightning Telecommunications Technology Co. Ltd" }, - { { 0xF4, 0xB1, 0x9C }, "AltoBeam", "AltoBeam (China) Inc." }, + { { 0xF4, 0xB1, 0x9C }, "AltoBeam", "AltoBeam Inc." }, { { 0xF4, 0xB1, 0xC2 }, "ZhejiangDahu", "Zhejiang Dahua Technology Co., Ltd." }, + { { 0xF4, 0xB2, 0x4E }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xF4, 0xB3, 0x01 }, "Intel", "Intel Corporate" }, { { 0xF4, 0xB3, 0x81 }, "WindowMaster", "WindowMaster A/S" }, { { 0xF4, 0xB3, 0xB1 }, "SiliconLabor", "Silicon Laboratories" }, + { { 0xF4, 0xB4, 0x9E }, "eero", "eero inc." }, { { 0xF4, 0xB5, 0x20 }, "BiostarMicro", "Biostar Microtech international corp." }, { { 0xF4, 0xB5, 0x2F }, "JuniperNetwo", "Juniper Networks" }, { { 0xF4, 0xB5, 0x49 }, "XiamenYeasta", "Xiamen Yeastar Digital Technology Co., Ltd" }, @@ -38690,6 +39154,7 @@ { { 0xF4, 0xBC, 0xDA }, "JingxunSoftw", "Shenzhen Jingxun Software Telecommunication Technology Co.,Ltd" }, { { 0xF4, 0xBD, 0x7C }, "jinshicommun", "Chengdu jinshi communication Co., LTD" }, { { 0xF4, 0xBD, 0x9E }, "Cisco", "Cisco Systems, Inc" }, + { { 0xF4, 0xBD, 0xAE }, "VLinkTechnol", "Shenzhen V-Link Technology CO., LTD." }, { { 0xF4, 0xBD, 0xB9 }, "UbiqcomIndia", "Ubiqcom India Pvt Ltd" }, { { 0xF4, 0xBE, 0xEC }, "Apple", "Apple, Inc." }, { { 0xF4, 0xBF, 0x80 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -38717,7 +39182,7 @@ { { 0xF4, 0xCE, 0x23 }, "Intel", "Intel Corporate" }, { { 0xF4, 0xCE, 0x36 }, "NordicSemico", "Nordic Semiconductor ASA" }, { { 0xF4, 0xCE, 0x46 }, "HewlettPacka", "Hewlett Packard" }, - { { 0xF4, 0xCE, 0x48 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xF4, 0xCE, 0x48 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xF4, 0xCF, 0xA2 }, "Espressif", "Espressif Inc." }, { { 0xF4, 0xCF, 0xE2 }, "Cisco", "Cisco Systems, Inc" }, { { 0xF4, 0xD0, 0x32 }, "YunnanIdealI", "Yunnan Ideal Information&Technology.,Ltd" }, @@ -38763,7 +39228,7 @@ { { 0xF4, 0xE9, 0x75 }, "NewH3CTechno", "New H3C Technologies Co., Ltd" }, { { 0xF4, 0xE9, 0xD4 }, "QLogic", "QLogic Corporation" }, { { 0xF4, 0xEA, 0x67 }, "Cisco", "Cisco Systems, Inc" }, - { { 0xF4, 0xEA, 0xB5 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xF4, 0xEA, 0xB5 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xF4, 0xEB, 0x38 }, "SagemcomBroa", "Sagemcom Broadband SAS" }, { { 0xF4, 0xEB, 0x9F }, "Ellu2019SL", "Ellu Company 2019 SL" }, { { 0xF4, 0xEC, 0x38 }, "TpLinkTechno", "Tp-Link Technologies Co.,Ltd." }, @@ -38871,6 +39336,7 @@ { { 0xF8, 0x27, 0x93 }, "Apple", "Apple, Inc." }, { { 0xF8, 0x28, 0x19 }, "LiteonTechno", "Liteon Technology Corporation" }, { { 0xF8, 0x28, 0xC9 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0xF8, 0x29, 0x80 }, "DongguanRuil", "Dongguan Ruilian Xiangtong Technology Co., Ltd" }, { { 0xF8, 0x29, 0xC0 }, "Availink", "Availink, Inc." }, { { 0xF8, 0x2A, 0x53 }, "GDMideaAirCo", "GD Midea Air-Conditioning Equipment Co.,Ltd." }, { { 0xF8, 0x2A, 0xE2 }, "Apple", "Apple, Inc." }, @@ -38890,6 +39356,7 @@ { { 0xF8, 0x2F, 0xA8 }, "HonHaiPrecis", "Hon Hai Precision Ind. Co.,Ltd." }, { { 0xF8, 0x30, 0x02 }, "TexasInstrum", "Texas Instruments" }, { { 0xF8, 0x30, 0x94 }, "AlcatelLucen", "Alcatel-Lucent Telecom Limited" }, + { { 0xF8, 0x31, 0x25 }, "XiamenuinkTe", "Xiamen uink Technology Co., Ltd" }, { { 0xF8, 0x31, 0x3E }, "endeavour", "endeavour GmbH" }, { { 0xF8, 0x32, 0xBA }, "VusionGroup", "VusionGroup" }, { { 0xF8, 0x32, 0xE4 }, "ASUSTekCOMPU", "ASUSTek COMPUTER INC." }, @@ -38949,6 +39416,7 @@ { { 0xF8, 0x51, 0x6D }, "DenwaTechnol", "Denwa Technology Corp." }, { { 0xF8, 0x52, 0xDF }, "VNLEurope", "VNL Europe AB" }, { { 0xF8, 0x53, 0x29 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0xF8, 0x53, 0x33 }, "TashangSemic", "Tashang Semiconductor(Shanghai) Co., Ltd." }, { { 0xF8, 0x54, 0xAF }, "ECITelecom", "ECI Telecom Ltd." }, { { 0xF8, 0x54, 0xB8 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xF8, 0x54, 0xF6 }, "AzureWaveTec", "AzureWave Technology Inc." }, @@ -38977,6 +39445,7 @@ { { 0xF8, 0x5F, 0x2A }, "Nokia", "Nokia Corporation" }, { { 0xF8, 0x60, 0xF0 }, "HewlettPacka", "Hewlett Packard Enterprise" }, { { 0xF8, 0x62, 0x14 }, "Apple", "Apple, Inc." }, + { { 0xF8, 0x62, 0x2A }, "eero", "eero inc." }, { { 0xF8, 0x62, 0xAA }, "xn", "xn systems" }, { { 0xF8, 0x63, 0x3F }, "Intel", "Intel Corporate" }, { { 0xF8, 0x63, 0x47 }, "SichuanAILin", "Sichuan AI-Link Technology Co., Ltd." }, @@ -39116,6 +39585,7 @@ { { 0xF8, 0xB1, 0x32 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF8, 0xB1, 0x56 }, "Dell", "Dell Inc." }, { { 0xF8, 0xB1, 0xDD }, "Apple", "Apple, Inc." }, + { { 0xF8, 0xB2, 0x2C }, "Roku", "Roku, Inc" }, { { 0xF8, 0xB2, 0xF3 }, "GuangzhouBos", "Guangzhou Bosma Technology Co.,Ltd" }, { { 0xF8, 0xB3, 0xB7 }, "Espressif", "Espressif Inc." }, { { 0xF8, 0xB4, 0x6A }, "HewlettPacka", "Hewlett Packard" }, @@ -39139,6 +39609,7 @@ { { 0xF8, 0xC1, 0x20 }, "XianLinkScie", "Xi'an Link-Science Technology Co.,Ltd" }, { { 0xF8, 0xC2, 0x49 }, "AmpereComput", "Ampere Computing Llc" }, { { 0xF8, 0xC2, 0x88 }, "Cisco", "Cisco Systems, Inc" }, + { { 0xF8, 0xC3, 0x62 }, "SiliconLabor", "Silicon Laboratories" }, { { 0xF8, 0xC3, 0x72 }, "TsuzukiDenki", "Tsuzuki Denki" }, { { 0xF8, 0xC3, 0x97 }, "NZXT", "NZXT Corp. Ltd." }, { { 0xF8, 0xC3, 0x9E }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -39237,6 +39708,7 @@ { { 0xF8, 0xF5, 0x19 }, "Rulogic", "Rulogic Inc." }, { { 0xF8, 0xF5, 0x32 }, "Commscope", "Commscope" }, { { 0xF8, 0xF5, 0x8C }, "Apple", "Apple, Inc." }, + { { 0xF8, 0xF6, 0xB7 }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, { { 0xF8, 0xF7, 0xB9 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xF8, 0xF7, 0xD2 }, "EqualOptics", "Equal Optics, LLC" }, { { 0xF8, 0xF7, 0xD3 }, "Internationa", "International Communications Corporation" }, @@ -39263,6 +39735,7 @@ { { 0xFA, 0x66, 0x73 }, "NellsElectro", "Nells Electronic Systems (Nes)" }, { { 0xFA, 0x7A, 0xCB }, "UltraEtherne", "Ultra Ethernet Consortium" }, { { 0xFA, 0x7D, 0x04 }, "SalienceLabs", "Salience Labs" }, + { { 0xFA, 0x8D, 0x93 }, "RunioneTech", "Runione Tech Co., Ltd" }, { { 0xFA, 0x93, 0x05 }, "PanasonicAut", "Panasonic Automotive Systems Co., Ltd." }, { { 0xFA, 0x94, 0xF1 }, "IEEE8021Chai", "IEEE 802.1 Chair" }, { { 0xFA, 0xBA, 0x85 }, "APATOptoelec", "APAT Optoelectronics Components Co., Ltd." }, @@ -39289,14 +39762,16 @@ { { 0xFC, 0x08, 0x77 }, "PrentkeRomic", "Prentke Romich Company" }, { { 0xFC, 0x09, 0xD8 }, "ACTEONGroup", "ACTEON Group" }, { { 0xFC, 0x09, 0xF6 }, "TonzeElectri", "Guangdong Tonze Electric Co.,Ltd" }, - { { 0xFC, 0x0A, 0x81 }, "ExtremeNetwo", "Extreme Networks Headquarters" }, + { { 0xFC, 0x0A, 0x81 }, "ExtremeNetwo", "Extreme Networks, Inc." }, { { 0xFC, 0x0C, 0x45 }, "SuperElectro", "Shenzhen SuperElectron Technology Co.,Ltd." }, { { 0xFC, 0x0F, 0x4B }, "TexasInstrum", "Texas Instruments" }, + { { 0xFC, 0x0F, 0x76 }, "AmazonTechno", "Amazon Technologies Inc." }, { { 0xFC, 0x0F, 0xE6 }, "SonyInteract", "Sony Interactive Entertainment Inc." }, { { 0xFC, 0x0F, 0xE7 }, "MicrochipTec", "Microchip Technology Inc." }, { { 0xFC, 0x10, 0x1A }, "PaloAltoNetw", "Palo Alto Networks" }, { { 0xFC, 0x10, 0xBD }, "ControlSiste", "Control Sistematizado S.A." }, { { 0xFC, 0x10, 0xC6 }, "TaicangT&WEl", "Taicang T&W Electronics" }, + { { 0xFC, 0x11, 0x19 }, "SiliconLabor", "Silicon Laboratories" }, { { 0xFC, 0x11, 0x65 }, "CambiumNetwo", "Cambium Networks Limited" }, { { 0xFC, 0x11, 0x86 }, "Logic3", "Logic3 plc" }, { { 0xFC, 0x11, 0x93 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -39310,6 +39785,7 @@ { { 0xFC, 0x17, 0x94 }, "InterCreativ", "InterCreative Co., Ltd" }, { { 0xFC, 0x18, 0x03 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xFC, 0x18, 0x3C }, "Apple", "Apple, Inc." }, + { { 0xFC, 0x18, 0x6B }, "DotOrigin", "Dot Origin Ltd" }, { { 0xFC, 0x19, 0x10 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xFC, 0x19, 0x28 }, "ActionsMicro", "Actions Microelectronics" }, { { 0xFC, 0x19, 0x99 }, "XiaomiCommun", "Xiaomi Communications Co Ltd" }, @@ -39335,6 +39811,7 @@ { { 0xFC, 0x23, 0xCD }, "BilianElectr", "Shenzhen Bilian Electronic Co.，Ltd" }, { { 0xFC, 0x24, 0x22 }, "EzvizSoftwar", "Hangzhou Ezviz Software Co.,Ltd." }, { { 0xFC, 0x25, 0x3F }, "Apple", "Apple, Inc." }, + { { 0xFC, 0x26, 0x40 }, "HuaweiDevice", "Huawei Device Co., Ltd." }, { { 0xFC, 0x26, 0x8C }, "Signify", "Signify B.V." }, { { 0xFC, 0x27, 0xA2 }, "TransElectri", "Trans Electric Co., Ltd." }, { { 0xFC, 0x29, 0xE3 }, "Infinixmobil", "Infinix mobility limited" }, @@ -39396,6 +39873,7 @@ { { 0xFC, 0x48, 0xC9 }, "YobiiqIntell", "Yobiiq Intelligence B.V." }, { { 0xFC, 0x48, 0xEF }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xFC, 0x49, 0x2D }, "AmazonTechno", "Amazon Technologies Inc." }, + { { 0xFC, 0x4A, 0x47 }, "Nokia", "Nokia" }, { { 0xFC, 0x4A, 0xE9 }, "CastlenetTec", "Castlenet Technology Inc." }, { { 0xFC, 0x4B, 0x1C }, "Intersensor", "Intersensor S.R.L." }, { { 0xFC, 0x4B, 0x57 }, "PeerlessInst", "Peerless Instrument Division of Curtiss-Wright" }, @@ -39508,6 +39986,7 @@ { { 0xFC, 0x92, 0x3B }, "Nokia", "Nokia Corporation" }, { { 0xFC, 0x92, 0x57 }, "RenesasElect", "Renesas Electronics (Penang) Sdn. Bhd." }, { { 0xFC, 0x93, 0x1D }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, + { { 0xFC, 0x93, 0x4E }, "RealtekSemic", "Realtek Semiconductor Corp." }, { { 0xFC, 0x93, 0x6B }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xFC, 0x94, 0x2E }, "CiscoMeraki", "Cisco Meraki" }, { { 0xFC, 0x94, 0x35 }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, @@ -39526,6 +40005,7 @@ { { 0xFC, 0x9C, 0x98 }, "ArloTechnolo", "Arlo Technology" }, { { 0xFC, 0x9C, 0xA7 }, "Apple", "Apple, Inc." }, { { 0xFC, 0x9D, 0x05 }, "MicroStarINT", "Micro-Star INTL CO., LTD." }, + { { 0xFC, 0x9D, 0xD2 }, "Apple", "Apple, Inc." }, { { 0xFC, 0x9D, 0xD8 }, "TongTongYiLi", "Beijing TongTongYiLian Science and Technology Ltd." }, { { 0xFC, 0x9E, 0x53 }, "Intel", "Intel Corporate" }, { { 0xFC, 0x9F, 0x2A }, "ZyxelCommuni", "Zyxel Communications Corporation" }, @@ -39639,6 +40119,7 @@ { { 0xFC, 0xE3, 0x3C }, "HuaweiTechno", "Huawei Technologies Co.,Ltd" }, { { 0xFC, 0xE4, 0x21 }, "zhejiangDusu", "zhejiang Dusun Electron Co.,Ltd" }, { { 0xFC, 0xE5, 0x57 }, "Nokia", "Nokia Corporation" }, + { { 0xFC, 0xE5, 0xF0 }, "SamsungElect", "Samsung Electronics Co.,Ltd" }, { { 0xFC, 0xE6, 0x6A }, "IndustrialSo", "Industrial Software Co" }, { { 0xFC, 0xE6, 0xC6 }, "ChinaMobileG", "China Mobile Group Device Co.,Ltd." }, { { 0xFC, 0xE8, 0x06 }, "EdifierInter", "Edifier International" }, @@ -39856,6 +40337,21 @@ { { 0x04, 0xEE, 0xE8, 0xC0 }, "daishin", "daishin" }, { { 0x04, 0xEE, 0xE8, 0xD0 }, "TopwellTechn", "Shenzhen Topwell Technology Co., Ltd." }, { { 0x04, 0xEE, 0xE8, 0xE0 }, "BestIntegrat", "Best Integration Technology Co., Ltd." }, + { { 0x08, 0x25, 0x32, 0x00 }, "WarnerElectr", "Warner Electronics (I) Pvt. Ltd." }, + { { 0x08, 0x25, 0x32, 0x10 }, "SercommPhili", "Sercomm Philippines Inc" }, + { { 0x08, 0x25, 0x32, 0x20 }, "MengfengZhan", "Shenzhen Mengfeng Zhanqi Technology Co., Ltd" }, + { { 0x08, 0x25, 0x32, 0x30 }, "Becklar", "Becklar, LLC" }, + { { 0x08, 0x25, 0x32, 0x40 }, "MegaPhase", "Mega Phase" }, + { { 0x08, 0x25, 0x32, 0x50 }, "Max", "Max Co.,Ltd." }, + { { 0x08, 0x25, 0x32, 0x60 }, "DigitalEnhan", "Digital Enhancement (Shenzhen) Co., Ltd." }, + { { 0x08, 0x25, 0x32, 0x70 }, "EmbeddedSIA", "Embedded Systems SIA" }, + { { 0x08, 0x25, 0x32, 0x80 }, "XinyuzhouInt", "Shanghai Xinyuzhou Intelligent Technology Co., Ltd." }, + { { 0x08, 0x25, 0x32, 0x90 }, "YirunTechnol", "Shenzhen Yirun Technology Co., Ltd." }, + { { 0x08, 0x25, 0x32, 0xA0 }, "Eveosp", "Eveo sp. z o.o." }, + { { 0x08, 0x25, 0x32, 0xB0 }, "ShuangheElec", "Shenzhen Shuanghe Electric Co., Ltd." }, + { { 0x08, 0x25, 0x32, 0xC0 }, "CloudTechnol", "Cloud Technology Group, Llc" }, + { { 0x08, 0x25, 0x32, 0xD0 }, "DreamSolutio", "Dream Solution Inc." }, + { { 0x08, 0x25, 0x32, 0xE0 }, "RuboMicroele", "Shenzhen Rubo Microelectronics Co.,Ltd" }, { { 0x08, 0x26, 0xAE, 0x00 }, "TianyuInform", "Wuhan Tianyu Information Industry Co., Ltd." }, { { 0x08, 0x26, 0xAE, 0x10 }, "SilionTechno", "Beijing Silion Technology Corp.,Ltd." }, { { 0x08, 0x26, 0xAE, 0x20 }, "ZaiNar", "ZaiNar" }, @@ -39948,9 +40444,19 @@ { { 0x08, 0xF8, 0x0D, 0xE0 }, "SuzhouSidiIn", "Suzhou Sidi Information Technology Co., Ltd." }, { { 0x0C, 0x0E, 0xC1, 0x00 }, "Spintronica", "Spintronica LLC" }, { { 0x0C, 0x0E, 0xC1, 0x10 }, "DeltacastTv", "Deltacast.Tv" }, + { { 0x0C, 0x0E, 0xC1, 0x20 }, "MTS", "MTS Systems Corp." }, { { 0x0C, 0x0E, 0xC1, 0x30 }, "LupaTecnolog", "Lupa Tecnologia e Sistemas Ltda" }, + { { 0x0C, 0x0E, 0xC1, 0x40 }, "SwannCommuni", "Swann Communications Pty Ltd" }, + { { 0x0C, 0x0E, 0xC1, 0x50 }, "Micron", "Micron Systems" }, { { 0x0C, 0x0E, 0xC1, 0x60 }, "CogitoTech", "Cogito Tech Company Limited" }, + { { 0x0C, 0x0E, 0xC1, 0x70 }, "naext", "naext gmbh" }, + { { 0x0C, 0x0E, 0xC1, 0x80 }, "BitsAndByteI", "Bits And Byte It Consulting Pvt Ltd" }, + { { 0x0C, 0x0E, 0xC1, 0x90 }, "GONGO", "GO.N.GO Ltd" }, + { { 0x0C, 0x0E, 0xC1, 0xA0 }, "SonoroAudio", "Sonoro Audio GmbH" }, { { 0x0C, 0x0E, 0xC1, 0xB0 }, "tecget", "tecget GmbH" }, + { { 0x0C, 0x0E, 0xC1, 0xC0 }, "InskyCommuni", "Insky Communications Private Limited" }, + { { 0x0C, 0x0E, 0xC1, 0xD0 }, "AeroraNorthA", "Aerora North America" }, + { { 0x0C, 0x0E, 0xC1, 0xE0 }, "t0technology", "t0.technology Inc." }, { { 0x0C, 0x47, 0xA9, 0x00 }, "DigitalTelem", "Digital Telemedia Technology Private Limited" }, { { 0x0C, 0x47, 0xA9, 0x10 }, "BSTElectric", "Shanghai BST Electric Co.,ltd" }, { { 0x0C, 0x47, 0xA9, 0x20 }, "Annapurnalab", "Annapurna labs" }, @@ -41058,7 +41564,7 @@ { { 0x34, 0x04, 0x9E, 0x10 }, "ConnectedIO", "Connected IO" }, { { 0x34, 0x04, 0x9E, 0x20 }, "EFDInduction", "EFD Induction" }, { { 0x34, 0x04, 0x9E, 0x30 }, "NanjingMythw", "Nanjing Mythware Information Technology Co., Ltd." }, - { { 0x34, 0x04, 0x9E, 0x40 }, "HarbinYantuo", "Harbin Yantuo Science and Technology Development Co., Ltd" }, + { { 0x34, 0x04, 0x9E, 0x40 }, "HarbinXiluTe", "Harbin Xilu Technology Co., Ltd" }, { { 0x34, 0x04, 0x9E, 0x50 }, "SeeinerTechn", "Seeiner Technology Co.,LTD" }, { { 0x34, 0x04, 0x9E, 0x60 }, "LifeInterfac", "Life Interface Co., Ltd." }, { { 0x34, 0x04, 0x9E, 0x70 }, "PebbleTechno", "Pebble Technology" }, @@ -41263,7 +41769,7 @@ { { 0x38, 0xB1, 0x4E, 0xB0 }, "HuizhouGYXXT", "Huizhou GYXX Technology Co., Ltd" }, { { 0x38, 0xB1, 0x4E, 0xC0 }, "GuangzhouSun", "Guangzhou Sunrise Technology Co., Ltd." }, { { 0x38, 0xB1, 0x4E, 0xD0 }, "Private", "Private" }, - { { 0x38, 0xB1, 0x4E, 0xE0 }, "KnitSound", "Knit Sound Company" }, + { { 0x38, 0xB1, 0x4E, 0xE0 }, "ZohoBusiness", "Zoho Business Services LLP - ZBS Nagpur," }, { { 0x38, 0xB1, 0x9E, 0x00 }, "TripleJumpMe", "Triple Jump Medical" }, { { 0x38, 0xB1, 0x9E, 0x10 }, "Freedompro", "Freedompro Srl" }, { { 0x38, 0xB1, 0x9E, 0x20 }, "Hdanywhere", "Hdanywhere" }, @@ -41818,6 +42324,21 @@ { { 0x50, 0x0B, 0x91, 0xC0 }, "DiamondTraff", "Diamond Traffic Products, Inc" }, { { 0x50, 0x0B, 0x91, 0xD0 }, "LuckySonics", "Shenzhen Lucky Sonics Co.,Ltd" }, { { 0x50, 0x0B, 0x91, 0xE0 }, "zhongjuFiber", "Shenzhen zhong ju Fiber optical Co.Ltd" }, + { { 0x50, 0x19, 0x11, 0x00 }, "AyduoElektro", "Ayduo Elektronik San. Dan. Ve Tic. A.S." }, + { { 0x50, 0x19, 0x11, 0x10 }, "ChinoECommun", "Shenzhen Chino-E Communication Co,Ltd" }, + { { 0x50, 0x19, 0x11, 0x20 }, "Hbtech", "Hbtech" }, + { { 0x50, 0x19, 0x11, 0x30 }, "IngersollRan", "Ingersoll-Rand" }, + { { 0x50, 0x19, 0x11, 0x40 }, "StavechoInte", "Stavecho Intelligence Technology (Beijing) Co., Ltd" }, + { { 0x50, 0x19, 0x11, 0x50 }, "COITechnolog", "Shenzhen COI Technology Co.,LTD" }, + { { 0x50, 0x19, 0x11, 0x60 }, "Private", "Private" }, + { { 0x50, 0x19, 0x11, 0x70 }, "GuangheZhida", "Guanghe Zhida Technology (Beijing) Co., Ltd" }, + { { 0x50, 0x19, 0x11, 0x80 }, "Art", "Art Llc" }, + { { 0x50, 0x19, 0x11, 0x90 }, "RuggedLogic", "Rugged Logic, Inc." }, + { { 0x50, 0x19, 0x11, 0xA0 }, "SigenNewEner", "Shanghai Sigen New Energy Technology Co., Ltd" }, + { { 0x50, 0x19, 0x11, 0xB0 }, "SichuanWanwu", "Sichuan Wanwu Zongheng Technology Co., Ltd." }, + { { 0x50, 0x19, 0x11, 0xC0 }, "JTechDigital", "J-Tech Digital, Inc" }, + { { 0x50, 0x19, 0x11, 0xD0 }, "MIKIKAIHATSU", "MIKI KAIHATSU Co.,Ltd" }, + { { 0x50, 0x19, 0x11, 0xE0 }, "NorthropGrum", "Northrop Grumman Italia" }, { { 0x50, 0x48, 0x2C, 0x00 }, "LandatelComu", "Landatel Comunicaciones SL" }, { { 0x50, 0x48, 0x2C, 0x10 }, "Annapurnalab", "Annapurna labs" }, { { 0x50, 0x48, 0x2C, 0x20 }, "BBPOS", "BBPOS Limited" }, @@ -42197,7 +42718,7 @@ { { 0x5C, 0x85, 0x7E, 0xE0 }, "GuoyiLiangzi", "Guoyi Liangzi (Hefei) Technology Co., Ltd(CIQTEK)" }, { { 0x5C, 0x87, 0xD8, 0x00 }, "NanjingShufa", "Nanjing Shufan Information Technology Co., Ltd." }, { { 0x5C, 0x87, 0xD8, 0x10 }, "COMETSYSTEMs", "COMET SYSTEM, s.r.o." }, - { { 0x5C, 0x87, 0xD8, 0x20 }, "Freeus", "Freeus LLC" }, + { { 0x5C, 0x87, 0xD8, 0x20 }, "Becklar", "Becklar, LLC" }, { { 0x5C, 0x87, 0xD8, 0x30 }, "BeiensImport", "Shenzhen Beiens Import and Export Co.,Ltd" }, { { 0x5C, 0x87, 0xD8, 0x40 }, "TelfiTechnol", "Telfi Technologies Private Limited" }, { { 0x5C, 0x87, 0xD8, 0x50 }, "AdvancedInte", "Hangzhou Advanced Intelligent Manufacturing Systems Co.,Ltd." }, @@ -42688,6 +43209,21 @@ { { 0x74, 0x5B, 0xC5, 0xC0 }, "ComNot", "ComNot" }, { { 0x74, 0x5B, 0xC5, 0xD0 }, "CelyssSas", "Celyss Sas" }, { { 0x74, 0x5B, 0xC5, 0xE0 }, "QingdaoWinte", "Qingdao Wintec System Co., Ltd" }, + { { 0x74, 0xA2, 0x35, 0x00 }, "FlextronicsT", "Flextronics Technologies India Private Limited" }, + { { 0x74, 0xA2, 0x35, 0x10 }, "Efference", "Efference" }, + { { 0x74, 0xA2, 0x35, 0x20 }, "DeepSeaTechn", "DeepSea Technologies" }, + { { 0x74, 0xA2, 0x35, 0x30 }, "SEETelecom", "SEE Telecom" }, + { { 0x74, 0xA2, 0x35, 0x40 }, "Zeroport", "Zeroport LTD" }, + { { 0x74, 0xA2, 0x35, 0x50 }, "Xhorse3DTech", "Shenzhen Xhorse3D Technology Co.,LTD." }, + { { 0x74, 0xA2, 0x35, 0x60 }, "Skylight", "Skylight" }, + { { 0x74, 0xA2, 0x35, 0x70 }, "BotsUnlimite", "Bots Unlimited LLC" }, + { { 0x74, 0xA2, 0x35, 0x80 }, "ProcodeTechn", "Procode Technology Litd" }, + { { 0x74, 0xA2, 0x35, 0x90 }, "Rebel", "Rebel Systems" }, + { { 0x74, 0xA2, 0x35, 0xA0 }, "CPSpeed", "CPSpeed co., ltd." }, + { { 0x74, 0xA2, 0x35, 0xB0 }, "EnterpriseSo", "Enterprise Software Solutions Lab Pvt Ltd" }, + { { 0x74, 0xA2, 0x35, 0xC0 }, "YewEnterpris", "Yew Enterprises" }, + { { 0x74, 0xA2, 0x35, 0xD0 }, "NeuromodDevi", "Neuromod Devices Ltd." }, + { { 0x74, 0xA2, 0x35, 0xE0 }, "JointelliTec", "Shenzhen Jointelli Technologies Co.,Ltd" }, { { 0x74, 0xE1, 0x4A, 0x00 }, "AltenburgerE", "Altenburger Electronic GmbH" }, { { 0x74, 0xE1, 0x4A, 0x10 }, "Cerevo", "Cerevo Inc." }, { { 0x74, 0xE1, 0x4A, 0x20 }, "KLIMATSOLECS", "KLIMAT SOLEC Sp. z o.o." }, @@ -42977,6 +43513,21 @@ { { 0x7C, 0xCB, 0xE2, 0xC0 }, "mirakontasl", "mirakonta s.l." }, { { 0x7C, 0xCB, 0xE2, 0xD0 }, "optilinknetw", "optilink networks pvt ltd" }, { { 0x7C, 0xCB, 0xE2, 0xE0 }, "AplexTechnol", "Aplex Technology Inc." }, + { { 0x7C, 0xE4, 0xA1, 0x00 }, "AltosComputi", "Altos Computing (India) Private Limited" }, + { { 0x7C, 0xE4, 0xA1, 0x10 }, "TrulyElectro", "Truly Electronics Mfg.,Ltd" }, + { { 0x7C, 0xE4, 0xA1, 0x20 }, "DeHaardt", "De Haardt bv" }, + { { 0x7C, 0xE4, 0xA1, 0x30 }, "VybeAudio", "Vybe Audio LLC" }, + { { 0x7C, 0xE4, 0xA1, 0x40 }, "WeihaiIdenco", "Weihai Idencoder Electronic Technology Co.,Ltd" }, + { { 0x7C, 0xE4, 0xA1, 0x50 }, "HITecnologia", "HI Tecnologia Industria e Comercio Ltda" }, + { { 0x7C, 0xE4, 0xA1, 0x60 }, "ISRTechnolog", "ISR Technologies Israel Ltd" }, + { { 0x7C, 0xE4, 0xA1, 0x70 }, "Keenfinity", "Keenfinity S.A." }, + { { 0x7C, 0xE4, 0xA1, 0x80 }, "LiandianComm", "Shenzhen Liandian Communication Technology Co.LTD" }, + { { 0x7C, 0xE4, 0xA1, 0x90 }, "Annapurnalab", "Annapurna labs" }, + { { 0x7C, 0xE4, 0xA1, 0xA0 }, "SZZuviTechno", "SZ Zuvi Technology Co., Ltd." }, + { { 0x7C, 0xE4, 0xA1, 0xB0 }, "Cummins", "Cummins Inc" }, + { { 0x7C, 0xE4, 0xA1, 0xC0 }, "Annapurnalab", "Annapurna labs" }, + { { 0x7C, 0xE4, 0xA1, 0xD0 }, "HarogicTechn", "Harogic Technologies Pte. Ltd." }, + { { 0x7C, 0xE4, 0xA1, 0xE0 }, "DongguanCity", "Dongguan City Boqun Electronic Technology Co., Ltd." }, { { 0x80, 0x02, 0xF4, 0x00 }, "BKNetworks", "BK Networks Co,. Ltd." }, { { 0x80, 0x02, 0xF4, 0x10 }, "Sichuanlooko", "Sichuan lookout environment protection technology co.,Ltd" }, { { 0x80, 0x02, 0xF4, 0x20 }, "Cybercore", "Beijing Cybercore" }, @@ -43266,7 +43817,7 @@ { { 0x8C, 0x14, 0x7D, 0x70 }, "UrbanHello", "UrbanHello" }, { { 0x8C, 0x14, 0x7D, 0x80 }, "V2", "V2 S.p.A." }, { { 0x8C, 0x14, 0x7D, 0x90 }, "AnywareSolut", "Anyware Solutions ApS" }, - { { 0x8C, 0x14, 0x7D, 0xA0 }, "BluemegaDocu", "Bluemega Document & Print Services" }, + { { 0x8C, 0x14, 0x7D, 0xA0 }, "Kpax", "Kpax" }, { { 0x8C, 0x14, 0x7D, 0xB0 }, "BauschDataco", "Bausch Datacom NV/SA" }, { { 0x8C, 0x14, 0x7D, 0xC0 }, "ReynaersAlum", "Reynaers Aluminium" }, { { 0x8C, 0x14, 0x7D, 0xD0 }, "Lanxustechno", "Shenzhen Lanxus technology Co. Ltd." }, @@ -43872,6 +44423,21 @@ { { 0xA0, 0x22, 0x4E, 0xC0 }, "Standartopti", "Standartoptic, Limited Liability Company" }, { { 0xA0, 0x22, 0x4E, 0xD0 }, "DigifocusTec", "Digifocus Technology Inc." }, { { 0xA0, 0x22, 0x4E, 0xE0 }, "HunanYoumeiS", "Hunan Youmei Science&Technology Development Co.,Ltd." }, + { { 0xA0, 0x24, 0x90, 0x00 }, "JackalDesign", "Jackal Design LLC" }, + { { 0xA0, 0x24, 0x90, 0x10 }, "AttenTechnol", "Shenzhen Atten Technology Co.,Ltd" }, + { { 0xA0, 0x24, 0x90, 0x20 }, "nodorinterna", "nodor international" }, + { { 0xA0, 0x24, 0x90, 0x30 }, "BoschRexroth", "Bosch Rexroth AG" }, + { { 0xA0, 0x24, 0x90, 0x40 }, "Nefence", "Nefence Inc." }, + { { 0xA0, 0x24, 0x90, 0x50 }, "Nektar", "Nektar Inc." }, + { { 0xA0, 0x24, 0x90, 0x60 }, "Siame", "Siame" }, + { { 0xA0, 0x24, 0x90, 0x70 }, "VelvuTechnol", "Velvu Technologies Private Limited" }, + { { 0xA0, 0x24, 0x90, 0x80 }, "Elisity", "Elisity, Inc." }, + { { 0xA0, 0x24, 0x90, 0x90 }, "SanshaElectr", "Sansha Electric Manufacturing Co., Ltd." }, + { { 0xA0, 0x24, 0x90, 0xA0 }, "JooanTechnol", "Shenzhen Jooan Technology Co., Ltd" }, + { { 0xA0, 0x24, 0x90, 0xB0 }, "TauroTechnol", "Tauro Technologies" }, + { { 0xA0, 0x24, 0x90, 0xC0 }, "WiEWerkfürin", "WiE GmbH - Werk für industrielle Elektronik" }, + { { 0xA0, 0x24, 0x90, 0xD0 }, "Jkin", "Jkin" }, + { { 0xA0, 0x24, 0x90, 0xE0 }, "MiniMotor", "Mini Motor Spa" }, { { 0xA0, 0x28, 0x33, 0x00 }, "GERSYS", "GERSYS GmbH" }, { { 0xA0, 0x28, 0x33, 0x10 }, "Ordercube", "Ordercube GmbH" }, { { 0xA0, 0x28, 0x33, 0x20 }, "NohmiSecomFi", "Shanghai Nohmi Secom Fire Protection Equipment Co.,Ltd." }, @@ -44344,6 +44910,21 @@ { { 0xB4, 0xAB, 0xF3, 0xC0 }, "Annapurnalab", "Annapurna labs" }, { { 0xB4, 0xAB, 0xF3, 0xD0 }, "AtlasTech", "Atlas Tech Inc" }, { { 0xB4, 0xAB, 0xF3, 0xE0 }, "RangDongLigh", "Rang Dong Light Source & Vacuum Flask J.S.C" }, + { { 0xB4, 0xDF, 0x43, 0x00 }, "Metatronix", "Metatronix srl" }, + { { 0xB4, 0xDF, 0x43, 0x10 }, "UtaWireless", "Uta Wireless S.R.L." }, + { { 0xB4, 0xDF, 0x43, 0x20 }, "WenzelAssoci", "Wenzel Associates" }, + { { 0xB4, 0xDF, 0x43, 0x30 }, "HuasuTechnol", "Hangzhou Huasu Technology CO., LTD." }, + { { 0xB4, 0xDF, 0x43, 0x40 }, "HuizhenFishe", "Shenzhen Huizhen Fishery Co., Ltd." }, + { { 0xB4, 0xDF, 0x43, 0x50 }, "EnokCommunic", "Guangdong Enok Communication CO.,Ltd." }, + { { 0xB4, 0xDF, 0x43, 0x60 }, "ViLab", "Vi Lab" }, + { { 0xB4, 0xDF, 0x43, 0x70 }, "RDPInnovatio", "RDP Innovation" }, + { { 0xB4, 0xDF, 0x43, 0x80 }, "QizhiInnovat", "Qizhi Innovation (shenzhen) Conmmunication Technology Co., Ltd" }, + { { 0xB4, 0xDF, 0x43, 0x90 }, "Epilady2000", "Epilady 2000" }, + { { 0xB4, 0xDF, 0x43, 0xA0 }, "HuaqinTechno", "Huaqin Technology Co.,Ltd" }, + { { 0xB4, 0xDF, 0x43, 0xB0 }, "HuatenIntern", "Huaten International Technology Limited" }, + { { 0xB4, 0xDF, 0x43, 0xC0 }, "RavenResonan", "Raven Resonance Inc." }, + { { 0xB4, 0xDF, 0x43, 0xD0 }, "LeicaBiosyst", "Leica Biosystems Shanghai" }, + { { 0xB4, 0xDF, 0x43, 0xE0 }, "WellsunNewEn", "Shanghai Wellsun New Energy Co.,Ltd." }, { { 0xB8, 0x4C, 0x87, 0x00 }, "Annapurnalab", "Annapurna labs" }, { { 0xB8, 0x4C, 0x87, 0x10 }, "emtrak", "em-trak" }, { { 0xB8, 0x4C, 0x87, 0x20 }, "Huixiangfeng", "Shenzhen Huixiangfeng Electronic Technology Co., Ltd." }, @@ -44764,7 +45345,7 @@ { { 0xC8, 0x63, 0x14, 0x90 }, "Maxcom", "Maxcom S.A." }, { { 0xC8, 0x63, 0x14, 0xA0 }, "Optictimes", "Optictimes Co.,Ltd" }, { { 0xC8, 0x63, 0x14, 0xB0 }, "LiheweiElect", "Shenzhen Lihewei Electronics Co.,Ltd.Hunan Branch" }, - { { 0xC8, 0x63, 0x14, 0xC0 }, "Freeus", "Freeus LLC" }, + { { 0xC8, 0x63, 0x14, 0xC0 }, "Becklar", "Becklar, LLC" }, { { 0xC8, 0x63, 0x14, 0xD0 }, "Telematix", "Telematix AG" }, { { 0xC8, 0x63, 0x14, 0xE0 }, "TaylorDynamo", "Taylor Dynamometer" }, { { 0xC8, 0x6B, 0xBC, 0x00 }, "SafelyYou", "SafelyYou" }, @@ -44874,6 +45455,21 @@ { { 0xCC, 0x22, 0x37, 0xC0 }, "HebeiZHSFTec", "Hebei ZHSF Technology Co.,Ltd." }, { { 0xCC, 0x22, 0x37, 0xD0 }, "HooenergyTec", "Shenzhen Hooenergy Technology Co.,Ltd" }, { { 0xCC, 0x22, 0x37, 0xE0 }, "Manufacturas", "Manufacturas Y Transformados Ab, S.L." }, + { { 0xCC, 0x39, 0x53, 0x00 }, "QingdaoSansh", "Qingdao Sanshun Smart Electric Appliance Co.,Ltd." }, + { { 0xCC, 0x39, 0x53, 0x10 }, "Viatek", "Viatek" }, + { { 0xCC, 0x39, 0x53, 0x20 }, "Esys", "Esys Srl" }, + { { 0xCC, 0x39, 0x53, 0x30 }, "NingboAllian", "Ningbo AllianStream Photonics Technology Co., Ltd." }, + { { 0xCC, 0x39, 0x53, 0x40 }, "XuanchengLux", "Xuancheng Luxshare Precision Industry Co., Ltd." }, + { { 0xCC, 0x39, 0x53, 0x50 }, "JunliTechnol", "Shenzhen Junli Technology Co., Ltd" }, + { { 0xCC, 0x39, 0x53, 0x60 }, "SkyWingCommu", "Sky Wing Communication Electronics Co., Ltd." }, + { { 0xCC, 0x39, 0x53, 0x70 }, "SuperxonComm", "Chengdu Superxon Communication Technology Co., Ltd." }, + { { 0xCC, 0x39, 0x53, 0x80 }, "EliteDigital", "Hangzhou Elite Digital Technology co., Ltd" }, + { { 0xCC, 0x39, 0x53, 0x90 }, "MtLinkTechno", "Mt-Link Technologies Co" }, + { { 0xCC, 0x39, 0x53, 0xA0 }, "InTallyConDe", "InTallyCon Development FZCO" }, + { { 0xCC, 0x39, 0x53, 0xB0 }, "DatCondoo", "Dat-Con d.o.o." }, + { { 0xCC, 0x39, 0x53, 0xC0 }, "BroadbandNet", "Broadband Net Inc" }, + { { 0xCC, 0x39, 0x53, 0xD0 }, "GuangzhouXra", "Guang zhou Xradio Technology Co., Ltd" }, + { { 0xCC, 0x39, 0x53, 0xE0 }, "NingboXiaoji", "Ningbo Xiaojiang IoT Technology Co., Ltd." }, { { 0xCC, 0x4F, 0x5C, 0x00 }, "RenHengMeiGu", "Chengdu Ren Heng Mei Guang Technology Co.,Ltd." }, { { 0xCC, 0x4F, 0x5C, 0x10 }, "lesswire", "lesswire GmbH" }, { { 0xCC, 0x4F, 0x5C, 0x20 }, "MatchX", "MatchX GmbH" }, @@ -45145,6 +45741,20 @@ { { 0xD0, 0xD9, 0x4F, 0xC0 }, "ArrowaveTech", "Arrowave Technologies Limited" }, { { 0xD0, 0xD9, 0x4F, 0xD0 }, "Duksanmecasy", "Duksanmecasys Co., Ltd." }, { { 0xD0, 0xD9, 0x4F, 0xE0 }, "Appotronics", "Appotronics Co., Ltd" }, + { { 0xD0, 0xDA, 0x24, 0x00 }, "DeepriftTech", "Beijing Deeprift Technologies Co., Ltd." }, + { { 0xD0, 0xDA, 0x24, 0x10 }, "WitstekHongk", "Witstek Hongkong Limited" }, + { { 0xD0, 0xDA, 0x24, 0x20 }, "acemetroelec", "acemetro electronics india private limited" }, + { { 0xD0, 0xDA, 0x24, 0x30 }, "ArcvideoTech", "Hangzhou Arcvideo Technology Co., Ltd." }, + { { 0xD0, 0xDA, 0x24, 0x40 }, "NationalSecu", "National Security Technology JSC" }, + { { 0xD0, 0xDA, 0x24, 0x50 }, "ZhangyueTech", "Shenzhen Zhangyue Technology Co.,Ltd" }, + { { 0xD0, 0xDA, 0x24, 0x60 }, "AheesaDigita", "Aheesa Digital Innovations Private Limited" }, + { { 0xD0, 0xDA, 0x24, 0x70 }, "Canlab", "Canlab Co., Ltd." }, + { { 0xD0, 0xDA, 0x24, 0x80 }, "YunsiliconTe", "Shanghai Yunsilicon Technology Co., Ltd." }, + { { 0xD0, 0xDA, 0x24, 0x90 }, "TeradyneRobo", "Teradyne Robotics A/S" }, + { { 0xD0, 0xDA, 0x24, 0xA0 }, "BeilaiTechno", "Shenzhen Beilai Technology Co.,Ltd" }, + { { 0xD0, 0xDA, 0x24, 0xB0 }, "Cjms", "Cjms Llc" }, + { { 0xD0, 0xDA, 0x24, 0xC0 }, "AlloopLimite", "Alloop（Hong kong）Limited" }, + { { 0xD0, 0xDA, 0x24, 0xD0 }, "AmenTech", "AmenTech Inc." }, { { 0xD4, 0x20, 0x00, 0x00 }, "Wattsense", "Wattsense" }, { { 0xD4, 0x20, 0x00, 0x10 }, "ZelusTechnol", "Zelus(HuangZhou) Technology Ltd." }, { { 0xD4, 0x20, 0x00, 0x20 }, "AIDevelopMan", "Shenzhen AI Develop & Manufacture Co.,LTD." }, @@ -45780,7 +46390,7 @@ { { 0xF4, 0x20, 0x55, 0xE0 }, "KeykingTechn", "Shenzhen Keyking Technology Limited" }, { { 0xF4, 0x3A, 0xFA, 0x00 }, "AugustDevice", "AugustDevices India Private limited" }, { { 0xF4, 0x3A, 0xFA, 0x10 }, "DspreadTechn", "Dspread Technology (Beijing) Inc." }, - { { 0xF4, 0x3A, 0xFA, 0x20 }, "Private", "Private" }, + { { 0xF4, 0x3A, 0xFA, 0x20 }, "RuijieNetwor", "Ruijie Networks Co.,LTD" }, { { 0xF4, 0x3A, 0xFA, 0x30 }, "JiaxingHaish", "Jiaxing Haishijiaan Smartcity Technology CO., LTD." }, { { 0xF4, 0x3A, 0xFA, 0x40 }, "Aifrutech", "Aifrutech Co.,LTD" }, { { 0xF4, 0x3A, 0xFA, 0x50 }, "GrayeyeITPri", "Grayeye IT Systems Private Limited" }, @@ -45821,7 +46431,7 @@ { { 0xF4, 0x70, 0x0C, 0xA0 }, "JinanHuakeEl", "Jinan Huake Electrical Device Co., Ltd." }, { { 0xF4, 0x70, 0x0C, 0xB0 }, "RisingpoElec", "Shanghai Risingpo Electronics CO.,LTD" }, { { 0xF4, 0x70, 0x0C, 0xC0 }, "GSDGroup", "G.S.D Group Inc." }, - { { 0xF4, 0x70, 0x0C, 0xD0 }, "Freeus", "Freeus LLC" }, + { { 0xF4, 0x70, 0x0C, 0xD0 }, "Becklar", "Becklar, LLC" }, { { 0xF4, 0x70, 0x0C, 0xE0 }, "WeProTalkTec", "Shenzhen WeProTalk Technology Co., Ltd." }, { { 0xF4, 0x90, 0xCB, 0x00 }, "Epitel", "Epitel, Inc." }, { { 0xF4, 0x90, 0xCB, 0x10 }, "Delem", "Delem Bv" }, @@ -49516,7 +50126,7 @@ { { 0x00, 0x50, 0xC2, 0xCA, 0x20 }, "Logical", "The Logical Company" }, { { 0x00, 0x50, 0xC2, 0xCA, 0x30 }, "CT", "CT Company" }, { { 0x00, 0x50, 0xC2, 0xCA, 0x40 }, "VoxTechnolog", "Vox Technologies" }, - { { 0x00, 0x50, 0xC2, 0xCA, 0x50 }, "Yokowo", "Yokowo Co.,Ltd" }, + { { 0x00, 0x50, 0xC2, 0xCA, 0x50 }, "Yokowo", "Yokowo Co., Ltd." }, { { 0x00, 0x50, 0xC2, 0xCA, 0x60 }, "Vidisys", "Vidisys GmbH" }, { { 0x00, 0x50, 0xC2, 0xCA, 0x70 }, "ThermoFisher", "Thermo Fisher Scientific" }, { { 0x00, 0x50, 0xC2, 0xCA, 0x80 }, "SystemsWithI", "Systems With Intelligence Inc." }, @@ -51473,7 +52083,7 @@ { { 0x70, 0xB3, 0xD5, 0x26, 0x60 }, "SpectraDispl", "Spectra Displays Ltd" }, { { 0x70, 0xB3, 0xD5, 0x26, 0x70 }, "ZehntnerTest", "Zehntner Testing Instruments" }, { { 0x70, 0xB3, 0xD5, 0x26, 0x80 }, "CardinalScal", "Cardinal Scale Mfg Co" }, - { { 0x70, 0xB3, 0xD5, 0x26, 0x90 }, "GilbarcoVeed", "Gilbarco Veeder-Root ‎" }, + { { 0x70, 0xB3, 0xD5, 0x26, 0x90 }, "GilbarcoVeed", "Gilbarco Veeder-Root" }, { { 0x70, 0xB3, 0xD5, 0x26, 0xA0 }, "TalleresdeEs", "Talleres de Escoriaza SA" }, { { 0x70, 0xB3, 0xD5, 0x26, 0xB0 }, "Sorama", "Sorama BV" }, { { 0x70, 0xB3, 0xD5, 0x26, 0xC0 }, "EAElektroaut", "EA Elektroautomatik GmbH & Co. KG" }, @@ -51881,7 +52491,7 @@ { { 0x70, 0xB3, 0xD5, 0x3F, 0xE0 }, "SiemensIndus", "Siemens Industry Software Inc." }, { { 0x70, 0xB3, 0xD5, 0x3F, 0xF0 }, "HydraControl", "Hydra Controls" }, { { 0x70, 0xB3, 0xD5, 0x40, 0x00 }, "Vtron", "Vtron Pty Ltd" }, - { { 0x70, 0xB3, 0xD5, 0x40, 0x10 }, "Private", "Private" }, + { { 0x70, 0xB3, 0xD5, 0x40, 0x10 }, "CEM", "CEM Ltd" }, { { 0x70, 0xB3, 0xD5, 0x40, 0x20 }, "AKIStechnolo", "AKIS technologies" }, { { 0x70, 0xB3, 0xD5, 0x40, 0x30 }, "MightyCube", "Mighty Cube Co., Ltd." }, { { 0x70, 0xB3, 0xD5, 0x40, 0x40 }, "RANIX", "RANIX,Inc." }, @@ -54957,6 +55567,7 @@ { { 0x8C, 0x1F, 0x64, 0x00, 0xA0 }, "TaskUnite", "TaskUnite Inc. (dba AMPAworks)" }, { { 0x8C, 0x1F, 0x64, 0x00, 0xC0 }, "GuanShowTech", "Guan Show Technologe Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x00, 0xD0 }, "T4ISp", "T4I Sp. z o.o." }, + { { 0x8C, 0x1F, 0x64, 0x00, 0xE0 }, "HamayanTechn", "Hamayan Technology" }, { { 0x8C, 0x1F, 0x64, 0x01, 0x10 }, "DEUTAWERKE", "DEUTA-WERKE GmbH" }, { { 0x8C, 0x1F, 0x64, 0x01, 0x40 }, "CristalContr", "Cristal Controles Ltee" }, { { 0x8C, 0x1F, 0x64, 0x01, 0x60 }, "SigntelCommu", "Signtel Communications Pvt Ltd" }, @@ -54985,6 +55596,7 @@ { { 0x8C, 0x1F, 0x64, 0x03, 0x50 }, "RealWear", "RealWear" }, { { 0x8C, 0x1F, 0x64, 0x03, 0x60 }, "PhotonCounti", "Photon Counting Systems LLC" }, { { 0x8C, 0x1F, 0x64, 0x03, 0x70 }, "EnlessWirele", "Enless Wireless" }, + { { 0x8C, 0x1F, 0x64, 0x03, 0x90 }, "BreasMedical", "Breas Medical AB" }, { { 0x8C, 0x1F, 0x64, 0x03, 0xA0 }, "OrionCompute", "Orion Computers" }, { { 0x8C, 0x1F, 0x64, 0x03, 0xB0 }, "OrionPower", "Orion Power Systems, Inc." }, { { 0x8C, 0x1F, 0x64, 0x03, 0xC0 }, "SonaBusiness", "Sona Business B.V." }, @@ -55039,6 +55651,7 @@ { { 0x8C, 0x1F, 0x64, 0x08, 0x10 }, "HarmonyFire", "Harmony Fire Ltd" }, { { 0x8C, 0x1F, 0x64, 0x08, 0x20 }, "ZhongchengTe", "Zhongcheng Technology Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x08, 0x30 }, "Avionica", "Avionica" }, + { { 0x8C, 0x1F, 0x64, 0x08, 0x40 }, "KSTtechnolog", "KST technology" }, { { 0x8C, 0x1F, 0x64, 0x08, 0x50 }, "SorbEngineer", "Sorb Engineering Llc" }, { { 0x8C, 0x1F, 0x64, 0x08, 0x60 }, "WEPTECHelekt", "WEPTECH elektronik GmbH" }, { { 0x8C, 0x1F, 0x64, 0x08, 0x90 }, "AnserNet", "Anser-Net Co., Ltd" }, @@ -55076,6 +55689,7 @@ { { 0x8C, 0x1F, 0x64, 0x0A, 0xE0 }, "GogoBA", "Gogo BA" }, { { 0x8C, 0x1F, 0x64, 0x0A, 0xF0 }, "ForseePower", "Forsee Power" }, { { 0x8C, 0x1F, 0x64, 0x0B, 0x00 }, "BunkaShutter", "Bunka Shutter Co., Ltd." }, + { { 0x8C, 0x1F, 0x64, 0x0B, 0x30 }, "NetSenseCybe", "NetSense CyberSecurity Private Limited" }, { { 0x8C, 0x1F, 0x64, 0x0B, 0x50 }, "SMCGateway", "SMC Gateway" }, { { 0x8C, 0x1F, 0x64, 0x0B, 0x60 }, "LukeGrangerB", "Luke Granger-Brown" }, { { 0x8C, 0x1F, 0x64, 0x0B, 0x70 }, "Tiama", "Tiama" }, @@ -55095,6 +55709,7 @@ { { 0x8C, 0x1F, 0x64, 0x0C, 0xC0 }, "SmartIElectr", "Smart I Electronics Systems Pvt. Ltd." }, { { 0x8C, 0x1F, 0x64, 0x0C, 0xD0 }, "DEUTAWerke", "DEUTA Werke GmbH" }, { { 0x8C, 0x1F, 0x64, 0x0C, 0xE0 }, "Digitella", "Digitella Inc." }, + { { 0x8C, 0x1F, 0x64, 0x0C, 0xF0 }, "R2Vision", "R2Vision GmbH" }, { { 0x8C, 0x1F, 0x64, 0x0D, 0x00 }, "LumiplanDuha", "Lumiplan-Duhamel" }, { { 0x8C, 0x1F, 0x64, 0x0D, 0x20 }, "biosilver", "biosilver.co.,ltd" }, { { 0x8C, 0x1F, 0x64, 0x0D, 0x30 }, "erfiErnstFis", "erfi Ernst Fischer GmbH+Co.KG" }, @@ -55102,8 +55717,11 @@ { { 0x8C, 0x1F, 0x64, 0x0D, 0x50 }, "RealD", "RealD, Inc." }, { { 0x8C, 0x1F, 0x64, 0x0D, 0x60 }, "AvdInnovatio", "Avd Innovation Limited" }, { { 0x8C, 0x1F, 0x64, 0x0D, 0x80 }, "PowerElectro", "Power Electronics Espana, S.L." }, + { { 0x8C, 0x1F, 0x64, 0x0D, 0xE0 }, "AceTech", "Ace Tech" }, { { 0x8C, 0x1F, 0x64, 0x0D, 0xF0 }, "Leidos", "Leidos" }, { { 0x8C, 0x1F, 0x64, 0x0E, 0x00 }, "Autopharma", "Autopharma" }, + { { 0x8C, 0x1F, 0x64, 0x0E, 0x10 }, "Riverloop", "Riverloop Co., Ltd." }, + { { 0x8C, 0x1F, 0x64, 0x0E, 0x20 }, "CardinalScal", "Cardinal Scales Manufacturing Co" }, { { 0x8C, 0x1F, 0x64, 0x0E, 0x30 }, "JISEONGENG", "JISEONGENG Co,.LTD" }, { { 0x8C, 0x1F, 0x64, 0x0E, 0x50 }, "RuggedScienc", "Rugged Science" }, { { 0x8C, 0x1F, 0x64, 0x0E, 0x60 }, "CleanwattsDi", "Cleanwatts Digital, S.A." }, @@ -55130,11 +55748,13 @@ { { 0x8C, 0x1F, 0x64, 0x10, 0x50 }, "AixControl", "AixControl GmbH" }, { { 0x8C, 0x1F, 0x64, 0x10, 0x60 }, "XingtuxinkeE", "Wuhan Xingtuxinke ELectronic Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x10, 0x70 }, "SCITechnolog", "SCI Technology, Inc." }, + { { 0x8C, 0x1F, 0x64, 0x10, 0x90 }, "TESCANGROUP", "TESCAN GROUP, a.s." }, { { 0x8C, 0x1F, 0x64, 0x10, 0xA0 }, "Sicon", "Sicon srl" }, { { 0x8C, 0x1F, 0x64, 0x10, 0xB0 }, "RedLionEurop", "Red Lion Europe GmbH" }, { { 0x8C, 0x1F, 0x64, 0x10, 0xF0 }, "ScenarioAuto", "Scenario Automation" }, { { 0x8C, 0x1F, 0x64, 0x11, 0x00 }, "XianLinkingB", "Xian Linking Backhaul Telecom Technology Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x11, 0x10 }, "Isac", "Isac Srl" }, + { { 0x8C, 0x1F, 0x64, 0x11, 0x20 }, "Isac", "Isac Srl" }, { { 0x8C, 0x1F, 0x64, 0x11, 0x30 }, "TimberlineMa", "Timberline Manufacturing" }, { { 0x8C, 0x1F, 0x64, 0x11, 0x40 }, "SanminaSCIMe", "Sanmina SCI Medical" }, { { 0x8C, 0x1F, 0x64, 0x11, 0x50 }, "NeuralogLP", "Neuralog LP" }, @@ -55162,6 +55782,7 @@ { { 0x8C, 0x1F, 0x64, 0x13, 0x80 }, "Vissavisp", "Vissavi sp. z o.o." }, { { 0x8C, 0x1F, 0x64, 0x13, 0xB0 }, "SDELcc", "SDELcc" }, { { 0x8C, 0x1F, 0x64, 0x13, 0xC0 }, "SiFive", "SiFive Inc" }, + { { 0x8C, 0x1F, 0x64, 0x13, 0xD0 }, "InabaTechnoE", "Inaba Techno Evolution Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x13, 0xE0 }, "BtecIndustri", "Btec Industrial Instrument Sdn. Bhd." }, { { 0x8C, 0x1F, 0x64, 0x13, 0xF0 }, "Elsist", "Elsist Srl" }, { { 0x8C, 0x1F, 0x64, 0x14, 0x00 }, "RFTuote", "RF-Tuote Oy" }, @@ -55187,6 +55808,7 @@ { { 0x8C, 0x1F, 0x64, 0x15, 0xE0 }, "Dynomotion", "Dynomotion, Inc" }, { { 0x8C, 0x1F, 0x64, 0x16, 0x40 }, "RevoTec", "Revo - Tec GmbH" }, { { 0x8C, 0x1F, 0x64, 0x16, 0x60 }, "HikariAlphax", "Hikari Alphax Inc." }, + { { 0x8C, 0x1F, 0x64, 0x16, 0x80 }, "JAPANID", "JAPAN ID Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x16, 0x90 }, "CreativeTele", "Creative Telecom Pvt. Ltd." }, { { 0x8C, 0x1F, 0x64, 0x16, 0xA0 }, "Keyline", "Keyline S.P.A." }, { { 0x8C, 0x1F, 0x64, 0x16, 0xB0 }, "TKRSpezialwe", "TKR Spezialwerkzeuge GmbH" }, @@ -55194,6 +55816,7 @@ { { 0x8C, 0x1F, 0x64, 0x16, 0xE0 }, "BenchmarkEle", "Benchmark Electronics BV" }, { { 0x8C, 0x1F, 0x64, 0x16, 0xF0 }, "Codasipsro", "Codasip s.r.o." }, { { 0x8C, 0x1F, 0x64, 0x17, 0x00 }, "FracarroRadi", "Fracarro Radioindustrie Srl" }, + { { 0x8C, 0x1F, 0x64, 0x17, 0x10 }, "Maxphotoics", "Maxphotoics GmbH" }, { { 0x8C, 0x1F, 0x64, 0x17, 0x40 }, "KSTtechnolog", "KST technology" }, { { 0x8C, 0x1F, 0x64, 0x17, 0x50 }, "YiValleyOpto", "Wuhan YiValley Opto-electric technology Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x17, 0x60 }, "Leidos", "Leidos Inc" }, @@ -55208,6 +55831,7 @@ { { 0x8C, 0x1F, 0x64, 0x18, 0x00 }, "StructuralIn", "Structural Integrity Services" }, { { 0x8C, 0x1F, 0x64, 0x18, 0x20 }, "Private", "Private" }, { { 0x8C, 0x1F, 0x64, 0x18, 0x30 }, "NICETotalCas", "NICE Total Cash Management Co., Ltd." }, + { { 0x8C, 0x1F, 0x64, 0x18, 0x40 }, "GJDManufactu", "GJD Manufacturing" }, { { 0x8C, 0x1F, 0x64, 0x18, 0x50 }, "BiotageGb", "Biotage Gb Ltd" }, { { 0x8C, 0x1F, 0x64, 0x18, 0x60 }, "BreasMedical", "Breas Medical AB" }, { { 0x8C, 0x1F, 0x64, 0x18, 0x70 }, "Sicon", "Sicon srl" }, @@ -55225,9 +55849,10 @@ { { 0x8C, 0x1F, 0x64, 0x19, 0xB0 }, "FeedFlo", "FeedFlo" }, { { 0x8C, 0x1F, 0x64, 0x19, 0xC0 }, "Aton", "Aton srl" }, { { 0x8C, 0x1F, 0x64, 0x1A, 0x00 }, "EngageTechno", "Engage Technologies" }, + { { 0x8C, 0x1F, 0x64, 0x1A, 0x40 }, "QinghongChua", "Beijing Qinghong Chuangzhi Technology Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0x1A, 0x50 }, "Dialtronics", "Dialtronics Systems Pvt Ltd" }, { { 0x8C, 0x1F, 0x64, 0x1A, 0x70 }, "aelettronica", "aelettronica group srl" }, - { { 0x8C, 0x1F, 0x64, 0x1A, 0x80 }, "Private", "Private" }, + { { 0x8C, 0x1F, 0x64, 0x1A, 0x80 }, "LCREmbedded", "LCR Embedded Systems" }, { { 0x8C, 0x1F, 0x64, 0x1A, 0xC0 }, "Unitron", "Unitron Systems b.v." }, { { 0x8C, 0x1F, 0x64, 0x1A, 0xD0 }, "NexxtoServic", "Nexxto Servicos Em Tecnologia da Informacao SA" }, { { 0x8C, 0x1F, 0x64, 0x1A, 0xE0 }, "BounceImagin", "Bounce Imaging" }, @@ -55280,6 +55905,7 @@ { { 0x8C, 0x1F, 0x64, 0x1E, 0xE0 }, "Kneron", "Kneron (Taiwan) Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x1E, 0xF0 }, "Tantronic", "Tantronic AG" }, { { 0x8C, 0x1F, 0x64, 0x1F, 0x00 }, "AVCOMMTechno", "AVCOMM Technologies Inc" }, + { { 0x8C, 0x1F, 0x64, 0x1F, 0x20 }, "SpyderContro", "Spyder Controls Corp." }, { { 0x8C, 0x1F, 0x64, 0x1F, 0x40 }, "EiffageEnerg", "Eiffage Energie Electronique" }, { { 0x8C, 0x1F, 0x64, 0x1F, 0x50 }, "NanoThings", "NanoThings Inc." }, { { 0x8C, 0x1F, 0x64, 0x1F, 0x70 }, "Sicon", "Sicon srl" }, @@ -55298,9 +55924,13 @@ { { 0x8C, 0x1F, 0x64, 0x20, 0xC0 }, "StairmedTech", "Shanghai Stairmed Technology Co.,ltd" }, { { 0x8C, 0x1F, 0x64, 0x20, 0xD0 }, "Grossenbache", "Grossenbacher Systeme AG" }, { { 0x8C, 0x1F, 0x64, 0x20, 0xE0 }, "AlphaBridgeT", "Alpha Bridge Technologies Private Limited" }, + { { 0x8C, 0x1F, 0x64, 0x20, 0xF0 }, "Dave", "Dave Srl" }, + { { 0x8C, 0x1F, 0x64, 0x21, 0x00 }, "Trunexa", "Trunexa Inc" }, { { 0x8C, 0x1F, 0x64, 0x21, 0x10 }, "BipomElectro", "Bipom Electronics, Inc." }, + { { 0x8C, 0x1F, 0x64, 0x21, 0x20 }, "Svms", "Svms" }, { { 0x8C, 0x1F, 0x64, 0x21, 0x50 }, "XLOGIC", "XLOGIC srl" }, { { 0x8C, 0x1F, 0x64, 0x21, 0x60 }, "HiwinMikrosy", "Hiwin Mikrosystem Corp." }, + { { 0x8C, 0x1F, 0x64, 0x21, 0x80 }, "SymphonyInte", "Symphony Interactive Inc" }, { { 0x8C, 0x1F, 0x64, 0x21, 0x90 }, "GuangzhouDes", "Guangzhou Desam Audio Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x21, 0xA0 }, "ExicomTechno", "Exicom Technologies India Pvt. Ltd." }, { { 0x8C, 0x1F, 0x64, 0x21, 0xC0 }, "LLCEMSExpert", "LLC \"EMS-Expert\"" }, @@ -55339,6 +55969,7 @@ { { 0x8C, 0x1F, 0x64, 0x25, 0x90 }, "SHODEN", "SHODEN Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x25, 0xA0 }, "XingtuxinkeE", "Wuhan Xingtuxinke ELectronic Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x25, 0xC0 }, "TimeMachines", "TimeMachines Inc." }, + { { 0x8C, 0x1F, 0x64, 0x25, 0xD0 }, "mpsonic", "mpsonic" }, { { 0x8C, 0x1F, 0x64, 0x25, 0xE0 }, "R2Sonic", "R2Sonic, LLC" }, { { 0x8C, 0x1F, 0x64, 0x25, 0xF0 }, "Acuris", "Acuris Inc" }, { { 0x8C, 0x1F, 0x64, 0x26, 0x00 }, "Ealarms", "E-alarms" }, @@ -55404,11 +56035,13 @@ { { 0x8C, 0x1F, 0x64, 0x2A, 0x90 }, "ElbitAmerica", "Elbit Systems of America, LLC" }, { { 0x8C, 0x1F, 0x64, 0x2A, 0xA0 }, "XianSingular", "Xi'an Singularity Energy Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x2A, 0xC0 }, "Dco", "Dco Systems Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x2A, 0xD0 }, "SugiharaSoft", "Sugihara Software and Electron Industry" }, { { 0x8C, 0x1F, 0x64, 0x2A, 0xF0 }, "ABestLid", "A-Best Co.,Lid." }, { { 0x8C, 0x1F, 0x64, 0x2B, 0x10 }, "UMeiDahIntLE", "U -Mei-Dah Int'L Enterprise Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0x2B, 0x40 }, "Sonel", "Sonel S.A." }, { { 0x8C, 0x1F, 0x64, 0x2B, 0x60 }, "StercomPower", "Stercom Power Solutions GmbH" }, { { 0x8C, 0x1F, 0x64, 0x2B, 0x80 }, "Veinland", "Veinland GmbH" }, + { { 0x8C, 0x1F, 0x64, 0x2B, 0x90 }, "UltrasonicEn", "Ultrasonic Engineering Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x2B, 0xB0 }, "ChakraTechno", "Chakra Technology Ltd" }, { { 0x8C, 0x1F, 0x64, 0x2B, 0xC0 }, "DEUTAWerke", "DEUTA Werke GmbH" }, { { 0x8C, 0x1F, 0x64, 0x2B, 0xF0 }, "GogoBusiness", "Gogo Business Aviation" }, @@ -55497,6 +56130,7 @@ { { 0x8C, 0x1F, 0x64, 0x33, 0xF0 }, "LotecTeknolo", "Lotec Teknoloji Limited Sirketi" }, { { 0x8C, 0x1F, 0x64, 0x34, 0x00 }, "BRSSistemasE", "BRS Sistemas Eletrônicos" }, { { 0x8C, 0x1F, 0x64, 0x34, 0x20 }, "TimeMachines", "TimeMachines Inc." }, + { { 0x8C, 0x1F, 0x64, 0x34, 0x30 }, "SyscomInstru", "Syscom Instruments SA" }, { { 0x8C, 0x1F, 0x64, 0x34, 0x50 }, "KreafeuerSwi", "Kreafeuer AG, Swiss finsh" }, { { 0x8C, 0x1F, 0x64, 0x34, 0x70 }, "Plutdoo", "Plut d.o.o." }, { { 0x8C, 0x1F, 0x64, 0x34, 0x80 }, "BreasMedical", "Breas Medical AB" }, @@ -55511,6 +56145,7 @@ { { 0x8C, 0x1F, 0x64, 0x35, 0x40 }, "PaulTagliamo", "Paul Tagliamonte" }, { { 0x8C, 0x1F, 0x64, 0x35, 0x70 }, "YUYAMAMFG", "YUYAMA MFG Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x35, 0x80 }, "DensoManufac", "Denso Manufacturing Tennessee" }, + { { 0x8C, 0x1F, 0x64, 0x35, 0x90 }, "DongguanRiti", "Dongguan Ritian Communication Technology Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x35, 0xA0 }, "KoreaElectri", "Korea Electric Vehicle Infra Technology" }, { { 0x8C, 0x1F, 0x64, 0x35, 0xC0 }, "OpgalOptroni", "Opgal Optronic Industries ltd" }, { { 0x8C, 0x1F, 0x64, 0x35, 0xD0 }, "Security&Bes", "Security&Best" }, @@ -55527,6 +56162,7 @@ { { 0x8C, 0x1F, 0x64, 0x36, 0xA0 }, "INVENTIS", "INVENTIS S.r.l." }, { { 0x8C, 0x1F, 0x64, 0x36, 0xB0 }, "ViewSonic", "ViewSonic Corp" }, { { 0x8C, 0x1F, 0x64, 0x36, 0xC0 }, "ScrambleTool", "Scramble Tools LLC" }, + { { 0x8C, 0x1F, 0x64, 0x36, 0xD0 }, "WavebandTech", "Waveband Technologies Pvt Limited" }, { { 0x8C, 0x1F, 0x64, 0x36, 0xE0 }, "AbbottDiagno", "Abbott Diagnostics Technologies AS" }, { { 0x8C, 0x1F, 0x64, 0x36, 0xF0 }, "SpManufactur", "Sp Manufacturing Pte Ltd" }, { { 0x8C, 0x1F, 0x64, 0x37, 0x00 }, "WOLFAdvanced", "WOLF Advanced Technology" }, @@ -55573,6 +56209,7 @@ { { 0x8C, 0x1F, 0x64, 0x3A, 0x30 }, "Lumentum", "Lumentum" }, { { 0x8C, 0x1F, 0x64, 0x3A, 0x40 }, "QLMTechnolog", "QLM Technology Ltd" }, { { 0x8C, 0x1F, 0x64, 0x3A, 0x50 }, "TechmoversIn", "Techmovers Systems India Limited" }, + { { 0x8C, 0x1F, 0x64, 0x3A, 0x70 }, "FormFactor", "FormFactor" }, { { 0x8C, 0x1F, 0x64, 0x3A, 0xC0 }, "BenisonTech", "Benison Tech" }, { { 0x8C, 0x1F, 0x64, 0x3A, 0xD0 }, "TowerIQ", "TowerIQ" }, { { 0x8C, 0x1F, 0x64, 0x3A, 0xF0 }, "PSATechnolog", "PSA Technology Ltda." }, @@ -55589,6 +56226,7 @@ { { 0x8C, 0x1F, 0x64, 0x3C, 0x00 }, "Snek", "Snek" }, { { 0x8C, 0x1F, 0x64, 0x3C, 0x10 }, "SuzhouLiansh", "Suzhou Lianshichuangzhi Technology Co., Ltd" }, { { 0x8C, 0x1F, 0x64, 0x3C, 0x20 }, "SamuelCosgro", "Samuel Cosgrove" }, + { { 0x8C, 0x1F, 0x64, 0x3C, 0x30 }, "Digilube", "Digilube Systems Inc" }, { { 0x8C, 0x1F, 0x64, 0x3C, 0x40 }, "NavSysTechno", "NavSys Technology Inc." }, { { 0x8C, 0x1F, 0x64, 0x3C, 0x50 }, "StratisIOT", "Stratis IOT" }, { { 0x8C, 0x1F, 0x64, 0x3C, 0x60 }, "Wavestream", "Wavestream Corp" }, @@ -55640,7 +56278,9 @@ { { 0x8C, 0x1F, 0x64, 0x40, 0xD0 }, "PROFITT", "PROFITT Ltd" }, { { 0x8C, 0x1F, 0x64, 0x40, 0xE0 }, "BakerHughesE", "Baker Hughes EMEA" }, { { 0x8C, 0x1F, 0x64, 0x41, 0x00 }, "Roboteq", "Roboteq" }, + { { 0x8C, 0x1F, 0x64, 0x41, 0x10 }, "PioneerCentu", "Pioneer Century Infocomm Pte Ltd" }, { { 0x8C, 0x1F, 0x64, 0x41, 0x20 }, "ComercialEle", "Comercial Electronica Studio-2 s.l." }, + { { 0x8C, 0x1F, 0x64, 0x41, 0x30 }, "PotterElectr", "Potter Electric Signal Company" }, { { 0x8C, 0x1F, 0x64, 0x41, 0x40 }, "INSEVIS", "INSEVIS GmbH" }, { { 0x8C, 0x1F, 0x64, 0x41, 0x50 }, "OnAssetIntel", "OnAsset Intelligence" }, { { 0x8C, 0x1F, 0x64, 0x41, 0x70 }, "Fracarro", "Fracarro srl" }, @@ -55654,11 +56294,13 @@ { { 0x8C, 0x1F, 0x64, 0x42, 0x30 }, "HiwinMikrosy", "Hiwin Mikrosystem Corp." }, { { 0x8C, 0x1F, 0x64, 0x42, 0x60 }, "eumigindustr", "eumig industrie-TV GmbH." }, { { 0x8C, 0x1F, 0x64, 0x42, 0x70 }, "MBconnectlin", "MB connect line GmbH Fernwartungssysteme" }, + { { 0x8C, 0x1F, 0x64, 0x42, 0x80 }, "Greenerwave", "Greenerwave" }, { { 0x8C, 0x1F, 0x64, 0x42, 0x90 }, "AbbottDiagno", "Abbott Diagnostics Technologies AS" }, { { 0x8C, 0x1F, 0x64, 0x42, 0xA0 }, "Atonarp", "Atonarp Inc." }, { { 0x8C, 0x1F, 0x64, 0x42, 0xB0 }, "GamberJohnso", "Gamber Johnson-LLC" }, { { 0x8C, 0x1F, 0x64, 0x42, 0xD0 }, "JemacSweden", "Jemac Sweden AB" }, { { 0x8C, 0x1F, 0x64, 0x42, 0xF0 }, "TomorrowComp", "Tomorrow Companies Inc" }, + { { 0x8C, 0x1F, 0x64, 0x43, 0x00 }, "Editech", "Editech Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x43, 0x10 }, "Pneumax", "Pneumax Spa" }, { { 0x8C, 0x1F, 0x64, 0x43, 0x20 }, "Rebel", "Rebel Systems" }, { { 0x8C, 0x1F, 0x64, 0x43, 0x40 }, "netmon", "netmon" }, @@ -55707,7 +56349,7 @@ { { 0x8C, 0x1F, 0x64, 0x47, 0x40 }, "Audiobyte", "Audiobyte S.R.L." }, { { 0x8C, 0x1F, 0x64, 0x47, 0x50 }, "AlpineQuantu", "Alpine Quantum Technologies GmbH" }, { { 0x8C, 0x1F, 0x64, 0x47, 0x60 }, "ClairGlobal", "Clair Global Corporation" }, - { { 0x8C, 0x1F, 0x64, 0x47, 0x70 }, "Blaucomm", "Blaucomm Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x47, 0x70 }, "SyndoraAltoT", "Syndora Alto Technology Limited" }, { { 0x8C, 0x1F, 0x64, 0x47, 0x90 }, "AKSE", "AKSE srl" }, { { 0x8C, 0x1F, 0x64, 0x47, 0xA0 }, "MissingLinkE", "Missing Link Electronics, Inc." }, { { 0x8C, 0x1F, 0x64, 0x47, 0xB0 }, "FluidCompone", "Fluid Components Intl" }, @@ -55725,6 +56367,7 @@ { { 0x8C, 0x1F, 0x64, 0x48, 0xF0 }, "Mecos", "Mecos AG" }, { { 0x8C, 0x1F, 0x64, 0x49, 0x00 }, "Samson", "Samson Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0x49, 0x10 }, "PhospecIndus", "Phospec Industries Inc." }, + { { 0x8C, 0x1F, 0x64, 0x49, 0x20 }, "DEUTAWERKE", "DEUTA-WERKE GmbH" }, { { 0x8C, 0x1F, 0x64, 0x49, 0x30 }, "SecurityProd", "Security Products International, LLC" }, { { 0x8C, 0x1F, 0x64, 0x49, 0x50 }, "Dave", "Dave Srl" }, { { 0x8C, 0x1F, 0x64, 0x49, 0x60 }, "QualsenTechn", "Qualsen(Guangzhou)Technologies Co.,Ltd" }, @@ -55749,11 +56392,15 @@ { { 0x8C, 0x1F, 0x64, 0x4A, 0xE0 }, "KCS", "KCS Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x4A, 0xF0 }, "miniDSP", "miniDSP" }, { { 0x8C, 0x1F, 0x64, 0x4B, 0x00 }, "UMeiDahIntLE", "U -Mei-Dah Int'L Enterprise Co.,Ltd." }, + { { 0x8C, 0x1F, 0x64, 0x4B, 0x10 }, "RealRandom", "Real Random" }, { { 0x8C, 0x1F, 0x64, 0x4B, 0x20 }, "GVTechnology", "GV Technology Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0x4B, 0x30 }, "XYZDigitalPr", "XYZ Digital Private Limited" }, { { 0x8C, 0x1F, 0x64, 0x4B, 0x40 }, "PointOneNavi", "Point One Navigation" }, + { { 0x8C, 0x1F, 0x64, 0x4B, 0x60 }, "PantherunTec", "Pantherun Technologies Pvt Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x4B, 0x70 }, "AttePower", "Atte Power" }, { { 0x8C, 0x1F, 0x64, 0x4B, 0x80 }, "astTECSCommu", "astTECS Communications Private Limited" }, { { 0x8C, 0x1F, 0x64, 0x4B, 0xB0 }, "IWSGlobal", "IWS Global Pty Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x4B, 0xD0 }, "ZTZServicesI", "ZTZ Services International" }, { { 0x8C, 0x1F, 0x64, 0x4B, 0xF0 }, "SmartMonitor", "Smart Monitoring Innovations Private Limited" }, { { 0x8C, 0x1F, 0x64, 0x4C, 0x10 }, "ClockOMatic", "Clock-O-Matic" }, { { 0x8C, 0x1F, 0x64, 0x4C, 0x20 }, "LaserImagine", "Laser Imagineering Vertriebs GmbH" }, @@ -55860,11 +56507,13 @@ { { 0x8C, 0x1F, 0x64, 0x55, 0x70 }, "InliteDesign", "In-lite Design BV" }, { { 0x8C, 0x1F, 0x64, 0x55, 0x80 }, "Scitel", "Scitel" }, { { 0x8C, 0x1F, 0x64, 0x55, 0x90 }, "IntoziTech", "Intozi Tech Pvt Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x55, 0xA0 }, "Zomedica", "Zomedica" }, { { 0x8C, 0x1F, 0x64, 0x55, 0xB0 }, "SheetalWirel", "Sheetal Wireless Technologies Pvt Ltd" }, { { 0x8C, 0x1F, 0x64, 0x55, 0xC0 }, "Schildknecht", "Schildknecht AG" }, { { 0x8C, 0x1F, 0x64, 0x55, 0xE0 }, "Hanateksyste", "Hanateksystem" }, { { 0x8C, 0x1F, 0x64, 0x56, 0x00 }, "DexterLaundr", "Dexter Laundry Inc." }, { { 0x8C, 0x1F, 0x64, 0x56, 0x10 }, "DeepDetectio", "Deep Detection / ESB01736990" }, + { { 0x8C, 0x1F, 0x64, 0x56, 0x20 }, "WOLFAdvanced", "WOLF Advanced Technology" }, { { 0x8C, 0x1F, 0x64, 0x56, 0x60 }, "Ultiroam", "Ultiroam" }, { { 0x8C, 0x1F, 0x64, 0x56, 0x80 }, "Integerpl", "Integer.pl S.A." }, { { 0x8C, 0x1F, 0x64, 0x56, 0xA0 }, "RadazIndústr", "Radaz Indústria e Comércio de Produtos Eletronicos S/A" }, @@ -55911,6 +56560,7 @@ { { 0x8C, 0x1F, 0x64, 0x5A, 0x40 }, "Dave", "Dave Srl" }, { { 0x8C, 0x1F, 0x64, 0x5A, 0x60 }, "KinneyIndust", "Kinney Industries, Inc" }, { { 0x8C, 0x1F, 0x64, 0x5A, 0x70 }, "Rch", "Rch Spa" }, + { { 0x8C, 0x1F, 0x64, 0x5A, 0x80 }, "VersabyteDat", "Versabyte Data Systems Pvt Ltd" }, { { 0x8C, 0x1F, 0x64, 0x5A, 0x90 }, "AktiebolagSo", "Aktiebolag Solask Energi" }, { { 0x8C, 0x1F, 0x64, 0x5A, 0xA0 }, "LandisGyrEqu", "Landis+Gyr Equipamentos de Medição Ltda" }, { { 0x8C, 0x1F, 0x64, 0x5A, 0xC0 }, "YUYAMAMFG", "YUYAMA MFG Co.,Ltd" }, @@ -55934,6 +56584,7 @@ { { 0x8C, 0x1F, 0x64, 0x5C, 0x50 }, "ActiveResear", "Active Research Limited" }, { { 0x8C, 0x1F, 0x64, 0x5C, 0x60 }, "SystemsWithI", "Systems With Intelligence Inc." }, { { 0x8C, 0x1F, 0x64, 0x5C, 0x90 }, "AbbottDiagno", "Abbott Diagnostics Technologies AS" }, + { { 0x8C, 0x1F, 0x64, 0x5C, 0xA0 }, "Vitaltrace", "Vitaltrace PTY LTD" }, { { 0x8C, 0x1F, 0x64, 0x5C, 0xB0 }, "dinosys", "dinosys" }, { { 0x8C, 0x1F, 0x64, 0x5C, 0xC0 }, "Alpesrecherc", "Alpes recherche et développement" }, { { 0x8C, 0x1F, 0x64, 0x5C, 0xD0 }, "MahindrMahin", "Mahindr & Mahindra" }, @@ -55991,8 +56642,10 @@ { { 0x8C, 0x1F, 0x64, 0x61, 0x60 }, "DEUTAWerke", "DEUTA Werke GmbH" }, { { 0x8C, 0x1F, 0x64, 0x61, 0x80 }, "FoshanYiFeng", "Foshan YiFeng Electric Industrial Co., ltd" }, { { 0x8C, 0x1F, 0x64, 0x61, 0x90 }, "Labtrino", "Labtrino AB" }, + { { 0x8C, 0x1F, 0x64, 0x61, 0xB0 }, "EhonEnergyTe", "Ehon Energy Tech Pty Ltd" }, { { 0x8C, 0x1F, 0x64, 0x61, 0xC0 }, "Automata", "Automata GmbH & Co. KG" }, { { 0x8C, 0x1F, 0x64, 0x61, 0xD0 }, "Lewitt", "Lewitt GmbH" }, + { { 0x8C, 0x1F, 0x64, 0x61, 0xE0 }, "HedianDigita", "Hedian Digital Integration Technology Ltd." }, { { 0x8C, 0x1F, 0x64, 0x61, 0xF0 }, "Lightworks", "Lightworks GmbH" }, { { 0x8C, 0x1F, 0x64, 0x62, 0x00 }, "Solace", "Solace Systems Inc." }, { { 0x8C, 0x1F, 0x64, 0x62, 0x10 }, "JTL", "JTL Systems Ltd." }, @@ -56011,6 +56664,7 @@ { { 0x8C, 0x1F, 0x64, 0x63, 0x40 }, "Aml", "Aml" }, { { 0x8C, 0x1F, 0x64, 0x63, 0x60 }, "EuropeTrade", "Europe Trade" }, { { 0x8C, 0x1F, 0x64, 0x63, 0x80 }, "ThunderDataT", "Thunder Data Taiwan Co., Ltd." }, + { { 0x8C, 0x1F, 0x64, 0x63, 0x90 }, "TRDPte", "TRD Systems Pte Ltd" }, { { 0x8C, 0x1F, 0x64, 0x63, 0xB0 }, "Tiama", "Tiama" }, { { 0x8C, 0x1F, 0x64, 0x63, 0xC0 }, "Galios", "Galios" }, { { 0x8C, 0x1F, 0x64, 0x63, 0xD0 }, "RaxTechInter", "Rax-Tech International" }, @@ -56101,12 +56755,14 @@ { { 0x8C, 0x1F, 0x64, 0x6B, 0x80 }, "LarraiozElek", "Larraioz Elektronika" }, { { 0x8C, 0x1F, 0x64, 0x6B, 0x90 }, "GSIndustrieE", "GS Industrie-Elektronik GmbH" }, { { 0x8C, 0x1F, 0x64, 0x6B, 0xB0 }, "SeasonElectr", "Season Electronics Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x6B, 0xC0 }, "HarikTech", "Harik Tech" }, { { 0x8C, 0x1F, 0x64, 0x6B, 0xD0 }, "IoTWaterAnal", "IoT Water Analytics S.L." }, { { 0x8C, 0x1F, 0x64, 0x6B, 0xF0 }, "Automata", "Automata GmbH & Co. KG" }, { { 0x8C, 0x1F, 0x64, 0x6C, 0x10 }, "GogoBA", "Gogo BA" }, { { 0x8C, 0x1F, 0x64, 0x6C, 0x30 }, "BrightSoluti", "Bright Solutions PTE LTD" }, { { 0x8C, 0x1F, 0x64, 0x6C, 0x40 }, "inmediQ", "inmediQ GmbH" }, { { 0x8C, 0x1F, 0x64, 0x6C, 0x60 }, "Fit", "Fit" }, + { { 0x8C, 0x1F, 0x64, 0x6C, 0x70 }, "Pionierkraft", "Pionierkraft GmbH" }, { { 0x8C, 0x1F, 0x64, 0x6C, 0x80 }, "TaikoAudio", "Taiko Audio B.V." }, { { 0x8C, 0x1F, 0x64, 0x6C, 0xA0 }, "MelissaClima", "Melissa Climate Jsc" }, { { 0x8C, 0x1F, 0x64, 0x6C, 0xB0 }, "GJDManufactu", "GJD Manufacturing" }, @@ -56139,13 +56795,16 @@ { { 0x8C, 0x1F, 0x64, 0x6E, 0xD0 }, "ElbitAmerica", "Elbit Systems of America" }, { { 0x8C, 0x1F, 0x64, 0x6E, 0xE0 }, "CorticalLabs", "Cortical Labs Pte Ltd" }, { { 0x8C, 0x1F, 0x64, 0x6F, 0x00 }, "RightTimeSpo", "Right Time Sports LLC" }, + { { 0x8C, 0x1F, 0x64, 0x6F, 0x10 }, "alfamation", "alfamation spa" }, { { 0x8C, 0x1F, 0x64, 0x6F, 0x40 }, "Elsist", "Elsist Srl" }, + { { 0x8C, 0x1F, 0x64, 0x6F, 0x50 }, "LogicFruitTe", "Logic Fruit Technologies Pvt. Ltd." }, { { 0x8C, 0x1F, 0x64, 0x6F, 0x70 }, "EddyWorks", "EddyWorks Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x6F, 0x80 }, "ProikerTechn", "Proiker Technology Sl" }, { { 0x8C, 0x1F, 0x64, 0x6F, 0x90 }, "Anddoro", "Anddoro Llc" }, { { 0x8C, 0x1F, 0x64, 0x6F, 0xB0 }, "ExatronServe", "Exatron Servers Manufacturing Pvt Ltd" }, { { 0x8C, 0x1F, 0x64, 0x6F, 0xC0 }, "HM", "HM Systems A/S" }, { { 0x8C, 0x1F, 0x64, 0x70, 0x00 }, "Quantaflow", "Quantaflow" }, + { { 0x8C, 0x1F, 0x64, 0x70, 0x10 }, "WiltonArthur", "Wilton Arthur Poth" }, { { 0x8C, 0x1F, 0x64, 0x70, 0x20 }, "AIDirections", "AIDirections" }, { { 0x8C, 0x1F, 0x64, 0x70, 0x30 }, "CalnexSoluti", "Calnex Solutions plc" }, { { 0x8C, 0x1F, 0x64, 0x70, 0x70 }, "Oas", "Oas Ag" }, @@ -56153,8 +56812,10 @@ { { 0x8C, 0x1F, 0x64, 0x70, 0xA0 }, "YUYAMAMFG", "YUYAMA MFG Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x70, 0xB0 }, "Onicon", "Onicon" }, { { 0x8C, 0x1F, 0x64, 0x70, 0xC0 }, "BroyceContro", "Broyce Control Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x70, 0xD0 }, "Solace", "Solace Systems Inc." }, { { 0x8C, 0x1F, 0x64, 0x70, 0xE0 }, "OvercomTech", "OvercomTech" }, { { 0x8C, 0x1F, 0x64, 0x71, 0x00 }, "ZengarInstit", "Zengar Institute Inc" }, + { { 0x8C, 0x1F, 0x64, 0x71, 0x10 }, "JiangsuRuich", "Jiangsu Ruichi Broadcom Communications Technoligy Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x71, 0x20 }, "NexionDataPL", "Nexion Data Systems P/L" }, { { 0x8C, 0x1F, 0x64, 0x71, 0x30 }, "Nstek", "Nstek Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x71, 0x50 }, "InternetProt", "Internet Protocolo Logica Sl" }, @@ -56221,6 +56882,7 @@ { { 0x8C, 0x1F, 0x64, 0x76, 0xA0 }, "DorletSau", "Dorlet Sau" }, { { 0x8C, 0x1F, 0x64, 0x76, 0xB0 }, "WheribleGPS", "Wherible GPS, Inc." }, { { 0x8C, 0x1F, 0x64, 0x76, 0xC0 }, "GuanShowTech", "Guan Show Technologe Co., Ltd." }, + { { 0x8C, 0x1F, 0x64, 0x76, 0xD0 }, "uHooPte", "uHoo Pte. Ltd." }, { { 0x8C, 0x1F, 0x64, 0x76, 0xE0 }, "develogic", "develogic GmbH" }, { { 0x8C, 0x1F, 0x64, 0x76, 0xF0 }, "INVENTIASp", "INVENTIA Sp. z o.o." }, { { 0x8C, 0x1F, 0x64, 0x77, 0x10 }, "Automatizaci", "Automatizacion Y Conectividad" }, @@ -56234,6 +56896,7 @@ { { 0x8C, 0x1F, 0x64, 0x77, 0xA0 }, "DatacommNetw", "Datacomm Networks" }, { { 0x8C, 0x1F, 0x64, 0x77, 0xB0 }, "DbSas", "Db Sas" }, { { 0x8C, 0x1F, 0x64, 0x77, 0xC0 }, "OrangeTreeTe", "Orange Tree Technologies Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x77, 0xD0 }, "EventAcousti", "Event Acoustics B.V." }, { { 0x8C, 0x1F, 0x64, 0x77, 0xE0 }, "Institutegeo", "Institute of geophysics, China earthquake administration" }, { { 0x8C, 0x1F, 0x64, 0x77, 0xF0 }, "TargaSystem", "TargaSystem S.r.L." }, { { 0x8C, 0x1F, 0x64, 0x78, 0x00 }, "HME", "HME Co.,ltd" }, @@ -56246,6 +56909,7 @@ { { 0x8C, 0x1F, 0x64, 0x78, 0xB0 }, "Senso2Me", "Senso2Me Nv" }, { { 0x8C, 0x1F, 0x64, 0x78, 0xF0 }, "Connection", "Connection Systems" }, { { 0x8C, 0x1F, 0x64, 0x79, 0x10 }, "OtisTechnolo", "Otis Technology and Development(Shanghai) Co., Ltd." }, + { { 0x8C, 0x1F, 0x64, 0x79, 0x20 }, "MdsTech", "Mds Tech" }, { { 0x8C, 0x1F, 0x64, 0x79, 0x30 }, "Aditec", "Aditec GmbH" }, { { 0x8C, 0x1F, 0x64, 0x79, 0x70 }, "AlbanGiacomo", "Alban Giacomo S.p.a." }, { { 0x8C, 0x1F, 0x64, 0x79, 0xB0 }, "FoersterTech", "Foerster-Technik GmbH" }, @@ -56272,11 +56936,13 @@ { { 0x8C, 0x1F, 0x64, 0x7B, 0x70 }, "JamesGBiddle", "James G. Biddle dba Megger" }, { { 0x8C, 0x1F, 0x64, 0x7B, 0x80 }, "TimeMachines", "TimeMachines Inc." }, { { 0x8C, 0x1F, 0x64, 0x7B, 0x90 }, "Deviceroy", "Deviceroy" }, + { { 0x8C, 0x1F, 0x64, 0x7B, 0xA0 }, "NATIXONSp", "NATIXON Sp. z o.o." }, { { 0x8C, 0x1F, 0x64, 0x7B, 0xB0 }, "KotsuDengyos", "Kotsu Dengyosha Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x7B, 0xC0 }, "GOdevelopmen", "GO development GmbH" }, { { 0x8C, 0x1F, 0x64, 0x7B, 0xE0 }, "inomatic", "inomatic GmbH" }, { { 0x8C, 0x1F, 0x64, 0x7C, 0x10 }, "RailTelemati", "Rail Telematics Corp" }, { { 0x8C, 0x1F, 0x64, 0x7C, 0x20 }, "CTIIntlSolut", "CTI Intl Solutions" }, + { { 0x8C, 0x1F, 0x64, 0x7C, 0x30 }, "BlueBoxBiome", "The Blue Box Biomedical Solutions, SL" }, { { 0x8C, 0x1F, 0x64, 0x7C, 0x40 }, "MBconnectlin", "MB connect line GmbH" }, { { 0x8C, 0x1F, 0x64, 0x7C, 0x60 }, "FlextronicsI", "Flextronics International Kft" }, { { 0x8C, 0x1F, 0x64, 0x7C, 0x70 }, "AsconTecnolo", "Ascon Tecnologic S.r.l." }, @@ -56315,8 +56981,10 @@ { { 0x8C, 0x1F, 0x64, 0x7F, 0x30 }, "VideosysBroa", "Videosys Broadcast Ltd" }, { { 0x8C, 0x1F, 0x64, 0x7F, 0x40 }, "GMInternatio", "G.M. International srl" }, { { 0x8C, 0x1F, 0x64, 0x7F, 0x60 }, "AbbottDiagno", "Abbott Diagnostics Technologies AS" }, + { { 0x8C, 0x1F, 0x64, 0x7F, 0x70 }, "ADITUS", "ADITUS GmbH" }, { { 0x8C, 0x1F, 0x64, 0x7F, 0x80 }, "FleetSafeInd", "FleetSafe India Private Limited" }, { { 0x8C, 0x1F, 0x64, 0x7F, 0x90 }, "CopelionInte", "Copelion International Inc" }, + { { 0x8C, 0x1F, 0x64, 0x7F, 0xA0 }, "HiwinMikrosy", "Hiwin Mikrosystem Corp." }, { { 0x8C, 0x1F, 0x64, 0x7F, 0xC0 }, "MitsubishiEl", "Mitsubishi Electric Klimat Transportation Systems S.p.A." }, { { 0x8C, 0x1F, 0x64, 0x7F, 0xD0 }, "SECUREAAi", "SECUREAAi" }, { { 0x8C, 0x1F, 0x64, 0x7F, 0xE0 }, "KonvisonTech", "Shenzhen Konvison Technology Co.,Ltd." }, @@ -56355,6 +57023,7 @@ { { 0x8C, 0x1F, 0x64, 0x82, 0xC0 }, "PowerElectro", "Power Electronics Espana, S.L." }, { { 0x8C, 0x1F, 0x64, 0x82, 0xF0 }, "AnySignal", "AnySignal" }, { { 0x8C, 0x1F, 0x64, 0x83, 0x00 }, "Vtron", "Vtron Pty Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x83, 0x10 }, "AudioPlus", "Audio Plus" }, { { 0x8C, 0x1F, 0x64, 0x83, 0x50 }, "AdetecSas", "Adetec Sas" }, { { 0x8C, 0x1F, 0x64, 0x83, 0x70 }, "runZero", "runZero, Inc" }, { { 0x8C, 0x1F, 0x64, 0x83, 0x80 }, "Drimaes", "Drimaes Inc." }, @@ -56367,7 +57036,9 @@ { { 0x8C, 0x1F, 0x64, 0x84, 0x00 }, "InfoMacSp", "InfoMac Sp. z o.o. Sp.k." }, { { 0x8C, 0x1F, 0x64, 0x84, 0x20 }, "PotterElectr", "Potter Electric Signal Co. LLC" }, { { 0x8C, 0x1F, 0x64, 0x84, 0x30 }, "ImageSoft", "Image Soft Oy" }, + { { 0x8C, 0x1F, 0x64, 0x84, 0x40 }, "DeimosContro", "Deimos Controls LLC" }, { { 0x8C, 0x1F, 0x64, 0x84, 0x60 }, "FoXieOptoele", "Fo Xie Optoelectronics Technology Co., Ltd" }, + { { 0x8C, 0x1F, 0x64, 0x84, 0x70 }, "Slat", "Slat" }, { { 0x8C, 0x1F, 0x64, 0x84, 0x80 }, "JenaOptronik", "Jena-Optronik GmbH" }, { { 0x8C, 0x1F, 0x64, 0x84, 0x90 }, "TalleresdeEs", "Talleres de Escoriaza SAU" }, { { 0x8C, 0x1F, 0x64, 0x84, 0xA0 }, "BitmapperInt", "Bitmapper Integration Technologies Private Limited" }, @@ -56424,6 +57095,7 @@ { { 0x8C, 0x1F, 0x64, 0x89, 0x90 }, "AmericanEdge", "American Edge IP" }, { { 0x8C, 0x1F, 0x64, 0x89, 0xA0 }, "NationalCont", "National Control Devices, LLC" }, { { 0x8C, 0x1F, 0x64, 0x89, 0xE0 }, "Cinetix", "Cinetix Srl" }, + { { 0x8C, 0x1F, 0x64, 0x89, 0xF0 }, "PotterElectr", "Potter Electric Signal Co. LLC" }, { { 0x8C, 0x1F, 0x64, 0x8A, 0x00 }, "H&abyz", "H&abyz" }, { { 0x8C, 0x1F, 0x64, 0x8A, 0x40 }, "GenesisTechn", "Genesis Technologies AG" }, { { 0x8C, 0x1F, 0x64, 0x8A, 0x80 }, "Massachusett", "Massachusetts Institute of Technology" }, @@ -56443,6 +57115,7 @@ { { 0x8C, 0x1F, 0x64, 0x8B, 0x70 }, "DADesign", "DA-Design Oy" }, { { 0x8C, 0x1F, 0x64, 0x8B, 0x80 }, "WienEnergie", "Wien Energie GmbH" }, { { 0x8C, 0x1F, 0x64, 0x8B, 0x90 }, "ZynexMonitor", "Zynex Monitoring Solutions" }, + { { 0x8C, 0x1F, 0x64, 0x8B, 0xA0 }, "CodeBlue", "Code Blue Corporation" }, { { 0x8C, 0x1F, 0x64, 0x8B, 0xB0 }, "swisselectro", "swiss electronic creation GmbH" }, { { 0x8C, 0x1F, 0x64, 0x8B, 0xC0 }, "PeterHuberKa", "Peter Huber Kaeltemaschinenbau SE" }, { { 0x8C, 0x1F, 0x64, 0x8B, 0xE0 }, "YUYAMAMFG", "YUYAMA MFG Co.,Ltd" }, @@ -56495,6 +57168,7 @@ { { 0x8C, 0x1F, 0x64, 0x90, 0x30 }, "PortraitDisp", "Portrait Displays, Inc." }, { { 0x8C, 0x1F, 0x64, 0x90, 0x40 }, "HensoldtSens", "Hensoldt Sensors GmbH" }, { { 0x8C, 0x1F, 0x64, 0x90, 0x50 }, "Qualitrol", "Qualitrol LLC" }, + { { 0x8C, 0x1F, 0x64, 0x90, 0x60 }, "YUYAMAMFG", "YUYAMA MFG Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0x90, 0x70 }, "Sicon", "Sicon srl" }, { { 0x8C, 0x1F, 0x64, 0x90, 0x90 }, "Matelex", "Matelex" }, { { 0x8C, 0x1F, 0x64, 0x90, 0xC0 }, "CoolAir", "Cool Air Incorporated" }, @@ -56559,12 +57233,15 @@ { { 0x8C, 0x1F, 0x64, 0x96, 0x80 }, "IavEngineeri", "Iav Engineering Sarl" }, { { 0x8C, 0x1F, 0x64, 0x96, 0xA0 }, "EAElektroAut", "EA Elektro-Automatik GmbH" }, { { 0x8C, 0x1F, 0x64, 0x96, 0xB0 }, "VantageoPriv", "Vantageo Private Limited" }, + { { 0x8C, 0x1F, 0x64, 0x96, 0xD0 }, "SörgelElektr", "Sörgel Elektronik" }, { { 0x8C, 0x1F, 0x64, 0x96, 0xE0 }, "inomatic", "inomatic GmbH" }, { { 0x8C, 0x1F, 0x64, 0x96, 0xF0 }, "VortixNetwor", "Vortix Networks" }, { { 0x8C, 0x1F, 0x64, 0x97, 0x00 }, "PotterElectr", "Potter Electric Signal Co. LLC" }, { { 0x8C, 0x1F, 0x64, 0x97, 0x10 }, "InfrasafeAdv", "Infrasafe/ Advantor Systems" }, { { 0x8C, 0x1F, 0x64, 0x97, 0x20 }, "Federant", "Federant LLC" }, { { 0x8C, 0x1F, 0x64, 0x97, 0x30 }, "DorsettTechn", "Dorsett Technologies Inc" }, + { { 0x8C, 0x1F, 0x64, 0x97, 0x40 }, "Reo", "Reo Ag" }, + { { 0x8C, 0x1F, 0x64, 0x97, 0x50 }, "PrestonIndus", "Preston Industries dba PolyScience" }, { { 0x8C, 0x1F, 0x64, 0x97, 0x60 }, "JESElectroni", "JES Electronic Systems Private Limited" }, { { 0x8C, 0x1F, 0x64, 0x97, 0x80 }, "PlanetInnova", "Planet Innovation Products Inc." }, { { 0x8C, 0x1F, 0x64, 0x97, 0x90 }, "ArktisRadiat", "Arktis Radiation Detectors" }, @@ -56581,10 +57258,12 @@ { { 0x8C, 0x1F, 0x64, 0x98, 0xB0 }, "SyscomInstru", "Syscom Instruments SA" }, { { 0x8C, 0x1F, 0x64, 0x98, 0xC0 }, "PANBusinessC", "PAN Business & Consulting (ANYOS]" }, { { 0x8C, 0x1F, 0x64, 0x98, 0xD0 }, "Akselsp", "Aksel sp. z o.o." }, + { { 0x8C, 0x1F, 0x64, 0x98, 0xE0 }, "RationalProd", "Rational Production srl Unipersonale" }, { { 0x8C, 0x1F, 0x64, 0x98, 0xF0 }, "BreasMedical", "Breas Medical AB" }, { { 0x8C, 0x1F, 0x64, 0x99, 0x10 }, "DBSystel", "DB Systel GmbH" }, { { 0x8C, 0x1F, 0x64, 0x99, 0x30 }, "AppliedElect", "Applied Electro Magnetics Pvt. Ltd." }, { { 0x8C, 0x1F, 0x64, 0x99, 0x40 }, "uHaveControl", "uHave Control, Inc" }, + { { 0x8C, 0x1F, 0x64, 0x99, 0x70 }, "Daifuku", "Daifuku CO., Ltd." }, { { 0x8C, 0x1F, 0x64, 0x99, 0x80 }, "EVLOStockage", "EVLO Stockage Énergie" }, { { 0x8C, 0x1F, 0x64, 0x99, 0x90 }, "AdvancedTech", "Advanced Techne" }, { { 0x8C, 0x1F, 0x64, 0x99, 0xB0 }, "Grossenbache", "Grossenbacher Systeme AG" }, @@ -56711,6 +57390,7 @@ { { 0x8C, 0x1F, 0x64, 0xA4, 0xE0 }, "SyscomInstru", "Syscom Instruments SA" }, { { 0x8C, 0x1F, 0x64, 0xA4, 0xF0 }, "AsconTecnolo", "Ascon Tecnologic S.r.l." }, { { 0x8C, 0x1F, 0x64, 0xA5, 0x10 }, "Babtel", "Babtel" }, + { { 0x8C, 0x1F, 0x64, 0xA5, 0x20 }, "Tiama", "Tiama" }, { { 0x8C, 0x1F, 0x64, 0xA5, 0x60 }, "FlextronicsI", "Flextronics International Kft" }, { { 0x8C, 0x1F, 0x64, 0xA5, 0x70 }, "EkspertStroy", "EkspertStroyProekt" }, { { 0x8C, 0x1F, 0x64, 0xA5, 0xA0 }, "UniPOSEOOD", "UniPOS EOOD" }, @@ -56720,6 +57400,7 @@ { { 0x8C, 0x1F, 0x64, 0xA5, 0xF0 }, "WattsonAudio", "Wattson Audio SA" }, { { 0x8C, 0x1F, 0x64, 0xA6, 0x00 }, "ActiveOptica", "Active Optical Systems, LLC" }, { { 0x8C, 0x1F, 0x64, 0xA6, 0x10 }, "BreasMedical", "Breas Medical AB" }, + { { 0x8C, 0x1F, 0x64, 0xA6, 0x20 }, "YUYAMAMFG", "YUYAMA MFG Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xA6, 0x40 }, "VigorElectri", "Vigor Electric Corp." }, { { 0x8C, 0x1F, 0x64, 0xA6, 0x60 }, "vtt", "vtt systems Inc." }, { { 0x8C, 0x1F, 0x64, 0xA6, 0x70 }, "Electrovymir", "Electrovymir LLC" }, @@ -56731,6 +57412,7 @@ { { 0x8C, 0x1F, 0x64, 0xA7, 0x00 }, "VteknikElekt", "V-teknik Elektronik AB" }, { { 0x8C, 0x1F, 0x64, 0xA7, 0x10 }, "Martec", "Martec S.p.A." }, { { 0x8C, 0x1F, 0x64, 0xA7, 0x20 }, "FirstDesignS", "First Design System Inc." }, + { { 0x8C, 0x1F, 0x64, 0xA7, 0x30 }, "ITKPrecision", "ITK Precisioning GmbH" }, { { 0x8C, 0x1F, 0x64, 0xA7, 0x40 }, "HiwinMikrosy", "Hiwin Mikrosystem Corp." }, { { 0x8C, 0x1F, 0x64, 0xA7, 0x50 }, "ProconElectr", "Procon Electronics Pty Ltd" }, { { 0x8C, 0x1F, 0x64, 0xA7, 0x60 }, "DEUTAWERKE", "DEUTA-WERKE GmbH" }, @@ -56775,7 +57457,7 @@ { { 0x8C, 0x1F, 0x64, 0xAB, 0x50 }, "JustmorphPte", "Justmorph Pte. Ltd." }, { { 0x8C, 0x1F, 0x64, 0xAB, 0x60 }, "EMIT", "EMIT GmbH" }, { { 0x8C, 0x1F, 0x64, 0xAB, 0x70 }, "MClavis", "MClavis Co.,Ltd." }, - { { 0x8C, 0x1F, 0x64, 0xAB, 0x80 }, "Private", "Private" }, + { { 0x8C, 0x1F, 0x64, 0xAB, 0x80 }, "CharlesIndus", "Charles Industries" }, { { 0x8C, 0x1F, 0x64, 0xAB, 0xA0 }, "FLUGCOM", "FLUGCOM GmbH" }, { { 0x8C, 0x1F, 0x64, 0xAB, 0xE0 }, "TAIYODENON", "TAIYO DENON Corporation" }, { { 0x8C, 0x1F, 0x64, 0xAB, 0xF0 }, "StackiotTech", "Stackiot Technologies Private Limited" }, @@ -56803,6 +57485,7 @@ { { 0x8C, 0x1F, 0x64, 0xAD, 0xA0 }, "AbilityIntel", "Ability Intelligent Corp." }, { { 0x8C, 0x1F, 0x64, 0xAD, 0xB0 }, "HebeiWeijiEl", "Hebei Weiji Electric Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xAD, 0xC0 }, "MotorProtect", "Motor Protection Electronics" }, + { { 0x8C, 0x1F, 0x64, 0xAE, 0x00 }, "AsterProAudi", "Aster Pro-Audio Inc." }, { { 0x8C, 0x1F, 0x64, 0xAE, 0x10 }, "YUYAMAMFG", "YUYAMA MFG Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xAE, 0x20 }, "JiangsuYiRon", "Jiangsu Yi Rong Mstar Technology Ltd." }, { { 0x8C, 0x1F, 0x64, 0xAE, 0x30 }, "Private", "Private" }, @@ -56810,6 +57493,7 @@ { { 0x8C, 0x1F, 0x64, 0xAE, 0x80 }, "AdetecSas", "Adetec Sas" }, { { 0x8C, 0x1F, 0x64, 0xAE, 0x90 }, "Ennple", "Ennple" }, { { 0x8C, 0x1F, 0x64, 0xAE, 0xA0 }, "INHEMETER", "INHEMETER Co.,Ltd" }, + { { 0x8C, 0x1F, 0x64, 0xAE, 0xB0 }, "Sedna", "Sedna" }, { { 0x8C, 0x1F, 0x64, 0xAE, 0xC0 }, "PixelDesignM", "Pixel Design & Manufacturing Sdn. Bhd." }, { { 0x8C, 0x1F, 0x64, 0xAE, 0xD0 }, "MBconnectlin", "MB connect line GmbH Fernwartungssysteme" }, { { 0x8C, 0x1F, 0x64, 0xAE, 0xF0 }, "ScenarioAuto", "Scenario Automation" }, @@ -56826,10 +57510,12 @@ { { 0x8C, 0x1F, 0x64, 0xAF, 0xE0 }, "MotecUSA", "Motec USA, Inc." }, { { 0x8C, 0x1F, 0x64, 0xAF, 0xF0 }, "Qtechnology", "Qtechnology A/S" }, { { 0x8C, 0x1F, 0x64, 0xB0, 0x00 }, "GetsMSS", "Gets MSS" }, - { { 0x8C, 0x1F, 0x64, 0xB0, 0x10 }, "BlueOceanUG", "Blue Ocean UG" }, + { { 0x8C, 0x1F, 0x64, 0xB0, 0x10 }, "TerranovaInd", "Terranova Industries UG (haftungsbeschränkt)" }, { { 0x8C, 0x1F, 0x64, 0xB0, 0x30 }, "PisoftwareTe", "Shenzhen Pisoftware Technology Co.,Ltd." }, + { { 0x8C, 0x1F, 0x64, 0xB0, 0x70 }, "AeroVironmen", "AeroVironment" }, { { 0x8C, 0x1F, 0x64, 0xB0, 0x80 }, "CronusElectr", "Cronus Electronics" }, { { 0x8C, 0x1F, 0x64, 0xB0, 0xC0 }, "BarkodesBilg", "Barkodes Bilgisayar Sistemleri Bilgi Iletisim ve Y" }, + { { 0x8C, 0x1F, 0x64, 0xB0, 0xD0 }, "ProbeFox", "ProbeFox GmbH" }, { { 0x8C, 0x1F, 0x64, 0xB0, 0xE0 }, "WatthourEngi", "Watthour Engineering Co., Inc." }, { { 0x8C, 0x1F, 0x64, 0xB0, 0xF0 }, "HKCSecurity", "HKC Security Ltd." }, { { 0x8C, 0x1F, 0x64, 0xB1, 0x00 }, "MTUAeroEngin", "MTU Aero Engines AG" }, @@ -56855,6 +57541,7 @@ { { 0x8C, 0x1F, 0x64, 0xB2, 0xB0 }, "RhombusEurop", "Rhombus Europe" }, { { 0x8C, 0x1F, 0x64, 0xB2, 0xC0 }, "SanminaIsrae", "Sanmina Israel Medical Systems Ltd" }, { { 0x8C, 0x1F, 0x64, 0xB2, 0xD0 }, "wondermedite", "wonder meditec" }, + { { 0x8C, 0x1F, 0x64, 0xB2, 0xE0 }, "Grossenbache", "Grossenbacher Systeme AG" }, { { 0x8C, 0x1F, 0x64, 0xB2, 0xF0 }, "MtechnologyG", "Mtechnology - Gamma Commerciale Srl" }, { { 0x8C, 0x1F, 0x64, 0xB3, 0x00 }, "FujianONETHI", "Fujian ONETHING Technology Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0xB3, 0x10 }, "Rsc", "Rsc" }, @@ -56899,6 +57586,7 @@ { { 0x8C, 0x1F, 0x64, 0xB6, 0xF0 }, "ProsecureFzc", "Prosecure Fzco" }, { { 0x8C, 0x1F, 0x64, 0xB7, 0x10 }, "SichuanYouke", "Sichuan Youke Communication Technology Co., Ltd" }, { { 0x8C, 0x1F, 0x64, 0xB7, 0x30 }, "Commence", "Comm-ence, Inc." }, + { { 0x8C, 0x1F, 0x64, 0xB7, 0x60 }, "BavariaDigit", "Bavaria Digital Technik GmbH" }, { { 0x8C, 0x1F, 0x64, 0xB7, 0x70 }, "CarestreamDe", "Carestream Dental LLC" }, { { 0x8C, 0x1F, 0x64, 0xB7, 0x90 }, "AddSecureSma", "AddSecure Smart Grids" }, { { 0x8C, 0x1F, 0x64, 0xB7, 0xA0 }, "MG", "MG s.r.l." }, @@ -56928,6 +57616,7 @@ { { 0x8C, 0x1F, 0x64, 0xB9, 0x90 }, "iLifeX", "iLifeX" }, { { 0x8C, 0x1F, 0x64, 0xB9, 0xA0 }, "QuercusTechn", "Quercus Technologies, S.L." }, { { 0x8C, 0x1F, 0x64, 0xB9, 0xB0 }, "Kromek", "Kromek Limited" }, + { { 0x8C, 0x1F, 0x64, 0xB9, 0xC0 }, "GIBKorea", "GIB Korea Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0xB9, 0xE0 }, "PowerElectro", "Power Electronics Espana, S.L." }, { { 0x8C, 0x1F, 0x64, 0xB9, 0xF0 }, "LithionBatte", "Lithion Battery Inc" }, { { 0x8C, 0x1F, 0x64, 0xBA, 0x00 }, "JmvLps", "Jmv Lps Ltd" }, @@ -56974,6 +57663,7 @@ { { 0x8C, 0x1F, 0x64, 0xBC, 0xE0 }, "BESOsp", "BESO sp. z o.o." }, { { 0x8C, 0x1F, 0x64, 0xBC, 0xF0 }, "ErbaLachemas", "Erba Lachema s.r.o." }, { { 0x8C, 0x1F, 0x64, 0xBD, 0x00 }, "MesaLabs", "Mesa Labs, Inc." }, + { { 0x8C, 0x1F, 0x64, 0xBD, 0x10 }, "ButterflyNet", "Butterfly Network" }, { { 0x8C, 0x1F, 0x64, 0xBD, 0x20 }, "attocube", "attocube systems AG" }, { { 0x8C, 0x1F, 0x64, 0xBD, 0x30 }, "IOMasterTech", "IO Master Technology" }, { { 0x8C, 0x1F, 0x64, 0xBD, 0x40 }, "AVEAGroup", "AVEA Group, Inc." }, @@ -56981,6 +57671,7 @@ { { 0x8C, 0x1F, 0x64, 0xBD, 0x60 }, "NOVAProducts", "NOVA Products GmbH" }, { { 0x8C, 0x1F, 0x64, 0xBD, 0x70 }, "UnionElectro", "Union Electronic." }, { { 0x8C, 0x1F, 0x64, 0xBD, 0x90 }, "Watts", "Watts" }, + { { 0x8C, 0x1F, 0x64, 0xBD, 0xA0 }, "SkipInnovati", "Skip Innovations, Inc" }, { { 0x8C, 0x1F, 0x64, 0xBD, 0xB0 }, "CardinalScal", "Cardinal Scales Manufacturing Co" }, { { 0x8C, 0x1F, 0x64, 0xBD, 0xF0 }, "MasTechnolog", "Mas Technology" }, { { 0x8C, 0x1F, 0x64, 0xBE, 0x10 }, "Geolux", "Geolux" }, @@ -57018,6 +57709,7 @@ { { 0x8C, 0x1F, 0x64, 0xC0, 0xC0 }, "GiordanoCont", "Giordano Controls Spa" }, { { 0x8C, 0x1F, 0x64, 0xC0, 0xD0 }, "AbbottDiagno", "Abbott Diagnostics Technologies AS" }, { { 0x8C, 0x1F, 0x64, 0xC0, 0xE0 }, "GoodtechASde", "Goodtech AS dep Fredrikstad" }, + { { 0x8C, 0x1F, 0x64, 0xC0, 0xF0 }, "Konax", "Konax Bv" }, { { 0x8C, 0x1F, 0x64, 0xC1, 0x20 }, "PHYSEC", "PHYSEC GmbH" }, { { 0x8C, 0x1F, 0x64, 0xC1, 0x30 }, "Glucoloop", "Glucoloop AG" }, { { 0x8C, 0x1F, 0x64, 0xC1, 0x60 }, "Alisonic", "Alisonic Srl" }, @@ -57067,6 +57759,7 @@ { { 0x8C, 0x1F, 0x64, 0xC5, 0x70 }, "StrategicRob", "Strategic Robotic Systems" }, { { 0x8C, 0x1F, 0x64, 0xC5, 0x80 }, "Kitagawa", "Kitagawa Corporation" }, { { 0x8C, 0x1F, 0x64, 0xC5, 0x90 }, "Tunstall", "Tunstall A/S" }, + { { 0x8C, 0x1F, 0x64, 0xC5, 0xB0 }, "TclOperation", "Tcl Operations Polska Sp. Z O.O." }, { { 0x8C, 0x1F, 0x64, 0xC5, 0xD0 }, "AlfaProximad", "Alfa Proxima d.o.o." }, { { 0x8C, 0x1F, 0x64, 0xC5, 0xE0 }, "YUYAMAMFG", "YUYAMA MFG Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xC6, 0x00 }, "IntelligentS", "Intelligent Security Systems (ISS)" }, @@ -57091,12 +57784,14 @@ { { 0x8C, 0x1F, 0x64, 0xC7, 0xB0 }, "FreedomAtlan", "Freedom Atlantic" }, { { 0x8C, 0x1F, 0x64, 0xC7, 0xC0 }, "MERKLESchwei", "MERKLE Schweissanlagen-Technik GmbH" }, { { 0x8C, 0x1F, 0x64, 0xC7, 0xD0 }, "GlassonElect", "Glasson Electronics Ltd" }, + { { 0x8C, 0x1F, 0x64, 0xC7, 0xF0 }, "BrightwellDo", "Brightwell Dosing ltd" }, { { 0x8C, 0x1F, 0x64, 0xC8, 0x00 }, "VECOSEurope", "VECOS Europe B.V." }, { { 0x8C, 0x1F, 0x64, 0xC8, 0x10 }, "TaolinkTechn", "Taolink Technologies Corporation" }, { { 0x8C, 0x1F, 0x64, 0xC8, 0x20 }, "SekureTrakdb", "SekureTrak Inc. dba TraknProtect" }, { { 0x8C, 0x1F, 0x64, 0xC8, 0x30 }, "PowerElectro", "Power Electronics Espana, S.L." }, { { 0x8C, 0x1F, 0x64, 0xC8, 0x40 }, "Luceor", "Luceor" }, { { 0x8C, 0x1F, 0x64, 0xC8, 0x50 }, "PotterElectr", "Potter Electric Signal Co. LLC" }, + { { 0x8C, 0x1F, 0x64, 0xC8, 0x90 }, "MBconnectlin", "MB connect line GmbH" }, { { 0x8C, 0x1F, 0x64, 0xC8, 0xD0 }, "Aeronautics", "Aeronautics Ltd." }, { { 0x8C, 0x1F, 0x64, 0xC8, 0xF0 }, "JWFroehlichM", "JW Froehlich Maschinenfabrik GmbH" }, { { 0x8C, 0x1F, 0x64, 0xC9, 0x10 }, "SoehnleIndus", "Soehnle Industrial Solutions GmbH" }, @@ -57116,6 +57811,7 @@ { { 0x8C, 0x1F, 0x64, 0xCA, 0x40 }, "BitPart", "Bit Part LLC" }, { { 0x8C, 0x1F, 0x64, 0xCA, 0x60 }, "ReliaSpeakIn", "ReliaSpeak Information Technology Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0xCA, 0x70 }, "eumigindustr", "eumig industrie-TV GmbH." }, + { { 0x8C, 0x1F, 0x64, 0xCA, 0x80 }, "OptiemusElec", "Optiemus Electronics Limited" }, { { 0x8C, 0x1F, 0x64, 0xCA, 0x90 }, "AvantTechnol", "Avant Technologies" }, { { 0x8C, 0x1F, 0x64, 0xCA, 0xB0 }, "SpyderContro", "Spyder Controls Corp." }, { { 0x8C, 0x1F, 0x64, 0xCA, 0xD0 }, "GeneralMotor", "General Motors" }, @@ -57124,6 +57820,7 @@ { { 0x8C, 0x1F, 0x64, 0xCB, 0x10 }, "Xi’anSunwayC", "Xi’an Sunway Communication Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0xCB, 0x20 }, "DyncirSoluçõ", "Dyncir Soluções Tecnológicas Ltda" }, { { 0x8C, 0x1F, 0x64, 0xCB, 0x30 }, "DELOIndustri", "DELO Industrie Klebstoffe GmbH & Co. KGaA" }, + { { 0x8C, 0x1F, 0x64, 0xCB, 0x40 }, "Wi4B", "Wi4B s.r.l." }, { { 0x8C, 0x1F, 0x64, 0xCB, 0x50 }, "GamberJohnso", "Gamber-Johnson LLC" }, { { 0x8C, 0x1F, 0x64, 0xCB, 0x60 }, "RowanElettro", "Rowan Elettronica Srl" }, { { 0x8C, 0x1F, 0x64, 0xCB, 0x70 }, "ARKRAYKyotoL", "ARKRAY,Inc.Kyoto Laboratory" }, @@ -57133,6 +57830,7 @@ { { 0x8C, 0x1F, 0x64, 0xCB, 0xE0 }, "CircaEnterpr", "Circa Enterprises Inc" }, { { 0x8C, 0x1F, 0x64, 0xCC, 0x10 }, "VITREASmartH", "VITREA Smart Home Technologies Ltd." }, { { 0x8C, 0x1F, 0x64, 0xCC, 0x20 }, "Toyogiken", "Toyogiken Co.,Ltd." }, + { { 0x8C, 0x1F, 0x64, 0xCC, 0x30 }, "Kronotech", "Kronotech Srl" }, { { 0x8C, 0x1F, 0x64, 0xCC, 0x50 }, "PotterElectr", "Potter Electric Signal Co. LLC" }, { { 0x8C, 0x1F, 0x64, 0xCC, 0x60 }, "GeniusVision", "Genius Vision Digital Private Limited" }, { { 0x8C, 0x1F, 0x64, 0xCC, 0x80 }, "Sicon", "Sicon srl" }, @@ -57164,6 +57862,7 @@ { { 0x8C, 0x1F, 0x64, 0xCE, 0xE0 }, "Displax", "Displax S.A." }, { { 0x8C, 0x1F, 0x64, 0xCE, 0xF0 }, "GoertekRobot", "Goertek Robotics Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0xCF, 0x10 }, "ROBOfiber", "ROBOfiber, Inc." }, + { { 0x8C, 0x1F, 0x64, 0xCF, 0x20 }, "PotterElectr", "Potter Electric Signal Company" }, { { 0x8C, 0x1F, 0x64, 0xCF, 0x30 }, "ABB", "ABB S.p.A." }, { { 0x8C, 0x1F, 0x64, 0xCF, 0x40 }, "Nt", "Nt" }, { { 0x8C, 0x1F, 0x64, 0xCF, 0x60 }, "NYBSYS", "NYBSYS Inc" }, @@ -57181,6 +57880,7 @@ { { 0x8C, 0x1F, 0x64, 0xD0, 0x80 }, "PowerElectro", "Power Electronics Espana, S.L." }, { { 0x8C, 0x1F, 0x64, 0xD0, 0x90 }, "MinartimeSci", "Minartime(Beijing)Science &Technology Development Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xD0, 0xA0 }, "BOTEVOBuildi", "BOTEVO Building Solutions GmbH" }, + { { 0x8C, 0x1F, 0x64, 0xD0, 0xB0 }, "Technolog", "Technolog Ltd" }, { { 0x8C, 0x1F, 0x64, 0xD0, 0xC0 }, "KSBeschallun", "KS Beschallungstechnik GmbH" }, { { 0x8C, 0x1F, 0x64, 0xD0, 0xE0 }, "Labforge", "Labforge Inc." }, { { 0x8C, 0x1F, 0x64, 0xD0, 0xF0 }, "Mecco", "Mecco LLC" }, @@ -57212,6 +57912,7 @@ { { 0x8C, 0x1F, 0x64, 0xD2, 0xD0 }, "Eskomar", "Eskomar Ltd." }, { { 0x8C, 0x1F, 0x64, 0xD2, 0xF0 }, "Ltec", "Ltec Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xD3, 0x00 }, "FMCTechnolog", "FMC Technologies Measurement Solutions Inc" }, + { { 0x8C, 0x1F, 0x64, 0xD3, 0x30 }, "SPACECREATOR", "SPACE CREATORS ALLIANCE Inc." }, { { 0x8C, 0x1F, 0x64, 0xD3, 0x40 }, "Kronotech", "Kronotech Srl" }, { { 0x8C, 0x1F, 0x64, 0xD3, 0x50 }, "XianBianguIn", "Xi'an Biangu Information Technology Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0xD3, 0x80 }, "CuuLongTechn", "Cuu Long Technology And Trading Company Limited" }, @@ -57235,6 +57936,7 @@ { { 0x8C, 0x1F, 0x64, 0xD5, 0x40 }, "GrupoEpelsaS", "Grupo Epelsa S.L." }, { { 0x8C, 0x1F, 0x64, 0xD5, 0x50 }, "FairwindsTec", "Fairwinds Technologies" }, { { 0x8C, 0x1F, 0x64, 0xD5, 0x60 }, "WisdomAudio", "Wisdom Audio" }, + { { 0x8C, 0x1F, 0x64, 0xD5, 0x70 }, "Integerpl", "Integer.pl S.A." }, { { 0x8C, 0x1F, 0x64, 0xD5, 0x80 }, "ZumbachElect", "Zumbach Electronic AG" }, { { 0x8C, 0x1F, 0x64, 0xD5, 0xA0 }, "RealtekSemic", "Realtek Semiconductor Corp." }, { { 0x8C, 0x1F, 0x64, 0xD5, 0xB0 }, "LocalSecurit", "Local Security" }, @@ -57262,9 +57964,11 @@ { { 0x8C, 0x1F, 0x64, 0xD8, 0x00 }, "Aztek", "Aztek Sa" }, { { 0x8C, 0x1F, 0x64, 0xD8, 0x10 }, "MitsubishiEl", "Mitsubishi Electric India Pvt. Ltd." }, { { 0x8C, 0x1F, 0x64, 0xD8, 0x20 }, "JarueMicrosy", "Shanghai Jarue Microsystem.CO.,Ltd." }, + { { 0x8C, 0x1F, 0x64, 0xD8, 0x40 }, "OES", "OES Inc." }, { { 0x8C, 0x1F, 0x64, 0xD8, 0x70 }, "ExperioTechP", "Experio Tech Private Limited" }, { { 0x8C, 0x1F, 0x64, 0xD8, 0x80 }, "UniversityGe", "University of Geneva - Department of Particle Physics" }, { { 0x8C, 0x1F, 0x64, 0xD8, 0xA0 }, "BoonArthurEn", "Boon Arthur Engineering Pte Ltd" }, + { { 0x8C, 0x1F, 0x64, 0xD8, 0xB0 }, "IOControls", "I/O Controls" }, { { 0x8C, 0x1F, 0x64, 0xD8, 0xC0 }, "Smri", "Smri" }, { { 0x8C, 0x1F, 0x64, 0xD8, 0xD0 }, "WiTronix", "Wi-Tronix, LLC" }, { { 0x8C, 0x1F, 0x64, 0xD8, 0xE0 }, "PotterElectr", "Potter Electric Signal Co. LLC" }, @@ -57312,6 +58016,7 @@ { { 0x8C, 0x1F, 0x64, 0xDC, 0xA0 }, "Porscheengin", "Porsche engineering" }, { { 0x8C, 0x1F, 0x64, 0xDC, 0xB0 }, "CeresdataTec", "Beijing Ceresdata Technology Co., LTD" }, { { 0x8C, 0x1F, 0x64, 0xDC, 0xF0 }, "Reo", "Reo Ag" }, + { { 0x8C, 0x1F, 0x64, 0xDD, 0x00 }, "GeniusSports", "Genius Sports" }, { { 0x8C, 0x1F, 0x64, 0xDD, 0x20 }, "ShieldCctv", "Shield-Cctv Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0xDD, 0x30 }, "CHUGOKUELECT", "CHUGOKU ELECTRICAL INSTRUMENTS Co.,LTD." }, { { 0x8C, 0x1F, 0x64, 0xDD, 0x40 }, "MidlandsTech", "Midlands Technical Co., Ltd." }, @@ -57326,12 +58031,14 @@ { { 0x8C, 0x1F, 0x64, 0xDE, 0x20 }, "Softgentsp", "Softgent sp. z o.o." }, { { 0x8C, 0x1F, 0x64, 0xDE, 0x50 }, "GogoBusiness", "Gogo Business Aviation" }, { { 0x8C, 0x1F, 0x64, 0xDE, 0x60 }, "IHIInspectio", "IHI Inspection & Instrumentation Co.,Ltd." }, + { { 0x8C, 0x1F, 0x64, 0xDE, 0x70 }, "GuangzhouMof", "Guangzhou Mofiu Technology Co., Ltd" }, { { 0x8C, 0x1F, 0x64, 0xDE, 0x90 }, "EONTechnolog", "EON Technology, Corp" }, { { 0x8C, 0x1F, 0x64, 0xDE, 0xA0 }, "NatronEnergy", "Natron Energy" }, { { 0x8C, 0x1F, 0x64, 0xDE, 0xB0 }, "PXMMarekZupn", "PXM Marek Zupnik spolka komandytowa" }, { { 0x8C, 0x1F, 0x64, 0xDE, 0xD0 }, "PhotonPath", "PhotonPath" }, { { 0x8C, 0x1F, 0x64, 0xDF, 0x00 }, "Cyberkar", "Cyberkar Systems inc." }, { { 0x8C, 0x1F, 0x64, 0xDF, 0x20 }, "Lomar", "Lomar Srl" }, + { { 0x8C, 0x1F, 0x64, 0xDF, 0x40 }, "AnglianWater", "Anglian Water Business (National) Limited" }, { { 0x8C, 0x1F, 0x64, 0xDF, 0x50 }, "ConceptProSu", "Concept Pro Surveillance" }, { { 0x8C, 0x1F, 0x64, 0xDF, 0x60 }, "Micronova", "Micronova srl" }, { { 0x8C, 0x1F, 0x64, 0xDF, 0x80 }, "WittraNetwor", "Wittra Networks AB" }, @@ -57357,6 +58064,7 @@ { { 0x8C, 0x1F, 0x64, 0xE1, 0x20 }, "PixusTechnol", "Pixus Technologies Inc." }, { { 0x8C, 0x1F, 0x64, 0xE1, 0x40 }, "Proserv", "Proserv" }, { { 0x8C, 0x1F, 0x64, 0xE1, 0x50 }, "Panascaisehf", "Panascais ehf." }, + { { 0x8C, 0x1F, 0x64, 0xE1, 0x60 }, "SlipstreamEn", "Slipstream Engineering Design Ltd" }, { { 0x8C, 0x1F, 0x64, 0xE1, 0xA0 }, "DAccessSecur", "DAccess Security Systems P Ltd" }, { { 0x8C, 0x1F, 0x64, 0xE1, 0xC0 }, "CLOUDTELECOM", "CLOUD TELECOM Inc." }, { { 0x8C, 0x1F, 0x64, 0xE1, 0xD0 }, "XworksNZ", "Xworks NZ Limited" }, @@ -57410,6 +58118,7 @@ { { 0x8C, 0x1F, 0x64, 0xE6, 0x40 }, "Indefac", "Indefac company" }, { { 0x8C, 0x1F, 0x64, 0xE6, 0x60 }, "EnlessWirele", "Enless Wireless" }, { { 0x8C, 0x1F, 0x64, 0xE6, 0x80 }, "LHA", "LHA Systems (Pty) Ltd" }, + { { 0x8C, 0x1F, 0x64, 0xE6, 0x90 }, "FullohmKD", "FullohmKD" }, { { 0x8C, 0x1F, 0x64, 0xE6, 0xB0 }, "TerratelTech", "Terratel Technology s.r.o." }, { { 0x8C, 0x1F, 0x64, 0xE6, 0xE0 }, "HumanDgm", "Human Dgm. Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0xE6, 0xF0 }, "VisionSafety", "Vision Systems Safety Tech" }, @@ -57426,6 +58135,7 @@ { { 0x8C, 0x1F, 0x64, 0xE7, 0xC0 }, "AshinneTechn", "Ashinne Technology Co., Ltd" }, { { 0x8C, 0x1F, 0x64, 0xE7, 0xD0 }, "AudioVisualD", "Audio Visual Digital Systems" }, { { 0x8C, 0x1F, 0x64, 0xE8, 0x00 }, "PowerElectro", "Power Electronics Espana, S.L." }, + { { 0x8C, 0x1F, 0x64, 0xE8, 0x10 }, "SunairElectr", "Sunair Electronics" }, { { 0x8C, 0x1F, 0x64, 0xE8, 0x20 }, "SMITEC", "SMITEC S.p.A." }, { { 0x8C, 0x1F, 0x64, 0xE8, 0x60 }, "ComVetia", "ComVetia AG" }, { { 0x8C, 0x1F, 0x64, 0xE8, 0x70 }, "ChemiCon", "Chemi-Con" }, @@ -57439,12 +58149,15 @@ { { 0x8C, 0x1F, 0x64, 0xE9, 0x10 }, "RADICTechnol", "RADIC Technologies, Inc." }, { { 0x8C, 0x1F, 0x64, 0xE9, 0x20 }, "EAElektroAut", "EA Elektro-Automatik GmbH" }, { { 0x8C, 0x1F, 0x64, 0xE9, 0x40 }, "ZinTechnolog", "Zin Technologies" }, + { { 0x8C, 0x1F, 0x64, 0xE9, 0x70 }, "Lucint", "Lucint Systems, Inc." }, { { 0x8C, 0x1F, 0x64, 0xE9, 0x80 }, "LuxshareElec", "Luxshare Electronic Technology (Kunshan) LTD" }, { { 0x8C, 0x1F, 0x64, 0xE9, 0x90 }, "PantherunTec", "Pantherun Technologies Pvt Ltd" }, { { 0x8C, 0x1F, 0x64, 0xE9, 0xA0 }, "SiFive", "SiFive Inc" }, { { 0x8C, 0x1F, 0x64, 0xE9, 0xB0 }, "DiscoverEner", "Discover Energy Systems Corp." }, { { 0x8C, 0x1F, 0x64, 0xE9, 0xD0 }, "ZhuhaiLonlel", "Zhuhai Lonl electric Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0xE9, 0xF0 }, "LumiplanDuha", "Lumiplan Duhamel" }, + { { 0x8C, 0x1F, 0x64, 0xEA, 0x00 }, "OxyTechnolog", "Oxy Technology Usa Llc" }, + { { 0x8C, 0x1F, 0x64, 0xEA, 0x20 }, "VisionSafety", "Vision Systems Safety Tech" }, { { 0x8C, 0x1F, 0x64, 0xEA, 0x60 }, "DialPlan", "Dial Plan Limited" }, { { 0x8C, 0x1F, 0x64, 0xEA, 0x80 }, "ZumbachElect", "Zumbach Electronic AG" }, { { 0x8C, 0x1F, 0x64, 0xEA, 0xA0 }, "KBModul", "\"KB \"Modul\", LLC" }, @@ -57453,6 +58166,7 @@ { { 0x8C, 0x1F, 0x64, 0xEA, 0xE0 }, "TrafficPolsk", "Traffic Polska sp. z o. o." }, { { 0x8C, 0x1F, 0x64, 0xEA, 0xF0 }, "YUYAMAMFG", "YUYAMA MFG Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xEB, 0x00 }, "ExyteTechnol", "Exyte Technology GmbH" }, + { { 0x8C, 0x1F, 0x64, 0xEB, 0x10 }, "Olzetek", "Olzetek" }, { { 0x8C, 0x1F, 0x64, 0xEB, 0x20 }, "AquaBroadcas", "Aqua Broadcast Ltd" }, { { 0x8C, 0x1F, 0x64, 0xEB, 0x40 }, "1Finity", "1Finity Inc." }, { { 0x8C, 0x1F, 0x64, 0xEB, 0x50 }, "MeiryoDenshi", "Meiryo Denshi Corp." }, @@ -57471,8 +58185,10 @@ { { 0x8C, 0x1F, 0x64, 0xEC, 0x30 }, "ScenarioAuto", "Scenario Automation" }, { { 0x8C, 0x1F, 0x64, 0xEC, 0x50 }, "StanleyBlack", "Stanley Black & Decker Engineered Fastening (Nantong) Co., Ltd." }, { { 0x8C, 0x1F, 0x64, 0xEC, 0xC0 }, "BaldwinJimek", "Baldwin Jimek AB" }, + { { 0x8C, 0x1F, 0x64, 0xEC, 0xD0 }, "BITMCTechnol", "Beijing BITMC Technology co.Ltd" }, { { 0x8C, 0x1F, 0x64, 0xEC, 0xF0 }, "Monnit", "Monnit Corporation" }, { { 0x8C, 0x1F, 0x64, 0xED, 0x00 }, "JupperTechno", "Shanghai Jupper Technology Co.Ltd" }, + { { 0x8C, 0x1F, 0x64, 0xED, 0x10 }, "SmartSolutio", "Smart Solution Inc." }, { { 0x8C, 0x1F, 0x64, 0xED, 0x30 }, "Senso2Me", "Senso2Me Nv" }, { { 0x8C, 0x1F, 0x64, 0xED, 0x40 }, "ZhejiangChit", "Zhejiang Chitic-Safeway New Energy Technical Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0xED, 0x50 }, "SmartDataInt", "Smart Data (Shenzhen) Intelligent System Co., Ltd." }, @@ -57484,12 +58200,14 @@ { { 0x8C, 0x1F, 0x64, 0xED, 0xC0 }, "InfosoftDigi", "Infosoft Digital Design and Services P L" }, { { 0x8C, 0x1F, 0x64, 0xED, 0xD0 }, "OnDisSolutio", "OnDis Solutions Ltd" }, { { 0x8C, 0x1F, 0x64, 0xED, 0xF0 }, "XleraSolutio", "Xlera Solutions, LLC" }, - { { 0x8C, 0x1F, 0x64, 0xEE, 0x00 }, "Private", "Private" }, + { { 0x8C, 0x1F, 0x64, 0xEE, 0x00 }, "CEM", "CEM Ltd" }, { { 0x8C, 0x1F, 0x64, 0xEE, 0x10 }, "PuSund", "PuS GmbH und Co. KG" }, { { 0x8C, 0x1F, 0x64, 0xEE, 0x30 }, "SichuanHuacu", "Sichuan Huacun Zhigu Technology Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xEE, 0x60 }, "Lynkx", "Lynkx" }, { { 0x8C, 0x1F, 0x64, 0xEE, 0x80 }, "GlobalOrganG", "Global Organ Group B.V." }, + { { 0x8C, 0x1F, 0x64, 0xEE, 0x90 }, "Intect", "Intect AG" }, { { 0x8C, 0x1F, 0x64, 0xEE, 0xA0 }, "Amess", "Amess" }, + { { 0x8C, 0x1F, 0x64, 0xEE, 0xC0 }, "Lumenir", "Lumenir Inc." }, { { 0x8C, 0x1F, 0x64, 0xEE, 0xD0 }, "ViziontechUK", "Viziontech UK" }, { { 0x8C, 0x1F, 0x64, 0xEE, 0xF0 }, "AiUnion", "AiUnion Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xEF, 0x00 }, "Sonendo", "Sonendo Inc" }, @@ -57527,13 +58245,16 @@ { { 0x8C, 0x1F, 0x64, 0xF2, 0x50 }, "MisakaNetwor", "Misaka Network, Inc." }, { { 0x8C, 0x1F, 0x64, 0xF2, 0x70 }, "TesatSpaceco", "Tesat-Spacecom GmbH & Co. KG" }, { { 0x8C, 0x1F, 0x64, 0xF2, 0x80 }, "DEUTAWerke", "DEUTA Werke GmbH" }, + { { 0x8C, 0x1F, 0x64, 0xF2, 0x90 }, "Horizon", "Horizon.Inc" }, { { 0x8C, 0x1F, 0x64, 0xF2, 0xC0 }, "Tunstall", "Tunstall A/S" }, { { 0x8C, 0x1F, 0x64, 0xF2, 0xD0 }, "HUERNERSchwe", "HUERNER Schweisstechnik GmbH" }, + { { 0x8C, 0x1F, 0x64, 0xF2, 0xE0 }, "EmTroniXSàrl", "EmTroniX Sàrl" }, { { 0x8C, 0x1F, 0x64, 0xF2, 0xF0 }, "QuantumTechn", "Quantum Technologies Inc" }, { { 0x8C, 0x1F, 0x64, 0xF3, 0x10 }, "Internationa", "International Water Treatment Maritime AS" }, { { 0x8C, 0x1F, 0x64, 0xF3, 0x20 }, "INVTElectric", "Shenzhen INVT Electric Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xF3, 0x30 }, "Sicon", "Sicon srl" }, { { 0x8C, 0x1F, 0x64, 0xF3, 0x70 }, "Polarity", "Polarity Inc" }, + { { 0x8C, 0x1F, 0x64, 0xF3, 0x80 }, "AKSE", "AKSE srl" }, { { 0x8C, 0x1F, 0x64, 0xF3, 0x90 }, "WeinanWinsFu", "Weinan Wins Future Technology Co.,Ltd" }, { { 0x8C, 0x1F, 0x64, 0xF3, 0xA0 }, "intersaar", "intersaar GmbH" }, { { 0x8C, 0x1F, 0x64, 0xF3, 0xB0 }, "REMANGTechno", "Beijing REMANG Technology Co., Ltd." }, @@ -57584,6 +58305,7 @@ { { 0x8C, 0x1F, 0x64, 0xF7, 0xD0 }, "RpgInformati", "Rpg Informatica, S.A." }, { { 0x8C, 0x1F, 0x64, 0xF7, 0xF0 }, "VisionSafety", "Vision Systems Safety Tech" }, { { 0x8C, 0x1F, 0x64, 0xF8, 0x00 }, "VinfastTradi", "Vinfast Trading and Production JSC" }, + { { 0x8C, 0x1F, 0x64, 0xF8, 0x20 }, "SeorimTechno", "Seorim Technology" }, { { 0x8C, 0x1F, 0x64, 0xF8, 0x30 }, "VishayNobel", "Vishay Nobel AB" }, { { 0x8C, 0x1F, 0x64, 0xF8, 0x40 }, "KSTtechnolog", "KST technology" }, { { 0x8C, 0x1F, 0x64, 0xF8, 0x60 }, "INFOSTECH", "INFOSTECH Co., Ltd." }, @@ -57623,6 +58345,7 @@ { { 0x8C, 0x1F, 0x64, 0xFB, 0x90 }, "IWSGlobal", "IWS Global Pty Ltd" }, { { 0x8C, 0x1F, 0x64, 0xFB, 0xA0 }, "OntoInnovati", "Onto Innovation" }, { { 0x8C, 0x1F, 0x64, 0xFB, 0xB0 }, "Telica", "Telica" }, + { { 0x8C, 0x1F, 0x64, 0xFB, 0xC0 }, "ImmersiveAud", "Immersive Audio Technologies" }, { { 0x8C, 0x1F, 0x64, 0xFB, 0xD0 }, "SANAIElectro", "SAN-AI Electronic Industries Co.,Ltd." }, { { 0x8C, 0x1F, 0x64, 0xFC, 0x10 }, "Nidecasi", "Nidec asi spa" }, { { 0x8C, 0x1F, 0x64, 0xFC, 0x20 }, "IOControls", "I/O Controls" }, @@ -57630,6 +58353,7 @@ { { 0x8C, 0x1F, 0x64, 0xFC, 0x40 }, "DorletSau", "Dorlet Sau" }, { { 0x8C, 0x1F, 0x64, 0xFC, 0x50 }, "Sumico", "Sumico" }, { { 0x8C, 0x1F, 0x64, 0xFC, 0x60 }, "InvertekDriv", "Invertek Drives Ltd" }, + { { 0x8C, 0x1F, 0x64, 0xFC, 0x70 }, "AzuraTechnol", "Azura Technology Co. Ltd." }, { { 0x8C, 0x1F, 0x64, 0xFC, 0x80 }, "MetaphaseTec", "Metaphase Technologies" }, { { 0x8C, 0x1F, 0x64, 0xFC, 0xA0 }, "Elektrotechn", "Elektrotechnik & Elektronik Oltmann GmbH" }, { { 0x8C, 0x1F, 0x64, 0xFC, 0xC0 }, "GredmannTaiw", "Gredmann Taiwan Ltd." }, @@ -57644,6 +58368,7 @@ { { 0x8C, 0x1F, 0x64, 0xFD, 0xA0 }, "ArkhamTechno", "Arkham Technology" }, { { 0x8C, 0x1F, 0x64, 0xFD, 0xB0 }, "DeepSenXeInt", "DeepSenXe International ltd." }, { { 0x8C, 0x1F, 0x64, 0xFD, 0xC0 }, "NuphotonTech", "Nuphoton Technologies" }, + { { 0x8C, 0x1F, 0x64, 0xFD, 0xD0 }, "AtikCamerasU", "Atik Cameras Unipessoal, Lda" }, { { 0x8C, 0x1F, 0x64, 0xFD, 0xF0 }, "PotterElectr", "Potter Electric Signal Co. LLC" }, { { 0x8C, 0x1F, 0x64, 0xFE, 0x00 }, "PotterElectr", "Potter Electric Signal Co. LLC" }, { { 0x8C, 0x1F, 0x64, 0xFE, 0x10 }, "SOREL", "SOREL GmbH" }, diff -Nru wireshark-4.4.16/epan/reassemble.c wireshark-4.4.18/epan/reassemble.c --- wireshark-4.4.16/epan/reassemble.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/reassemble.c 2026-08-12 17:19:13.000000000 +0000 @@ -1871,7 +1871,12 @@ for(fd_i=fd_head->next;fd_i;fd_i=fd_i->next) { if(!last_fd || last_fd->offset!=fd_i->offset){ - size+=fd_i->len; + if (ckd_add(&size, size, fd_i->len) || size > INT32_MAX) { + /* Change this maximum size when unsigned lengths + * are fully supported (#20103). */ + size = INT32_MAX; + break; + } } last_fd=fd_i; } @@ -1887,10 +1892,21 @@ last_fd=NULL; for (fd_i=fd_head->next; fd_i; fd_i=fd_i->next) { if (fd_i->len) { - if(!last_fd || last_fd->offset != fd_i->offset) { + if (dfpos >= size) { + fd_i->flags |= FD_TOOLONGFRAGMENT; // FD_OVERFLOW? + fd_head->flags |= FD_TOOLONGFRAGMENT; // FD_OVERFLOW? + } else if (!last_fd || last_fd->offset != fd_i->offset) { /* First fragment or in-sequence fragment */ - memcpy(data+dfpos, tvb_get_ptr(fd_i->tvb_data, 0, fd_i->len), fd_i->len); - dfpos += fd_i->len; + /* We need the position for overlap calculation of new fragments */ + uint32_t copy_len = fd_i->len; + uint32_t old_dfpos = dfpos; + if (ckd_add(&dfpos, dfpos, fd_i->len) || dfpos > size) { + copy_len = size - old_dfpos; + dfpos = size; + fd_i->flags |= FD_TOOLONGFRAGMENT; // FD_OVERFLOW? + fd_head->flags |= FD_TOOLONGFRAGMENT; // FD_OVERFLOW? + } + memcpy(data + old_dfpos, tvb_get_ptr(fd_i->tvb_data, 0, fd_i->len), copy_len); } else { /* duplicate/retransmission/overlap */ fd_i->flags |= FD_OVERLAP; diff -Nru wireshark-4.4.16/epan/services-data.c wireshark-4.4.18/epan/services-data.c --- wireshark-4.4.16/epan/services-data.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/services-data.c 2026-08-12 17:19:13.000000000 +0000 @@ -4419,6 +4419,7 @@ { 6581, "parsec-peer", "Parsec Peer-to-Peer" }, { 6582, "parsec-game", "Parsec Gameserver" }, { 6583, "joaJewelSuite", "JOA Jewel Suite" }, + { 6610, "bencher", "Bencher API" }, { 6619, "odette-ftps", "ODETTE-FTP over TLS/SSL" }, { 6620, "kftp-data", "Kerberos V5 FTP Data" }, { 6621, "kftp", "Kerberos V5 FTP Control" }, @@ -4504,6 +4505,7 @@ { 7100, "font-service", "X Font Service" }, { 7101, "elcn", "Embedded Light Control Network" }, { 7121, "virprot-lm", "Virtual Prototypes License Manager" }, + { 7123, "snif", "SNIF End-to-End TLS Relay Control Connection" }, { 7128, "scenidm", "intelligent data manager" }, { 7129, "scenccs", "Catalog Content Search" }, { 7161, "cabsm-comm", "CA BSM Comm" }, @@ -5186,6 +5188,7 @@ { 30002, "pago-services2", "Pago Services 2" }, { 30003, "amicon-fpsu-ra", "Amicon FPSU-IP Remote Administration" }, { 30260, "kingdomsonline", "Kingdoms Online (CraigAvenue)" }, + { 30939, "dilithium3", "Persistent peer-to-peer connections for block propagation, transaction relay, and BFT consensus message exchange." }, { 30999, "ovobs", "OpenView Service Desk Client" }, { 31337, "eldim", "eldim is a secure file upload proxy" }, { 31416, "xqosd", "XQoS network monitor" }, @@ -5642,7 +5645,6 @@ { 7072, "iba-cfg", "iba Device Configuration Protocol" }, { 7073, "martalk", "MarTalk protocol" }, { 7117, "rothaga", "Encrypted chat and file transfer service" }, - { 7123, "snif", "End-to-end TLS Relay Control Connection" }, { 7167, "casrmagent", "CA SRM Agent" }, { 7168, "cnckadserver", "cncKadServer DB & Inventory Services" }, { 7172, "metalbend", "Port used for MetalBend programmable interface" }, diff -Nru wireshark-4.4.16/epan/to_str.c wireshark-4.4.18/epan/to_str.c --- wireshark-4.4.16/epan/to_str.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/to_str.c 2026-08-12 17:19:13.000000000 +0000 @@ -370,6 +370,9 @@ /* C99 and C++11 guarantee integer division rounds to zero */ msecs = -(time_val % 1000); time_val /= 1000; + if (time_val == 0) { + wmem_strbuf_append_c(buf, '-'); + } } else { msecs = time_val % 1000; time_val /= 1000; diff -Nru wireshark-4.4.16/epan/tvbuff_rdp.c wireshark-4.4.18/epan/tvbuff_rdp.c --- wireshark-4.4.16/epan/tvbuff_rdp.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/tvbuff_rdp.c 2026-08-12 17:19:13.000000000 +0000 @@ -253,7 +253,7 @@ uint32_t rest, tocopy; /* first copy in the output buffer */ - if (zgfx->outputCount > 65535 - count) + if (count > 65535 - zgfx->outputCount) return false; if (!bitstream_copyraw(b, &(zgfx->outputSegment[zgfx->outputCount]), count)) @@ -289,7 +289,7 @@ uint32_t remainingCount, copyTemplateSize, toCopy; uint8_t *outputPtr; - if (zgfx->outputCount > 65535 - count) + if (count > 65535 - zgfx->outputCount) return false; remainingCount = count; @@ -340,7 +340,7 @@ if (!(flags & ZGX_PACKET_COMPRESSED)) { if (len > 65535) { - return false; + return false; } tvbuff_t *raw = tvb_new_subset_remaining(tvb, 1); zgfx_write_history_buffer_tvb(zgfx, raw, len); diff -Nru wireshark-4.4.16/epan/wslua/wslua_dumper.c wireshark-4.4.18/epan/wslua/wslua_dumper.c --- wireshark-4.4.16/epan/wslua/wslua_dumper.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/epan/wslua/wslua_dumper.c 2026-08-12 17:19:13.000000000 +0000 @@ -237,62 +237,68 @@ if (! d ) { /* WSLUA_ERROR("Error while opening file for writing"); */ + + /* Push an appropriate error message, and free the err_info string + if necessary. */ switch (err) { case WTAP_ERR_NOT_REGULAR_FILE: - luaL_error(L,"The file \"%s\" is a \"special file\" or socket or other non-regular file", - filename); + lua_pushfstring(L,"The file \"%s\" is a \"special file\" or socket or other non-regular file", + filename); break; case WTAP_ERR_CANT_WRITE_TO_PIPE: - luaL_error(L,"The file \"%s\" is a pipe, and %s capture files can't be written to a pipe", - filename, wtap_file_type_subtype_description(filetype)); + lua_pushfstring(L,"The file \"%s\" is a pipe, and %s capture files can't be written to a pipe", + filename, + wtap_file_type_subtype_description(filetype)); break; case WTAP_ERR_UNWRITABLE_FILE_TYPE: - luaL_error(L,"Files of file type %s cannot be written", - wtap_file_type_subtype_description(filetype)); + lua_pushfstring(L,"Files of file type %s cannot be written", + wtap_file_type_subtype_description(filetype)); break; case WTAP_ERR_UNWRITABLE_ENCAP: - luaL_error(L,"Files of file type %s don't support encapsulation %s", - wtap_file_type_subtype_description(filetype), - wtap_encap_name(encap)); + lua_pushfstring(L,"Files of file type %s don't support encapsulation %s", + wtap_file_type_subtype_description(filetype), + wtap_encap_name(encap)); break; case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED: - luaL_error(L,"Files of file type %s don't support per-packet encapsulation", - wtap_file_type_subtype_description(filetype)); + lua_pushfstring(L,"Files of file type %s don't support per-packet encapsulation", + wtap_file_type_subtype_description(filetype)); break; case WTAP_ERR_CANT_OPEN: - luaL_error(L,"The file \"%s\" could not be created for some unknown reason", - filename); + lua_pushfstring(L,"The file \"%s\" could not be created for some unknown reason", + filename); break; case WTAP_ERR_SHORT_WRITE: - luaL_error(L,"A full header couldn't be written to the file \"%s\".", - filename); + lua_pushfstring(L,"A full header couldn't be written to the file \"%s\".", + filename); break; case WTAP_ERR_COMPRESSION_NOT_SUPPORTED: - luaL_error(L,"Files of file type %s cannot be written as a compressed file", - wtap_file_type_subtype_description(filetype)); + lua_pushfstring(L,"Files of file type %s cannot be written as a compressed file", + wtap_file_type_subtype_description(filetype)); break; case WTAP_ERR_INTERNAL: - luaL_error(L,"An internal error occurred creating the file \"%s\" (%s)", - filename, - err_info != NULL ? err_info : "no information supplied"); + lua_pushfstring(L,"An internal error occurred creating the file \"%s\" (%s)", + filename, + err_info != NULL ? err_info : "no information supplied"); g_free(err_info); break; default: - luaL_error(L,"error while opening \"%s\": %s", - filename, - wtap_strerror(err)); + lua_pushfstring(L,"error while opening \"%s\": %s", + filename, + wtap_strerror(err)); break; } - return 0; + + /* Now throw the error. */ + return lua_error(L); } g_hash_table_insert(dumper_encaps,d,GINT_TO_POINTER(encap)); @@ -316,14 +322,19 @@ g_hash_table_remove(dumper_encaps,*dp); if (!wtap_dump_close(*dp, NULL, &err, &err_info)) { + /* Push an appropriate error message, and free the err_info string + if necessary. */ if (err_info != NULL) { - luaL_error(L,"error closing: %s (%s)", - wtap_strerror(err), err_info); + lua_pushfstring(L,"error closing: %s (%s)", + wtap_strerror(err), err_info); g_free(err_info); } else { - luaL_error(L,"error closing: %s", - wtap_strerror(err)); + lua_pushfstring(L,"error closing: %s", + wtap_strerror(err)); } + + /* Now throw the error. */ + return lua_error(L); } /* this way if we close a dumper any attempt to use it (for everything but GC) will yield an error */ @@ -402,19 +413,26 @@ * should be copying it to pkthdr.pkt_block if we can. */ if (! wtap_dump(d, &rec, ba->data, &err, &err_info)) { + wtap_rec_cleanup(&rec); + + /* Push an appropriate error message, and free the err_info string + if necessary. */ switch (err) { case WTAP_ERR_UNWRITABLE_REC_DATA: - luaL_error(L,"error while dumping: %s (%s)", - wtap_strerror(err), err_info); + lua_pushfstring(L,"error while dumping: %s (%s)", + wtap_strerror(err), err_info); g_free(err_info); break; default: - luaL_error(L,"error while dumping: %s", - wtap_strerror(err)); + lua_pushfstring(L,"error while dumping: %s", + wtap_strerror(err)); break; } + + /* Now throw the error. */ + return lua_error(L); } return 0; @@ -450,62 +468,67 @@ &err_info); if (! d ) { + /* Push an appropriate error message, and free the err_info string + if necessary. */ switch (err) { case WTAP_ERR_NOT_REGULAR_FILE: - luaL_error(L,"The file \"%s\" is a \"special file\" or socket or other non-regular file", - filename); + lua_pushfstring(L,"The file \"%s\" is a \"special file\" or socket or other non-regular file", + filename); break; case WTAP_ERR_CANT_WRITE_TO_PIPE: - luaL_error(L,"The file \"%s\" is a pipe, and %s capture files can't be written to a pipe", - filename, wtap_file_type_subtype_description(filetype)); + lua_pushfstring(L,"The file \"%s\" is a pipe, and %s capture files can't be written to a pipe", + filename, + wtap_file_type_subtype_description(filetype)); break; case WTAP_ERR_UNWRITABLE_FILE_TYPE: - luaL_error(L,"Files of file type %s cannot be written", - wtap_file_type_subtype_description(filetype)); + lua_pushfstring(L,"Files of file type %s cannot be written", + wtap_file_type_subtype_description(filetype)); break; case WTAP_ERR_UNWRITABLE_ENCAP: - luaL_error(L,"Files of file type %s don't support encapsulation %s", - wtap_file_type_subtype_description(filetype), - wtap_encap_name(encap)); + lua_pushfstring(L,"Files of file type %s don't support encapsulation %s", + wtap_file_type_subtype_description(filetype), + wtap_encap_name(encap)); break; case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED: - luaL_error(L,"Files of file type %s don't support per-packet encapsulation", - wtap_file_type_subtype_description(filetype)); + lua_pushfstring(L,"Files of file type %s don't support per-packet encapsulation", + wtap_file_type_subtype_description(filetype)); break; case WTAP_ERR_CANT_OPEN: - luaL_error(L,"The file \"%s\" could not be created for some unknown reason", - filename); + lua_pushfstring(L,"The file \"%s\" could not be created for some unknown reason", + filename); break; case WTAP_ERR_SHORT_WRITE: - luaL_error(L,"A full header couldn't be written to the file \"%s\".", - filename); + lua_pushfstring(L,"A full header couldn't be written to the file \"%s\".", + filename); break; case WTAP_ERR_COMPRESSION_NOT_SUPPORTED: - luaL_error(L,"Files of file type %s cannot be written as a compressed file", - wtap_file_type_subtype_description(filetype)); + lua_pushfstring(L,"Files of file type %s cannot be written as a compressed file", + wtap_file_type_subtype_description(filetype)); break; case WTAP_ERR_INTERNAL: - luaL_error(L,"An internal error occurred creating the file \"%s\" (%s)", - filename, - err_info != NULL ? err_info : "no information supplied"); + lua_pushfstring(L,"An internal error occurred creating the file \"%s\" (%s)", + filename, + err_info != NULL ? err_info : "no information supplied"); g_free(err_info); break; default: - luaL_error(L,"error while opening \"%s\": %s", - filename, - wtap_strerror(err)); + lua_pushfstring(L,"error while opening \"%s\": %s", + filename, + wtap_strerror(err)); break; } - return 0; + + /* Now throw the error. */ + return lua_error(L); } pushDumper(L,d); @@ -567,19 +590,26 @@ data = (const unsigned char *)tvb_memdup(lua_pinfo->pool,tvb,0,rec.rec_header.packet_header.caplen); if (! wtap_dump(d, &rec, data, &err, &err_info)) { + wtap_rec_cleanup(&rec); + + /* Push an appropriate error message, and free the err_info string + if necessary. */ switch (err) { case WTAP_ERR_UNWRITABLE_REC_DATA: - luaL_error(L,"error while dumping: %s (%s)", - wtap_strerror(err), err_info); + lua_pushfstring(L,"error while dumping: %s (%s)", + wtap_strerror(err), err_info); g_free(err_info); break; default: - luaL_error(L,"error while dumping: %s", - wtap_strerror(err)); + lua_pushfstring(L,"error while dumping: %s", + wtap_strerror(err)); break; } + + /* Now throw the error. */ + return lua_error(L); } return 0; @@ -599,14 +629,19 @@ g_hash_table_remove(dumper_encaps,*dp); if (!wtap_dump_close(*dp, NULL, &err, &err_info)) { + /* Push an appropriate error message, and free the err_info string + if necessary. */ if (err_info != NULL) { - luaL_error(L,"error closing: %s (%s)", - wtap_strerror(err), err_info); + lua_pushfstring(L,"error closing: %s (%s)", + wtap_strerror(err), err_info); g_free(err_info); } else { - luaL_error(L,"error closing: %s", - wtap_strerror(err)); + lua_pushfstring(L,"error closing: %s", + wtap_strerror(err)); } + + /* Now throw the error. */ + return lua_error(L); } return 0; diff -Nru wireshark-4.4.16/extcap/androiddump.c wireshark-4.4.18/extcap/androiddump.c --- wireshark-4.4.16/extcap/androiddump.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/extcap/androiddump.c 2026-08-12 17:19:13.000000000 +0000 @@ -1945,7 +1945,7 @@ return EXIT_CODE_ERROR_WHILE_SENDING_ADB_PACKET_2; } - /* Read "btsnoop" header - 16 bytes */ + /* Read "btsnoop" file header - 16 bytes */ while (used_buffer_length < BTSNOOP_HDR_LEN) { length = recv(sock, packet + used_buffer_length, (int)(BTSNOOP_HDR_LEN - used_buffer_length), 0); if (length <= 0) { @@ -1976,10 +1976,27 @@ used_buffer_length += length; - while (used_buffer_length >= 24 && - used_buffer_length >= (int) (24 + GINT32_FROM_BE(*captured_length))) { + while (used_buffer_length >= 24) { + /* We have the next record header. */ + uint32_t record_reported_length = GUINT32_FROM_BE(*reported_length); + uint32_t record_captured_length = GUINT32_FROM_BE(*captured_length); int32_t direction; + /* Check that the captured length fits in our allocated packet buf, + * and that the reported length is at least as long as the captured + * length and won't overflow. */ + if (record_captured_length > PACKET_LENGTH - sizeof(own_pcap_bluetooth_h4_header) - 24 || + record_reported_length < record_captured_length || + record_reported_length > UINT32_MAX - sizeof(own_pcap_bluetooth_h4_header)) { + ws_warning("Invalid btsnoop packet length."); + closesocket(sock); + return EXIT_CODE_GENERIC; + } + + /* Check if we have the entire record. */ + if ((size_t)used_buffer_length < 24 + record_captured_length) + break; + ts = GINT64_FROM_BE(*timestamp); ts -= BTSNOOP_TIMESTAMP_BASE; @@ -1988,12 +2005,12 @@ endless_loop = extcap_dumper_dump(extcap_dumper, fifo, payload - sizeof(own_pcap_bluetooth_h4_header), - GINT32_FROM_BE(*captured_length) + sizeof(own_pcap_bluetooth_h4_header), - GINT32_FROM_BE(*reported_length) + sizeof(own_pcap_bluetooth_h4_header), + (ssize_t)(record_captured_length + sizeof(own_pcap_bluetooth_h4_header)), + (ssize_t)(record_reported_length + sizeof(own_pcap_bluetooth_h4_header)), (uint32_t)(ts / 1000000), ((uint32_t)(ts % 1000000)) * 1000); - used_buffer_length -= 24 + GINT32_FROM_BE(*captured_length); + used_buffer_length -= 24 + record_captured_length; if (used_buffer_length < 0) { ws_warning("Internal Negative used buffer length."); closesocket(sock); @@ -2001,7 +2018,7 @@ } if (used_buffer_length > 0) - memmove(packet + sizeof(own_pcap_bluetooth_h4_header), payload + GINT32_FROM_BE(*captured_length), used_buffer_length); + memmove(packet + sizeof(own_pcap_bluetooth_h4_header), payload + record_captured_length, used_buffer_length); } } diff -Nru wireshark-4.4.16/extcap/ciscodump.c wireshark-4.4.18/extcap/ciscodump.c --- wireshark-4.4.16/extcap/ciscodump.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/extcap/ciscodump.c 2026-08-12 17:19:13.000000000 +0000 @@ -662,6 +662,9 @@ } g_strfreev(parts); + if (*offset >= PACKET_MAX_SIZE) + return CISCODUMP_PARSER_IN_PACKET; + /* we got a line of the packet */ /* A line looks like */ /*
: <1st group> <2nd group> <3rd group> <4th group> */ @@ -675,12 +678,15 @@ if (*part && *(part+1)) { /* There is at least one match. Skip first string */ part++; - while(*part) { + while(*offset < PACKET_MAX_SIZE && *part) { /* RE matched */ if (strlen(*part) > 1) { ws_hexstrtou32(*part, NULL, &value); value = g_ntohl(value); size = strlen(*part) / 2; + if (*offset + size > PACKET_MAX_SIZE) { + size = PACKET_MAX_SIZE - *offset; + } memcpy(packet + *offset, &value, size); *offset += (uint32_t)size; } @@ -728,6 +734,9 @@ return CISCODUMP_PARSER_IN_HEADER; } + if (*offset >= PACKET_MAX_SIZE) + return CISCODUMP_PARSER_IN_PACKET; + /* we got a line of the packet */ /* A line looks like */ /* 0000: 00000C07 AC154C5D 3C259068 08004500 ......L]<%.h..E. */ @@ -742,11 +751,14 @@ if (*part && *(part+1)) { /* There is at least one match. Skip first string */ part++; - while(*part) { + while(*offset < PACKET_MAX_SIZE && *part) { if (strlen(*part) > 1) { ws_hexstrtou32(*part, NULL, &value); value = g_ntohl(value); size = strlen(*part) / 2; + if (*offset + size > PACKET_MAX_SIZE) { + size = PACKET_MAX_SIZE - *offset; + } memcpy(packet + *offset, &value, size); *offset += (uint32_t)size; } @@ -775,6 +787,9 @@ 0030 10 20 6a 20 00 00 00 00 00 00 00 00 . j ........ */ + if (*offset >= PACKET_MAX_SIZE) + return CISCODUMP_PARSER_IN_PACKET; + /* we got a line of the packet */ /* A line looks like */ /* 0000 6c 5e 3b 88 5e 80 6c 5e 3b 88 5e 80 08 00 45 00 l^;.^.l^;.^...E */ @@ -789,7 +804,7 @@ if (*part && *(part+1)) { /* There is at least one match. Skip first string */ part++; - while(*part) { + while(*offset < PACKET_MAX_SIZE && *part) { if (strlen(*part) > 1) { ws_hexstrtou8(*part, NULL, &value); memcpy(packet + *offset, &value, 1); @@ -864,6 +879,9 @@ return CISCODUMP_PARSER_END_PACKET; } + if (*offset >= PACKET_MAX_SIZE) + return CISCODUMP_PARSER_IN_PACKET; + /* we got a line of the packet */ /* A line looks like */ /* 0x
: <1st group> <...> <8th group> <5th group> */ @@ -878,11 +896,14 @@ if (*part && *(part+1)) { /* There is at least one match. Skip first string */ part++; - while(*part) { + while(*offset < PACKET_MAX_SIZE && *part) { if (strlen(*part) > 1) { ws_hexstrtou16(*part, NULL, &value); value = g_ntohs(value); size = strlen(*part) / 2; + if (*offset + size > PACKET_MAX_SIZE) { + size = PACKET_MAX_SIZE - *offset; + } memcpy(packet + *offset, &value, size); *offset += (uint32_t)size; } diff -Nru wireshark-4.4.16/extcap/sdjournal.c wireshark-4.4.18/extcap/sdjournal.c --- wireshark-4.4.16/extcap/sdjournal.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/extcap/sdjournal.c 2026-08-12 17:19:13.000000000 +0000 @@ -195,7 +195,6 @@ sd_id128_t boot_id; char boot_id_str[FLD_BOOT_ID_LEN] = FLD_BOOT_ID; int ret = EXIT_FAILURE; - char* err_info = NULL; char *appname; bool success; int jr = 0; @@ -292,12 +291,6 @@ sd_journal_close(jnl); } - if (err_info) { - ws_warning("%s", err_info); - } - - g_free(err_info); - /* clean up and exit */ if (g_strcmp0(fifo, "-")) { fclose(fp); diff -Nru wireshark-4.4.16/packaging/debian/changelog wireshark-4.4.18/packaging/debian/changelog --- wireshark-4.4.16/packaging/debian/changelog 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/packaging/debian/changelog 2026-08-12 17:19:13.000000000 +0000 @@ -1,4 +1,4 @@ -wireshark (4.4.16) UNRELEASED; urgency=low +wireshark (4.4.18) UNRELEASED; urgency=low * Self-made package diff -Nru wireshark-4.4.16/packaging/debian/rules wireshark-4.4.18/packaging/debian/rules --- wireshark-4.4.16/packaging/debian/rules 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/packaging/debian/rules 2026-08-12 17:19:13.000000000 +0000 @@ -32,11 +32,7 @@ MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif -ifeq ($(MAKE),ninja) - DH_BUILDSYSTEM = cmake+ninja -else - DH_BUILDSYSTEM = cmake -endif +DH_BUILDSYSTEM = cmake ifneq ($(filter pkg.wireshark.logray,$(DEB_BUILD_PROFILES)),) CONFIGURE_SWITCHES += -DBUILD_logray=ON -DBUILD_falcodump=ON @@ -72,11 +68,7 @@ override_dh_auto_install: dh_auto_install -ifeq ($(MAKE),ninja) - DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C $(CURDIR)/obj-* install-headers -else $(MAKE) DESTDIR=$(CURDIR)/debian/tmp -C $(CURDIR)/obj-* install-headers -endif rm -rf $(CURDIR)/debian/tmp/usr/share/wireshark/COPYING override_dh_install: diff -Nru wireshark-4.4.16/packaging/nsis/windeployqt-to-nsis.py wireshark-4.4.18/packaging/nsis/windeployqt-to-nsis.py --- wireshark-4.4.16/packaging/nsis/windeployqt-to-nsis.py 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/packaging/nsis/windeployqt-to-nsis.py 2026-08-12 17:19:13.000000000 +0000 @@ -78,7 +78,15 @@ # https://bugreports.qt.io/browse/QTBUG-122257 # Affects 6.6.0 - 6.6.2 continue - path, relative = line.split(" ") + if line.startswith('Skipping system library'): + # Added in 6.11.1 to fix + # https://qt-project.atlassian.net/browse/QTBUG-142131 + continue + try: + path, relative = line.split(" ") + except ValueError: + print(f'Ignoring unexpected line "{line}"', file=sys.stderr) + continue rel_path = os.path.split(relative) if len(rel_path) > 1: base_dir = rel_path[0].strip('"') diff -Nru wireshark-4.4.16/packaging/source/git-export-release.sh.in wireshark-4.4.18/packaging/source/git-export-release.sh.in --- wireshark-4.4.16/packaging/source/git-export-release.sh.in 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/packaging/source/git-export-release.sh.in 2026-08-12 17:19:13.000000000 +0000 @@ -44,7 +44,7 @@ # A tarball produced by 'git archive' will have the $Format string # substituted due to the use of 'export-subst' in .gitattributes. # shellcheck disable=SC2016 -COMMIT='77a2a01017b740d3edc148a691693b2d9cad9b6a' +COMMIT='b6c99a3f2a1aecf7926e7e64a94488b2bd071571' if [[ $COMMIT != \$F* ]] ; then # This file was extracted from a tarball produced by git archive diff -Nru wireshark-4.4.16/packaging/wix/CMakeLists.txt wireshark-4.4.18/packaging/wix/CMakeLists.txt --- wireshark-4.4.16/packaging/wix/CMakeLists.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/packaging/wix/CMakeLists.txt 2026-08-12 17:19:13.000000000 +0000 @@ -69,21 +69,10 @@ set (VERSION "${PROJECT_VERSION}") set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) -# Use the merge module that comes with our version of Visual Studio -if(MSVC_VERSION GREATER_EQUAL 1930) - set (MSVC_CRT_VERSION "VC143") -elseif(MSVC_VERSION GREATER_EQUAL 1920) - set (MSVC_CRT_VERSION "VC142") -elseif(MSVC_VERSION GREATER_EQUAL 1910) - set (MSVC_CRT_VERSION "VC141") -elseif(MSVC_VERSION GREATER_EQUAL 1900) - set (MSVC_CRT_VERSION "VC140") -endif() - # Starting with Visual Studio 2019 merge modules are deprecated but # are available as an individual component. # https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes#-deprecations -set(MERGE_MODULE "Microsoft_${MSVC_CRT_VERSION}_CRT_${WIRESHARK_TARGET_PLATFORM}.msm") +set(MERGE_MODULE "Microsoft_VC${MSVC_TOOLSET_VERSION}_CRT_${WIRESHARK_TARGET_PLATFORM}.msm") set (PF86_ENV "ProgramFiles(x86)") set(VC_TOOLS_MERGE_MODULES_DIR) @@ -99,7 +88,7 @@ "$ENV{PROGRAMFILES}/Common Files/Merge Modules" NO_DEFAULT_PATH ) -file(TO_NATIVE_PATH "${MERGE_MODULE_DIR}/Microsoft_${MSVC_CRT_VERSION}_CRT_${WIRESHARK_TARGET_PLATFORM}.msm" MSM_NATIVE_PATH) +file(TO_NATIVE_PATH "${MERGE_MODULE_DIR}/${MERGE_MODULE}" MSM_NATIVE_PATH) message(STATUS "Using ${MSM_NATIVE_PATH} for the WiX installer") # DependentComponents.wxi. Can be created at configure time. @@ -197,7 +186,7 @@ -dRadiusDictDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/radius -dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/snmp/mibs -dUsersGuideDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/doc/wsug_html_chunked - -dVCRedistVersion=${MSVC_CRT_VERSION} + -dVCRedistVersion=VC${MSVC_TOOLSET_VERSION} -dVCRedistDir=${MERGE_MODULE_DIR} ${d_smi_dir} ${d_mmdbresolve_exe} diff -Nru wireshark-4.4.16/packaging/wix/windeployqt-to-wix.ps1 wireshark-4.4.18/packaging/wix/windeployqt-to-wix.ps1 --- wireshark-4.4.16/packaging/wix/windeployqt-to-wix.ps1 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/packaging/wix/windeployqt-to-wix.ps1 2026-08-12 17:19:13.000000000 +0000 @@ -93,6 +93,8 @@ " foreach ($entry in $wdqtList) { $dir = Split-Path -Parent $entry + $wix_name = $entry -ireplace "[^a-z0-9]", "_" + if ($dir) { if ($dir -ne $currentDir) { if ($currentDir -ne "") { # for everything but first directory found @@ -108,7 +110,6 @@ $currentDir = $dir } - $wix_name = $entry -replace "[\\|\.]", "_" $currentDirList += " @@ -116,12 +117,11 @@ $componentGroup += " " } else { - - $dllList += " - + $dllList += " + " - $componentGroup += " + $componentGroup += " " } } diff -Nru wireshark-4.4.16/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml wireshark-4.4.18/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml --- wireshark-4.4.16/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml 2026-08-12 17:19:13.000000000 +0000 @@ -65,7 +65,13 @@ wireshark-dev_at_wireshark.org - + + https://www.wireshark.org/docs/relnotes/wireshark-4.4.18.html + + + https://www.wireshark.org/docs/relnotes/wireshark-4.4.17.html + + https://www.wireshark.org/docs/relnotes/wireshark-4.4.16.html diff -Nru wireshark-4.4.16/sharkd_session.c wireshark-4.4.18/sharkd_session.c --- wireshark-4.4.16/sharkd_session.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/sharkd_session.c 2026-08-12 17:19:13.000000000 +0000 @@ -3411,487 +3411,515 @@ return register_tap_listener(get_eo_tap_listener_name(eo), eo_object, tap_filter, 0, NULL, get_eo_packet_func(eo), tap_draw, NULL); } -/** - * sharkd_session_process_tap() - * - * Process tap request - * - * Input: - * (m) tap0 - First tap request - * (o) tap1...tap15 - Other tap requests - * - * Output object with attributes: - * (m) taps - array of object with attributes: - * (m) tap - tap name - * (m) type - tap output type - * ... - * for type:stats see sharkd_session_process_tap_stats_cb() - * for type:nstat see sharkd_session_process_tap_nstat_cb() - * for type:conv see sharkd_session_process_tap_conv_cb() - * for type:host see sharkd_session_process_tap_conv_cb() - * for type:rtp-streams see sharkd_session_process_tap_rtp_cb() - * for type:rtp-analyse see sharkd_session_process_tap_rtp_analyse_cb() - * for type:eo see sharkd_session_process_tap_eo_cb() - * for type:expert see sharkd_session_process_tap_expert_cb() - * for type:rtd see sharkd_session_process_tap_rtd_cb() - * for type:srt see sharkd_session_process_tap_srt_cb() - * for type:flow see sharkd_session_process_tap_flow_cb() - * - * (m) err - error code - */ static void -sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count) +rtpstream_free_cb(void *data) { - void *taps_data[16]; - GFreeFunc taps_free[16]; - int taps_count = 0; - int i; - const char *tap_filter = json_find_attr(buf, tokens, count, "filter"); + rtpstream_tapinfo_t *rtp_tapinfo = (rtpstream_tapinfo_t*)data; - rtpstream_tapinfo_t rtp_tapinfo = - { NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, TAP_ANALYSE, NULL, NULL, NULL, false, false}; - - for (i = 0; i < 16; i++) - { - char tapbuf[32]; - const char *tok_tap; + rtpstream_reset(rtp_tapinfo); + g_free(rtp_tapinfo); +} - void *tap_data = NULL; - GFreeFunc tap_free = NULL; - GString *tap_error = NULL; +static bool +sharkd_session_register_tap(const char *tok_tap, const char *tap_filter, void **tap_datap, GFreeFunc *tap_freep) +{ + void *tap_data = NULL; + GFreeFunc tap_free = NULL; + GString *tap_error = NULL; - snprintf(tapbuf, sizeof(tapbuf), "tap%d", i); - tok_tap = json_find_attr(buf, tokens, count, tapbuf); - if (!tok_tap) - break; + if (!strncmp(tok_tap, "stat:", 5)) + { + stats_tree_cfg *cfg = stats_tree_get_cfg_by_abbr(tok_tap + 5); + stats_tree *st; - if (!strncmp(tok_tap, "stat:", 5)) + if (!cfg) { - stats_tree_cfg *cfg = stats_tree_get_cfg_by_abbr(tok_tap + 5); - stats_tree *st; + sharkd_json_error( + rpcid, -11001, NULL, + "sharkd_session_process_tap() stat %s not found", tok_tap + 5 + ); + return false; + } - if (!cfg) - { - sharkd_json_error( - rpcid, -11001, NULL, - "sharkd_session_process_tap() stat %s not found", tok_tap + 5 - ); - return; - } + st = stats_tree_new(cfg, NULL, tap_filter); - st = stats_tree_new(cfg, NULL, tap_filter); + tap_error = register_tap_listener(st->cfg->tapname, st, st->filter, st->cfg->flags, stats_tree_reset, stats_tree_packet, sharkd_session_process_tap_stats_cb, NULL); - tap_error = register_tap_listener(st->cfg->tapname, st, st->filter, st->cfg->flags, stats_tree_reset, stats_tree_packet, sharkd_session_process_tap_stats_cb, NULL); + if (!tap_error && cfg->init) + cfg->init(st); - if (!tap_error && cfg->init) - cfg->init(st); + tap_data = st; + tap_free = sharkd_session_free_tap_stats_cb; + } + else if (!strcmp(tok_tap, "expert")) + { + struct sharkd_expert_tap *expert_tap; - tap_data = st; - tap_free = sharkd_session_free_tap_stats_cb; - } - else if (!strcmp(tok_tap, "expert")) - { - struct sharkd_expert_tap *expert_tap; + expert_tap = g_new0(struct sharkd_expert_tap, 1); + expert_tap->text = g_string_chunk_new(100); - expert_tap = g_new0(struct sharkd_expert_tap, 1); - expert_tap->text = g_string_chunk_new(100); + tap_error = register_tap_listener("expert", expert_tap, tap_filter, 0, NULL, sharkd_session_packet_tap_expert_cb, sharkd_session_process_tap_expert_cb, NULL); - tap_error = register_tap_listener("expert", expert_tap, tap_filter, 0, NULL, sharkd_session_packet_tap_expert_cb, sharkd_session_process_tap_expert_cb, NULL); + tap_data = expert_tap; + tap_free = sharkd_session_free_tap_expert_cb; + } + else if (!strncmp(tok_tap, "seqa:", 5)) + { + seq_analysis_info_t *graph_analysis; + register_analysis_t *analysis; + const char *tap_name; + tap_packet_cb tap_func; + unsigned tap_flags; - tap_data = expert_tap; - tap_free = sharkd_session_free_tap_expert_cb; - } - else if (!strncmp(tok_tap, "seqa:", 5)) + analysis = sequence_analysis_find_by_name(tok_tap + 5); + if (!analysis) { - seq_analysis_info_t *graph_analysis; - register_analysis_t *analysis; - const char *tap_name; - tap_packet_cb tap_func; - unsigned tap_flags; + sharkd_json_error( + rpcid, -11002, NULL, + "sharkd_session_process_tap() seq analysis %s not found", tok_tap + 5 + ); + return false; + } - analysis = sequence_analysis_find_by_name(tok_tap + 5); - if (!analysis) - { - sharkd_json_error( - rpcid, -11002, NULL, - "sharkd_session_process_tap() seq analysis %s not found", tok_tap + 5 - ); - return; - } + graph_analysis = sequence_analysis_info_new(); + graph_analysis->name = tok_tap + 5; + /* TODO, make configurable */ + graph_analysis->any_addr = false; - graph_analysis = sequence_analysis_info_new(); - graph_analysis->name = tok_tap + 5; - /* TODO, make configurable */ - graph_analysis->any_addr = false; + tap_name = sequence_analysis_get_tap_listener_name(analysis); + tap_flags = sequence_analysis_get_tap_flags(analysis); + tap_func = sequence_analysis_get_packet_func(analysis); - tap_name = sequence_analysis_get_tap_listener_name(analysis); - tap_flags = sequence_analysis_get_tap_flags(analysis); - tap_func = sequence_analysis_get_packet_func(analysis); + tap_error = register_tap_listener(tap_name, graph_analysis, tap_filter, tap_flags, NULL, tap_func, sharkd_session_process_tap_flow_cb, NULL); - tap_error = register_tap_listener(tap_name, graph_analysis, tap_filter, tap_flags, NULL, tap_func, sharkd_session_process_tap_flow_cb, NULL); + tap_data = graph_analysis; + tap_free = sharkd_session_free_tap_flow_cb; + } + else if (!strncmp(tok_tap, "conv:", 5) || !strncmp(tok_tap, "endpt:", 6)) + { + struct register_ct *ct = NULL; + const char *ct_tapname; + struct sharkd_conv_tap_data *ct_data; + tap_packet_cb tap_func = NULL; - tap_data = graph_analysis; - tap_free = sharkd_session_free_tap_flow_cb; - } - else if (!strncmp(tok_tap, "conv:", 5) || !strncmp(tok_tap, "endpt:", 6)) + if (!strncmp(tok_tap, "conv:", 5)) { - struct register_ct *ct = NULL; - const char *ct_tapname; - struct sharkd_conv_tap_data *ct_data; - tap_packet_cb tap_func = NULL; - - if (!strncmp(tok_tap, "conv:", 5)) - { - ct = get_conversation_by_proto_id(proto_get_id_by_short_name(tok_tap + 5)); - - if (!ct || !(tap_func = get_conversation_packet_func(ct))) - { - sharkd_json_error( - rpcid, -11003, NULL, - "sharkd_session_process_tap() conv %s not found", tok_tap + 5 - ); - return; - } - } - else if (!strncmp(tok_tap, "endpt:", 6)) - { - ct = get_conversation_by_proto_id(proto_get_id_by_short_name(tok_tap + 6)); + ct = get_conversation_by_proto_id(proto_get_id_by_short_name(tok_tap + 5)); - if (!ct || !(tap_func = get_endpoint_packet_func(ct))) - { - sharkd_json_error( - rpcid, -11004, NULL, - "sharkd_session_process_tap() endpt %s not found", tok_tap + 6 - ); - return; - } - } - else + if (!ct || !(tap_func = get_conversation_packet_func(ct))) { sharkd_json_error( - rpcid, -11005, NULL, - "sharkd_session_process_tap() conv/endpt(?): %s not found", tok_tap + rpcid, -11003, NULL, + "sharkd_session_process_tap() conv %s not found", tok_tap + 5 ); - return; + return false; } - - ct_tapname = proto_get_protocol_filter_name(get_conversation_proto_id(ct)); - - ct_data = g_new0(struct sharkd_conv_tap_data, 1); - ct_data->type = tok_tap; - ct_data->hash.user_data = ct_data; - - /* XXX: make configurable */ - ct_data->resolve_name = true; - ct_data->resolve_port = true; - - tap_error = register_tap_listener(ct_tapname, &ct_data->hash, tap_filter, 0, NULL, tap_func, sharkd_session_process_tap_conv_cb, NULL); - - tap_data = &ct_data->hash; - tap_free = sharkd_session_free_tap_conv_cb; } - else if (!strncmp(tok_tap, "nstat:", 6)) + else if (!strncmp(tok_tap, "endpt:", 6)) { - stat_tap_table_ui *stat_tap = stat_tap_by_name(tok_tap + 6); - stat_data_t *stat_data; + ct = get_conversation_by_proto_id(proto_get_id_by_short_name(tok_tap + 6)); - if (!stat_tap) + if (!ct || !(tap_func = get_endpoint_packet_func(ct))) { sharkd_json_error( - rpcid, -11006, NULL, - "sharkd_session_process_tap() nstat=%s not found", tok_tap + 6 + rpcid, -11004, NULL, + "sharkd_session_process_tap() endpt %s not found", tok_tap + 6 ); - return; + return false; } + } + else + { + sharkd_json_error( + rpcid, -11005, NULL, + "sharkd_session_process_tap() conv/endpt(?): %s not found", tok_tap + ); + return false; + } - stat_tap->stat_tap_init_cb(stat_tap); + ct_tapname = proto_get_protocol_filter_name(get_conversation_proto_id(ct)); - stat_data = g_new0(stat_data_t, 1); - stat_data->stat_tap_data = stat_tap; - stat_data->user_data = NULL; + ct_data = g_new0(struct sharkd_conv_tap_data, 1); + ct_data->type = tok_tap; + ct_data->hash.user_data = ct_data; - tap_error = register_tap_listener(stat_tap->tap_name, stat_data, tap_filter, 0, NULL, stat_tap->packet_func, sharkd_session_process_tap_nstat_cb, NULL); + /* XXX: make configurable */ + ct_data->resolve_name = true; + ct_data->resolve_port = true; - tap_data = stat_data; - tap_free = sharkd_session_free_tap_nstat_cb; - } - else if (!strncmp(tok_tap, "rtd:", 4)) + tap_error = register_tap_listener(ct_tapname, &ct_data->hash, tap_filter, 0, NULL, tap_func, sharkd_session_process_tap_conv_cb, NULL); + + tap_data = &ct_data->hash; + tap_free = sharkd_session_free_tap_conv_cb; + } + else if (!strncmp(tok_tap, "nstat:", 6)) + { + stat_tap_table_ui *stat_tap = stat_tap_by_name(tok_tap + 6); + stat_data_t *stat_data; + + if (!stat_tap) { - register_rtd_t *rtd = get_rtd_table_by_name(tok_tap + 4); - rtd_data_t *rtd_data; - char *err; + sharkd_json_error( + rpcid, -11006, NULL, + "sharkd_session_process_tap() nstat=%s not found", tok_tap + 6 + ); + return false; + } - if (!rtd) - { - sharkd_json_error( - rpcid, -11007, NULL, - "sharkd_session_process_tap() rtd=%s not found", tok_tap + 4 - ); - return; - } + stat_tap->stat_tap_init_cb(stat_tap); - rtd_table_get_filter(rtd, "", &tap_filter, &err); - if (err != NULL) - { - sharkd_json_error( - rpcid, -11008, NULL, - "sharkd_session_process_tap() rtd=%s err=%s", tok_tap + 4, err - ); - g_free(err); - return; - } + stat_data = g_new0(stat_data_t, 1); + stat_data->stat_tap_data = stat_tap; + stat_data->user_data = NULL; - rtd_data = g_new0(rtd_data_t, 1); - rtd_data->user_data = rtd; - rtd_table_dissector_init(rtd, &rtd_data->stat_table, NULL, NULL); + tap_error = register_tap_listener(stat_tap->tap_name, stat_data, tap_filter, 0, NULL, stat_tap->packet_func, sharkd_session_process_tap_nstat_cb, NULL); - tap_error = register_tap_listener(get_rtd_tap_listener_name(rtd), rtd_data, tap_filter, 0, NULL, get_rtd_packet_func(rtd), sharkd_session_process_tap_rtd_cb, NULL); + tap_data = stat_data; + tap_free = sharkd_session_free_tap_nstat_cb; + } + else if (!strncmp(tok_tap, "rtd:", 4)) + { + register_rtd_t *rtd = get_rtd_table_by_name(tok_tap + 4); + rtd_data_t *rtd_data; + char *err; - tap_data = rtd_data; - tap_free = sharkd_session_free_tap_rtd_cb; - } - else if (!strncmp(tok_tap, "srt:", 4)) + if (!rtd) { - register_srt_t *srt = get_srt_table_by_name(tok_tap + 4); - srt_data_t *srt_data; - char *err; + sharkd_json_error( + rpcid, -11007, NULL, + "sharkd_session_process_tap() rtd=%s not found", tok_tap + 4 + ); + return false; + } - if (!srt) - { - sharkd_json_error( - rpcid, -11009, NULL, - "sharkd_session_process_tap() srt=%s not found", tok_tap + 4 - ); - return; - } + rtd_table_get_filter(rtd, "", &tap_filter, &err); + if (err != NULL) + { + sharkd_json_error( + rpcid, -11008, NULL, + "sharkd_session_process_tap() rtd=%s err=%s", tok_tap + 4, err + ); + g_free(err); + return false; + } - srt_table_get_filter(srt, "", &tap_filter, &err); - if (err != NULL) - { - sharkd_json_error( - rpcid, -11010, NULL, - "sharkd_session_process_tap() srt=%s err=%s", tok_tap + 4, err - ); - g_free(err); - return; - } + rtd_data = g_new0(rtd_data_t, 1); + rtd_data->user_data = rtd; + rtd_table_dissector_init(rtd, &rtd_data->stat_table, NULL, NULL); - srt_data = g_new0(srt_data_t, 1); - srt_data->srt_array = g_array_new(FALSE, TRUE, sizeof(srt_stat_table *)); - srt_data->user_data = srt; - srt_table_dissector_init(srt, srt_data->srt_array); + tap_error = register_tap_listener(get_rtd_tap_listener_name(rtd), rtd_data, tap_filter, 0, NULL, get_rtd_packet_func(rtd), sharkd_session_process_tap_rtd_cb, NULL); - tap_error = register_tap_listener(get_srt_tap_listener_name(srt), srt_data, tap_filter, 0, NULL, get_srt_packet_func(srt), sharkd_session_process_tap_srt_cb, NULL); + tap_data = rtd_data; + tap_free = sharkd_session_free_tap_rtd_cb; + } + else if (!strncmp(tok_tap, "srt:", 4)) + { + register_srt_t *srt = get_srt_table_by_name(tok_tap + 4); + srt_data_t *srt_data; + char *err; - tap_data = srt_data; - tap_free = sharkd_session_free_tap_srt_cb; + if (!srt) + { + sharkd_json_error( + rpcid, -11009, NULL, + "sharkd_session_process_tap() srt=%s not found", tok_tap + 4 + ); + return false; } - else if (!strncmp(tok_tap, "eo:", 3)) + + srt_table_get_filter(srt, "", &tap_filter, &err); + if (err != NULL) { - register_eo_t *eo = get_eo_by_name(tok_tap + 3); + sharkd_json_error( + rpcid, -11010, NULL, + "sharkd_session_process_tap() srt=%s err=%s", tok_tap + 4, err + ); + g_free(err); + return false; + } - if (!eo) - { - sharkd_json_error( - rpcid, -11011, NULL, - "sharkd_session_process_tap() eo=%s not found", tok_tap + 3 - ); - return; - } + srt_data = g_new0(srt_data_t, 1); + srt_data->srt_array = g_array_new(FALSE, TRUE, sizeof(srt_stat_table *)); + srt_data->user_data = srt; + srt_table_dissector_init(srt, srt_data->srt_array); - tap_error = sharkd_session_eo_register_tap_listener(eo, tok_tap, tap_filter, sharkd_session_process_tap_eo_cb, &tap_data, &tap_free); + tap_error = register_tap_listener(get_srt_tap_listener_name(srt), srt_data, tap_filter, 0, NULL, get_srt_packet_func(srt), sharkd_session_process_tap_srt_cb, NULL); - /* tap_data & tap_free assigned by sharkd_session_eo_register_tap_listener */ - } - else if (!strcmp(tok_tap, "rtp-streams")) - { - tap_error = register_tap_listener("rtp", &rtp_tapinfo, tap_filter, 0, rtpstream_reset_cb, rtpstream_packet_cb, sharkd_session_process_tap_rtp_cb, NULL); + tap_data = srt_data; + tap_free = sharkd_session_free_tap_srt_cb; + } + else if (!strncmp(tok_tap, "eo:", 3)) + { + register_eo_t *eo = get_eo_by_name(tok_tap + 3); - tap_data = &rtp_tapinfo; - tap_free = rtpstream_reset_cb; - } - else if (!strncmp(tok_tap, "rtp-analyse:", 12)) + if (!eo) { - struct sharkd_analyse_rtp *rtp_req; + sharkd_json_error( + rpcid, -11011, NULL, + "sharkd_session_process_tap() eo=%s not found", tok_tap + 3 + ); + return false; + } - rtp_req = (struct sharkd_analyse_rtp *) g_malloc0(sizeof(*rtp_req)); - if (!sharkd_rtp_match_init(&rtp_req->id, tok_tap + 12)) - { - rtpstream_id_free(&rtp_req->id); - g_free(rtp_req); - continue; - } + tap_error = sharkd_session_eo_register_tap_listener(eo, tok_tap, tap_filter, sharkd_session_process_tap_eo_cb, &tap_data, &tap_free); - rtp_req->tap_name = tok_tap; - rtp_req->statinfo.first_packet = true; - rtp_req->statinfo.reg_pt = PT_UNDEFINED; + /* tap_data & tap_free assigned by sharkd_session_eo_register_tap_listener */ + } + else if (!strcmp(tok_tap, "rtp-streams")) + { + rtpstream_tapinfo_t *rtp_tapinfo = g_new0(rtpstream_tapinfo_t, 1); + rtp_tapinfo->mode = TAP_ANALYSE; // This is 0 anyway - tap_error = register_tap_listener("rtp", rtp_req, tap_filter, 0, NULL, sharkd_session_packet_tap_rtp_analyse_cb, sharkd_session_process_tap_rtp_analyse_cb, NULL); + tap_error = register_tap_listener("rtp", rtp_tapinfo, tap_filter, 0, rtpstream_reset_cb, rtpstream_packet_cb, sharkd_session_process_tap_rtp_cb, NULL); - tap_data = rtp_req; - tap_free = sharkd_session_process_tap_rtp_free_cb; - } - else if (!strcmp(tok_tap, "multicast")) - { - mcaststream_tapinfo_t *mcaststream_tapinfo; - mcaststream_tapinfo = (mcaststream_tapinfo_t *) g_malloc0(sizeof(*mcaststream_tapinfo)); + tap_data = rtp_tapinfo; + tap_free = rtpstream_free_cb; + } + else if (!strncmp(tok_tap, "rtp-analyse:", 12)) + { + struct sharkd_analyse_rtp *rtp_req; - tap_error = register_tap_listener("udp", mcaststream_tapinfo, tap_filter, 0, NULL, mcaststream_packet, sharkd_session_process_tap_multicast_cb, NULL); - tap_data = mcaststream_tapinfo; - tap_free = sharkd_session_process_free_tap_multicast_cb; - } - else if (!strcmp(tok_tap, "phs")) + rtp_req = (struct sharkd_analyse_rtp *) g_malloc0(sizeof(*rtp_req)); + if (!sharkd_rtp_match_init(&rtp_req->id, tok_tap + 12)) { - phs_t *rs; + sharkd_json_error( + rpcid, -10001, NULL, + "sharkd_session_process_tap() rtp tokenizing error %s", tok_tap + ); + rtpstream_id_free(&rtp_req->id); + g_free(rtp_req); + return false; + } - pc_proto_id = proto_registrar_get_id_byname("pkt_comment"); + rtp_req->tap_name = tok_tap; + rtp_req->statinfo.first_packet = true; + rtp_req->statinfo.reg_pt = PT_UNDEFINED; - rs = new_phs_t(NULL, tap_filter); + tap_error = register_tap_listener("rtp", rtp_req, tap_filter, 0, NULL, sharkd_session_packet_tap_rtp_analyse_cb, sharkd_session_process_tap_rtp_analyse_cb, NULL); - tap_error = register_tap_listener("frame", rs, tap_filter, TL_REQUIRES_PROTO_TREE, NULL, - protohierstat_packet, - sharkd_session_process_tap_phs_cb, NULL); + tap_data = rtp_req; + tap_free = sharkd_session_process_tap_rtp_free_cb; + } + else if (!strcmp(tok_tap, "multicast")) + { + mcaststream_tapinfo_t *mcaststream_tapinfo; + mcaststream_tapinfo = (mcaststream_tapinfo_t *) g_malloc0(sizeof(*mcaststream_tapinfo)); - tap_data = rs; - tap_free = sharkd_session_free_tap_phs_cb; - } - else if (!strcmp(tok_tap, "voip-calls")) - { - voip_stat_init_tapinfo(); + tap_error = register_tap_listener("udp", mcaststream_tapinfo, tap_filter, 0, NULL, mcaststream_packet, sharkd_session_process_tap_multicast_cb, NULL); + tap_data = mcaststream_tapinfo; + tap_free = sharkd_session_process_free_tap_multicast_cb; + } + else if (!strcmp(tok_tap, "phs")) + { + phs_t *rs; - tap_error = register_tap_listener("frame", &tapinfo_, tap_filter, 0, NULL, NULL, sharkd_session_process_tap_voip_calls_cb, NULL); + pc_proto_id = proto_registrar_get_id_byname("pkt_comment"); - tapinfo_.session = cfile.epan; - voip_calls_init_all_taps(&tapinfo_); + rs = new_phs_t(NULL, tap_filter); - tap_data = &tapinfo_; - tap_free = sharkd_session_free_tap_voip_calls_cb; - } - else if (!strncmp(tok_tap, "voip-convs:", 11)) - { - int len; - unsigned int min, max; - struct sharkd_voip_convs_req *voip_convs_req; - const char *conv_arg = tok_tap + 11; + tap_error = register_tap_listener("frame", rs, tap_filter, TL_REQUIRES_PROTO_TREE, NULL, + protohierstat_packet, + sharkd_session_process_tap_phs_cb, NULL); - // parse tok_tap to get which call we are asking for - if (*conv_arg == 0) { - // set all bits of voip_conv_sel (-1 in binary is all 1's) - memset(voip_conv_sel, -1, sizeof(voip_conv_sel)); - } else { - memset(voip_conv_sel, 0, sizeof(voip_conv_sel)); + tap_data = rs; + tap_free = sharkd_session_free_tap_phs_cb; + } + else if (!strcmp(tok_tap, "voip-calls")) + { + voip_stat_init_tapinfo(); - while (*conv_arg != 0) { - if (*conv_arg == ',') { - conv_arg++; - } - if (sscanf(conv_arg, "%u-%u%n", &min, &max, &len) == 2) { - conv_arg += len; - } else if (sscanf(conv_arg, "%u%n", &min, &len) == 1) { - max = min; - conv_arg += len; - } else { - sharkd_json_error( - rpcid, -11014, NULL, - "sharkd_session_process_tap() voip-convs=%s invalid 'convs' parameter", tok_tap - ); - return; - } - if (min > max || min >= VOIP_CONV_MAX || max >= VOIP_CONV_MAX) { - sharkd_json_error( - rpcid, -11012, NULL, - "sharkd_session_process_tap() voip-convs=%s invalid 'convs' number range", tok_tap - ); - return; - } - for(; min <= max; min++) { - voip_conv_sel[min / VOIP_CONV_BITS] |= 1 << (min % VOIP_CONV_BITS); - } + tap_error = register_tap_listener("frame", &tapinfo_, tap_filter, 0, NULL, NULL, sharkd_session_process_tap_voip_calls_cb, NULL); + + tapinfo_.session = cfile.epan; + voip_calls_init_all_taps(&tapinfo_); + + tap_data = &tapinfo_; + tap_free = sharkd_session_free_tap_voip_calls_cb; + } + else if (!strncmp(tok_tap, "voip-convs:", 11)) + { + int len; + unsigned int min, max; + struct sharkd_voip_convs_req *voip_convs_req; + const char *conv_arg = tok_tap + 11; + + // parse tok_tap to get which call we are asking for + if (*conv_arg == 0) { + // set all bits of voip_conv_sel (-1 in binary is all 1's) + memset(voip_conv_sel, -1, sizeof(voip_conv_sel)); + } else { + memset(voip_conv_sel, 0, sizeof(voip_conv_sel)); + + while (*conv_arg != 0) { + if (*conv_arg == ',') { + conv_arg++; + } + if (sscanf(conv_arg, "%u-%u%n", &min, &max, &len) == 2) { + conv_arg += len; + } else if (sscanf(conv_arg, "%u%n", &min, &len) == 1) { + max = min; + conv_arg += len; + } else { + sharkd_json_error( + rpcid, -11014, NULL, + "sharkd_session_process_tap() voip-convs=%s invalid 'convs' parameter", tok_tap + ); + return false; + } + if (min > max || min >= VOIP_CONV_MAX || max >= VOIP_CONV_MAX) { + sharkd_json_error( + rpcid, -11012, NULL, + "sharkd_session_process_tap() voip-convs=%s invalid 'convs' number range", tok_tap + ); + return false; + } + for(; min <= max; min++) { + voip_conv_sel[min / VOIP_CONV_BITS] |= 1 << (min % VOIP_CONV_BITS); } } + } - voip_stat_init_tapinfo(); + voip_stat_init_tapinfo(); - voip_convs_req = (struct sharkd_voip_convs_req *) g_malloc0(sizeof(*voip_convs_req)); - voip_convs_req->tapinfo = &tapinfo_; - voip_convs_req->tap_name = tok_tap; - - tap_error = register_tap_listener("frame", voip_convs_req, tap_filter, 0, NULL, NULL, sharkd_session_process_tap_voip_convs_cb, NULL); - - tapinfo_.session = cfile.epan; - voip_calls_init_all_taps(&tapinfo_); - - tap_data = voip_convs_req; - tap_free = sharkd_session_free_tap_voip_convs_cb; - } - else if (!strncmp(tok_tap, "hosts:", 6)) - { - bool dump_v4; - bool dump_v6; - struct sharkd_hosts_req *hosts_req; - const char *proto_arg; - char **proto_tokens; - int proto_count; - - proto_arg = tok_tap + 6; - - if (strlen(proto_arg) == 0) { - dump_v4 = true; - dump_v6 = true; - } else { - dump_v4 = false; - dump_v6 = false; - - proto_tokens = g_strsplit(proto_arg, ",", 0); - proto_count = 0; - while (proto_tokens[proto_count]) { - if (!strcmp("ip", proto_tokens[proto_count]) || - !strcmp("ipv4", proto_tokens[proto_count])) { - dump_v4 = true; - } else if (!strcmp("ipv6", proto_tokens[proto_count])) { - dump_v6 = true; - } else { - g_strfreev(proto_tokens); - sharkd_json_error( - rpcid, -11015, NULL, - "sharkd_session_process_tap() hosts=%s invalid 'protos' parameter", tok_tap - ); - return; - } - proto_count++; + voip_convs_req = (struct sharkd_voip_convs_req *) g_malloc0(sizeof(*voip_convs_req)); + voip_convs_req->tapinfo = &tapinfo_; + voip_convs_req->tap_name = tok_tap; + + tap_error = register_tap_listener("frame", voip_convs_req, tap_filter, 0, NULL, NULL, sharkd_session_process_tap_voip_convs_cb, NULL); + + tapinfo_.session = cfile.epan; + voip_calls_init_all_taps(&tapinfo_); + + tap_data = voip_convs_req; + tap_free = sharkd_session_free_tap_voip_convs_cb; + } + else if (!strncmp(tok_tap, "hosts:", 6)) + { + bool dump_v4; + bool dump_v6; + struct sharkd_hosts_req *hosts_req; + const char *proto_arg; + char **proto_tokens; + int proto_count; + + proto_arg = tok_tap + 6; + + if (strlen(proto_arg) == 0) { + dump_v4 = true; + dump_v6 = true; + } else { + dump_v4 = false; + dump_v6 = false; + + proto_tokens = g_strsplit(proto_arg, ",", 0); + proto_count = 0; + while (proto_tokens[proto_count]) { + if (!strcmp("ip", proto_tokens[proto_count]) || + !strcmp("ipv4", proto_tokens[proto_count])) { + dump_v4 = true; + } else if (!strcmp("ipv6", proto_tokens[proto_count])) { + dump_v6 = true; + } else { + g_strfreev(proto_tokens); + sharkd_json_error( + rpcid, -11015, NULL, + "sharkd_session_process_tap() hosts=%s invalid 'protos' parameter", tok_tap + ); + return false; } - g_strfreev(proto_tokens); + proto_count++; } + g_strfreev(proto_tokens); + } - hosts_req = (struct sharkd_hosts_req *)g_malloc0(sizeof(*hosts_req)); - hosts_req->dump_v4 = dump_v4; - hosts_req->dump_v6 = dump_v6; - hosts_req->tap_name = tok_tap; + hosts_req = (struct sharkd_hosts_req *)g_malloc0(sizeof(*hosts_req)); + hosts_req->dump_v4 = dump_v4; + hosts_req->dump_v6 = dump_v6; + hosts_req->tap_name = tok_tap; - tap_error = register_tap_listener("frame", hosts_req, tap_filter, TL_REQUIRES_PROTO_TREE, NULL, NULL, sharkd_session_process_tap_hosts_cb, NULL); + tap_error = register_tap_listener("frame", hosts_req, tap_filter, TL_REQUIRES_PROTO_TREE, NULL, NULL, sharkd_session_process_tap_hosts_cb, NULL); - tap_data = hosts_req; - tap_free = sharkd_session_free_tap_hosts_cb; - } - else - { - sharkd_json_error( - rpcid, -11012, NULL, - "sharkd_session_process_tap() %s not recognized", tok_tap - ); - return; - } + tap_data = hosts_req; + tap_free = sharkd_session_free_tap_hosts_cb; + } + else + { + sharkd_json_error( + rpcid, -11012, NULL, + "sharkd_session_process_tap() %s not recognized", tok_tap + ); + return false; + } - if (tap_error) - { - sharkd_json_error( - rpcid, -11013, NULL, - "sharkd_session_process_tap() name=%s error=%s", tok_tap, tap_error->str - ); - g_string_free(tap_error, TRUE); - if (tap_free) - tap_free(tap_data); - return; + if (tap_error) + { + sharkd_json_error( + rpcid, -11013, NULL, + "sharkd_session_process_tap() name=%s error=%s", tok_tap, tap_error->str + ); + g_string_free(tap_error, TRUE); + if (tap_free) + tap_free(tap_data); + return false; + } + + *tap_freep = tap_free; + *tap_datap = tap_data; + return true; +} + +/** + * sharkd_session_process_tap() + * + * Process tap request + * + * Input: + * (m) tap0 - First tap request + * (o) tap1...tap15 - Other tap requests + * + * Output object with attributes: + * (m) taps - array of object with attributes: + * (m) tap - tap name + * (m) type - tap output type + * ... + * for type:stats see sharkd_session_process_tap_stats_cb() + * for type:nstat see sharkd_session_process_tap_nstat_cb() + * for type:conv see sharkd_session_process_tap_conv_cb() + * for type:host see sharkd_session_process_tap_conv_cb() + * for type:rtp-streams see sharkd_session_process_tap_rtp_cb() + * for type:rtp-analyse see sharkd_session_process_tap_rtp_analyse_cb() + * for type:eo see sharkd_session_process_tap_eo_cb() + * for type:expert see sharkd_session_process_tap_expert_cb() + * for type:rtd see sharkd_session_process_tap_rtd_cb() + * for type:srt see sharkd_session_process_tap_srt_cb() + * for type:flow see sharkd_session_process_tap_flow_cb() + * + * (m) err - error code + */ +static void +sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count) +{ + void *taps_data[16]; + GFreeFunc taps_free[16]; + int taps_count = 0; + int i; + const char *tap_filter = json_find_attr(buf, tokens, count, "filter"); + + for (i = 0; i < 16; i++) + { + char tapbuf[32]; + const char *tok_tap; + + void *tap_data = NULL; + GFreeFunc tap_free = NULL; + + snprintf(tapbuf, sizeof(tapbuf), "tap%d", i); + tok_tap = json_find_attr(buf, tokens, count, tapbuf); + if (!tok_tap) + break; + + if (!sharkd_session_register_tap(tok_tap, tap_filter, &tap_data, &tap_free)) { + goto cleanup; } taps_data[taps_count] = tap_data; @@ -3915,6 +3943,7 @@ sharkd_json_array_close(); sharkd_json_result_epilogue(); +cleanup: for (i = 0; i < taps_count; i++) { if (taps_data[i]) @@ -4486,10 +4515,9 @@ const char *tok_interval = json_find_attr(buf, tokens, count, "interval"); const char *tok_interval_units = json_find_attr(buf, tokens, count, "interval_units"); struct sharkd_iograph graphs[10]; - bool is_any_ok = false; - int graph_count; + unsigned graph_count; - int i; + unsigned i; /* default: 1000ms = one per second */ uint32_t interval = 1000; @@ -4527,7 +4555,7 @@ interval_us = 1000000 * interval; } - for (i = graph_count = 0; i < (int) G_N_ELEMENTS(graphs); i++) + for (i = graph_count = 0; i < G_N_ELEMENTS(graphs); i++) { struct sharkd_iograph *graph = &graphs[graph_count]; @@ -4585,8 +4613,6 @@ if (!graph->error) graph->error = register_tap_listener("frame", graph, tok_filter, TL_REQUIRES_PROTO_TREE, NULL, sharkd_iograph_packet, NULL, NULL); - graph_count++; - if (graph->error) { sharkd_json_error( @@ -4594,15 +4620,14 @@ "%s", graph->error->str ); g_string_free(graph->error, TRUE); - return; + goto cleanup; } - if (graph->error == NULL) - is_any_ok = true; + graph_count++; } /* retap only if we have at least one ok */ - if (is_any_ok) + if (graph_count) sharkd_retap(); sharkd_json_result_prologue(rpcid); @@ -4647,12 +4672,19 @@ } json_dumper_end_object(&dumper); - remove_tap_listener(graph); - g_free(graph->items); } sharkd_json_array_close(); sharkd_json_result_epilogue(); + +cleanup: + for (i = 0; i < graph_count; i++) + { + struct sharkd_iograph *graph = &graphs[i]; + + remove_tap_listener(graph); + g_free(graph->items); + } } /** diff -Nru wireshark-4.4.16/tools/make-enterprises.py wireshark-4.4.18/tools/make-enterprises.py --- wireshark-4.4.16/tools/make-enterprises.py 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/tools/make-enterprises.py 2026-08-12 17:19:13.000000000 +0000 @@ -160,7 +160,7 @@ with urllib.request.urlopen(ENTERPRISE_NUMBERS_URL) as f: if f.status != 200: raise Exception("request for " + ENTERPRISE_NUMBERS_URL + " failed with result code " + f.status) - data = f.read().decode('utf-8') + data = f.read().decode('utf-8').replace(u'\u200e', '') # Find bits we need and generate enterprise entries enterprises_content,last_updated_line = generate_enterprise_entries(data) diff -Nru wireshark-4.4.16/tools/make-manuf.py wireshark-4.4.18/tools/make-manuf.py --- wireshark-4.4.16/tools/make-manuf.py 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/tools/make-manuf.py 2026-08-12 17:19:13.000000000 +0000 @@ -52,7 +52,7 @@ try: req = urllib.request.Request(url_path, headers=req_headers) response = urllib.request.urlopen(req) - body = response.read().decode('UTF-8', 'replace') + body = response.read().decode('UTF-8', 'replace').replace(u'\u200e', '') except Exception: exit_msg('Error opening ' + url_path) diff -Nru wireshark-4.4.16/tools/make-version.py wireshark-4.4.18/tools/make-version.py --- wireshark-4.4.16/tools/make-version.py 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/tools/make-version.py 2026-08-12 17:19:13.000000000 +0000 @@ -44,8 +44,8 @@ # If the text "$Format" is still present, it means that # git archive did not replace the $Format string, which # means that this not a git archive. -GIT_EXPORT_SUBST_H = '77a2a01017b740d3edc148a691693b2d9cad9b6a' -GIT_EXPORT_SUBST_D = 'tag: v4.4.16, refs/merge-requests/24997/head, refs/keep-around/77a2a01017b740d3edc148a691693b2d9cad9b6a, refs/environments/windows-package/deployments/4509, refs/environments/windows-package/deployments/4508, refs/environments/macos-package/deployments/4511, refs/environments/macos-package/deployments/4510' +GIT_EXPORT_SUBST_H = 'b6c99a3f2a1aecf7926e7e64a94488b2bd071571' +GIT_EXPORT_SUBST_D = 'tag: v4.4.18, refs/merge-requests/26134/head, refs/keep-around/b6c99a3f2a1aecf7926e7e64a94488b2bd071571, refs/environments/windows-package/deployments/7962, refs/environments/windows-package/deployments/7961, refs/environments/macos-package/deployments/7964, refs/environments/macos-package/deployments/7963' IS_GIT_ARCHIVE = not GIT_EXPORT_SUBST_H.startswith('$Format') diff -Nru wireshark-4.4.16/tools/mingw-rpm-setup.sh wireshark-4.4.18/tools/mingw-rpm-setup.sh --- wireshark-4.4.16/tools/mingw-rpm-setup.sh 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/tools/mingw-rpm-setup.sh 2026-08-12 17:19:13.000000000 +0000 @@ -44,7 +44,6 @@ mingw64-qt6-qt5compat \ mingw64-qt6-qtmultimedia \ mingw64-qt6-qttools \ - mingw64-speexdsp \ mingw32-nsis \ mingw64-nsis \ mingw64-gnutls \ @@ -65,6 +64,21 @@ cmake cmake-rpm-macros" +# Adds package $2 to list variable $1 if the package is found +add_package() { + local list="$1" pkgname="$2" + + # fail if the package is not known + # shellcheck disable=SC2086 + dnf info "$pkgname" &> /dev/null || return 1 + + # package is found, append it to list + eval "${list}=\"\${${list}} \${pkgname}\"" +} + +add_package BASIC_LIST mingw64-speexdsp || +echo "Basic package mingw64-speexdsp is unavailable" >&2 + ACTUAL_LIST=$BASIC_LIST dnf install $ACTUAL_LIST $OPTIONS diff -Nru wireshark-4.4.16/tools/pre-commit wireshark-4.4.18/tools/pre-commit --- wireshark-4.4.16/tools/pre-commit 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/tools/pre-commit 2026-08-12 17:19:13.000000000 +0000 @@ -114,7 +114,7 @@ done -if [ "x$DIAMETER_FILES" != x ] +if [ "$DIAMETER_FILES" != "" ] then ./tools/validate-diameter-xml.sh > /dev/null || exit_status=1 fi diff -Nru wireshark-4.4.16/tools/win-setup.ps1 wireshark-4.4.18/tools/win-setup.ps1 --- wireshark-4.4.16/tools/win-setup.ps1 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/tools/win-setup.ps1 2026-08-12 17:19:13.000000000 +0000 @@ -79,12 +79,12 @@ "falcosecurity-libs/falcosecurity-plugins-2024-06-05-1-x64-ws.zip" = "3d19595f4ef9de77fef2ec2233000432b7b1e5a0f9353f6c8d99859205e113f8"; "gnutls/gnutls-3.8.13-1-x64-mingw-dynamic-ws.7z" = "129cf3fb34a421cec35f02184e5629f107f5bf7459f69223a821656084977fb8"; "krb5/krb5-1.22.1-1-x64-windows-ws.7z" = "087c0b2a0df3b8adcb0f3458b290df0adab3ce85b57a328501fe4206ef62915d"; - "libgcrypt/libgcrypt-bundle-1.12.2-2-x64-mingw-dynamic-ws.7z" = "13c4a2f4a421646e74418ad23f76252d0c0348d390fce7887e1b63a33abfff2e"; + "libgcrypt/libgcrypt-bundle-1.12.2-3-x64-mingw-dynamic-ws.7z" = "2f6fc68ace540844238d4eafa0ad7e60720a20ddeabab7307c72ddc8974a2da4"; "libilbc/libilbc-2.0.2-4-x64-windows-ws.zip" = "4f35a1ffa03c89bf473f38249282a7867b203988d2b6d3d2f0924764619fd5f5"; "libmaxminddb/libmaxminddb-1.4.3-1-win64ws.zip" = "ee89944a19ab6e1c873bdecb9fc6205d317c41e6da6ec1d30bc892fddfd143da"; "libpcap/libpcap-1.10.4-1-x64-windows-ws.zip" = "ad18ee1da72ce9df524b8baf9c185f237e534ef8e356c0b3eb3a5d6762004656"; "libsmi/libsmi-2021-01-15-2-x64-windows-ws.zip" = "ee8e349427d2a4ee9c18fc6b5839bd6df41685ecba03506179c21425e04f3413"; - "libssh/libssh-0.11.4-1-x64-mingw-dynamic-ws.7z" = "86a2ded014cfd3bffda2394c2c4e608ec36e8a0b8aef777edf3e8b79c3eabfad"; + "libssh/libssh-0.12.2-1-x64-mingw-dynamic-ws.7z" = "e17f22770bb0992870f51381b3e25d528541735c9602ee13e487324ceb456ac8"; "lua/lua-5.4.6-unicode-win64-vc14.zip" = "f0c6c7eb28733425b16717beb338d44c041dfbb5c6807e618d96bd754276aaff"; "lz4/lz4-1.10.0-1-x64-windows-ws.zip" = "8b838f68cc90efa2d7c37f2bc651d153487bc336525d67f9c224a3e4bccf3583"; "minizip/minizip-1.3-1-x64-windows-ws.zip" = "eb0bb5fffda5328e192d0d7951ff0254e64dcd736d46909fde7db792c1c53bcc"; @@ -98,7 +98,7 @@ "spandsp/spandsp-0.0.6-5-x64-windows-ws.zip" = "cbb18310876ec6f081662253a2d37f5174ac60c58b0b7cd6759852fbcfaa7d7f"; "speexdsp/speexdsp-1.21.1-1-win64ws.zip" = "d36db62e64ffaee38d9f607bef07d3778d8957ad29757f3eba169eb135f1a4e5"; "vcpkg-export/vcpkg-export-20250124-1-x64-windows-ws.zip" = "8587711d1b95fe3708355b71139a28036e0c17f60840a8805f014b70c036d460"; - "WinSparkle/WinSparkle-0.8.0-4-gb320893.zip" = "3ae42326bcd34594bc21b1e7948863a839ee76e87d9f4cf6b59b9d9f9a083881"; + "WinSparkle/WinSparkle-0.9.2-1-x64-windows-ws.7z" = "293dfb2cb5b70398f0164e2f02bab906ec54589c84b0d5605d1344235c5d9d20"; "zlib-ng/zlib-ng-2.1.5-1-x64-windows-ws.zip" = "a9f90e349d041d464afc1e0926d628ebee02e7093ab9983c5a7808e2b70d7873"; "zstd/zstd-1.5.6-1-x64-windows-ws.zip" = "f3f59351d273a1c1f2b84b60164556c8d2726155da2148f917d260d9efd16b6e"; } @@ -112,12 +112,12 @@ "falcosecurity-libs/falcosecurity-plugins-2024-06-05-1-arm64-ws.zip" = "81f7b5a918c3b4cd1c0e08d8e2fadd6859363897d9d6a48f8b408aa67f072b5c"; "gnutls/gnutls-3.8.13-1-arm64-mingw-dynamic-ws.7z" = "ce6f1f0042a72fcb121c995b2d7ef9f696ea21e23ab4ca52bcabe64eb01a44ef"; "krb5/krb5-1.22.1-1-arm64-windows-ws.7z" = "916d6a7a8063c00c4c586f338ec9d0b956f7acb50b93408500a7814fb1ebf851"; - "libgcrypt/libgcrypt-bundle-1.12.2-2-arm64-mingw-dynamic-ws.7z" = "481d8fbc6bdae867cf57192c6576d098f7417d74946c30ad5856beee96e332a3"; + "libgcrypt/libgcrypt-bundle-1.12.2-3-arm64-mingw-dynamic-ws.7z" = "af4324184234b78a4e4f223c36c7eb8d28e343618b9684ccb8af54f98f29d529"; "libilbc/libilbc-2.0.2-4-arm64-windows-ws.zip" = "00a506cc1aac8a2e31856e463a555d899b5a6ccf376485a124104858ccf0be6d"; "libmaxminddb/libmaxminddb-1.4.3-1-win64armws.zip" = "9996327f301cb4a4de797bc024ad0471acd95c1850a2afc849c57fcc93360610"; "libpcap/libpcap-1.10.4-1-arm64-windows-ws.zip" = "98dbac265e3617eb0ab1a690902a4989e022d0761098c2753bff4cd0189419b3"; "libsmi/libsmi-2021-01-15-2-arm64-windows-ws.zip" = "3f5b7507a19436bd6494e2cbc89856a5980950f931f7cf0d637a8e764914d015"; - "libssh/libssh-0.11.4-1-arm64-mingw-dynamic-ws.7z" = "82b81aab9c91583a11399b6d042af3f15817a8e3ed6173ec37111271a5696869"; + "libssh/libssh-0.12.2-1-arm64-mingw-dynamic-ws.7z" = "06a81338e9d66dab6659658fcf0d99508bfe1ccabda2e20b04bd498ba17e11d6"; "lua/lua-5.4.6-unicode-arm64-windows-vc14.zip" = "a28c38acde71de5c495420cd8bf480e2e41f1a14bac81503b700fc64a9679b95"; "lz4/lz4-1.10.0-1-arm64-windows-ws.zip" = "ee51fbf87bf359fa7835be89797c3488daf502e36e26337b0e649030aab7a09b"; "minizip/minizip-1.3-1-arm64-windows-ws.zip" = "e5b35d064ff10f1ab1ee9193a0965fd1eb3d1e16eab5a905ab3fea9b14fb5afe"; @@ -131,7 +131,7 @@ "spandsp/spandsp-0.0.6-5-arm64-windows-ws.zip" = "fdf01e3c33e739ff9399b7d42cd8230c97cb27ce51865a0f06285a8f68206b6c"; "speexdsp/speexdsp-1.2.1-1-win64armws.zip" = "1759a9193065f27e50dd79dbb1786d24031ac43ccc48c40dca46d8a48552e3bb"; "vcpkg-export/vcpkg-export-20250124-1-arm64-windows-ws.zip" = "29f234a5dc64c43e1b3aca8c47561ea877cdfc21abfeafc97174770023a097dc"; - "WinSparkle/WinSparkle-0.8.0-4-gb320893.zip" = "3ae42326bcd34594bc21b1e7948863a839ee76e87d9f4cf6b59b9d9f9a083881"; + "WinSparkle/WinSparkle-0.9.2-1-arm64-windows-ws.7z" = "39f61aff84e12d10b2b11abf9a2fad93206a4c9c33e6834b10551a2fcc4fb91f"; "zlib-ng/zlib-ng-2.1.5-1-arm64-windows-ws.zip" = "de3a42d0096a17085b27630402a710b036cc8e3c85029ad37536d929697271e5"; "zstd/zstd-1.5.6-1-arm64-windows-ws.zip" = "167261f9605a28f8f5a45a2fa400daa5072290a89d5fdc218595da52d57f938b"; } diff -Nru wireshark-4.4.16/ui/logray/CMakeLists.txt wireshark-4.4.18/ui/logray/CMakeLists.txt --- wireshark-4.4.16/ui/logray/CMakeLists.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/logray/CMakeLists.txt 2026-08-12 17:19:13.000000000 +0000 @@ -625,31 +625,43 @@ ${CMAKE_SOURCE_DIR}/AUTHORS ) -set(LOGRAY_QT_QRC - ${CMAKE_SOURCE_DIR}/resources/about.qrc - ${CMAKE_SOURCE_DIR}/resources/languages/languages.qrc - ${CMAKE_SOURCE_DIR}/resources/layout.qrc - ${CMAKE_SOURCE_DIR}/resources/lricon.qrc - ${CMAKE_SOURCE_DIR}/resources/stock_icons.qrc - ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc - ${CMAKE_CURRENT_BINARY_DIR}/authors.qrc - ${CMAKE_CURRENT_BINARY_DIR}/authors.csv -) - -if(NOT Qt${qtver}Widgets_VERSION VERSION_LESS "5.9") - # Drop the file modification time of source files from generated files - # to help with reproducible builds. We do not use QFileInfo.lastModified - # so this has no unwanted side effects. This mtime started appearing in - # Qt 5.8. The option to force the old file format without mtime was - # added in Qt 5.9. See https://bugreports.qt.io/browse/QTBUG-58769. - # Force the compression algorithm to zlib, since zstd requires format - # version 3. See https://gitlab.com/wireshark/wireshark/-/issues/18100. - # Use the number of dashes for each argument as documented at - # https://doc.qt.io/qt-6/rcc.html. - set(CMAKE_AUTORCC_OPTIONS --format-version 1) - if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "5.13") - list(APPEND CMAKE_AUTORCC_OPTIONS -compress-algo zlib) - endif() +# Drop the file modification time of source files from generated files +# to help with reproducible builds. We do not use QFileInfo.lastModified +# so this has no unwanted side effects. This mtime started appearing in +# Qt 5.8. The option to force the old file format without mtime was +# added in Qt 5.9. See https://bugreports.qt.io/browse/QTBUG-58769. +# Force the compression algorithm to zlib, since zstd requires format +# version 3. See https://gitlab.com/wireshark/wireshark/-/issues/18100. +# Use the number of dashes for each argument as documented at +# https://doc.qt.io/qt-6/rcc.html. +set(CMAKE_AUTORCC_OPTIONS --format-version 1) +if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "5.13") + list(APPEND CMAKE_AUTORCC_OPTIONS -compress-algo zlib) +endif() + +if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "5.15") + qt_add_resources(LOGRAY_QT_QRC + ${CMAKE_SOURCE_DIR}/resources/about.qrc + ${CMAKE_SOURCE_DIR}/resources/languages/languages.qrc + ${CMAKE_SOURCE_DIR}/resources/layout.qrc + ${CMAKE_SOURCE_DIR}/resources/ssicon.qrc + ${CMAKE_SOURCE_DIR}/resources/stock_icons.qrc + ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc + ${CMAKE_CURRENT_BINARY_DIR}/authors.qrc + OPTIONS ${CMAKE_AUTORCC_OPTIONS} + ) +else() + # The unversioned qt_add_resources was added in Qt 5.15 + qt5_add_resources(LOGRAY_QT_QRC + ${CMAKE_SOURCE_DIR}/resources/about.qrc + ${CMAKE_SOURCE_DIR}/resources/languages/languages.qrc + ${CMAKE_SOURCE_DIR}/resources/layout.qrc + ${CMAKE_SOURCE_DIR}/resources/ssicon.qrc + ${CMAKE_SOURCE_DIR}/resources/stock_icons.qrc + ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc + ${CMAKE_CURRENT_BINARY_DIR}/authors.qrc + OPTIONS ${CMAKE_AUTORCC_OPTIONS} + ) endif() if (USE_qt6) @@ -767,13 +779,18 @@ FOLDER "UI" AUTOMOC ON AUTOUIC ON - AUTORCC ON + # AUTORCC not needed with qt_add_resources + #AUTORCC ON # Ensure .qm files are generated before autogenerating i18n.qrc AUTOGEN_TARGET_DEPENDS "${LOGRAY_QT_QM}" ) if(MSVC) set_target_properties(ui_logray PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}") + # https://bugreports.qt.io/browse/QTBUG-118993 + if(Qt${qtver}Widgets_VERSION VERSION_LESS "6.5.4") + target_compile_definitions(ui_logray PUBLIC _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) + endif() endif() CHECKAPI( diff -Nru wireshark-4.4.16/ui/qt/CMakeLists.txt wireshark-4.4.18/ui/qt/CMakeLists.txt --- wireshark-4.4.16/ui/qt/CMakeLists.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/CMakeLists.txt 2026-08-12 17:19:13.000000000 +0000 @@ -566,8 +566,9 @@ ${WIRESHARK_MODEL_SRCS} ${WIRESHARK_UTILS_SRCS} ${WIRESHARK_MANAGER_SRCS} - ${WIRESHARK_3RD_PARTY_WIDGET_SRCS} ${WIRESHARK_WIDGET_SRCS} + # WIRESHARK_3RD_PARTY_WIDGET_SRCS is allowed to have warnings + #${WIRESHARK_3RD_PARTY_WIDGET_SRCS} ) set(WIRESHARK_QT_UI @@ -709,31 +710,43 @@ ${CMAKE_SOURCE_DIR}/AUTHORS ) -set(WIRESHARK_QT_QRC - ../../resources/about.qrc - ../../resources/languages/languages.qrc - ../../resources/layout.qrc - ../../resources/stock_icons.qrc - ../../resources/wsicon.qrc - ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc - ${CMAKE_CURRENT_BINARY_DIR}/authors.qrc - ${CMAKE_CURRENT_BINARY_DIR}/authors.csv -) - -if(NOT Qt${qtver}Widgets_VERSION VERSION_LESS "5.9") - # Drop the file modification time of source files from generated files - # to help with reproducible builds. We do not use QFileInfo.lastModified - # so this has no unwanted side effects. This mtime started appearing in - # Qt 5.8. The option to force the old file format without mtime was - # added in Qt 5.9. See https://bugreports.qt.io/browse/QTBUG-58769. - # Force the compression algorithm to zlib, since zstd requires format - # version 3. See https://gitlab.com/wireshark/wireshark/-/issues/18100. - # Use the number of dashes for each argument as documented at - # https://doc.qt.io/qt-6/rcc.html. - set(CMAKE_AUTORCC_OPTIONS --format-version 1) - if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "5.13") - list(APPEND CMAKE_AUTORCC_OPTIONS -compress-algo zlib) - endif() +# Drop the file modification time of source files from generated files +# to help with reproducible builds. We do not use QFileInfo.lastModified +# so this has no unwanted side effects. This mtime started appearing in +# Qt 5.8. The option to force the old file format without mtime was +# added in Qt 5.9. See https://bugreports.qt.io/browse/QTBUG-58769. +# Force the compression algorithm to zlib, since zstd requires format +# version 3. See https://gitlab.com/wireshark/wireshark/-/issues/18100. +# Use the number of dashes for each argument as documented at +# https://doc.qt.io/qt-6/rcc.html. +set(CMAKE_AUTORCC_OPTIONS --format-version 1) +if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "5.13") + list(APPEND CMAKE_AUTORCC_OPTIONS -compress-algo zlib) +endif() + +if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "5.15") + qt_add_resources(WIRESHARK_QT_QRC + ../../resources/about.qrc + ../../resources/languages/languages.qrc + ../../resources/layout.qrc + ../../resources/stock_icons.qrc + ../../resources/wsicon.qrc + ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc + ${CMAKE_CURRENT_BINARY_DIR}/authors.qrc + OPTIONS ${CMAKE_AUTORCC_OPTIONS} + ) +else() + # The unversions qt_add_resources was added in Qt 5.15 + qt5_add_resources(WIRESHARK_QT_QRC + ../../resources/about.qrc + ../../resources/languages/languages.qrc + ../../resources/layout.qrc + ../../resources/stock_icons.qrc + ../../resources/wsicon.qrc + ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc + ${CMAKE_CURRENT_BINARY_DIR}/authors.qrc + OPTIONS ${CMAKE_AUTORCC_OPTIONS} + ) endif() if (USE_qt6) @@ -800,6 +813,7 @@ ${WIRESHARK_MODEL_HEADERS} ${WIRESHARK_QT_NONGENERATED_SRC} + ${WIRESHARK_3RD_PARTY_WIDGET_SRCS} # For AUTOUIC and AUTORCC. ${WIRESHARK_QT_UI} @@ -854,13 +868,18 @@ FOLDER "UI" AUTOMOC ON AUTOUIC ON - AUTORCC ON + # AUTORCC not needed with qt_add_resources + #AUTORCC ON # Ensure .qm files are generated before autogenerating i18n.qrc AUTOGEN_TARGET_DEPENDS "${WIRESHARK_QT_QM}" ) if(MSVC) set_target_properties(qtui PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}") + # https://bugreports.qt.io/browse/QTBUG-118993 + if(Qt${qtver}Widgets_VERSION VERSION_LESS "6.5.4") + target_compile_definitions(qtui PUBLIC _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) + endif() endif() CHECKAPI( diff -Nru wireshark-4.4.16/ui/qt/about_dialog.cpp wireshark-4.4.18/ui/qt/about_dialog.cpp --- wireshark-4.4.16/ui/qt/about_dialog.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/about_dialog.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -66,7 +66,12 @@ QFile f_authors; f_authors.setFileName(":/about/authors.csv"); - f_authors.open(QFile::ReadOnly | QFile::Text); + if (!f_authors.open(QFile::ReadOnly | QFile::Text)) { + // "Cannot fail" because the file is in the resource system, + // unless something went wrong during building. + Q_ASSERT(false); + return; + } QTextStream ReadFile_authors(&f_authors); #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ReadFile_authors.setEncoding(QStringConverter::Utf8); @@ -390,35 +395,45 @@ connect(ui->tblShortcuts, &QTreeView::customContextMenuRequested, this, &AboutDialog::handleCopyMenu); connect(ui->searchShortcuts, &QLineEdit::textChanged, shortcutProxyModel, &AStringListListSortFilterProxyModel::setFilter); + /* Acknowledgements */ f_acknowledgements.setFileName(":/about/Acknowledgements.md"); - f_acknowledgements.open(QFile::ReadOnly | QFile::Text); - QTextStream ReadFile_acks(&f_acknowledgements); - - /* QTextBrowser markdown support added in 5.14. */ + if (f_acknowledgements.open(QFile::ReadOnly | QFile::Text)) { + QTextStream ReadFile_acks(&f_acknowledgements); + /* QTextBrowser markdown support added in 5.14. */ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) - QTextBrowser *textBrowserAcks = new QTextBrowser(); - textBrowserAcks->setMarkdown(ReadFile_acks.readAll()); - textBrowserAcks->setReadOnly(true); - textBrowserAcks->setOpenExternalLinks(true); - textBrowserAcks->moveCursor(QTextCursor::Start); - ui->ackVerticalLayout->addWidget(textBrowserAcks); + QTextBrowser *textBrowserAcks = new QTextBrowser(); + + textBrowserAcks->setMarkdown(ReadFile_acks.readAll()); + textBrowserAcks->setReadOnly(true); + textBrowserAcks->setOpenExternalLinks(true); + textBrowserAcks->moveCursor(QTextCursor::Start); + ui->ackVerticalLayout->addWidget(textBrowserAcks); #else - QPlainTextEdit *pte = new QPlainTextEdit(); - pte->setPlainText(ReadFile_acks.readAll()); - pte->setReadOnly(true); - pte->moveCursor(QTextCursor::Start); - ui->ackVerticalLayout->addWidget(pte); -#endif + QPlainTextEdit *pte = new QPlainTextEdit(); + pte->setPlainText(ReadFile_acks.readAll()); + pte->setReadOnly(true); + pte->moveCursor(QTextCursor::Start); + ui->ackVerticalLayout->addWidget(pte); +#endif + } else { + // "Cannot fail" because the file is in the resource system, + // unless something went wrong during building. + Q_ASSERT(false); + } /* License */ f_license.setFileName(":/about/gpl-2.0-standalone.html"); - f_license.open(QFile::ReadOnly | QFile::Text); - QTextStream ReadFile_license(&f_license); - - ui->textBrowserLicense->setHtml(ReadFile_license.readAll()); + if (f_license.open(QFile::ReadOnly | QFile::Text)) { + QTextStream ReadFile_license(&f_license); + ui->textBrowserLicense->setHtml(ReadFile_license.readAll()); + } else { + // "Cannot fail" because the file is in the resource system, + // unless something went wrong during building. + Q_ASSERT(false); + } ui->textBrowserLicense->moveCursor(QTextCursor::Start); } diff -Nru wireshark-4.4.16/ui/qt/firewall_rules_dialog.cpp wireshark-4.4.18/ui/qt/firewall_rules_dialog.cpp --- wireshark-4.4.16/ui/qt/firewall_rules_dialog.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/firewall_rules_dialog.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -179,9 +179,10 @@ QFile save_file(file_name); QByteArray rule_text = ui->textBrowser->toPlainText().toUtf8(); - save_file.open(QIODevice::WriteOnly); - save_file.write(rule_text); - save_file.close(); + if (save_file.open(QIODevice::WriteOnly)) { + save_file.write(rule_text); + save_file.close(); + } if (save_file.error() != QFile::NoError) { QMessageBox::warning(this, tr("Warning"), tr("Unable to save %1").arg(save_file.fileName())); diff -Nru wireshark-4.4.16/ui/qt/geometry_state_dialog.cpp wireshark-4.4.18/ui/qt/geometry_state_dialog.cpp --- wireshark-4.4.16/ui/qt/geometry_state_dialog.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/geometry_state_dialog.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -100,7 +100,10 @@ // XXX: maximized and fullScreen are different window states; we've been // using the maximized key for fullScreen ever since this was added. geom.maximized = isFullScreen(); - geom.qt_geom = g_strdup(saveGeometry().toHex().constData()); + + // Don't let the hex QByteArray be freed until window_geom_save copies it. + QByteArray qgeometry = saveGeometry().toHex(); + geom.qt_geom = qgeometry.constData(); window_geom_save(dialog_name_.toUtf8().constData(), &geom); } diff -Nru wireshark-4.4.16/ui/qt/iax2_analysis_dialog.cpp wireshark-4.4.18/ui/qt/iax2_analysis_dialog.cpp --- wireshark-4.4.16/ui/qt/iax2_analysis_dialog.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/iax2_analysis_dialog.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -253,14 +253,12 @@ // We keep our temp files open for the lifetime of the dialog. The GTK+ // UI opens and closes at various points. - QString tempname = QString("%1/wireshark_iax2_f").arg(QDir::tempPath()); + QString tempname = QStringLiteral("%1/wireshark_iax2_f").arg(QDir::tempPath()); fwd_tempfile_ = new QTemporaryFile(tempname, this); - fwd_tempfile_->open(); - tempname = QString("%1/wireshark_iax2_r").arg(QDir::tempPath()); + tempname = QStringLiteral("%1/wireshark_iax2_r").arg(QDir::tempPath()); rev_tempfile_ = new QTemporaryFile(tempname, this); - rev_tempfile_->open(); - if (fwd_tempfile_->error() != QFile::NoError || rev_tempfile_->error() != QFile::NoError) { + if (!fwd_tempfile_->open() || fwd_tempfile_->error() != QFile::NoError || !rev_tempfile_->open() || rev_tempfile_->error() != QFile::NoError) { err_str_ = tr("Unable to save RTP data."); ui->actionSaveAudio->setEnabled(false); ui->actionSaveForwardAudio->setEnabled(false); @@ -899,11 +897,10 @@ bool stop_flag = false; qint64 nchars; - save_file.open(QIODevice::WriteOnly); fwd_tempfile_->seek(0); rev_tempfile_->seek(0); - if (save_file.error() != QFile::NoError) { + if (!save_file.open(QIODevice::WriteOnly) || save_file.error() != QFile::NoError) { QMessageBox::warning(this, tr("Warning"), tr("Unable to save %1").arg(save_file.fileName())); return; } @@ -1152,7 +1149,10 @@ if (file_path.isEmpty()) return; QFile save_file(file_path); - save_file.open(QFile::WriteOnly); + if (!save_file.open(QFile::WriteOnly)) { + // XXX - Warning dialog? + return; + } if (direction == dir_forward_ || direction == dir_both_) { save_file.write("Forward\n"); @@ -1199,6 +1199,7 @@ save_file.write("\n"); } } + // XXX - Check for failure and warn? } bool Iax2AnalysisDialog::eventFilter(QObject *, QEvent *event) diff -Nru wireshark-4.4.16/ui/qt/io_graph_dialog.cpp wireshark-4.4.18/ui/qt/io_graph_dialog.cpp --- wireshark-4.4.16/ui/qt/io_graph_dialog.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/io_graph_dialog.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -2137,7 +2137,9 @@ bool IOGraphDialog::saveCsv(const QString &file_name) const { QFile save_file(file_name); - save_file.open(QFile::WriteOnly | QFile::Text); + if (!save_file.open(QFile::WriteOnly | QFile::Text)) { + return false; + } QTextStream out(&save_file); makeCsv(out); diff -Nru wireshark-4.4.16/ui/qt/main_application.cpp wireshark-4.4.18/ui/qt/main_application.cpp --- wireshark-4.4.16/ui/qt/main_application.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/main_application.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -319,27 +319,22 @@ void MainApplication::setMonospaceFont(const char *font_string) { if (font_string && strlen(font_string) > 0) { -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) - // Qt 6's QFont::toString returns a value with 16 or 17 fields, e.g. - // Consolas,11,-1,5,400,0,0,0,0,0,0,0,0,0,0,1 - // Corbel,10,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular - // Qt 5's QFont::fromString expects a value with 10 or 11 fields, e.g. - // Consolas,10,-1,5,50,0,0,0,0,0 - // Corbel,10,-1,5,50,0,0,0,0,0,Regular - // It looks like Qt6's QFont::fromString can read both forms: - // https://github.com/qt/qtbase/blob/6.0/src/gui/text/qfont.cpp#L2146 - // but Qt5's cannot: - // https://github.com/qt/qtbase/blob/5.15/src/gui/text/qfont.cpp#L2151 - const char *fs_ptr = font_string; - int field_count = 1; - while ((fs_ptr = strchr(fs_ptr, ',')) != NULL) { - fs_ptr++; - field_count++; + QString trimmedName = QString::fromUtf8(font_string).trimmed(); +#if QT_VERSION < QT_VERSION_CHECK(6, 11, 0) + // Qt 6.11 added two extra attributes to the comma separated list. + // https://doc.qt.io/qt-6/qfont.html#toString + // https://doc.qt.io/qt-6.10/qfont.html#toString + // On earlier versions, strip any attributes after 17. + const auto parts = trimmedName.split(QLatin1Char(',')); + constexpr qsizetype maxAttributes = 17; + const qsizetype size = parts.size(); + + if (size > maxAttributes) { + // QList.first is Qt 6.0 + trimmedName = parts.mid(0, maxAttributes).join(QLatin1Char(',')); } - if (field_count <= 11) { #endif - mono_font_.fromString(font_string); - + if (mono_font_.fromString(trimmedName)) { // Only accept the font name if it actually exists. if (mono_font_.family() == QFontInfo(mono_font_).family()) { return; @@ -350,8 +345,27 @@ #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) } else { ws_warning("Monospace font %s appears to be from Qt6 and we're running Qt5.", font_string); + // Qt 5 couldn't parse a Qt 6-format string (or it was malformed). + // Fall back: strip the extra trailing fields to the 10/11 Qt 5 + // expects, preserving a trailing style name if present. + // (Qt 5.15 appears to expect the Qt 6 style, this is for even + // earlier.) + if (parts.size() >= 11) { + QStringList trimmed = parts.mid(0, 10); + if (!parts.last().isEmpty() && !parts.last().at(0).isDigit()) + trimmed << parts.last(); + if (mono_font_.fromString(trimmed.join(QLatin1Char(',')))) { + // Only accept the font name if it actually exists. + if (mono_font_.family() == QFontInfo(mono_font_).family()) { + return; + } else { + ws_warning("Monospace font family %s differs from its fontinfo: %s", + qUtf8Printable(mono_font_.family()), qUtf8Printable(QFontInfo(mono_font_).family())); + } + } + } +#endif /* QT_VERSION < QT_VERSION_CHECK(6, 0, 0) */ } -#endif } // https://en.wikipedia.org/wiki/Category:Monospaced_typefaces diff -Nru wireshark-4.4.16/ui/qt/models/astringlist_list_model.cpp wireshark-4.4.18/ui/qt/models/astringlist_list_model.cpp --- wireshark-4.4.16/ui/qt/models/astringlist_list_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/astringlist_list_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -108,8 +108,15 @@ void AStringListListSortFilterProxyModel::setFilter(const QString & filter) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif filter_ = filter; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } static bool AContainsB(const QVariant &a, const QVariant &b, Qt::CaseSensitivity cs) @@ -185,13 +192,27 @@ { if (! types_.keys().contains(column)) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif types_.insert(column, type); +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } else if (types_.keys().contains(column) && type != types_[column]) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif types_[column] = type; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } } } @@ -200,8 +221,15 @@ { if (column < columnCount() && ! columnsToFilter_.contains(column)) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif columnsToFilter_.append(column); +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } } @@ -211,33 +239,62 @@ foreach (int column, columns) { if (column < columnCount() && ! columnsToFilter_.contains(column)) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + if (!hasBeenAdded) + beginFilterChange(); +#endif columnsToFilter_.append(column); hasBeenAdded = true; } } if (hasBeenAdded) +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void AStringListListSortFilterProxyModel::clearColumnsToFilter() { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif columnsToFilter_.clear(); +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void AStringListListSortFilterProxyModel::clearHiddenColumns() { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif hiddenColumns_.clear(); +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Columns); +#else invalidateFilter(); +#endif } void AStringListListSortFilterProxyModel::setColumnToHide(int col) { if (! hiddenColumns_.contains(col) && col > -1 && sourceModel() && sourceModel()->columnCount() > col) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif hiddenColumns_ << col; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Columns); +#else invalidateFilter(); +#endif } } @@ -256,16 +313,30 @@ void AStringListListSortFilterProxyModel::clearNumericColumns() { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif numericColumns_.clear(); +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void AStringListListSortFilterProxyModel::setColumnAsNumeric(int col) { if (! numericColumns_.contains(col) && col > -1 && sourceModel() && sourceModel()->columnCount() > col) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif numericColumns_ << col; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } } diff -Nru wireshark-4.4.16/ui/qt/models/column_list_model.cpp wireshark-4.4.18/ui/qt/models/column_list_model.cpp --- wireshark-4.4.16/ui/qt/models/column_list_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/column_list_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -59,8 +59,15 @@ void ColumnProxyModel::setShowDisplayedOnly(bool set) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif showDisplayedOnly_ = set; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } ColumnTypeDelegate::ColumnTypeDelegate(QObject * parent) : diff -Nru wireshark-4.4.16/ui/qt/models/dissector_tables_model.cpp wireshark-4.4.18/ui/qt/models/dissector_tables_model.cpp --- wireshark-4.4.16/ui/qt/models/dissector_tables_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/dissector_tables_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -396,8 +396,15 @@ void DissectorTablesProxyModel::setFilter(const QString& filter) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif filter_ = filter; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void DissectorTablesProxyModel::adjustHeader(const QModelIndex ¤tIndex) diff -Nru wireshark-4.4.16/ui/qt/models/enabled_protocols_model.cpp wireshark-4.4.18/ui/qt/models/enabled_protocols_model.cpp --- wireshark-4.4.16/ui/qt/models/enabled_protocols_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/enabled_protocols_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -473,10 +473,17 @@ void EnabledProtocolsProxyModel::setFilter(const QString& filter, EnabledProtocolsProxyModel::SearchType type, EnabledProtocolItem::EnableProtocolType protocolType) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif filter_ = filter; type_ = type; protocolType_ = protocolType; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void EnabledProtocolsProxyModel::setItemsEnable(EnabledProtocolsProxyModel::EnableType enableType, QModelIndex parent) diff -Nru wireshark-4.4.16/ui/qt/models/expert_info_proxy_model.cpp wireshark-4.4.18/ui/qt/models/expert_info_proxy_model.cpp --- wireshark-4.4.16/ui/qt/models/expert_info_proxy_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/expert_info_proxy_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -297,6 +297,9 @@ void ExpertInfoProxyModel::setSeverityFilter(int severity, bool hide) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif if (hide) { hidden_severities_ << severity; @@ -306,11 +309,23 @@ hidden_severities_.removeOne(severity); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void ExpertInfoProxyModel::setSummaryFilter(const QString &filter) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif textFilter_ = filter; + +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } diff -Nru wireshark-4.4.16/ui/qt/models/export_objects_model.cpp wireshark-4.4.18/ui/qt/models/export_objects_model.cpp --- wireshark-4.4.16/ui/qt/models/export_objects_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/export_objects_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -276,14 +276,28 @@ void ExportObjectProxyModel::setContentFilterString(QString filter_) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif contentFilter_ = filter_; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void ExportObjectProxyModel::setTextFilterString(QString filter_) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif textFilter_ = filter_; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } bool ExportObjectProxyModel::filterAcceptsRow(int source_row, const QModelIndex &/*source_parent*/) const diff -Nru wireshark-4.4.16/ui/qt/models/interface_sort_filter_model.cpp wireshark-4.4.18/ui/qt/models/interface_sort_filter_model.cpp --- wireshark-4.4.16/ui/qt/models/interface_sort_filter_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/interface_sort_filter_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -28,6 +28,9 @@ void InterfaceSortFilterModel::resetAllFilter() { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif _filterHidden = true; _filterTypes = true; _invertTypeFilter = false; @@ -41,7 +44,11 @@ for (int col = 0; col < IFTREE_COL_MAX; col++) _columns.append((InterfaceTreeColumns)col); +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(); +#else invalidateFilter(); +#endif invalidate(); } @@ -89,6 +96,9 @@ void InterfaceSortFilterModel::toggleRemoteDisplay() { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif _remoteDisplay = ! _remoteDisplay; if (_storeOnChange) @@ -98,7 +108,11 @@ prefs_main_write(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif invalidate(); } @@ -156,6 +170,9 @@ void InterfaceSortFilterModel::toggleFilterHidden() { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif _filterHidden = ! _filterHidden; if (_storeOnChange) @@ -165,7 +182,11 @@ prefs_main_write(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif invalidate(); } @@ -209,9 +230,19 @@ void InterfaceSortFilterModel::setInterfaceTypeVisible(int ifType, bool visible) { if (visible && displayHiddenTypes.contains(ifType)) + { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif displayHiddenTypes.removeAll(ifType); + } else if (! visible && ! displayHiddenTypes.contains(ifType)) + { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif displayHiddenTypes.append(ifType); + } else /* Nothing should have changed */ return; @@ -233,7 +264,11 @@ prefs_main_write(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif invalidate(); } diff -Nru wireshark-4.4.16/ui/qt/models/manuf_table_model.cpp wireshark-4.4.18/ui/qt/models/manuf_table_model.cpp --- wireshark-4.4.16/ui/qt/models/manuf_table_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/manuf_table_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -158,22 +158,43 @@ { if (filter_type_ == FilterEmpty) return; +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif filter_type_ = FilterEmpty; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void ManufSortFilterProxyModel::setFilterAddress(const QByteArray &bytes) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif filter_type_ = FilterByAddress; filter_bytes_ = bytes; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void ManufSortFilterProxyModel::setFilterName(QRegularExpression &name) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif filter_type_ = FilterByName; filter_name_ = name; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } static bool match_filter(const QByteArray &bytes, const QByteArray &mac_block) diff -Nru wireshark-4.4.16/ui/qt/models/pref_models.cpp wireshark-4.4.18/ui/qt/models/pref_models.cpp --- wireshark-4.4.16/ui/qt/models/pref_models.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/pref_models.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -702,14 +702,28 @@ void AdvancedPrefsModel::setFilter(const QString& filter) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif filter_ = filter; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void AdvancedPrefsModel::setShowChangedValues(bool show_changed_values) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif show_changed_values_ = show_changed_values; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } diff -Nru wireshark-4.4.16/ui/qt/models/profile_model.cpp wireshark-4.4.18/ui/qt/models/profile_model.cpp --- wireshark-4.4.16/ui/qt/models/profile_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/profile_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -73,14 +73,28 @@ void ProfileSortModel::setFilterType(FilterType ft) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif ft_ = ft; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void ProfileSortModel::setFilterString(QString txt) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif ftext_ = ! txt.isEmpty() ? txt : ""; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } QStringList ProfileSortModel::filterTypes() diff -Nru wireshark-4.4.16/ui/qt/models/supported_protocols_model.cpp wireshark-4.4.18/ui/qt/models/supported_protocols_model.cpp --- wireshark-4.4.16/ui/qt/models/supported_protocols_model.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/models/supported_protocols_model.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -257,6 +257,13 @@ void SupportedProtocolsProxyModel::setFilter(const QString& filter) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif filter_ = filter; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } diff -Nru wireshark-4.4.16/ui/qt/rtp_analysis_dialog.cpp wireshark-4.4.18/ui/qt/rtp_analysis_dialog.cpp --- wireshark-4.4.16/ui/qt/rtp_analysis_dialog.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/rtp_analysis_dialog.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -908,7 +908,10 @@ if (file_path.isEmpty()) return; QFile save_file(file_path); - save_file.open(QFile::WriteOnly); + if (!save_file.open(QFile::WriteOnly)) { + // XXX - Warning dialog on failure? + return; + } switch (direction) { case dir_one_: @@ -944,6 +947,7 @@ } break; } + // XXX - Check for failure and warn? } bool RtpAnalysisDialog::eventFilter(QObject *, QEvent *event) diff -Nru wireshark-4.4.16/ui/qt/rtp_player_dialog.cpp wireshark-4.4.18/ui/qt/rtp_player_dialog.cpp --- wireshark-4.4.16/ui/qt/rtp_player_dialog.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/rtp_player_dialog.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -1302,10 +1302,20 @@ void RtpPlayerDialog::playFinished(RtpAudioStream *stream, QAudio::Error error) { - if ((error != QAudio::NoError) && (error != QAudio::UnderrunError)) { - setPlaybackError(tr("Playback of stream %1 failed!") - .arg(stream->getIDAsQString()) - ); + if (error != QAudio::NoError) { +#if (QT_VERSION < QT_VERSION_CHECK(6, 11, 0)) + if (error != QAudio::UnderrunError) { + setPlaybackError(tr("Playback of stream %1 failed!") + .arg(stream->getIDAsQString()) + ); + } +#else + if (stream->outputState() != QAudio::IdleState) { + setPlaybackError(tr("Playback of stream %1 failed!") + .arg(stream->getIDAsQString()) + ); + } +#endif // QT_VERSION < QT_VERSION_CHECK(6,11,0) } playing_streams_.removeOne(stream); if (playing_streams_.isEmpty()) { @@ -2625,9 +2635,8 @@ } QFile file(path); - file.open(QIODevice::WriteOnly); - if (!file.isOpen() || (file.error() != QFile::NoError)) { + if (!file.open(QIODevice::WriteOnly) || (file.error() != QFile::NoError)) { QMessageBox::warning(this, tr("Warning"), tr("Save failed!")); } else { switch (format) { @@ -2688,9 +2697,8 @@ if (format == save_payload_none) return; QFile file(path); - file.open(QIODevice::WriteOnly); - if (!file.isOpen() || (file.error() != QFile::NoError)) { + if (!file.open(QIODevice::WriteOnly) || (file.error() != QFile::NoError)) { QMessageBox::warning(this, tr("Warning"), tr("Save failed!")); } else if (!audio_stream->savePayload(&file)) { QMessageBox::warning(this, tr("Warning"), tr("Save failed!")); diff -Nru wireshark-4.4.16/ui/qt/show_packet_bytes_dialog.cpp wireshark-4.4.18/ui/qt/show_packet_bytes_dialog.cpp --- wireshark-4.4.16/ui/qt/show_packet_bytes_dialog.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/show_packet_bytes_dialog.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -372,7 +372,10 @@ } QFile file(file_name); - file.open(open_mode); + if (!file.open(open_mode)) { + // XXX - Warn? + return; + } switch (recent.gui_show_bytes_show) { @@ -417,6 +420,7 @@ break; } + // XXX - Check for failure and warn? file.close(); } diff -Nru wireshark-4.4.16/ui/qt/widgets/qcustomplot.cpp wireshark-4.4.18/ui/qt/widgets/qcustomplot.cpp --- wireshark-4.4.16/ui/qt/widgets/qcustomplot.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/widgets/qcustomplot.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -6521,6 +6521,9 @@ QCPAxisTickerDateTime::QCPAxisTickerDateTime() : mDateTimeFormat(QLatin1String("hh:mm:ss\ndd.MM.yy")), mDateTimeSpec(Qt::LocalTime), +# if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) + mTimeZone(QTimeZone::LocalTime), +# endif mDateStrategy(dsNone) { setTickCount(4); @@ -6584,6 +6587,23 @@ void QCPAxisTickerDateTime::setDateTimeSpec(Qt::TimeSpec spec) { mDateTimeSpec = spec; +# if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) + switch (spec) { + case Qt::LocalTime: + mTimeZone = QTimeZone(QTimeZone::LocalTime); + break; + case Qt::OffsetFromUTC: + // There's no offset to be used + qWarning() << "QCPAxisTickerDateTime treating QT::OffsetFromUTC as QT::UTC"; + // FALLTHROUGH + case Qt::UTC: + mTimeZone = QTimeZone(QTimeZone::UTC); + break; + default: + // If it's Qt::TimeZone, ignore and hope setTimeZone is/was called + break; + } +# endif } # if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) @@ -6713,7 +6733,9 @@ { Q_UNUSED(precision) Q_UNUSED(formatChar) -# if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) +# if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) + return locale.toString(keyToDateTime(tick).toTimeZone(mTimeZone), mDateTimeFormat); +# elif QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) if (mDateTimeSpec == Qt::TimeZone) return locale.toString(keyToDateTime(tick).toTimeZone(mTimeZone), mDateTimeFormat); else @@ -6821,8 +6843,23 @@ return QDateTime(date, QTime(0, 0), timeSpec).toTime_t(); # elif QT_VERSION < QT_VERSION_CHECK(5, 14, 0) return QDateTime(date, QTime(0, 0), timeSpec).toMSecsSinceEpoch()/1000.0; -# else +# elif QT_VERSION < QT_VERSION_CHECK(6, 5, 0) return date.startOfDay(timeSpec).toMSecsSinceEpoch()/1000.0; +# else + switch (timeSpec) { + case Qt::TimeZone: + // No QTimeZone was passed in, so this is treated as Qt::LocalTime in + // the deprecated function: + // https://doc.qt.io/qt-6/qdatetime-obsolete.html + case Qt::LocalTime: + return date.startOfDay().toMSecsSinceEpoch()/1000.0; + case Qt::OffsetFromUTC: + // No offset was passed in, treating as zero per deprecated function. + case Qt::UTC: + return date.startOfDay(QTimeZone(QTimeZone::UTC)).toMSecsSinceEpoch()/1000.0; + default: + Q_UNREACHABLE(); + } # endif } /* end of 'src/axis/axistickerdatetime.cpp' */ @@ -30624,13 +30661,13 @@ QPointF center(position->pixelPosition()); double w = mSize/2.0; - QRect clip = clipRect(); + QRectF clip(clipRect()); switch (mStyle) { case tsNone: return -1; case tsPlus: { - if (clipRect().intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)).toRect())) + if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)))) return qSqrt(qMin(QCPVector2D(pos).distanceSquaredToLine(center+QPointF(-w, 0), center+QPointF(w, 0)), QCPVector2D(pos).distanceSquaredToLine(center+QPointF(0, -w), center+QPointF(0, w)))); break; @@ -30642,7 +30679,7 @@ } case tsCircle: { - if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)).toRect())) + if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)))) { // distance to border: double centerDist = QCPVector2D(center-pos).length(); @@ -30660,7 +30697,7 @@ } case tsSquare: { - if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)).toRect())) + if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)))) { QRectF rect = QRectF(center-QPointF(w, w), center+QPointF(w, w)); bool filledRect = mBrush.style() != Qt::NoBrush && mBrush.color().alpha() != 0; @@ -30683,13 +30720,13 @@ painter->setBrush(mainBrush()); QPointF center(position->pixelPosition()); double w = mSize/2.0; - QRect clip = clipRect(); + QRectF clip(clipRect()); switch (mStyle) { case tsNone: return; case tsPlus: { - if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)).toRect())) + if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)))) { painter->drawLine(QLineF(center+QPointF(-w, 0), center+QPointF(w, 0))); painter->drawLine(QLineF(center+QPointF(0, -w), center+QPointF(0, w))); @@ -30706,13 +30743,13 @@ } case tsCircle: { - if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)).toRect())) + if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)))) painter->drawEllipse(center, w, w); break; } case tsSquare: { - if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)).toRect())) + if (clip.intersects(QRectF(center-QPointF(w, w), center+QPointF(w, w)))) painter->drawRect(QRectF(center-QPointF(w, w), center+QPointF(w, w))); break; } diff -Nru wireshark-4.4.16/ui/qt/widgets/traffic_tree.cpp wireshark-4.4.18/ui/qt/widgets/traffic_tree.cpp --- wireshark-4.4.16/ui/qt/widgets/traffic_tree.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/widgets/traffic_tree.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -276,10 +276,17 @@ if (filterOn < 0 || filterOn > TrafficDataFilterProxy::TRAFFIC_DATA_EQUAL) column = -1; +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif _filterColumn = mapToSourceColumn(column); _filterOn = filterOn; _filterText = filterText; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } int TrafficDataFilterProxy::mapToSourceColumn(int proxyColumn) const @@ -592,10 +599,17 @@ void TrafficDataFilterProxy::setColumnVisibility(int column, bool visible) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif hideColumns_.removeAll(column); if (!visible) hideColumns_.append(column); +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Columns); +#else invalidateFilter(); +#endif } bool TrafficDataFilterProxy::columnVisible(int column) const diff -Nru wireshark-4.4.16/ui/qt/widgets/traffic_types_list.cpp wireshark-4.4.18/ui/qt/widgets/traffic_types_list.cpp --- wireshark-4.4.16/ui/qt/widgets/traffic_types_list.cpp 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/widgets/traffic_types_list.cpp 2026-08-12 17:19:13.000000000 +0000 @@ -230,8 +230,15 @@ void TrafficListSortModel::setFilter(QString filter) { if ( filter.compare(_filter) != 0 ) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + beginFilterChange(); +#endif _filter = filter; +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } } diff -Nru wireshark-4.4.16/ui/qt/wireshark_de.ts wireshark-4.4.18/ui/qt/wireshark_de.ts --- wireshark-4.4.16/ui/qt/wireshark_de.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_de.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -8831,6 +8823,10 @@ UE Id + + + + Name Name @@ -8964,13 +8960,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/qt/wireshark_en.ts wireshark-4.4.18/ui/qt/wireshark_en.ts --- wireshark-4.4.16/ui/qt/wireshark_en.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_en.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -8768,6 +8760,10 @@ + + + + Name @@ -8900,13 +8896,6 @@ - - QObject::QObject::QObject - - CCCH - - - RemoteCaptureDialog diff -Nru wireshark-4.4.16/ui/qt/wireshark_es.ts wireshark-4.4.18/ui/qt/wireshark_es.ts --- wireshark-4.4.16/ui/qt/wireshark_es.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_es.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -4407,11 +4399,11 @@ 2 min - 10 min {2 ?} + 5 min - 10 min {5 ?} + Wireshark I/O Graphs: %1 @@ -6466,7 +6458,7 @@ Move Up 100 Pixels - Mover arriba 10 píxeles {100 ?} + PgUp @@ -8749,6 +8741,10 @@ UE Id + + + + Name Nombre @@ -8882,13 +8878,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface @@ -9921,11 +9910,11 @@ Move Left 1 Pixels - Mover a la izquierda 10 píxeles {1 ?} + Move Right 1 Pixels - Mover a la derecha 10 píxeles {1 ?} + Go To Packet Under Cursor diff -Nru wireshark-4.4.16/ui/qt/wireshark_fr.ts wireshark-4.4.18/ui/qt/wireshark_fr.ts --- wireshark-4.4.16/ui/qt/wireshark_fr.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_fr.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -8830,6 +8822,10 @@ Id UE + + + + Name Nom @@ -8963,13 +8959,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/qt/wireshark_it.ts wireshark-4.4.18/ui/qt/wireshark_it.ts --- wireshark-4.4.16/ui/qt/wireshark_it.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_it.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -8831,6 +8823,10 @@ UE Id + + + + Name Nome @@ -8964,13 +8960,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/qt/wireshark_ja_JP.ts wireshark-4.4.18/ui/qt/wireshark_ja_JP.ts --- wireshark-4.4.16/ui/qt/wireshark_ja_JP.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_ja_JP.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -8801,6 +8793,10 @@ UE Id + + + + Name 名前 @@ -8934,13 +8930,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/qt/wireshark_ko.ts wireshark-4.4.18/ui/qt/wireshark_ko.ts --- wireshark-4.4.16/ui/qt/wireshark_ko.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_ko.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -8798,6 +8790,10 @@ UE Id + + + + Name 이름 @@ -8931,13 +8927,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/qt/wireshark_pl.ts wireshark-4.4.18/ui/qt/wireshark_pl.ts --- wireshark-4.4.16/ui/qt/wireshark_pl.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_pl.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -8804,6 +8796,10 @@ UE Id + + + + Name Nazwa @@ -8937,13 +8933,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/qt/wireshark_ru.ts wireshark-4.4.18/ui/qt/wireshark_ru.ts --- wireshark-4.4.16/ui/qt/wireshark_ru.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_ru.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -8864,6 +8856,10 @@ UE Id + + + + Name Имя @@ -8997,13 +8993,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/qt/wireshark_sv.ts wireshark-4.4.18/ui/qt/wireshark_sv.ts --- wireshark-4.4.16/ui/qt/wireshark_sv.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_sv.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -8831,6 +8823,10 @@ UE-Id + + + + Name Namn @@ -8964,13 +8960,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/qt/wireshark_tr_TR.ts wireshark-4.4.18/ui/qt/wireshark_tr_TR.ts --- wireshark-4.4.16/ui/qt/wireshark_tr_TR.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_tr_TR.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -4397,11 +4389,11 @@ 2 min - 10 dakika {2 ?} + 5 min - 10 dakika {5 ?} + Wireshark I/O Graphs: %1 @@ -8754,6 +8746,10 @@ UE Id + + + + Name Ad @@ -8887,13 +8883,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/qt/wireshark_uk.ts wireshark-4.4.18/ui/qt/wireshark_uk.ts --- wireshark-4.4.16/ui/qt/wireshark_uk.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_uk.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -4383,19 +4375,19 @@ 2 sec - 10 сек {2 ?} + 5 sec - 10 сек {5 ?} + 2 min - 10 хв {2 ?} + 5 min - 10 хв {5 ?} + Wireshark I/O Graphs: %1 @@ -6452,7 +6444,7 @@ Move Up 100 Pixels - Переміститися Вгору На 10 Пікселів {100 ?} + PgUp @@ -8745,6 +8737,10 @@ + + + + Name @@ -8878,13 +8874,6 @@ - QObject::QObject::QObject - - CCCH - - - - RemoteCaptureDialog Remote Interface @@ -9915,11 +9904,11 @@ Move Left 1 Pixels - Переміститися Вліво На 10 Пікселів {1 ?} + Move Right 1 Pixels - Переміститися Вправо На 10 Пікселів {1 ?} + Go To Packet Under Cursor diff -Nru wireshark-4.4.16/ui/qt/wireshark_zh_CN.ts wireshark-4.4.18/ui/qt/wireshark_zh_CN.ts --- wireshark-4.4.16/ui/qt/wireshark_zh_CN.ts 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/qt/wireshark_zh_CN.ts 2026-08-12 17:19:13.000000000 +0000 @@ -2,14 +2,6 @@ - Abbreviation - - - for "not applicable" - - - - AboutDialog About Wireshark @@ -4351,11 +4343,11 @@ 2 ms - 100毫秒 {2 ?} + 5 ms - 100毫秒 {5 ?} + 10 ms @@ -4363,11 +4355,11 @@ 20 ms - 100毫秒 {20 ?} + 50 ms - 100毫秒 {50 ?} + 100 ms @@ -4375,27 +4367,27 @@ 200 ms - 100毫秒 {200 ?} + 500 ms - 100毫秒 {500 ?} + 2 sec - 10秒 {2 ?} + 5 sec - 10秒 {5 ?} + 2 min - 10分钟 {2 ?} + 5 min - 10分钟 {5 ?} + Wireshark I/O Graphs: %1 @@ -8680,31 +8672,31 @@ LCID 32 - LCID 32 + LCID 33 - LCID 33 + LCID 34 - LCID 34 + LCID 35 - LCID 35 + LCID 36 - LCID 36 + LCID 37 - LCID 37 + LCID 38 - LCID 38 + TM @@ -8747,6 +8739,10 @@ UE ID + + + + Name 名称 @@ -8880,13 +8876,6 @@ - QObject::QObject::QObject - - CCCH - CCCH - - - RemoteCaptureDialog Remote Interface diff -Nru wireshark-4.4.16/ui/recent.c wireshark-4.4.18/ui/recent.c --- wireshark-4.4.16/ui/recent.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/recent.c 2026-08-12 17:19:13.000000000 +0000 @@ -263,7 +263,7 @@ { window_geometry_t *geom = (window_geometry_t*)data; g_free(geom->key); - g_free(geom->qt_geom); + g_free((char*)geom->qt_geom); // We copied it; we can free it g_free(geom); } @@ -284,6 +284,7 @@ *work = *geom; key = g_strdup(name); work->key = key; + work->qt_geom = g_strdup(geom->qt_geom); g_hash_table_replace(window_geom_hash, key, work); } @@ -392,7 +393,7 @@ parse_recent_boolean(value, &geom.maximized); geom.set_maximized = true; } else if (strcmp(key, "qt_geometry") == 0) { - geom.qt_geom = g_strdup(value); + geom.qt_geom = value; } else { /* * Silently ignore the bogus key. We shouldn't abort here, diff -Nru wireshark-4.4.16/ui/recent.h wireshark-4.4.18/ui/recent.h --- wireshark-4.4.16/ui/recent.h 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/recent.h 2026-08-12 17:19:13.000000000 +0000 @@ -279,7 +279,15 @@ */ extern void recent_set_column_xalign(int col, char xalign); -/* save the window and its current geometry into the geometry hashtable */ +/** + * @brief save the window and its current geometry into the geometry hashtable. + * + * @param name The name of the window. + * @param geom Pointer to the window_geometry_t structure containing the geometry data. + * + * @note This deep copies the window_geometry_t struct (including the qt_geom + * member) and does NOT take ownership of the original. + */ extern void window_geom_save(const char *name, window_geometry_t *geom); /* load the desired geometry for this window from the geometry hashtable */ diff -Nru wireshark-4.4.16/ui/ws_ui_util.h wireshark-4.4.18/ui/ws_ui_util.h --- wireshark-4.4.16/ui/ws_ui_util.h 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/ui/ws_ui_util.h 2026-08-12 17:19:13.000000000 +0000 @@ -37,7 +37,7 @@ int height; /**< the windows height */ bool set_maximized; /**< set the maximized state */ bool maximized; /**< the windows maximized state */ - char* qt_geom; /**< hex bytestring from Qt's saveGeometry() */ + const char* qt_geom; /**< hex bytestring from Qt's saveGeometry() */ } window_geometry_t; /* update the main window */ diff -Nru wireshark-4.4.16/wiretap/CMakeLists.txt wireshark-4.4.18/wiretap/CMakeLists.txt --- wireshark-4.4.16/wiretap/CMakeLists.txt 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/CMakeLists.txt 2026-08-12 17:19:13.000000000 +0000 @@ -178,7 +178,7 @@ PREFIX "lib" COMPILE_DEFINITIONS "WS_BUILD_DLL" LINK_FLAGS "${WS_LINK_FLAGS}" - VERSION "15.0.16" SOVERSION 15 + VERSION "15.0.18" SOVERSION 15 FOLDER "DLLs" INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}" ) diff -Nru wireshark-4.4.16/wiretap/blf.c wireshark-4.4.18/wiretap/blf.c --- wireshark-4.4.16/wiretap/blf.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/blf.c 2026-08-12 17:19:13.000000000 +0000 @@ -706,6 +706,196 @@ } } +#if defined (HAVE_ZLIB) || defined (HAVE_ZLIBNG) + +static uint8_t* +blf_decompress_zlib(uint8_t *compressed_data, unsigned compressed_len, uint64_t decompressed_len, int *err, char **err_info) +{ + /* decompressed_len is just read from packet data, and could be bogus. + * It's stored in real_length as a 64-bit integer, but appears to + * be read from packet data as a 32-bit quantity only. In any case, + * we only allocate a 32-bit chunk at a time, and zlib/zlib-ng only + * allow avail_out to be a 32-bit unsigned integer. */ + uint32_t bufsize; + + /* z_stream->total_out is an unsigned long in Zlib, which is always + * 32-bits on Windows (LLP). In Zlib-ng it's a size_t, which is 32-bits + * on 32-bit platforms. */ + uint64_t total_out = 0; + + /* blf_pull_logcontainer_into_memory already checks for 0 */ + ws_assert(decompressed_len != 0); + + /* blf_pull_logcontainer_into_memory already checks for 0 by + * checking the return value of g_[try_]malloc. */ + ws_assert(compressed_len != 0); + + /* Typical compression ratios are between 2:1-5:1; the theoretical max + * is somewhat above 1030:1; depending on what's being compressed, that + * could actually be legitimate (sometimes there are long runs of zeros), + * but we might want to just refuse past a certain point. Since the + * decompressed_len in reality seems to be 32-bit, that imposes a limit. */ + uint64_t ratio = decompressed_len / compressed_len; + if (ratio > 1032) { + /* This is just impossible, so go ahead and stop now. */ + *err = WTAP_ERR_BAD_FILE; + *err_info = ws_strdup_printf("blf: uncompressed data has wrong length (%" PRIu64 " with a compressed size of %u is a compression ratio of %" PRIu64 ", greater than the theoretical max of 1032)", decompressed_len, compressed_len, ratio); + return NULL; + } else if (ratio > 5) { + if (ckd_mul(&bufsize, compressed_len, 5)) { + bufsize = UINT_MAX; + } + } else { + bufsize = (unsigned)MIN(decompressed_len, UINT_MAX); + } + + unsigned char *buf = g_try_malloc(bufsize); + if (buf == NULL) { + *err = WTAP_ERR_INTERNAL; + *err_info = ws_strdup("blf: cannot allocate memory"); + return NULL; + } + zlib_stream infstream = {0}; + + infstream.avail_in = compressed_len; + infstream.next_in = compressed_data; + + /* the actual DE-compression work. */ + if (Z_OK != ZLIB_PREFIX(inflateInit)(&infstream)) { + /* + * XXX - check the error code and handle this appropriately. + */ + g_free(buf); + *err = WTAP_ERR_INTERNAL; + if (infstream.msg != NULL) { + *err_info = ws_strdup_printf("blf: inflateInit failed for LogContainer, message\"%s\"", + infstream.msg); + } else { + *err_info = ws_strdup("blf: inflateInit failed for LogContainer"); + } + ws_debug("inflateInit failed for LogContainer"); + if (infstream.msg != NULL) { + ws_debug("inflateInit returned: \"%s\"", infstream.msg); + } + return NULL; + } + + int ret; + + + do { + infstream.avail_out = bufsize; + infstream.next_out = &buf[total_out]; + ret = ZLIB_PREFIX(inflate)(&infstream, Z_NO_FLUSH); + + switch (ret) { + case Z_OK: + case Z_STREAM_END: + total_out += (bufsize - infstream.avail_out); + + /* Presumably need more space. */ + if (total_out > decompressed_len) { + *err = WTAP_ERR_BAD_FILE; + *err_info = ws_strdup_printf("blf: uncompressed data has wrong length (%" PRIu64 " > %" PRIu64")", total_out, decompressed_len); + break; + } + if (infstream.avail_out == 0) { + /* Increase the total buffer */ + bufsize = (uint32_t)MIN(total_out, UINT32_MAX); + bufsize = (uint32_t)MIN(decompressed_len - total_out, bufsize); + + buf = (uint8_t*)g_realloc(buf, total_out + bufsize); + } + continue; + + case Z_NEED_DICT: + *err = WTAP_ERR_DECOMPRESS; + *err_info = ws_strdup("blf: preset dictionary needed to decompress"); + break; + + case Z_STREAM_ERROR: + *err = WTAP_ERR_INTERNAL; + *err_info = ws_strdup_printf("blf: Z_STREAM_ERROR from inflate(), message \"%s\"", + (infstream.msg != NULL) ? infstream.msg : "(none)"); + break; + + case Z_MEM_ERROR: + /* This means "not enough memory". */ + *err = ENOMEM; + *err_info = NULL; + break; + + case Z_DATA_ERROR: + /* This means "deflate stream invalid" */ + *err = WTAP_ERR_DECOMPRESS; + *err_info = (infstream.msg != NULL) ? ws_strdup(infstream.msg) : NULL; + break; + + case Z_BUF_ERROR: + /* XXX - this is recoverable; what should we do here? */ + *err = WTAP_ERR_INTERNAL; + *err_info = ws_strdup_printf("blf: Z_BUF_ERROR from inflate(), message \"%s\"", + (infstream.msg != NULL) ? infstream.msg : "(none)"); + break; + + case Z_VERSION_ERROR: + *err = WTAP_ERR_INTERNAL; + *err_info = ws_strdup_printf("blf: Z_VERSION_ERROR from inflate(), message \"%s\"", + (infstream.msg != NULL) ? infstream.msg : "(none)"); + break; + + default: + *err = WTAP_ERR_INTERNAL; + *err_info = ws_strdup_printf("blf: unexpected error %d from inflate(), message \"%s\"", + ret, + (infstream.msg != NULL) ? infstream.msg : "(none)"); + break; + } + g_free(buf); + ws_debug("inflate failed (return code %d) for LogContainer", ret); + if (infstream.msg != NULL) { + ws_debug("inflate returned: \"%s\"", infstream.msg); + } + /* Free up any dynamically-allocated memory in infstream */ + ZLIB_PREFIX(inflateEnd)(&infstream); + return NULL; + } while (ret != Z_STREAM_END); + + if (Z_OK != ZLIB_PREFIX(inflateEnd)(&infstream)) { + /* + * The zlib manual says this only returns Z_OK on success + * and Z_STREAM_ERROR if the stream state was inconsistent. + * + * It's not clear what useful information can be reported + * for Z_STREAM_ERROR; a look at the 1.2.11 source indicates + * that no string is returned to indicate what the problem + * was. + * + * It's also not clear what to do about infstream if this + * fails. + */ + *err = WTAP_ERR_INTERNAL; + *err_info = ws_strdup("blf: inflateEnd failed for LogContainer"); + g_free(buf); + ws_debug("inflateEnd failed for LogContainer"); + if (infstream.msg != NULL) { + ws_debug("inflateEnd returned: \"%s\"", infstream.msg); + } + return NULL; + } + + if (total_out < decompressed_len) { + /* Decompressed fewer bytes than claimed. */ + g_free(buf); + *err = WTAP_ERR_BAD_FILE; + *err_info = ws_strdup_printf("blf: uncompressed data has wrong length (%" PRIu64 " < %" PRIu64")", total_out, decompressed_len); + return NULL; + } + + return buf; +} +#endif + /** Ensures the given log container is in memory * * If the log container already is not already in memory, @@ -815,6 +1005,9 @@ #if defined (HAVE_ZLIB) || defined (HAVE_ZLIBNG) unsigned char *compressed_data = g_try_malloc((size_t)data_length); if (compressed_data == NULL) { + /* g_try_malloc returns NULL if data_length is 0. Can data_length + * be zero, and in a way that we should just skip it, as above if + * the decompressed length is 0? */ *err = WTAP_ERR_INTERNAL; *err_info = ws_strdup("blf_pull_logcontainer_into_memory: cannot allocate memory"); return false; @@ -832,126 +1025,11 @@ return false; } - unsigned char *buf = g_try_malloc((size_t)container->real_length); - if (buf == NULL) { - g_free(compressed_data); - *err = WTAP_ERR_INTERNAL; - *err_info = ws_strdup("blf_pull_logcontainer_into_memory: cannot allocate memory"); - return false; - } - zlib_stream infstream = {0}; - - infstream.avail_in = (unsigned int)data_length; - infstream.next_in = compressed_data; - infstream.avail_out = (unsigned int)container->real_length; - infstream.next_out = buf; - - /* the actual DE-compression work. */ - if (Z_OK != ZLIB_PREFIX(inflateInit)(&infstream)) { - /* - * XXX - check the error code and handle this appropriately. - */ - g_free(buf); - g_free(compressed_data); - *err = WTAP_ERR_INTERNAL; - if (infstream.msg != NULL) { - *err_info = ws_strdup_printf("blf_pull_logcontainer_into_memory: inflateInit failed for LogContainer, message\"%s\"", - infstream.msg); - } else { - *err_info = ws_strdup("blf_pull_logcontainer_into_memory: inflateInit failed for LogContainer"); - } - ws_debug("inflateInit failed for LogContainer"); - if (infstream.msg != NULL) { - ws_debug("inflateInit returned: \"%s\"", infstream.msg); - } - return false; - } - - int ret = ZLIB_PREFIX(inflate)(&infstream, Z_NO_FLUSH); - /* Z_OK should not happen here since we know how big the buffer should be */ - if (Z_STREAM_END != ret) { - switch (ret) { - - case Z_NEED_DICT: - *err = WTAP_ERR_DECOMPRESS; - *err_info = ws_strdup("preset dictionary needed"); - break; - - case Z_STREAM_ERROR: - *err = WTAP_ERR_INTERNAL; - *err_info = ws_strdup_printf("blf_pull_logcontainer_into_memory: Z_STREAM_ERROR from inflate(), message \"%s\"", - (infstream.msg != NULL) ? infstream.msg : "(none)"); - break; - - case Z_MEM_ERROR: - /* This means "not enough memory". */ - *err = ENOMEM; - *err_info = NULL; - break; - - case Z_DATA_ERROR: - /* This means "deflate stream invalid" */ - *err = WTAP_ERR_DECOMPRESS; - *err_info = (infstream.msg != NULL) ? ws_strdup(infstream.msg) : NULL; - break; - - case Z_BUF_ERROR: - /* XXX - this is recoverable; what should we do here? */ - *err = WTAP_ERR_INTERNAL; - *err_info = ws_strdup_printf("blf_pull_logcontainer_into_memory: Z_BUF_ERROR from inflate(), message \"%s\"", - (infstream.msg != NULL) ? infstream.msg : "(none)"); - break; - - case Z_VERSION_ERROR: - *err = WTAP_ERR_INTERNAL; - *err_info = ws_strdup_printf("blf_pull_logcontainer_into_memory: Z_VERSION_ERROR from inflate(), message \"%s\"", - (infstream.msg != NULL) ? infstream.msg : "(none)"); - break; - - default: - *err = WTAP_ERR_INTERNAL; - *err_info = ws_strdup_printf("blf_pull_logcontainer_into_memory: unexpected error %d from inflate(), message \"%s\"", - ret, - (infstream.msg != NULL) ? infstream.msg : "(none)"); - break; - } - g_free(buf); - g_free(compressed_data); - ws_debug("inflate failed (return code %d) for LogContainer", ret); - if (infstream.msg != NULL) { - ws_debug("inflate returned: \"%s\"", infstream.msg); - } - /* Free up any dynamically-allocated memory in infstream */ - ZLIB_PREFIX(inflateEnd)(&infstream); - return false; - } - - if (Z_OK != ZLIB_PREFIX(inflateEnd)(&infstream)) { - /* - * The zlib manual says this only returns Z_OK on success - * and Z_STREAM_ERROR if the stream state was inconsistent. - * - * It's not clear what useful information can be reported - * for Z_STREAM_ERROR; a look at the 1.2.11 source indicates - * that no string is returned to indicate what the problem - * was. - * - * It's also not clear what to do about infstream if this - * fails. - */ - *err = WTAP_ERR_INTERNAL; - *err_info = ws_strdup("blf_pull_logcontainer_into_memory: inflateEnd failed for LogContainer"); - g_free(buf); - g_free(compressed_data); - ws_debug("inflateEnd failed for LogContainer"); - if (infstream.msg != NULL) { - ws_debug("inflateEnd returned: \"%s\"", infstream.msg); - } + container->real_data = blf_decompress_zlib(compressed_data, (unsigned)data_length, container->real_length, err, err_info); + g_free(compressed_data); + if (container->real_data == NULL) { return false; } - - g_free(compressed_data); - container->real_data = buf; return true; #else (void) params; diff -Nru wireshark-4.4.16/wiretap/busmaster_scanner.l wireshark-4.4.18/wiretap/busmaster_scanner.l --- wireshark-4.4.16/wiretap/busmaster_scanner.l 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/busmaster_scanner.l 2026-08-12 17:19:13.000000000 +0000 @@ -102,7 +102,11 @@ <*>{SPC} ; {ENDL} { yyterminate(); }; -{ENDL} { YY_FATAL_ERROR("Unterminated header statement"); } +{ENDL} { + yyextra->err = WTAP_ERR_BAD_FILE; + yyextra->err_info = g_strdup("Unterminated header statement"); + yyterminate(); + } "***" { BEGIN(HEADER); } "***"{ENDL}"***" { BEGIN(HEADER); return TOKEN_ENDL; } diff -Nru wireshark-4.4.16/wiretap/catapult_dct2000.c wireshark-4.4.18/wiretap/catapult_dct2000.c --- wireshark-4.4.16/wiretap/catapult_dct2000.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/catapult_dct2000.c 2026-08-12 17:19:13.000000000 +0000 @@ -1369,7 +1369,7 @@ if (!is_comment) { /***********************************************************/ /* Copy packet data into buffer, converting from ascii hex */ - for (n=0; n < data_chars; n+=2) { + for (n=0; n < (data_chars & ~1); n+=2) { frame_buffer[stub_offset + n/2] = hex_byte_from_chars(linebuff+dollar_offset+n); } diff -Nru wireshark-4.4.16/wiretap/daintree-sna.c wireshark-4.4.18/wiretap/daintree-sna.c --- wireshark-4.4.16/wiretap/daintree-sna.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/daintree-sna.c 2026-08-12 17:19:13.000000000 +0000 @@ -153,7 +153,7 @@ int *err, char **err_info) { uint64_t seconds; - int useconds; + char useconds[10]; char readLine[DAINTREE_MAX_LINE_SIZE]; char readData[READDATA_BUF_SIZE]; unsigned char *str = (unsigned char *)readData; @@ -173,13 +173,18 @@ rec->block = wtap_block_create(WTAP_BLOCK_PACKET); rec->presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN; - if (sscanf(readLine, "%*s %18" SCNu64 ".%9d %9u %" READDATA_MAX_FIELD_SIZE "s", - &seconds, &useconds, &rec->rec_header.packet_header.len, readData) != 4) { + memset(useconds, 0, sizeof(useconds)); + if (sscanf(readLine, "%*s %18" SCNu64 ".%9[0-9] %9u %" READDATA_MAX_FIELD_SIZE "s", + &seconds, useconds, &rec->rec_header.packet_header.len, readData) != 4) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup("daintree_sna: invalid read record"); return false; } + while (strlen(useconds) < 9) { + useconds[strlen(useconds)] = '0'; + } + /* Daintree doesn't store the FCS, but pads end of packet with 0xffff, which we toss */ if (rec->rec_header.packet_header.len <= FCS_LENGTH) { *err = WTAP_ERR_BAD_FILE; @@ -190,7 +195,7 @@ rec->rec_header.packet_header.len -= FCS_LENGTH; rec->ts.secs = (time_t) seconds; - rec->ts.nsecs = useconds * 1000; /* convert mS to nS */ + sscanf(useconds, "%9u", &rec->ts.nsecs); /* * READDATA_BUF_SIZE is < WTAP_MAX_PACKET_SIZE_STANDARD, and is the maximum diff -Nru wireshark-4.4.16/wiretap/dbs-etherwatch.c wireshark-4.4.18/wiretap/dbs-etherwatch.c --- wireshark-4.4.16/wiretap/dbs-etherwatch.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/dbs-etherwatch.c 2026-08-12 17:19:13.000000000 +0000 @@ -461,8 +461,10 @@ return false; } - /* Make sure we have enough room, even for an oversized Ethernet packet */ - ws_buffer_assure_space(buf, rec->rec_header.packet_header.caplen); + /* Make sure we have enough room, even for an oversized Ethernet packet. + * The length is checked *after* writing each line, so add slack. + * Note the byte separator is optional. */ + ws_buffer_assure_space(buf, rec->rec_header.packet_header.caplen + DBS_ETHERWATCH_LINE_LENGTH/2); pd = ws_buffer_start_ptr(buf); /* diff -Nru wireshark-4.4.16/wiretap/erf.c wireshark-4.4.18/wiretap/erf.c --- wireshark-4.4.16/wiretap/erf.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/erf.c 2026-08-12 17:19:13.000000000 +0000 @@ -3276,6 +3276,15 @@ if(state.gen_time == 0U && tag.type == ERF_META_TAG_gen_time ) { + if (tag.length < sizeof(state.gen_time)) { + /* + * Skip the record if the time tag is bogusly short. + * XXX - Should this, and other tags with bogus length, + * be reported as an error and bad file? + */ + return 0; + } + memcpy(&state.gen_time, tag.value, sizeof(state.gen_time)); /* diff -Nru wireshark-4.4.16/wiretap/file_wrappers.c wireshark-4.4.18/wiretap/file_wrappers.c --- wireshark-4.4.16/wiretap/file_wrappers.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/file_wrappers.c 2026-08-12 17:19:13.000000000 +0000 @@ -3100,6 +3100,10 @@ if (state->err != 0) return -1; + /* If not initialized yet, nothing to flush. */ + if (state->size_out == 0) + return 0; + bytesWritten = LZ4F_flush(state->lz4_cctx, state->out, state->size_out, NULL); if (LZ4F_isError(bytesWritten)) { // Should never happen if size_out >= LZ4F_compressBound(0, prefsPtr) @@ -3119,17 +3123,22 @@ { int ret = 0; - /* flush, free memory, and close file */ - size_t bytesWritten = LZ4F_compressEnd(state->lz4_cctx, state->out, state->size_out, NULL); - if (LZ4F_isError(bytesWritten)) { - // Should never happen if size_out >= LZ4F_compressBound(0, prefsPtr) - ret = WTAP_ERR_INTERNAL; + /* If not initialized yet, nothing to flush. */ + if (state->size_out != 0) { + /* flush and free memory */ + size_t bytesWritten = LZ4F_compressEnd(state->lz4_cctx, state->out, state->size_out, NULL); + if (LZ4F_isError(bytesWritten)) { + // Should never happen if size_out >= LZ4F_compressBound(0, prefsPtr) + ret = WTAP_ERR_INTERNAL; + } + if (!lz4_write_out(state, bytesWritten)) { + ret = state->err; + } + g_free(state->out); + LZ4F_freeCompressionContext(state->lz4_cctx); } - if (!lz4_write_out(state, bytesWritten)) { - ret = state->err; - } - g_free(state->out); - LZ4F_freeCompressionContext(state->lz4_cctx); + + /* Close file */ if (ws_close(state->fd) == -1 && ret == 0) ret = errno; g_free(state); diff -Nru wireshark-4.4.16/wiretap/k12.c wireshark-4.4.18/wiretap/k12.c --- wireshark-4.4.16/wiretap/k12.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/k12.c 2026-08-12 17:19:13.000000000 +0000 @@ -3,7 +3,7 @@ * * routines for importing tektronix k12xx *.rf5 files * - * Copyright (c) 2005, Luis E. Garia Ontanon + * Copyright (c) 2005, Luis E. Garcia Ontanon * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez @@ -20,8 +20,10 @@ #include "wtap-int.h" #include "file_wrappers.h" +#include #include #include +#include /* * See @@ -67,7 +69,7 @@ fprintf(dbg_out,"\n"); \ } } while(0) -void k12_hex_ascii_dump(unsigned level, int64_t offset, const char* label, const unsigned char* b, unsigned int len) { +void k12_hex_ascii_dump(unsigned level, int64_t offset, const char* label, const unsigned char* b, size_t len) { static const char* c2t[] = { "00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f", "10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f", @@ -90,7 +92,7 @@ if (debug_level < level) return; - fprintf(dbg_out,"%s(%.8" PRIx64 ",%.4x):\n",label,offset,len); + fprintf(dbg_out,"%s(%.8" PRIx64 ",%.4zx):\n",label,offset,len); for (i=0 ; irand_read_buff : file_data->seq_read_buff; - unsigned buffer_len = is_random ? file_data->rand_read_buff_len : file_data->seq_read_buff_len; + Buffer *buffer = is_random ? &file_data->rand_read_buff : &file_data->seq_read_buff; unsigned total_read = 0; unsigned left; - uint8_t* writep; #ifdef DEBUG_K12 unsigned actual_len; #endif @@ -441,19 +439,6 @@ K12_DBG(6,("get_record: ENTER: junky_offset=%" PRId64 ", file_offset=%" PRId64,junky_offset,file_offset)); - /* no buffer is given, lets create it */ - if (buffer == NULL) { - buffer = (uint8_t*)g_malloc(8192); - buffer_len = 8192; - if (is_random) { - file_data->rand_read_buff = buffer; - file_data->rand_read_buff_len = buffer_len; - } else { - file_data->seq_read_buff = buffer; - file_data->seq_read_buff_len = buffer_len; - } - } - if ( junky_offset == 8192 ) { /* * We're at the beginning of one of the 16-byte blobs, @@ -469,13 +454,20 @@ } /* + * Clean the selected buffer to prepare for reading the record. + */ + ws_buffer_clean(buffer); + + /* * Read the record length. */ - if ( !wtap_read_bytes( fh, buffer, 4, err, err_info ) ) + ws_buffer_assure_space(buffer, 4); + if ( !wtap_read_bytes( fh, ws_buffer_end_ptr(buffer), 4, err, err_info ) ) return -1; + ws_buffer_increase_length(buffer, 4); total_read += 4; - left = pntoh32(buffer + K12_RECORD_LEN); + left = pntoh32(ws_buffer_start_ptr(buffer) + K12_RECORD_LEN); #ifdef DEBUG_K12 actual_len = left; #endif @@ -501,22 +493,6 @@ return -1; } - /* - * XXX - calculate the lowest power of 2 >= left, rather than just - * looping. - */ - while (left > buffer_len) { - buffer = (uint8_t*)g_realloc(buffer,buffer_len*=2); - if (is_random) { - file_data->rand_read_buff = buffer; - file_data->rand_read_buff_len = buffer_len; - } else { - file_data->seq_read_buff = buffer; - file_data->seq_read_buff_len = buffer_len; - } - } - - writep = buffer + 4; left -= 4; /* Read the rest of the record. */ @@ -528,8 +504,10 @@ * The next 16-byte blob is past the end of this record. * Just read the rest of the record. */ - if ( !wtap_read_bytes( fh, writep, left, err, err_info ) ) + ws_buffer_assure_space(buffer, left); + if ( !wtap_read_bytes( fh, ws_buffer_end_ptr(buffer), left, err, err_info ) ) return -1; + ws_buffer_increase_length(buffer, left); total_read += left; break; } else { @@ -537,11 +515,12 @@ * The next 16-byte blob is part of this record. * Read up to the blob. */ - if ( !wtap_read_bytes( fh, writep, junky_offset, err, err_info ) ) + ws_buffer_assure_space(buffer, junky_offset); + if ( !wtap_read_bytes( fh, ws_buffer_end_ptr(buffer), junky_offset, err, err_info ) ) return -1; + ws_buffer_increase_length(buffer, junky_offset); total_read += junky_offset; - writep += junky_offset; /* * Skip the blob. @@ -556,7 +535,10 @@ } while(left); - K12_HEX_ASCII_DUMP(5,file_offset, "GOT record", buffer, actual_len); +#ifdef DEBUG_K12 + ws_assert(actual_len == ws_buffer_length(buffer)); +#endif + K12_HEX_ASCII_DUMP(5,file_offset, "GOT record", ws_buffer_start_ptr(buffer), ws_buffer_length(buffer)); return total_read; } @@ -575,8 +557,8 @@ } static bool -process_packet_data(wtap_rec *rec, Buffer *target, uint8_t *buffer, - unsigned record_len, k12_t *k12, int *err, char **err_info) +process_packet_data(wtap_rec *rec, Buffer *target, Buffer *k12_rec, + k12_t *k12, int *err, char **err_info) { uint32_t type; unsigned buffer_offset; @@ -585,6 +567,8 @@ uint32_t extra_len; uint32_t src_id; k12_src_desc_t* src_desc; + uint8_t *buffer = ws_buffer_start_ptr(k12_rec); + unsigned record_len = (unsigned)ws_buffer_length(k12_rec); type = pntoh32(buffer + K12_RECORD_TYPE); buffer_offset = (type == K12_REC_D0020) ? K12_PACKET_FRAME_D0020 : K12_PACKET_FRAME; @@ -675,7 +659,7 @@ static bool k12_read(wtap *wth, wtap_rec *rec, Buffer *buf, int *err, char **err_info, int64_t *data_offset) { k12_t *k12 = (k12_t *)wth->priv; k12_src_desc_t* src_desc; - uint8_t* buffer; + Buffer* buffer; int64_t offset; int len; uint32_t type; @@ -712,10 +696,10 @@ } k12->num_of_records--; - buffer = k12->seq_read_buff; + buffer = &k12->seq_read_buff; - type = pntoh32(buffer + K12_RECORD_TYPE); - src_id = pntoh32(buffer + K12_RECORD_SRC_ID); + type = pntoh32(ws_buffer_start_ptr(buffer) + K12_RECORD_TYPE); + src_id = pntoh32(ws_buffer_start_ptr(buffer) + K12_RECORD_SRC_ID); if ( ! (src_desc = (k12_src_desc_t*)g_hash_table_lookup(k12->src_by_id,GUINT_TO_POINTER(src_id))) ) { @@ -735,13 +719,13 @@ } while ( ((type & K12_MASK_PACKET) != K12_REC_PACKET && (type & K12_MASK_PACKET) != K12_REC_D0020) || !src_id || !src_desc ); - return process_packet_data(rec, buf, buffer, (unsigned)len, k12, err, err_info); + return process_packet_data(rec, buf, buffer, k12, err, err_info); } static bool k12_seek_read(wtap *wth, int64_t seek_off, wtap_rec *rec, Buffer *buf, int *err, char **err_info) { k12_t *k12 = (k12_t *)wth->priv; - uint8_t* buffer; + Buffer* buffer; int len; bool status; @@ -763,9 +747,9 @@ return false; } - buffer = k12->rand_read_buff; + buffer = &k12->rand_read_buff; - status = process_packet_data(rec, buf, buffer, (unsigned)len, k12, err, err_info); + status = process_packet_data(rec, buf, buffer, k12, err, err_info); K12_DBG(5,("k12_seek_read: DONE OK")); @@ -780,10 +764,9 @@ fd->num_of_records = 0; fd->src_by_name = g_hash_table_new(g_str_hash,g_str_equal); fd->src_by_id = g_hash_table_new(g_direct_hash,g_direct_equal); - fd->seq_read_buff = NULL; - fd->seq_read_buff_len = 0; - fd->rand_read_buff = NULL; - fd->rand_read_buff_len = 0; + ws_buffer_init(&fd->seq_read_buff, 2048); + ws_buffer_init(&fd->rand_read_buff, 2048); + // Buffers default to SMALL_BUFFER_SIZE (2048) given smaller values ws_buffer_init(&(fd->extra_info), 100); @@ -805,8 +788,8 @@ g_hash_table_foreach_remove(fd->src_by_name,destroy_srcdsc,NULL); g_hash_table_destroy(fd->src_by_name); ws_buffer_free(&(fd->extra_info)); - g_free(fd->seq_read_buff); - g_free(fd->rand_read_buff); + ws_buffer_free(&fd->seq_read_buff); + ws_buffer_free(&fd->rand_read_buff); g_free(fd); } @@ -825,7 +808,7 @@ wtap_open_return_val k12_open(wtap *wth, int *err, char **err_info) { k12_src_desc_t* rec; uint8_t header_buffer[K12_FILE_HDR_LEN]; - uint8_t* read_buffer; + const uint8_t* read_buffer; uint32_t type; long offset; long len; @@ -928,7 +911,7 @@ return WTAP_OPEN_ERROR; } - read_buffer = file_data->seq_read_buff; + read_buffer = ws_buffer_start_ptr(&file_data->seq_read_buff); rec_len = pntoh32( read_buffer + K12_RECORD_LEN ); if (rec_len < K12_RECORD_TYPE + 4) { @@ -1278,7 +1261,7 @@ } static bool k12_dump(wtap_dumper *wdh, const wtap_rec *rec, - const uint8_t *pd, int *err, char **err_info _U_) { + const uint8_t *pd, int *err, char **err_info) { const union wtap_pseudo_header *pseudo_header = &rec->rec_header.packet_header.pseudo_header; k12_dump_t *k12 = (k12_dump_t *)wdh->priv; uint32_t len; @@ -1294,7 +1277,7 @@ uint32_t datum_2; uint64_t ts; - uint8_t frame[0x1fc0]; + uint8_t frame[K12_RECORD_SIZE - K12_PACKET_FRAME]; } record; } obj; @@ -1313,6 +1296,18 @@ return false; } + /* + * This is the maximum size record the current implementation can write. + * We support reading multi-page records large than this in this format. + */ + if (rec->rec_header.packet_header.caplen > sizeof obj.record.frame) { + *err = WTAP_ERR_UNWRITABLE_REC_DATA; + *err_info = ws_strdup_printf("k12: packet length %u > maximum %zu", + rec->rec_header.packet_header.caplen, + sizeof obj.record.frame); + return false; + } + if (k12->num_of_records == 0) { k12_t* file_data = (k12_t*)pseudo_header->k12.stuff; GHashTableIter iter; @@ -1326,8 +1321,8 @@ } } } - obj.record.len = 0x20 + rec->rec_header.packet_header.caplen; - obj.record.len += (obj.record.len % 4) ? 4 - obj.record.len % 4 : 0; + obj.record.len = K12_PACKET_FRAME + rec->rec_header.packet_header.caplen; + obj.record.len = WS_ROUNDUP_4(obj.record.len); len = obj.record.len; diff -Nru wireshark-4.4.16/wiretap/log3gpp.c wireshark-4.4.18/wiretap/log3gpp.c --- wireshark-4.4.16/wiretap/log3gpp.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/log3gpp.c 2026-08-12 17:19:13.000000000 +0000 @@ -303,7 +303,7 @@ rec->rec_header.packet_header.caplen = data_chars/2 + stub_offset; /********************************/ /* Copy packet data into buffer */ - for (n=0; n <= data_chars; n+=2) + for (n=0; n < (data_chars & ~1); n+=2) { frame_buffer[stub_offset + n/2] = (hex_from_char(linebuff[dollar_offset+n]) << 4) | hex_from_char(linebuff[dollar_offset+n+1]); @@ -419,7 +419,7 @@ { /********************************/ /* Copy packet data into buffer */ - for (n=0; n <= data_chars; n+=2) + for (n=0; n < (data_chars & ~1); n+=2) { frame_buffer[stub_offset + n/2] = (hex_from_char(linebuff[dollar_offset+n]) << 4) | hex_from_char(linebuff[dollar_offset+n+1]); diff -Nru wireshark-4.4.16/wiretap/logcat.c wireshark-4.4.18/wiretap/logcat.c --- wireshark-4.4.16/wiretap/logcat.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/logcat.c 2026-08-12 17:19:13.000000000 +0000 @@ -10,6 +10,9 @@ #include +#include +#include + #include "wtap-int.h" #include "file_wrappers.h" @@ -136,24 +139,28 @@ return 0; } -int logcat_exported_pdu_length(const uint8_t *pd) { - const uint16_t *tag; - const uint16_t *tag_length; - int length = 0; - - tag = (const uint16_t *)(const void *) pd; - - while(GINT16_FROM_BE(*tag)) { - tag_length = (const uint16_t *)(const void *) (pd + 2); - length += 2 + 2 + GINT16_FROM_BE(*tag_length); - - pd += 2 + 2 + GINT16_FROM_BE(*tag_length); - tag = (const uint16_t *)(const void *) pd; +bool logcat_exported_pdu_length(const uint8_t *pd, unsigned caplen, unsigned *length) { + /* XXX - There's nothing logcat specific here; make this a generic fxn? */ + const uint8_t * const pd_end = pd + caplen; + uint16_t tag_length; + + *length = 0; + /* The last tag must be a EXP_PDU_TAG_END_OF_OPT (0) and have length 0. + * If we reach the end of the length first, that's bogus. */ + while(pd + 4 < pd_end) { + if (pntoh16(pd) == EXP_PDU_TAG_END_OF_OPT) { + /* OTOH, we do not bother verifying that the length of the + * END_OF_OPT TLV is 0, even though it should be. */ + *length += 2 + 2; + return true; + } + tag_length = pntoh16(pd + 2); + if (ckd_add(length, *length, 4 + tag_length)) + return false; + pd += 2 + 2 + tag_length; } - length += 2 + 2; - - return length; + return false; } static bool logcat_read_packet(struct logcat_phdr *logcat, FILE_T fh, @@ -319,7 +326,7 @@ const wtap_rec *rec, const uint8_t *pd, int *err, char **err_info _U_) { - int caplen; + uint32_t caplen; /* We can only write packet records. */ if (rec->rec_type != REC_TYPE_PACKET) { @@ -340,11 +347,14 @@ /* Skip EXPORTED_PDU*/ if (wdh->file_encap == WTAP_ENCAP_WIRESHARK_UPPER_PDU) { - int skipped_length; + unsigned skipped_length; - skipped_length = logcat_exported_pdu_length(pd); + if (!logcat_exported_pdu_length(pd, caplen, &skipped_length) || + ckd_sub(&caplen, caplen, skipped_length)) { + *err = WTAP_ERR_BAD_FILE; + return false; + } pd += skipped_length; - caplen -= skipped_length; } if (!wtap_dump_file_write(wdh, pd, caplen, err)) diff -Nru wireshark-4.4.16/wiretap/logcat.h wireshark-4.4.18/wiretap/logcat.h --- wireshark-4.4.16/wiretap/logcat.h 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/logcat.h 2026-08-12 17:19:13.000000000 +0000 @@ -47,7 +47,17 @@ wtap_open_return_val logcat_open(wtap *wth, int *err, char **err_info); -int logcat_exported_pdu_length(const uint8_t *pd); +/** + * @brief Calculate the length of a PDU (Protocol Data Unit) in a Logcat packet. + * + * This function calculates the total length of a PDU by iterating through the tags and their lengths. + * + * @param pd Pointer to the beginning of the PDU data. + * @param caplen The remaining length of the packet data, i.e. the size of pd. + * @param length The calculated length of the PDU. + * @return Whether the function succeeded. + */ +bool logcat_exported_pdu_length(const uint8_t *pd, unsigned caplen, unsigned *length); #endif /* diff -Nru wireshark-4.4.16/wiretap/logcat_text.c wireshark-4.4.18/wiretap/logcat_text.c --- wireshark-4.4.16/wiretap/logcat_text.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/logcat_text.c 2026-08-12 17:19:13.000000000 +0000 @@ -434,7 +434,7 @@ const uint8_t *pd, int *err, char **err_info) { char *buf; - int length; + unsigned length; char priority; const struct logger_entry *log_entry; const struct logger_entry_v2 *log_entry_v2; @@ -471,22 +471,32 @@ switch (wdh->file_encap) { case WTAP_ENCAP_WIRESHARK_UPPER_PDU: { - int skipped_length; + unsigned skipped_length; - skipped_length = logcat_exported_pdu_length(pd); + length = rec->rec_header.packet_header.caplen; + if (!logcat_exported_pdu_length(pd, length, &skipped_length) || + ckd_sub(&length, length, skipped_length)) { + *err = WTAP_ERR_BAD_FILE; + return false; + } pd += skipped_length; - if (!wtap_dump_file_write(wdh, (const char*) pd, rec->rec_header.packet_header.caplen - skipped_length, err)) { + if (!wtap_dump_file_write(wdh, (const char*) pd, length, err)) { return false; } } break; case WTAP_ENCAP_LOGCAT: - /* Skip EXPORTED_PDU*/ + length = rec->rec_header.packet_header.caplen; if (wdh->file_encap == WTAP_ENCAP_WIRESHARK_UPPER_PDU) { - int skipped_length; + /* Skip EXPORTED_PDU - XXX - This is unreachable. */ + unsigned skipped_length; - skipped_length = logcat_exported_pdu_length(pd); + if (!logcat_exported_pdu_length(pd, length, &skipped_length) || + ckd_sub(&length, length, skipped_length)) { + *err = WTAP_ERR_BAD_FILE; + return false; + } pd += skipped_length; logcat_version = buffered_detect_version(pd); diff -Nru wireshark-4.4.16/wiretap/ngsniffer.c wireshark-4.4.18/wiretap/ngsniffer.c --- wireshark-4.4.16/wiretap/ngsniffer.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/ngsniffer.c 2026-08-12 17:19:13.000000000 +0000 @@ -852,7 +852,7 @@ case 2: if (process_rec_header2_v2(wth, buffer, - rec_length_remaining, err, err_info) < 0) + bytes_to_read, err, err_info) < 0) return -1; break; @@ -860,7 +860,7 @@ case 4: case 5: if (process_rec_header2_v145(wth, buffer, - rec_length_remaining, maj_vers, err, err_info) < 0) + bytes_to_read, maj_vers, err, err_info) < 0) return -1; break; } diff -Nru wireshark-4.4.16/wiretap/pcapng.c wireshark-4.4.18/wiretap/pcapng.c --- wireshark-4.4.16/wiretap/pcapng.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/pcapng.c 2026-08-12 17:19:13.000000000 +0000 @@ -907,6 +907,9 @@ break; case NFLX_OPT_TYPE_TCPINFO: ws_debug("BBLog tcpinfo of length: %u", length); + if (length < 2 * sizeof(uint64_t)) { + return false; + } if (wblock->type == BLOCK_TYPE_CB_COPY) { ws_buffer_assure_space(wblock->frame_buffer, length); wblock->rec->rec_header.custom_block_header.length = length + 4; diff -Nru wireshark-4.4.16/wiretap/rtpdump.c wireshark-4.4.18/wiretap/rtpdump.c --- wireshark-4.4.16/wiretap/rtpdump.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/rtpdump.c 2026-08-12 17:19:13.000000000 +0000 @@ -290,7 +290,11 @@ offset = g_ntohl(offset); /* Set length to remaining length of packet data */ - length -= hdr_len; + if (ckd_sub(&length, length, hdr_len)) { + *err = WTAP_ERR_BAD_FILE; + *err_info = ws_strdup("rtpdump: total length should include 8-byte header"); + return false; + } ws_buffer_append_buffer(buf, &priv->epdu_headers); if (plen == 0) { @@ -309,8 +313,10 @@ ts.nsecs = (offset % 1000) * 1000000; nstime_sum(&rec->ts, &priv->start_time, &ts); rec->presence_flags |= WTAP_HAS_TS | WTAP_HAS_CAP_LEN; - rec->rec_header.packet_header.caplen = epdu_len + plen; - rec->rec_header.packet_header.len = epdu_len + length; + /* The result lengths cannot overflow as they are 32-bit, the + * values in the rtpdump header are 16-bit, and epdu_len is small. */ + rec->rec_header.packet_header.caplen = epdu_len + length; + rec->rec_header.packet_header.len = epdu_len + plen; rec->rec_type = REC_TYPE_PACKET; return wtap_read_packet_bytes(fh, buf, length, err, err_info); diff -Nru wireshark-4.4.16/wiretap/wtap.c wireshark-4.4.18/wiretap/wtap.c --- wireshark-4.4.16/wiretap/wtap.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wiretap/wtap.c 2026-08-12 17:19:13.000000000 +0000 @@ -1507,7 +1507,7 @@ const char * wtap_strerror(int err) { - static char errbuf[128]; + static WS_THREAD_LOCAL char errbuf[128]; unsigned int wtap_errlist_index; if (err < 0) { diff -Nru wireshark-4.4.16/wsutil/eax.c wireshark-4.4.18/wsutil/eax.c --- wireshark-4.4.16/wsutil/eax.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wsutil/eax.c 2026-08-12 17:19:13.000000000 +0000 @@ -15,21 +15,21 @@ /* Use libgcrypt for cipher libraries. */ #include +#include + typedef struct { uint8_t L[EAX_SIZEOF_KEY]; uint8_t D[EAX_SIZEOF_KEY]; uint8_t Q[EAX_SIZEOF_KEY]; } eax_s; -static eax_s instance; - /* these are defined as macros so they'll be easy to redo in assembly if desired */ #define BLK_CPY(dst, src) { memcpy(dst, src, EAX_SIZEOF_KEY); } #define BLK_XOR(dst, src) { int z; for (z=0; z < EAX_SIZEOF_KEY; z++) dst[z] ^= src[z]; } static void Dbl(uint8_t *out, const uint8_t *in); -static void CTR(const uint8_t *ws, uint8_t *pK, uint8_t *pN, uint16_t SizeN); -static void CMAC(uint8_t *pK, uint8_t *ws, const uint8_t *pN, uint16_t SizeN); -static void dCMAC(uint8_t *pK, uint8_t *ws, const uint8_t *pN, uint16_t SizeN, const uint8_t *pC, uint16_t SizeC); +static void CTR(const uint8_t *ws, uint8_t *pK, uint8_t *pN, uint32_t SizeN); +static bool CMAC(const eax_s *instance, uint8_t *pK, uint8_t *ws, const uint8_t *pN, uint32_t SizeN); +static bool dCMAC(const eax_s *instance, uint8_t *pK, uint8_t *ws, const uint8_t *pN, uint32_t SizeN, const uint8_t *pC, uint32_t SizeC); void AesEncrypt(unsigned char msg[EAX_SIZEOF_KEY], unsigned char key[EAX_SIZEOF_KEY]); /*! @@ -50,6 +50,7 @@ uint32_t SizeN, uint32_t SizeK, uint32_t SizeC, MAC_T *pMac, uint8_t Mode) { + eax_s instance; uint8_t wsn[EAX_SIZEOF_KEY]; uint8_t wsc[EAX_SIZEOF_KEY]; int i; @@ -68,9 +69,13 @@ /* first copy the nonce into our working space */ BLK_CPY(wsn, instance.D); if (Mode == EAX_MODE_CLEARTEXT_AUTH) { - dCMAC(pK, wsn, pN, SizeN, pC, SizeC); + if (!dCMAC(&instance, pK, wsn, pN, SizeN, pC, SizeC)) { + return false; + } } else { - CMAC(pK, wsn, pN, SizeN); + if (!CMAC(&instance, pK, wsn, pN, SizeN)) { + return false; + } } /* * In authentication mode the inputs are: pN, pK (and associated sizes), @@ -93,7 +98,7 @@ { /* first copy the nonce into our working space */ BLK_CPY(wsc, instance.Q); - CMAC(pK, wsc, pC, SizeC); + CMAC(&instance, pK, wsc, pC, SizeC); BLK_XOR(wsc, wsn); } if (memcmp(pMac, &wsc[EAX_SIZEOF_KEY-sizeof(*pMac)], sizeof(*pMac)) == 0) @@ -121,26 +126,30 @@ out[0] ^= 0x87; } -static void CMAC(uint8_t *pK, uint8_t *ws, const uint8_t *pN, uint16_t SizeN) +static bool CMAC(const eax_s *instance, uint8_t *pK, uint8_t *ws, const uint8_t *pN, uint32_t SizeN) { - dCMAC(pK, ws, pN, SizeN, NULL, 0); + return dCMAC(instance, pK, ws, pN, SizeN, NULL, 0); } -static void dCMAC(uint8_t *pK, uint8_t *ws, const uint8_t *pN, uint16_t SizeN, const uint8_t *pC, uint16_t SizeC) +static bool dCMAC(const eax_s *instance, uint8_t *pK, uint8_t *ws, const uint8_t *pN, uint32_t SizeN, const uint8_t *pC, uint32_t SizeC) { gcry_cipher_hd_t cipher_hd; uint8_t *work; uint8_t *ptr; - uint16_t SizeT = SizeN + SizeC; - uint16_t worksize = SizeT; + uint32_t SizeT; + size_t worksize; - /* worksize must be an integral multiple of 16 */ - if (SizeT & 0xf) { - worksize += 0x10 - (worksize & 0xf); + if (ckd_add(&SizeT, SizeN, SizeC)) { + return false; } + + /* worksize must be an integral multiple of 16 */ + worksize = WS_ROUNDUP_16(SizeT); + /* WS_ROUNDUP_16 can "round up" to 0, but then g_malloc will + * safely return NULL and we'll return false. */ work = (uint8_t *)g_malloc(worksize); if (work == NULL) { - return; + return false; } memcpy(work, pN, SizeN); if (pC != NULL) { @@ -155,39 +164,39 @@ for (ptr = &work[SizeT+1]; ptr <= &work[worksize-1]; ptr++) *ptr = 0; ptr= &work[worksize-0x10]; - BLK_XOR(ptr, instance.Q); + BLK_XOR(ptr, instance->Q); } else { ptr = &work[worksize-0x10]; - BLK_XOR(ptr, instance.D); + BLK_XOR(ptr, instance->D); } /* open the cipher */ if (gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC,0)){/* GCRY_CIPHER_CBC_MAC)) { */ g_free(work); - return; + return false; } if (gcry_cipher_setkey(cipher_hd, pK, EAX_SIZEOF_KEY)) { g_free(work); gcry_cipher_close(cipher_hd); - return; + return false; } if (gcry_cipher_setiv(cipher_hd, ws, EAX_SIZEOF_KEY)) { g_free(work); gcry_cipher_close(cipher_hd); - return; + return false; } if (gcry_cipher_encrypt(cipher_hd, work, worksize, work, worksize)) { g_free(work); gcry_cipher_close(cipher_hd); - return; + return false; } memcpy(ws, ptr, EAX_SIZEOF_KEY); g_free(work); gcry_cipher_close(cipher_hd); - return; + return true; } -static void CTR(const uint8_t *ws, uint8_t *pK, uint8_t *pN, uint16_t SizeN) +static void CTR(const uint8_t *ws, uint8_t *pK, uint8_t *pN, uint32_t SizeN) { gcry_cipher_hd_t cipher_hd; uint8_t ctr[EAX_SIZEOF_KEY]; diff -Nru wireshark-4.4.16/wsutil/filesystem.c wireshark-4.4.18/wsutil/filesystem.c --- wireshark-4.4.16/wsutil/filesystem.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wsutil/filesystem.c 2026-08-12 17:19:13.000000000 +0000 @@ -2275,7 +2275,7 @@ file_open_error_message(int err, bool for_writing) { const char *errmsg; - static char errmsg_errno[1024+1]; + static WS_THREAD_LOCAL char errmsg_errno[1024+1]; switch (err) { @@ -2380,7 +2380,7 @@ file_write_error_message(int err) { const char *errmsg; - static char errmsg_errno[1024+1]; + static WS_THREAD_LOCAL char errmsg_errno[1024+1]; switch (err) { diff -Nru wireshark-4.4.16/wsutil/version_info.c wireshark-4.4.18/wsutil/version_info.c --- wireshark-4.4.16/wsutil/version_info.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wsutil/version_info.c 2026-08-12 17:19:13.000000000 +0000 @@ -339,15 +339,19 @@ * though the MSVC compiler toolset in VS2017 delivers many new * features and conformance improvements it is a minor version, * compatible update from 14.00 in VS2015 to 14.10 in VS2017. + * + * https://learn.microsoft.com/en-us/cpp/overview/compiler-versions */ #if COMPILER_MINOR_VERSION < 10 #define VS_VERSION "2015" #elif COMPILER_MINOR_VERSION < 20 #define VS_VERSION "2017" #elif COMPILER_MINOR_VERSION < 30 - #define VS_VERSION "2019" - #else + #define VS_VERSION "2019" + #elif COMPILER_MINOR_VERSION < 50 #define VS_VERSION "2022" + #else + #define VS_VERSION "2026" #endif #else /* diff -Nru wireshark-4.4.16/wsutil/ws_strptime.c wireshark-4.4.18/wsutil/ws_strptime.c --- wireshark-4.4.16/wsutil/ws_strptime.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wsutil/ws_strptime.c 2026-08-12 17:19:13.000000000 +0000 @@ -658,6 +658,8 @@ case '-': neg = 1; break; + case '\0': + goto out; default: namedzone: bp = zname; diff -Nru wireshark-4.4.16/wsutil/wsgcrypt.c wireshark-4.4.18/wsutil/wsgcrypt.c --- wireshark-4.4.16/wsutil/wsgcrypt.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wsutil/wsgcrypt.c 2026-08-12 17:19:13.000000000 +0000 @@ -109,7 +109,7 @@ goto out; } - /* convert plain text sexp to mpi format */ + /* convert plaintext sexp to mpi format */ text = gcry_sexp_nth_mpi(s_plain, 0, 0); if (! text) { *err = g_strdup("can't convert sexp to mpi"); @@ -132,7 +132,7 @@ goto out; } - /* write plain text to newly allocated buffer */ + /* write plaintext to newly allocated buffer */ rc = gcry_mpi_print(GCRYMPI_FMT_USG, data, len, &decr_len, text); if (rc != 0) { *err = ws_strdup_printf("can't print decr data to mpi (size %zu):%s", decr_len, gcry_strerror(rc)); diff -Nru wireshark-4.4.16/wsutil/wsjson.c wireshark-4.4.18/wsutil/wsjson.c --- wireshark-4.4.16/wsutil/wsjson.c 2026-05-19 16:13:03.000000000 +0000 +++ wireshark-4.4.18/wsutil/wsjson.c 2026-08-12 17:19:13.000000000 +0000 @@ -90,13 +90,11 @@ static jsmntok_t *json_get_next_object(jsmntok_t *cur) { - int i; - jsmntok_t *next = cur+1; - - for (i = 0; i < cur->size; i++) { - next = json_get_next_object(next); + for (size_t tokens_remaining = 1; tokens_remaining > 0; tokens_remaining--) { + tokens_remaining += cur->size; + cur++; } - return next; + return cur; } jsmntok_t *json_get_object(const char *buf, jsmntok_t *parent, const char *name)