mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing the mac/vendor database download from wireshark, updated file … (#15175)

Browse Source 
* fixing the mac/vendor database download from wireshark, updated file location and format

* fixing the formatting issues
This commit is contained in:
tarik
2023-07-31 20:16:52 -07:00
committed by GitHub
parent 843d0a4669
commit 3541a582bb
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/functions.php
+9 -4
View File
@@ -1182,7 +1182,8 @@ function mac_oui_to_database()
if ($lock->get()) {
echo 'Storing Mac OUI in the database' . PHP_EOL;
try {
$mac_oui_url = 'https://gitlab.com/wireshark/wireshark/-/raw/master/manuf';
$mac_oui_url = 'https://www.wireshark.org/download/automated/data/manuf';
//$mac_oui_url = 'https://gitlab.com/wireshark/wireshark/-/raw/master/manuf';
//$mac_oui_url_mirror = 'https://raw.githubusercontent.com/wireshark/wireshark/master/manuf';
echo ' -> Downloading ...' . PHP_EOL;
@@ -1197,12 +1198,12 @@ function mac_oui_to_database()
$length = strlen($entry[0]);
$prefix = strtolower(str_replace(':', '', $entry[0]));
$vendor = $entry[2];
$vendor = $entry[1];
if (is_array($entry) && count($entry) >= 3 && $length == 8) {
if (is_array($entry) && count($entry) >= 2 && $length == 8) {
// We have a standard OUI xx:xx:xx
$oui = $prefix;
} elseif (is_array($entry) && count($entry) >= 3 && $length == 20) {
} elseif (is_array($entry) && count($entry) >= 2 && $length == 20) {
// We have a smaller range (xx:xx:xx:X or xx:xx:xx:xx:X)
if (substr($prefix, -2) == '28') {
$oui = substr($prefix, 0, 7);
@@ -1230,6 +1231,10 @@ function mac_oui_to_database()
return 1;
}
} else {
echo 'Not able to acquire lock, skipping mac database update' . PHP_EOL;
return 1;
}
return 0;