dani/pfsense-zabbix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix wan interface retrieval

Browse Source
This commit is contained in:
Ely Deckers 2022-02-19 13:41:55 +01:00
parent 5ccbd7fa59
commit 38f73ec622
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pfsense_zbx.php
View File

@ -293,6 +293,11 @@ class Util
return array_merge(...$multi_dimensional_array); return array_merge(...$multi_dimensional_array);
} }
public static function array_zip(array $keys, array $values): array
{
return array_map(null, array_keys($keys), array_values($values));
}
public static function b2int(bool $b): int public static function b2int(bool $b): int
{ {
return (int)$b; return (int)$b;
@ -334,11 +339,11 @@ class PfzInterfaces
$interfaces = array_map(function ($interface) { $interfaces = array_map(function ($interface) {
list ($if_name, $description) = $interface; list ($if_name, $description) = $interface;
return [ return array_merge(
...PfEnv::get_interface_info($if_name), PfEnv::get_interface_info($if_name),
"description" => $description, ["description" => $description],
]; );
}, array_map(null, array_keys($if_descriptions), array_values($if_descriptions))); }, Util::array_zip(array_keys($if_descriptions), array_values($if_descriptions)));
return array_filter($interfaces, function ($iface_info_ext) { return array_filter($interfaces, function ($iface_info_ext) {
$has_gw = array_key_exists("gateway", $iface_info_ext); $has_gw = array_key_exists("gateway", $iface_info_ext);