WebSVN – ALCASAR – Diff – /web/acc/phpsysinfo/includes/os/class.Linux.inc.php

 class Linux extends OS
+{
     /**
      * Assoc array of all CPUs loads.
      */
-    protected $_cpu_loads;
+    private $_cpu_loads = null;
     /**
      * Machine
+     *
      * @return void
                 $machine .= ", BIOS ".$bios;
+            }
+        }
         if ($machine != "") {
-            $machine = trim(preg_replace("/^\/,?/", "", preg_replace("/ ?(To be filled by O\.E\.M\.|System manufacturer|System Product Name|Not Specified) ?/i", "", $machine)));
+            $machine = trim(preg_replace("/^\/,?/", "", preg_replace("/ ?(To be filled by O\.E\.M\.|System manufacturer|System Product Name|Not Specified|Default string) ?/i", "", $machine)));
+        }
         if (CommonFunctions::fileexists($filename="/etc/config/uLinux.conf") // QNAP detection
            && CommonFunctions::rfts($filename, $buf, 0, 4096, false)
            && preg_match("/^Rsync\sModel\s*=\s*QNAP/m", $buf)
+                }
+            }
             if (CommonFunctions::executeProgram($uname, '-m', $strBuf, PSI_DEBUG)) {
                 $result .= ' '.$strBuf;
+            }
-        } elseif (CommonFunctions::rfts('/proc/version', $strBuf, 1) &&  preg_match('/version\s+(\S+)/', $strBuf, $ar_buf)) {
+        } elseif (CommonFunctions::rfts('/proc/version', $strBuf, 1) && preg_match('/version\s+(\S+)/', $strBuf, $ar_buf)) {
             $result = $ar_buf[1];
             if (preg_match('/SMP/', $strBuf)) {
                 $result .= ' (SMP)';
+            }
+        }
                     $result .= ' [docker]';
                 } elseif (preg_match('/:\/system\.slice\/docker\-/m', $strBuf2)) {
                     $result .= ' [docker]';
+                }
+            }
-            if (CommonFunctions::rfts('/proc/version', $strBuf2, 1, 4096, false)
+            if (CommonFunctions::rfts('/proc/version', $strBuf2, 1, 4096, false)) {
-                && preg_match('/^Linux version [\d\.-]+-Microsoft/', $strBuf2)) {
+                if (preg_match('/^Linux version [\d\.-]+-Microsoft/', $strBuf2)) {
-                    $result .= ' [lxss]';
+                    $result .= ' [wsl]';
+                } elseif (preg_match('/^Linux version [\d\.-]+-microsoft-standard/', $strBuf2)) {
+                    $result .= ' [wsl2]';
+                }
+            }
             $this->sys->setKernel($result);
+        }
+    }
+    {
         if (is_null($this->_cpu_loads)) {
             $this->_cpu_loads = array();
             $cpu_tmp = array();
-            if (CommonFunctions::rfts('/proc/stat', $buf)) {
+            if (CommonFunctions::rfts('/proc/stat', $buf, 0, 4096, PSI_DEBUG && (PSI_OS != 'Android'))) {
                 if (preg_match_all('/^(cpu[0-9]*) (.*)/m', $buf, $matches, PREG_SET_ORDER)) {
                     foreach ($matches as $line) {
                         $cpu = $line[1];
                         $buf2 = $line[2];
+                }
                 // we need a second value, wait 1 second befor getting (< 1 second no good value will occour)
                 sleep(1);
-                if (CommonFunctions::rfts('/proc/stat', $buf)) {
+                if (CommonFunctions::rfts('/proc/stat', $buf, 0, 4096, PSI_DEBUG)) {
                     if (preg_match_all('/^(cpu[0-9]*) (.*)/m', $buf, $matches, PREG_SET_ORDER)) {
                         foreach ($matches as $line) {
                             $cpu = $line[1];
                             if (isset($cpu_tmp[$cpu])) {
                                 $buf2 = $line[2];
+        }
         if (isset($this->_cpu_loads[$cpuline])) {
             return $this->_cpu_loads[$cpuline];
         } else {
-            return 0;
+            return null;
+        }
+    }
     /**
      * CPU information
                     $booDevice = true;
                     continue;
+                }
                 if ($booDevice) {
                     $dev = new HWDevice();
-                    $dev->setName(preg_replace('/\([^\)]+\)\.$/', '', trim($strLine)));
+                    $dev->setName(preg_replace('/\(rev\s[^\)]+\)\.$/', '', trim($strLine)));
                     $this->sys->setPciDevices($dev);
 /*
                     list($strKey, $strValue) = preg_split('/: /', $strLine, 2);
                     if (!preg_match('/bridge/i', $strKey) && !preg_match('/USB/i ', $strKey)) {
                         $dev = new HWDevice();
-                        $dev->setName(preg_replace('/\([^\)]+\)\.$/', '', trim($strValue)));
+                        $dev->setName(preg_replace('/\(rev\s[^\)]+\)\.$/', '', trim($strValue)));
                         $this->sys->setPciDevices($dev);
+                    }
 */
                     $booDevice = false;
+                }
+                        }
                         $product = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/product');
                         if ($product!==null) {
                             $usbarray[$usbid]['product'] = $product;
+                        }
+                        $speed = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/speed');
+                        if ($product!==null) {
+                            $usbarray[$usbid]['speed'] = $speed;
+                        }
                         if (defined('PSI_SHOW_DEVICES_INFOS') && PSI_SHOW_DEVICES_INFOS
                            && defined('PSI_SHOW_DEVICES_SERIAL') && PSI_SHOW_DEVICES_SERIAL) {
                             $serial = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/serial');
                             if (($serial!==null) && !preg_match('/\W/', $serial)) {
                                 $usbarray[$usbid]['serial'] = $serial;
+                    }
+                }
+            }
+        }
-        if ((count($usbarray) == 0) && CommonFunctions::rfts('/proc/bus/usb/devices', $bufr, 0, 4096, false)) {
+        if ((count($usbarray) == 0) && CommonFunctions::rfts('/proc/bus/usb/devices', $bufr, 0, 4096, false)) { //usb-devices
             $devnum = -1;
             $bufe = preg_split("/\n/", $bufr, -1, PREG_SPLIT_NO_EMPTY);
             foreach ($bufe as $buf) {
                 if (preg_match('/^T/', $buf)) {
                     $devnum++;
+                    if (preg_match('/\sSpd=([\d\.]+)/', $buf, $bufr)
+                       && isset($bufr[1]) && ($bufr[1]!=="")) {
+                        $usbarray[$devnum]['speed'] = $bufr[1];
+                    }
                 } elseif (preg_match('/^S:/', $buf)) {
                     list($key, $value) = preg_split('/: /', $buf, 2);
                     list($key, $value2) = preg_split('/=/', $value, 2);
                     switch (trim($key)) {
                     case 'Manufacturer':
+                }
             } else {
                 $product = '';
+            }
-            if (defined('PSI_SHOW_DEVICES_INFOS') && PSI_SHOW_DEVICES_INFOS
+            if (defined('PSI_SHOW_DEVICES_INFOS') && PSI_SHOW_DEVICES_INFOS) {
+                if (isset($usbdev['speed'])) {
+                    $dev->setSpeed($usbdev['speed']);
+                }
-                && defined('PSI_SHOW_DEVICES_SERIAL') && PSI_SHOW_DEVICES_SERIAL
+                if (defined('PSI_SHOW_DEVICES_SERIAL') && PSI_SHOW_DEVICES_SERIAL
-                && isset($usbdev['serial'])) {
+                   && isset($usbdev['serial'])) {
-                $dev->setSerial($usbdev['serial']);
+                    $dev->setSerial($usbdev['serial']);
+                }
+            }
             if (isset($usbdev['name']) && (($name=$usbdev['name']) !== 'unknown')) {
                 $dev->setName($name);
             } else {
                             foreach ($bufe2 as $buf2) {
 //                                if (preg_match('/^'.trim($dev_name).'\s+Link\sencap:Ethernet\s+HWaddr\s(\S+)/i', $buf2, $ar_buf2)
                                 if (preg_match('/\s+encap:Ethernet\s+HWaddr\s(\S+)/i', $buf2, $ar_buf2)
                                    || preg_match('/\s+encap:UNSPEC\s+HWaddr\s(\S+)-00-00-00-00-00-00-00-00-00-00\s*$/i', $buf2, $ar_buf2)
                                    || preg_match('/^\s+ether\s+(\S+)\s+txqueuelen/i', $buf2, $ar_buf2)
-                                   || preg_match('/^\s+link\/ether\s+(\S+)\s+brd/i', $buf2, $ar_buf2)
+                                   || preg_match('/^\s+link\/\S+\s+(\S+)\s+brd/i', $buf2, $ar_buf2)
-                                   || preg_match('/^\s+link\/ether\s+(\S+)$/i', $buf2, $ar_buf2)
+                                   || preg_match('/^\s+link\/\S+\s+(\S+)$/i', $buf2, $ar_buf2)) {
-                                   || preg_match('/^\s+link\/ieee802.11\s+(\S+)$/i', $buf2, $ar_buf2)) {
                                     if (!defined('PSI_HIDE_NETWORK_MACADDR') || !PSI_HIDE_NETWORK_MACADDR) {
                                         $macaddr = preg_replace('/:/', '-', strtoupper($ar_buf2[1]));
                                         if ($macaddr === '00-00-00-00-00-00') { // empty
                                             $macaddr = "";
+                                        }
+                            }
+                        }
                         if ($macaddr != "") {
                             $dev->setInfo($macaddr.($dev->getInfo()?';'.$dev->getInfo():''));
+                        }
+                        if ((!CommonFunctions::rfts('/sys/class/net/'.trim($dev_name).'/operstate', $buf, 1, 4096, false) || (($down=strtolower(trim($buf)))=="") || ($down!=="down")) &&
-                        if (CommonFunctions::rfts('/sys/class/net/'.trim($dev_name).'/speed', $buf, 1, 4096, false) && (($speed=trim($buf))!="") && ($buf > 0) && ($buf < 65535)) {
+                           (CommonFunctions::rfts('/sys/class/net/'.trim($dev_name).'/speed', $buf, 1, 4096, false) && (($speed=trim($buf))!="") && ($buf > 0) && ($buf < 65535))) {
                             if ($speed > 1000) {
                                 $speed = $speed/1000;
                                 $unit = "G";
                             } else {
                                 $unit = "M";
                         $dev->setErrors($ar_buf2[2]+$ar_buf2[5]);
                         $dev->setDrops($ar_buf2[3]+$ar_buf2[6]);
+                    }
                     $was = true;
                     if (defined('PSI_SHOW_NETWORK_INFOS') && (PSI_SHOW_NETWORK_INFOS)) {
-                        if (CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/speed', $buf, 1, 4096, false) && (trim($buf)!="")) {
+                        if ((!CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/operstate', $buf, 1, 4096, false) || (($down=strtolower(trim($buf)))=="") || ($down!=="down")) &&
-                            $speed = trim($buf);
+                           (CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/speed', $buf, 1, 4096, false) && (($speed=trim($buf))!="") && ($buf > 0) && ($buf < 65535))) {
                             if ($speed > 1000) {
                                 $speed = $speed/1000;
                                 $unit = "G";
                             } else {
                                 $unit = "M";
+                            }
-                            if (CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/duplex', $buf, 1, 4096, false) && (trim($buf)!="")) {
+                            if (CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/duplex', $buf, 1, 4096, false) && (($duplex=strtolower(trim($buf)))!="") && ($duplex!='unknown')) {
-                                $speedinfo = $speed.$unit.'b/s '.strtolower(trim($buf));
+                                $speedinfo = $speed.$unit.'b/s '.$duplex;
                             } else {
                                 $speedinfo = $speed.$unit.'b/s';
+                            }
+                        }
+                    }
                 } else {
                     if ($was) {
                         if (defined('PSI_SHOW_NETWORK_INFOS') && (PSI_SHOW_NETWORK_INFOS)) {
-                            if (preg_match('/^\s+link\/ether\s+(\S+)\s+brd/i', $line, $ar_buf2)) {
+                            if (preg_match('/^\s+link\/\S+\s+(\S+)\s+brd/i', $line, $ar_buf2)
+                               || preg_match('/^\s+link\/\S+\s+(\S+)$/i', $line, $ar_buf2)) {
                                 if (!defined('PSI_HIDE_NETWORK_MACADDR') || !PSI_HIDE_NETWORK_MACADDR) $macaddr = preg_replace('/:/', '-', strtoupper($ar_buf2[1]));
                             } elseif (preg_match('/^\s+inet\s+([^\/\s]+).*peer\s+([^\/\s]+).*\s+scope\s((global)|(host))/i', $line, $ar_buf2)) {
                                 if ($ar_buf2[1] != $ar_buf2[2]) {
                                      $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1].";:".$ar_buf2[2]);
                                 } else {
                     $macaddr = "";
                     $dev = new NetDevice();
                     $dev->setName($ar_buf[1]);
                     $was = true;
                     if (defined('PSI_SHOW_NETWORK_INFOS') && (PSI_SHOW_NETWORK_INFOS)) {
-                        if (CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/speed', $buf, 1, 4096, false) && (trim($buf)!="")) {
+                        if ((!CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/operstate', $buf, 1, 4096, false) || (($down=strtolower(trim($buf)))=="") || ($down!=="down")) &&
-                            $speed = trim($buf);
+                           (CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/speed', $buf, 1, 4096, false) && (($speed=trim($buf))!="") && ($buf > 0) && ($buf < 65535))) {
                             if ($speed > 1000) {
                                 $speed = $speed/1000;
                                 $unit = "G";
                             } else {
                                 $unit = "M";
+                            }
-                            if (CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/duplex', $buf, 1, 4096, false) && (trim($buf)!="")) {
+                            if (CommonFunctions::rfts('/sys/class/net/'.$ar_buf[1].'/duplex', $buf, 1, 4096, false) && (($duplex=strtolower(trim($buf)))!="") && ($duplex!='unknown')) {
-                                $speedinfo = $speed.$unit.'b/s '.strtolower(trim($buf));
+                                $speedinfo = $speed.$unit.'b/s '.$duplex;
                             } else {
                                 $speedinfo = $speed.$unit.'b/s';
+                            }
+                        }
-                        if (preg_match('/^'.$ar_buf[1].'\s+Link\sencap:Ethernet\s+HWaddr\s(\S+)/i', $line, $ar_buf2))
+                        if (preg_match('/^'.$ar_buf[1].'\s+Link\sencap:Ethernet\s+HWaddr\s(\S+)/i', $line, $ar_buf2)
+                           || preg_match('/^'.$ar_buf[1].'\s+Link\s+encap:UNSPEC\s+HWaddr\s(\S+)-00-00-00-00-00-00-00-00-00-00\s*$/i', $line, $ar_buf2)) {
-                            if (!defined('PSI_HIDE_NETWORK_MACADDR') || !PSI_HIDE_NETWORK_MACADDR) $macaddr = preg_replace('/:/', '-', strtoupper($ar_buf2[1]));
+                            if (!defined('PSI_HIDE_NETWORK_MACADDR') || !PSI_HIDE_NETWORK_MACADDR) {
+                                $macaddr = preg_replace('/:/', '-', strtoupper($ar_buf2[1]));
+                                if ($macaddr === '00-00-00-00-00-00') { // empty
+                                    $macaddr = "";
+                                }
+                            }
-                        elseif (preg_match('/^'.$ar_buf[1].':\s+ip\s+(\S+)\s+mask/i', $line, $ar_buf2))
+                        } elseif (preg_match('/^'.$ar_buf[1].':\s+ip\s+(\S+)\s+mask/i', $line, $ar_buf2))
                             $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+                    }
                 } else {
                     if ($was) {
                         if (preg_match('/\sRX bytes:(\d+)\s/i', $line, $ar_buf2)) {
                             $drops +=$ar_buf2[2];
+                        }
                         if (defined('PSI_SHOW_NETWORK_INFOS') && (PSI_SHOW_NETWORK_INFOS)) {
                             if (preg_match('/\s+encap:Ethernet\s+HWaddr\s(\S+)/i', $line, $ar_buf2)
+                             || preg_match('/\s+encap:UNSPEC\s+HWaddr\s(\S+)-00-00-00-00-00-00-00-00-00-00\s*$/i', $line, $ar_buf2)
                              || preg_match('/^\s+ether\s+(\S+)\s+txqueuelen/i', $line, $ar_buf2)) {
-                                if (!defined('PSI_HIDE_NETWORK_MACADDR') || !PSI_HIDE_NETWORK_MACADDR) $macaddr = preg_replace('/:/', '-', strtoupper($ar_buf2[1]));
+                                if (!defined('PSI_HIDE_NETWORK_MACADDR') || !PSI_HIDE_NETWORK_MACADDR) {
+                                    $macaddr = preg_replace('/:/', '-', strtoupper($ar_buf2[1]));
+                                    if ($macaddr === '00-00-00-00-00-00') { // empty
+                                        $macaddr = "";
+                                    }
+                                }
                             } elseif (preg_match('/^\s+inet\saddr:(\S+)\s+P-t-P:(\S+)/i', $line, $ar_buf2)
                                   || preg_match('/^\s+inet\s+(\S+)\s+netmask.+destination\s+(\S+)/i', $line, $ar_buf2)) {
                                 if ($ar_buf2[1] != $ar_buf2[2]) {
                                      $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1].";:".$ar_buf2[2]);
                                 } else {

Subversion Repositories ALCASAR

(root)/web/acc/phpsysinfo/includes/os/class.Linux.inc.php – Rev 2770 → 2976