From 025dca865f09c34ddc32e3e9de109133d2f4d687 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Feb 2026 10:30:53 -0500 Subject: [PATCH] feat: merge MacVendors.json with zm_utils, adding 39 new MAC prefixes Merge MAC vendor database from zm_utils into ZoneMinder. Adds entries for Reolink, Dahua, Hanwha, Buffalo, Google, Sagemcom, and many additional HikVision/Ubiquiti/Grandstream MACs. Sorted by vendor type for readability. Removes duplicates from zm_utils source. Preserves ZM-only Uniview and TP-Link entries. Keeps IC Realtime Dahua control mapping that zm_utils lost. Updates Vivotek with ePTZ control and normalizes D-Link type name. 34 -> 73 entries. Co-Authored-By: Claude Opus 4.6 --- misc/MacVendors.json | 105 +++++++++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 33 deletions(-) diff --git a/misc/MacVendors.json b/misc/MacVendors.json index 912091371..eec9d6d83 100644 --- a/misc/MacVendors.json +++ b/misc/MacVendors.json @@ -1,36 +1,75 @@ { - "000f7c": { "type": "ACTi", "control": "" }, - "00408c": { "type": "Axis", "control": "AxisV2", "vendor": "Axis" }, - "00626e": { "type": "Foscam", "control": "Foscam", "vendor": "Foscam" }, - "08a189": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "240f9b": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "2ca59c": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "98df82": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "4cf5dc": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "bcad28": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "bcbac2": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "bc5e33": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "c0517e": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "ecc89c": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd."}, - "20de88": { "type": "ICRealtime", "control": "Dahua", "vendor": "IC Realtime LLC"}, + "000f7c": { "type": "ACTi", "control": "" }, + "9c8ecd": { "type": "Amcrest", "control": "Amcrest_HTTP", "vendor": "Amcrest Technologies" }, + "a06032": { "type": "Amcrest", "control": "Amcrest_HTTP", "vendor": "Amcrest Technologies" }, + "001885": { "type": "Avigilon", "control": "", "vendor": "Avigilon Corporation" }, + "001f92": { "type": "Avigilon", "control": "", "vendor": "Avigilon Corporation" }, + "00408c": { "type": "Axis", "control": "AxisV2", "vendor": "Axis" }, + "68e1dc": { "type": "Buffalo", "control": "", "vendor": "Buffalo.Inc" }, + "28107b": { "type": "D-Link", "control": "", "vendor": "D-Link International" }, + "b0c554": { "type": "D-Link", "control": "", "vendor": "D-Link International" }, + "9c1463": { "type": "Dahua", "control": "Dahua", "vendor": "Zhejiang Dahua Technology Co., Ltd." }, + "e0508b": { "type": "Dahua", "control": "Dahua", "vendor": "Zhejiang Dahua Technology Co., Ltd." }, + "00626e": { "type": "Foscam", "control": "Foscam", "vendor": "Foscam" }, + "1c53f9": { "type": "Google", "control": "", "vendor": "Google, Inc" }, + "000b82": { "type": "Grandstream", "control": "Grandstream", "vendor": "Grandstream Networks Inc" }, + "c074ad": { "type": "Grandstream", "control": "Grandstream", "vendor": "Grandstream Networks Inc" }, + "e43022": { "type": "Hanwha", "control": "Hanwha", "vendor": "Hanwha Techwin Security Vietnam" }, + "040312": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "08a189": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "1012fb": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "142ffd": { "type": "Hikvision", "control": "HikVision", "vendor": "LT SECURITY INC" }, + "240f9b": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "244845": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "2857be": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "2ca59c": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "4447cc": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "44a642": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "4cbd8f": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "4cf5dc": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "5803fb": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "5c345b": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "686dbc": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "743fc2": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "807c62": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "80beaf": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "94e1ac": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "988b0a": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "98df82": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "acb92f": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "bc5e33": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "bc9b5e": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "bcad28": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "bcbac2": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "c0517e": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "c056e3": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "c06ded": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "c42f90": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "e0ca3c": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "e8a0ed": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "ecc89c": { "type": "HikVision", "control": "HikVision", "vendor": "Hangzhou Hikvision Digital Technology Co.,Ltd." }, + "20de88": { "type": "IC Realtime", "control": "Dahua", "vendor": "IC Realtime LLC" }, "0080f0": { "type": "Panasonic", "control": "" }, - "0002d1": { "type": "Vivotek", "control": "", "vendor": "Vivotek" }, - "7cdd90": { "type": "Wansview", "control": "" }, - "78a5dd": { "type": "Wansview", "control": "" }, - "9c8ecd": { "type": "Amcrest", "control": "Amcrest_HTTP", "vendor": "Amcrest Technologies" }, - "a06032": { "type": "Amcrest", "control": "Amcrest_HTTP", "vendor": "Amcrest Technologies" }, - "b827eb": { "type": "Pi", "control": "", "vendor": "Respberry Pi Trading Ltd" }, - "dca632": { "type": "Pi", "control": "", "vendor": "Respberry Pi Trading Ltd" }, - "28107b": { "type": "DLinkInternational", "control": "", "vendor": "D-Link International" }, - "b0c554": { "type": "DLinkInternational", "control": "", "vendor": "D-Link International" }, - "142ffd": { "type": "Hikvision", "control": "HikVision", "vendor": "LT SECURITY INC"}, - "000b82": { "type": "Grandstream", "control": "Grandstream", "vendor": "Grandstream Networks Inc"}, - "fcecda": { "type": "Ubiquiti", "control": "", "vendor": "Ubiquiti Networks Inc." }, - "001f92": { "type": "Avigilon", "control": "", "vendor": "Avigilon Corporation" }, - "001885": { "type": "Avigilon", "control": "", "vendor": "Avigilon Corporation" }, - "f0a731": { "type": "TP-Link", "control": "", "vendor": "TP-LINK TECHNOLOGIES CO.,LTD." }, - "48ea63": { "type": "Uniview", "control": "Uniview", "vendor": "Zhejiang Uniview Technologies Co.,Ltd." }, - "6cf17e": { "type": "Uniview", "control": "Uniview", "vendor": "Zhejiang Uniview Technologies Co.,Ltd." }, - "88263f": { "type": "Uniview", "control": "Uniview", "vendor": "Zhejiang Uniview Technologies Co.,Ltd." }, - "c47905": { "type": "Uniview", "control": "Uniview", "vendor": "Zhejiang Uniview Technologies Co.,Ltd." } + "b827eb": { "type": "Pi", "control": "", "vendor": "Respberry Pi Trading Ltd" }, + "dca632": { "type": "Pi", "control": "", "vendor": "Respberry Pi Trading Ltd" }, + "60fb00": { "type": "Reolink", "control": "Reolink", "vendor": "Reolink" }, + "683943": { "type": "Reolink", "control": "Reolink", "vendor": "Reolink" }, + "78669d": { "type": "Reolink", "control": "Reolink", "vendor": "Reolink" }, + "9c9561": { "type": "Reolink", "control": "Reolink", "vendor": "Reolink" }, + "c43cb0": { "type": "Reolink", "control": "Reolink", "vendor": "Reolink" }, + "ec71db": { "type": "Reolink", "control": "Reolink", "vendor": "Reolink" }, + "345d9e": { "type": "Sagemcom", "control": "", "vendor": "Sagemcom Broadband SAS" }, + "f0a731": { "type": "TP-Link", "control": "", "vendor": "TP-LINK TECHNOLOGIES CO.,LTD." }, + "602232": { "type": "Ubiquiti", "control": "", "vendor": "Ubiquiti Networks Inc." }, + "70a741": { "type": "Ubiquiti", "control": "", "vendor": "Ubiquiti Networks Inc." }, + "ac8ba9": { "type": "Ubiquiti", "control": "", "vendor": "Ubiquiti Networks Inc." }, + "f492bf": { "type": "Ubiquiti", "control": "", "vendor": "Ubiquiti Networks Inc." }, + "fcecda": { "type": "Ubiquiti", "control": "", "vendor": "Ubiquiti Networks Inc." }, + "48ea63": { "type": "Uniview", "control": "Uniview", "vendor": "Zhejiang Uniview Technologies Co.,Ltd." }, + "6cf17e": { "type": "Uniview", "control": "Uniview", "vendor": "Zhejiang Uniview Technologies Co.,Ltd." }, + "88263f": { "type": "Uniview", "control": "Uniview", "vendor": "Zhejiang Uniview Technologies Co.,Ltd." }, + "c47905": { "type": "Uniview", "control": "Uniview", "vendor": "Zhejiang Uniview Technologies Co.,Ltd." }, + "0002d1": { "type": "Vivotek", "control": "Vivotek ePTZ", "vendor": "Vivotek" }, + "78a5dd": { "type": "Wansview", "control": "" }, + "7cdd90": { "type": "Wansview", "control": "" } }