Changeset 932 for trunk

Timestamp:

May 11, 2022, 4:54:11 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Suppress warnings during checking network ports.
• Fixed: Check network ports only for enabled devices and interfaces.

File:

• trunk/Modules/NetworkConfigLinux/Generators/CheckPorts.php (modified) (2 diffs)

trunk/Modules/NetworkConfigLinux/Generators/CheckPorts.php

@@ -10 +10 @@
       else if ($Protocol == 'udp') $Prefix = 'udp://';
       else throw new Exception('Unsupported protocol "'.$Protocol.'"');
-    if ($Socket = @fsockopen($Prefix.$IP, $Port, $ErrorNumber, $ErrorString, $Timeout))
+    try 
     {
-      fclose($Socket);
-      $State = 1;
+      $LastErrorReporting = error_reporting();
+      error_reporting(0);
+      if ($Socket = @fsockopen($Prefix.$IP, $Port, $ErrorNumber, $ErrorString, $Timeout))
+      {
+        fclose($Socket);
+        $State = 1;
+      }
+    }
+    finally
+    {
+      error_reporting($LastErrorReporting);
     }
     return $State;
@@ -28 +37 @@
       'FROM `NetworkPort` '.
       'LEFT JOIN `NetworkInterface` ON `NetworkInterface`.`Id`=`NetworkPort`.`Interface` '.
-      'WHERE (`NetworkPort`.`Enabled`=1) AND (`NetworkInterface`.`LocalIP` !="")');
+      'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id`=`NetworkInterface`.`Device` '.
+      'WHERE (`NetworkPort`.`Enabled`=1) AND (`NetworkInterface`.`LocalIP` !="") AND (`NetworkInterface`.`Enabled`=1) AND'.
+      '(`NetworkDevice`.`Used`=1)');
     while ($DbRow = $DbResult->fetch_assoc())
       $Ports[$DbRow['Id']] = $DbRow;