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

Merge pull request #3904 from laf/cipsec-delete

Browse Source
This commit is contained in:
Søren Rosiak
2016-07-31 17:46:15 +02:00
committed by GitHub
parent 2e960c8aaa 307ea075c8
commit 2489e70d8a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/polling/cipsec-tunnels.inc.php
View File

@ -13,6 +13,8 @@ foreach ($tunnels_db as $tunnel) {
$tunnels[$tunnel['peer_addr']] = $tunnel;
}
$valid_tunnels = array();
foreach ($ipsec_array as $index => $tunnel) {
$tunnel = array_merge($tunnel, $ike_array[$tunnel['cipSecTunIkeTunnelIndex']]);
@ -50,6 +52,7 @@ foreach ($ipsec_array as $index => $tunnel) {
if (!is_array($tunnels[$tunnel['cikeTunRemoteValue']]) && !empty($tunnel['cikeTunRemoteValue'])) {
$tunnel_id = dbInsert(array('device_id' => $device['device_id'], 'peer_addr' => $tunnel['cikeTunRemoteValue'], 'local_addr' => $tunnel['cikeTunLocalValue'], 'tunnel_name' => $tunnel['cikeTunLocalName']), 'ipsec_tunnels');
$valid_tunnels[] = $tunnel_id;
}
else {
foreach ($db_oids as $db_oid => $db_value) {
@ -57,6 +60,7 @@ foreach ($ipsec_array as $index => $tunnel) {
}
$updated = dbUpdate($db_update, 'ipsec_tunnels', '`tunnel_id` = ?', array($tunnels[$tunnel['cikeTunRemoteValue']]['tunnel_id']));
$valid_tunnels[] = $tunnels[$tunnel['cikeTunRemoteValue']]['tunnel_id'];
}
if (is_numeric($tunnel['cipSecTunHcInOctets']) && is_numeric($tunnel['cipSecTunHcInDecompOctets'])
@ -104,4 +108,12 @@ foreach ($ipsec_array as $index => $tunnel) {
}
}//end foreach
if (is_array($valid_tunnels)) {
d_echo($valid_tunnels);
if (empty($valid_tunnels)) {
$valid_tunnels = array(0);
}
dbDelete('ipsec_tunnels', "`tunnel_id` NOT IN (".implode(',', $valid_tunnels).") AND `device_id`=?", array($device['device_id']));
}
unset($rrd_file,$rrd_create,$fields,$oids, $data, $data_array, $oid, $tunnel);