Changeset 819

Timestamp:

Mar 16, 2016, 10:20:36 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Checking network port states.
• Modified: Check only state of enabled interfaces.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/NetworkConfigLinux/Generators/CheckPorts.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 818; // Subversion revision
+$Revision = 819; // Subversion revision
 $DatabaseRevision = 818; // SQL structure revision
 $ReleaseTime = strtotime('2016-03-16');

trunk/Modules/Network/Network.php

@@ -712 +712 @@
       'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
       $Condition.' AND (`NetworkDevice`.`PermanentOnline`=1) AND (`NetworkDevice`.`Used`=1) AND '.
-      '(`NetworkInterface`.`LocalIP` != "") '.
+      '(`NetworkInterface`.`LocalIP` != "") AND (`NetworkInterface`.`Enabled` == 1)'.
       'ORDER BY `Name` ASC');
     if($DbResult3->num_rows > 0) 

trunk/Modules/NetworkConfigLinux/Generators/CheckPorts.php

@@ -7 +7 @@
     $Timeout = 1;
     $State = 0;
-    if($Protocol = 'tcp') $Prefix = '';
-      else if($Protocol = 'udp') $Prefix = 'udp://';
+    if($Protocol == 'tcp') $Prefix = '';
+      else if($Protocol == 'udp') $Prefix = 'udp://';
       else throw new Exception('Unsupported protocol "'.$Protocol.'"');
     if($Socket = @fsockopen($Prefix.$IP, $Port, $ErrorNumber, $ErrorString, $Timeout))
@@ -56 +56 @@
           '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkPortUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
           'AND (`TA`.`Port`=`TM`.`Port`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
-          'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Port['Id'].')');
+          'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Port` ='.$Port['Id'].')');
       }
     }
-    $DbResult = $this->Database->update('NetworkDevice', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
+    $DbResult = $this->Database->update('NetworkPort', '`LastOnline` < "'.
+      TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
 
     // Set offline all ports which were not updated as online