ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

populate network interfaces list, rescan on change.

This commit is contained in:
Isaac Connor 2020-05-19 16:58:26 -04:00
parent cc01a04efc
commit 074e270e79
1 changed files with 57 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
web/skins/classic/views/onvifprobe.php
View File

@ -49,7 +49,7 @@ function execONVIF( $cmd ) {
function probeCameras($localIp) {
$cameras = array();
if ( $lines = @execONVIF('probe') ) {
if ( $lines = @execONVIF('probe 1.1,1.2'.(isset($_REQUEST['interface']) ? isset($_REQUEST['interface'] : '' )) ) {
foreach ( $lines as $line ) {
$line = rtrim($line);
if ( preg_match('|^(.+),(.+),\s\((.*)\)$|', $line, $matches) ) {
@ -64,6 +64,7 @@ function probeCameras($localIp) {
'SOAP' => $soapversion,
'ConfigURL' => $device_ep,
'ConfigOptions' => 'SOAP' . $soapversion,
'Notes' => '',
),
);
foreach ( preg_split('|,\s*|', $matches[3]) as $attr_val ) {
@ -72,10 +73,12 @@ function probeCameras($localIp) {
$camera['model'] = $tokens[2];
} else if ( $tokens[1] == 'name' ) {
$camera['monitor']['Name'] = $tokens[2];
} elseif ( $tokens[1] == 'location' ) {
} else if ( $tokens[1] == 'type' ) {
} else if ( $tokens[1] == 'location' or $tokens[1] == 'location/city' or $tokens[1] == 'location/country' ) {
$camera['monitor']['Notes'] .= $tokens[1].'='.$tokens[2]."\n";
// $camera['location'] = $tokens[2];
} else {
ZM\Logger::Debug('Unknown token ' . $tokens[1]);
ZM\Logger::Debug('Unknown token '.$tokens[1].' = '.$tokens[2]);
}
}
} // end foreach token
@ -165,6 +168,48 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
<p>
<?php echo translate('OnvifProbeIntro') ?>
</p>
<p><label for="interface"><?php echo translate('Interface') ?></label>
<?php
$interfaces = array();
$default_interface = null;
exec('ip link', $output, $status);
if ( $status ) {
$html_output = implode('<br/>', $output);
ZM\Error("Unable to list network interfaces, status is '$status'. Output was:<br/><br/>$html_output");
} else {
foreach ( $output as $line ) {
if ( preg_match('/^\d+: ([[:alnum:]]+):/', $line, $matches ) ) {
if ( $matches[1] != 'lo' ) {
$interfaces[$matches[1]] = $matches[1];
} else {
ZM\Logger::Debug("No match for $line");
}
}
}
}
$routes = array();
exec('ip route', $output, $status);
if ( $status ) {
$html_output = implode('<br/>', $output);
ZM\Error("Unable to list network interfaces, status is '$status'. Output was:<br/><br/>$html_output");
} else {
foreach ( $output as $line ) {
if ( preg_match('/^default via [.[:digit:]]+ dev ([[:alnum:]]+)/', $line, $matches) ) {
$default_interface = $matches[1];
} else if ( preg_match('/^([.\/[:digit:]]+) dev ([[:alnum:]]+)/', $line, $matches) ) {
$interfaces[$matches[2]] .= ' ' . $matches[1];
}
} # end foreach line of output
}
echo htmlSelect('interface', $interfaces,
(isset($_REQUEST['interface']) ? $_REQUEST['interface'] : $default_interface),
array('data-on-change-this'=>'changeInterface') );
?>
</p>
<div id="DetectedCameras">
<p>
<label for="probe"><?php echo translate('DetectedCameras') ?></label>
<?php echo htmlSelect('probe', $cameras, null, array('data-on-change-this'=>'configureButtons')); ?>
@ -180,6 +225,7 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
<label for="Password"><?php echo translate('Password') ?></label>
<input type="password" name="Password" data-on-change-this="configureButtons"/>
</p>
</div>
<div id="contentButtons">
<button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
<button type="button" name="nextBtn" data-on-click-this="gotoStep2" disabled="disabled"><?php echo translate('Next') ?></button>