Changeset 829 for trunk/Modules/Network/Network.php

Timestamp:

Apr 29, 2016, 11:54:31 PM (9 years ago)

Author:

chronos

Message:

• Added: Experimental metod for calculating maximum speed limit according network links.
• Modified: Lowered routeros netwatch period to 30 seconds.

File:

• trunk/Modules/Network/Network.php (modified) (13 diffs)

trunk/Modules/Network/Network.php

@@ -100 +100 @@
 {
   var $MinNotifyTime;
-  
+
   function __construct($System)
   {
@@ -110 +110 @@
     $this->Description = 'Networking related tools';
     $this->Dependencies = array('Notify');
-    
+
     // TODO: Make notify time configurable
-    $this->MinNotifytime = 2 * 60; 
+    $this->MinNotifyTime = 2 * 60;
   }
 
@@ -125 +125 @@
   function DoStart()
   {
-    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkReachability', 
+    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkReachability',
       array($this, 'ReachabilityCheck'));
-    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkPort', 
+    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkPort',
       array($this, 'PortCheck'));
-    
-    
+
+
     $this->System->RegisterPage('network', 'PageNetwork');
     $this->System->RegisterPage(array('network', 'administration'), 'PageNetworkAdministration');
@@ -297 +297 @@
       'Items' => array(
         'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+        'MaxLinkSpeed' => array('Type' => 'Integer', 'Caption' => 'Maximální spojová rychlost', 'Default' => '0', 'Suffix' => 'bits/s'),
+        'MaxRealSpeed' => array('Type' => 'Integer', 'Caption' => 'Maximální reálná rychlost', 'Default' => '0', 'Suffix' => 'bits/s'),
+        'FullDuplex' => array('Type' => 'Boolean', 'Caption' => 'Plně duplexní', 'Default' => '0'),
+        'Color' => array('Type' => 'Color', 'Caption' => 'Barva', 'Default' => '0'),
       ),
     ));
@@ -669 +673 @@
       'Filter' => '1',
     ));
-    
+
     $this->System->ModuleManager->Modules['IS']->RegisterDashboardItem('Network',
       array('ModuleNetwork', 'ShowDashboardItem'));
@@ -680 +684 @@
     ));
   }
-  
+
   function AfterInsertNetworkDevice($Form)
   {
@@ -690 +694 @@
     $this->System->Models['NetworkDevice']->DoOnChange();
   }
-  
+
   function AfterInsertNetworkInterface($Form)
   {
@@ -700 +704 @@
     $this->System->Models['NetworkInterface']->DoOnChange();
   }
-  
+
   function BeforeDeleteNetworkInterface($Form, $Id)
   {
@@ -734 +738 @@
   {
   }
-  
+
   function OnlineList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
   {
@@ -748 +752 @@
       '(`NetworkInterface`.`LocalIP` != "") AND (`NetworkInterface`.`Enabled`=1)'.
       'ORDER BY `Name` ASC');
-    if($DbResult3->num_rows > 0) 
+    if($DbResult3->num_rows > 0)
     {
       $Output .= $Title.'<br/>';
@@ -780 +784 @@
     return($Output);
   }
-  
+
   function PortCheckList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
   {
@@ -808 +812 @@
         $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";
@@ -818 +822 @@
     return $Output;
   }
-  
+
   function PortCheck()
   {