Changeset 815

Timestamp:

Mar 9, 2016, 10:38:13 PM (9 years ago)

Author:

chronos

Message:

• Added: Linux periodic network ports check command.

Location:

trunk

Files:

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

trunk/Application/Version.php

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

trunk/Modules/Network/Network.php

@@ -667 +667 @@
   }
   
-  function CheckPortStatus($Ip, $Port)
-  {
-    $Timeout = 1;
-    if($Socket = @fsockopen($Ip, $Port, $ErrorNumber, $ErrorString, $Timeout))
-    {
-      fclose($Socket);
-      return(1);
-    } else
-    {
-      return(0);
-    }
-  }
-
   function PortCheckList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
   {
@@ -687 +674 @@
     $Condition = 'WHERE (`NetworkPort`.`Online` = '.$OnlineNow.') AND (`NetworkPort`.`OnlineNotify` = '.$OnlinePrevious.') '.
       'AND (`NetworkPort`.`LastOnline` <= "'.TimeToMysqlDateTime($Time - $MinDuration).'")';
-    $DbResult3 = $this->Database->query('SELECT CONCAT(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")), ":", `NetworkPort`.`Number`) AS `Name`, '.
+    $DbResult3 = $this->Database->query('SELECT CONCAT(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")), ":", `NetworkPort`.`Number`, "(", `NetworkPort`.`Name`, ")") AS `Name`, '.
       '`NetworkPort`.`Online`, `NetworkPort`.`LastOnline` FROM `NetworkPort` '.
       'LEFT JOIN `NetworkInterface` ON `NetworkInterface`.`Id` = `NetworkPort`.`Interface` '.
@@ -694 +681 @@
       '(`NetworkInterface`.`LocalIP` != "") AND (`NetworkPort`.`Enabled` = 1)'.
       'ORDER BY `Name` ASC');
-    echo($this->Database->LastQuery);
     if($DbResult3->num_rows > 0)
     {

trunk/Modules/NetworkConfigLinux/NetworkConfigLinux.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/Generators/DNS.php');
+include_once(dirname(__FILE__).'/Generators/CheckPorts.php');
 
 class ModuleNetworkConfigLinux extends AppModule
@@ -27 +28 @@
   {
     $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('linux-dns', 'ConfigDNS');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('linux-checkports', 'ConfigCheckPorts');
   }
 }