ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Midly improve dlink support. Fix for probing an undefined array

pull/3750/head
Isaac Connor 2023-08-08 18:34:44 -04:00
parent 0afa383c38
commit 00bd2259a3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/includes/monitor_probe.php
View File

@ -531,18 +531,20 @@ function probeFoscam($ip, $username, $password) {
} }
function probeDLinkInternational($ip, $username, $password) { function probeDLinkInternational($ip, $username, $password) {
if ($username === null) $username = 'root'; if ($username === null) $username = 'admin';
if ($password === null) $password = ''; if ($password === null) $password = '';
$cameras = []; $cameras = [];
$camera = array( $camera = array(
'ip' => $ip, 'ip' => $ip,
'Name' => 'DLink Camera', 'Name' => 'D-Link Camera',
'Manufacturer' => 'D-Link', 'Manufacturer' => 'D-Link',
'mjpegstream' => 'http://'.$username.':'.$password.'@'.$ip.'/video.cgi', 'mjpegstream' => 'http://'.$username.':'.$password.'@'.$ip.'/image/jpeg.cgi',
'monitor' => array( 'monitor' => array(
'Manufacturer' => 'D-Link', 'Manufacturer' => 'D-Link',
'Type' => 'Ffmpeg', 'Type' => 'Ffmpeg',
'Path' => 'http://'.$ip.'/video.cgi', 'Path' => 'rtsp://'.$username.':'.$password.'@'.$ip.'/live1.sdp',
'User' => $username,
'Pass' => $password,
'Host' => $ip, 'Host' => $ip,
'Width' => 640, 'Width' => 640,
'Height' => 480, 'Height' => 480,
@ -844,6 +846,7 @@ function probeNetwork() {
continue; continue;
} }
$macRoot = str_replace(':', '', substr($mac, 0, 8)); $macRoot = str_replace(':', '', substr($mac, 0, 8));
if (!isset($cameras[$mac])) $cameras[$mac] = [];
#ZM\Debug("Got $macRoot from $mac"); #ZM\Debug("Got $macRoot from $mac");
if (isset($macBases[$macRoot])) { if (isset($macBases[$macRoot])) {
ZM\Debug("Have match for $macRoot $ip ".$macBases[$macRoot]['type']); ZM\Debug("Have match for $macRoot $ip ".$macBases[$macRoot]['type']);