(get_interface_list) Properly handle an interface not appearing in dmesg

c9e04ae0 · Per von Zweigbergk · 4870ff10 · c9e04ae0
Commit c9e04ae0 authored Aug 13, 2016 by Per von Zweigbergk
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

util.inc src/etc/inc/util.inc +6 -5

No files found.
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -948,12 +948,13 @@ function get_interface_list($only_active = false)
        }
        $dmesg_arr = array();
+        $toput['dmesg'] = null;
        exec("/sbin/dmesg |grep $ifname", $dmesg_arr);
-        preg_match_all("/<(.*?)>/i", $dmesg_arr[0], $dmesg);
+        if (count($dmesg_arr) > 0) {
-        if (isset($dmesg[1][0])) {
+            preg_match_all("/<(.*?)>/i", $dmesg_arr[0], $dmesg);
-            $toput['dmesg'] = $dmesg[1][0];
+            if (isset($dmesg[1][0])) {
-        } else {
+                $toput['dmesg'] = $dmesg[1][0];
-            $toput['dmesg'] = null;
+            }
        }
        $iflist[$ifname] = $toput;