Changeset 814

Timestamp:

Mar 9, 2016, 10:07:18 PM (9 years ago)

Author:

chronos

Message:

• Added: Notify callback for checking state of network ports. Network ports can be defined as subtable under network interface.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (6 diffs)
• Modules/NetworkConfigAirOS/Generators/Signal.php (modified) (2 diffs)

trunk/Application/UpdateTrace.php

@@ -1946 +1946 @@
         "VALUES (NULL , 'Kontrola pokladen', ".$DbRow['Id'].", '".$ActionId."', '1');");
   }
-
+}
+
+function UpdateTo814($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkPort` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Name` varchar(255) NOT NULL,
+    `Interface` int(11) NOT NULL,
+    `Number` int(11) NOT NULL,
+    `Enabled` int(11) NOT NULL,
+    `Online` int(11) NOT NULL,
+    `LastOnline` datetime NULL,
+    `OnlineNotify` int(11) NOT NULL,
+    PRIMARY KEY (`Id`),
+    KEY `Interface` (`Interface`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+
+  $Manager->Execute('ALTER TABLE `NetworkPort`
+  ADD CONSTRAINT `NetworkPort_ibfk_1` FOREIGN KEY (`Interface`) REFERENCES `NetworkInterface` (`Id`);');
+  $Manager->Execute('ALTER TABLE `NetworkInterface` ADD `Enabled` INT NOT NULL DEFAULT "1" AFTER `OnlineNotify`;');
+  $Manager->Execute('ALTER TABLE `NetworkInterface` CHANGE `LastOnline` `LastOnline` DATETIME NULL;');
+  $Manager->Execute('UPDATE `NetworkInterface` SET `LastOnline` = NULL WHERE `LastOnline` = "0000-00-00 00:00:00"');
+  $Manager->Execute('ALTER TABLE `NetworkDevice` CHANGE `LastOnline` `LastOnline` DATETIME NULL;');
+  $Manager->Execute('UPDATE `NetworkDevice` SET `LastOnline` = NULL WHERE `LastOnline` = "0000-00-00 00:00:00"');
 }
 
@@ -2037 +2060 @@
       803 => array('Revision' => 807, 'Function' => 'UpdateTo807'),
       807 => array('Revision' => 808, 'Function' => 'UpdateTo808'),
+      808 => array('Revision' => 814, 'Function' => 'UpdateTo814'),
     ));
   }

trunk/Application/Version.php

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

trunk/Modules/Network/Network.php

@@ -120 +120 @@
   function DoStart()
   {
-    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkReachability', array($this, 'ReachabilityCheck'));
+    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkReachability', 
+      array($this, 'ReachabilityCheck'));
+    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkPort', 
+      array($this, 'PortCheck'));
+    
     
     $this->System->RegisterPage('network', 'PageNetwork');
@@ -188 +192 @@
         'ExternalIP' => array('Type' => 'IPv4Address', 'Caption' => 'Veřejná IPv4', 'Default' => '', 'Null' => true),
         'Device' => array('Type' => 'TNetworkDevice', 'Caption' => 'Zařízení', 'Default' => ''),
+        'Enabled' => array('Type' => 'Boolean', 'Caption' => 'Povoleno', 'Default' => '1'),
         'Online' => array('Type' => 'TOnlineState', 'Caption' => 'Běží', 'Default' => '0', 'ReadOnly' => true),
         'LastOnline' => array('Type' => 'DateTime', 'Caption' => 'Naposledy běželo', 'Default' => '', 'ReadOnly' => true),
@@ -194 +199 @@
         'Signal' => array('Type' => 'TNetworkSignalListInterface', 'Caption' => 'Signál', 'Default' => ''),
         'Wireless' => array('Type' => 'TNetworkInterfaceWirelessListInterface', 'Caption' => 'Bezdrátové spoje', 'Default' => ''),
+        'Ports' => array('Type' => 'TDevicePortListInterface', 'Caption' => 'Síťové porty', 'Default' => ''),
       ),
     ));
