diff --git a/src/etc/inc/interfaces.lib.inc b/src/etc/inc/interfaces.lib.inc index 92a7b30cf..c2b4d3047 100644 --- a/src/etc/inc/interfaces.lib.inc +++ b/src/etc/inc/interfaces.lib.inc @@ -551,34 +551,35 @@ function get_interface_list($only_active = false, $include_dmesg = false) /* list of virtual interface types */ $vfaces = [ - '_stf', - '_vip', - '_vlan', - '_wlan', - 'bridge', - 'carp', - 'enc', - 'faith', - 'gif', - 'gre', - 'ipfw', - 'l2tp', - 'lagg', - 'lo', - 'ng', - 'ovpnc', - 'ovpns', - 'pflog', - 'pfsync', - 'plip', - 'ppp', - 'pppoe', - 'pptp', - 'qinq', - 'sl', - 'tap', - 'tun', - 'vlan', + '_stf', + '_vip', + '_vlan', + '_wlan', + 'bridge', + 'carp', + 'enc', + 'faith', + 'gif', + 'gre', + 'ipfw', + 'ipsec', + 'l2tp', + 'lagg', + 'lo', + 'ng', + 'ovpnc', + 'ovpns', + 'pflog', + 'pfsync', + 'plip', + 'ppp', + 'pppoe', + 'pptp', + 'qinq', + 'sl', + 'tap', + 'tun', + 'vlan', ]; $ifnames_wlan = legacy_interface_listget('wlan'); diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc index 1b93879b6..3ac623a23 100644 --- a/src/etc/inc/plugins.inc.d/ipsec.inc +++ b/src/etc/inc/plugins.inc.d/ipsec.inc @@ -214,8 +214,13 @@ function ipsec_devices() $devices = []; $names = []; - foreach (array_keys(ipsec_get_configured_vtis()) as $device) { - $names[$device] = null; + foreach (ipsec_get_configured_vtis() as $device => $details) { + $names[$device] = [ + 'descr' => sprintf('%s (%s)', $device, $details['descr']), + 'ifdescr' => sprintf('%s', $details['descr']), + 'section' => 'ipsec', + 'name' => $device, + ]; } $devices[] = [ @@ -227,7 +232,7 @@ function ipsec_devices() 'type' => 'ipsec', ]; - $devices[] = ['pattern' => '^enc', 'volatile' => true]; + $devices[] = ['pattern' => '^enc|^ipsec', 'volatile' => true]; return $devices; } diff --git a/src/etc/inc/plugins.inc.d/loopback.inc b/src/etc/inc/plugins.inc.d/loopback.inc index 417d12ec1..0bb9f0c29 100644 --- a/src/etc/inc/plugins.inc.d/loopback.inc +++ b/src/etc/inc/plugins.inc.d/loopback.inc @@ -69,7 +69,7 @@ function loopback_devices() 'pattern' => '^lo', 'volatile' => true, 'type' => 'loopback', - 'names' =>$names, + 'names' => $names, ]]; }