@@ -225 +231 @@
         'AddressRangeIPv6' => array('Type' => 'String', 'Caption' => 'Rozsah adres IPv6', 'Default' => ''),
         'Configure' => array('Type' => 'Boolean', 'Caption' => 'Nastavovat', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterClass('NetworkPort', array(
+      'Title' => 'Síťový port',
+      'Table' => 'NetworkPort',
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+        'Number' => array('Type' => 'Integer', 'Caption' => 'Číslo', 'Default' => ''),
+        'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => ''),
+        'Enabled' => array('Type' => 'Boolean', 'Caption' => 'Povoleno', 'Default' => '1'),
+        'Online' => array('Type' => 'TOnlineState', 'Caption' => 'Běží', 'Default' => '0', 'ReadOnly' => true),
+        'LastOnline' => array('Type' => 'DateTime', 'Caption' => 'Naposledy běželo', 'Default' => '', 'ReadOnly' => true),
       ),
     ));
@@ -510 +528 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterFormType('TDevicePortListInterface', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkPort',
+      'Id' => 'Id',
+      'Ref' => 'Interface',
+      'Filter' => '1',
+    ));
     $this->System->FormManager->RegisterFormType('TNetworkLinkType', array(
       'Type' => 'Reference',
@@ -654 +679 @@
     }
   }
+
+  function PortCheckList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
+  {
+    $Time = time();
+    $OnlineText = array('<span style="color:red;">Nedostupný</span>', '<span style="color:green;">Dostupný</span>');
+    $Output = '';
+    $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`, '.
+      '`NetworkPort`.`Online`, `NetworkPort`.`LastOnline` FROM `NetworkPort` '.
+      'LEFT JOIN `NetworkInterface` ON `NetworkInterface`.`Id` = `NetworkPort`.`Interface` '.
+      'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
+      $Condition.' AND (`NetworkDevice`.`PermanentOnline`=1) AND (`NetworkDevice`.`Used`=1) AND '.
+      '(`NetworkInterface`.`LocalIP` != "") AND (`NetworkPort`.`Enabled` = 1)'.
+      'ORDER BY `Name` ASC');
+    echo($this->Database->LastQuery);
+    if($DbResult3->num_rows > 0)
+    {
+      $Output .= $Title.'<br/>';
+      $Output .= '<table>'.
+        '<tr><th align="center">Jméno</th><th align="center">Stav</th><th align="center">Čas</th><th align="center">Trvání</th></tr>'."\n";
+      while($Item = $DbResult3->fetch_assoc())
+      {
+        $Duration = $Time - MysqlDateTimeToTime($Item['LastOnline']);
+        $DurationText = sprintf('%02d', floor($Duration / 3600 % 24)).':'.
+          sprintf('%02d', floor($Duration / 60 % 60)).':'.
+          sprintf('%02d', floor($Duration % 60));
+        $Days = floor($Duration / (60 * 60 * 24));
+        if($Days > 0) $DurationText = $Days.' dnů '.$DurationText;
+  
+        $Output .= '<tr><td>'.$Item['Name'].'</td><td>'.$OnlineText[$Item['Online']].
+          '</td><td>'.$Item['LastOnline'].'</td><td>'.$DurationText.'</td></tr>'."\n";
+      }
+      $Output .= '</table><br/>'."\n";
+    }
+    $this->Database->query('UPDATE `NetworkPort` SET `OnlineNotify` = `Online` '.
+      $Condition);
+    return $Output;
+  }
+  
+  function PortCheck()
+  {
+    $Output = '';
+    $Output = $this->PortCheckList('Nově online', 1, 0, 0);
+    $Output .= $this->PortCheckList('Nově offline', 0, 1, 5 * 60);
+    if($Output != '') $Output .= $this->PortCheckList('Stále offline', 0, 0, 0);
+    return($Output);
+  }
 }

trunk/Modules/NetworkConfigAirOS/Generators/Signal.php

@@ -11 +11 @@
     // Load netwatch status from all DHCP routers
     $DbResult3 = $this->Database->query('SELECT `Id`, `LoginName`, `LoginPassword`, '.
-        '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
-        'FROM `NetworkDevice` WHERE (`API` = 2) AND (`Used` = 1)');
+      '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
+      'FROM `NetworkDevice` WHERE (`API` = 2) AND (`Used` = 1)');
     while($Device = $DbResult3->fetch_assoc())
     {
@@ -34 +34 @@
         $RateTx = $Properties['tx'];
         $this->Database->insert('NetworkSignal', array('MAC' => $Properties['mac'],
-            'Value' => $Strength, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
-            'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface, 'Device' => $Device['Id']));
+          'Value' => $Strength, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
+          'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface, 'Device' => $Device['Id']));
       }
     }