Changeset 671

Timestamp:

Jul 19, 2014, 1:21:24 AM (10 years ago)

Author:

chronos

Message:

• Upraveno: Příprava pro sledování signálu bezdrátových spojů.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (4 diffs)
• Modules/Log/Log.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (4 diffs)
• Modules/NetworkConfigRouterOS/RouterboardAPI.php (modified) (5 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 670; // Subversion revision
-$DatabaseRevision = 668; // SQL structure revision
-$ReleaseTime = strtotime('2014-07-15');
+$Revision = 671; // Subversion revision
+$DatabaseRevision = 671; // SQL structure revision
+$ReleaseTime = strtotime('2014-07-19');

trunk/Common/Setup/Updates.php

@@ -759 +759 @@
   $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
     "VALUES (NULL , 'Kontakty', '12', '".$ActionId."', '1');");
-  $ConatctMenuId = $Manager->Database->insert_id;
+  $ContactMenuId = $Manager->Database->insert_id;
 
   $Manager->Execute("INSERT INTO `Action` (
@@ -767 +767 @@
   $ActionId = $Manager->Database->insert_id;
   $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
-    "VALUES (NULL , 'Druhy kontaktů', ".$ConatctMenuId.", '".$ActionId."', '1');");
+    "VALUES (NULL , 'Druhy kontaktů', ".$ContactMenuId.", '".$ActionId."', '1');");
 
   $Manager->Execute("INSERT INTO `ContactCategory` (`Id` ,`Name`)
@@ -797 +797 @@
   $Manager->Execute('INSERT INTO `Module` (`Id` ,`Name` ,`Title`)
 VALUES (NULL , "RSS", "RSS kanály");');
+}
+
+function UpdateTo671($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkSignal` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Time` datetime NOT NULL,
+  `MAC` varchar(17) NOT NULL,
+  `Interface` int(11) DEFAULT NULL,
+  `Value` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Interface` (`Interface`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `NetworkSignal`
+  ADD CONSTRAINT `NetworkSignal_ibfk_1` FOREIGN KEY (`Interface`) REFERENCES `NetworkInterface` (`Id`);');
+  $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
+`Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
+NULL , "", "Signál rozhraní", "1", "/is/?t=NetworkSignal&a=list", NULL , NULL , NULL , "1");');
+  $ActionId = $Manager->Database->insert_id;
+  $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    "VALUES (NULL , 'Signál rozhraní', 4, '".$ActionId."', '1');");
+
+  $Manager->Execute('ALTER TABLE `NetworkDevice` ADD `API` INT NULL ,ADD INDEX ( `API` ) ;');
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `DeviceAPIType` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;');
+
+  $Manager->Execute('INSERT INTO `DeviceAPIType` (`Id`, `Name`) VALUES
+(1, "RouterOS API"),
+(2, "AirOS");');
+  $Manager->Execute('ALTER TABLE `NetworkDevice` ADD FOREIGN KEY ( `API` ) REFERENCES `DeviceAPIType` (
+`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;');
+
 }
 
@@ -842 +878 @@
       661 => array('Revision' => 662, 'Function' => 'UpdateTo662'),
       662 => array('Revision' => 668, 'Function' => 'UpdateTo668'),
+      668 => array('Revision' => 671, 'Function' => 'UpdateTo671'),
     ));
   }

trunk/Modules/Log/Log.php

@@ -65 +65 @@
     $this->FormatHTML = false;
     Header('Content-Type: text/xml');
-    $Count = 20;
+    $Count = 100;
 
     $Output = '';

trunk/Modules/Network/Network.php

@@ -228 +228 @@
         'Interface1' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní 1', 'Default' => ''),
         'Interface2' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní 2', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterClass('NetworkSignal', array(
+      'Title' => 'Signál rozhraní',
+      'Table' => 'NetworkSignal',
+      'Items' => array(
+        'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
+        'MAC' => array('Type' => 'MacAddress', 'Caption' => 'Fyzická adresa (MAC)', 'Default' => ''),
+        'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => '', 'Null' => true),
+        'Value' => array('Type' => 'Integer', 'Caption' => 'Signál', 'Default' => '0'),
       ),
     ));

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -12 +12 @@
   {
     $StartTime = time();
-    $Function();    
+    $Function();
     $EndTime = time();
     $Delay = $Period - ($EndTime - $StartTime);
@@ -19 +19 @@
     echo('Waiting '.$Delay.' seconds...'."\n");
     sleep($Delay);
-  }
+  }      print_r($Properties);
+
 }
 
@@ -25 +26 @@
 {
   global $System, $Config;
-  
+
   $Path = array('interface', 'wireless', 'registration-table');
+  $Time = time();
 
-  // Load netwatch status from all DHCP routers 
-  $DbResult3 = $System->Database->query('SELECT DHCP, AddressRange, Mask FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
-  while($Subnet = $DbResult3->fetch_assoc())
+  // Load netwatch status from all DHCP routers
+  $DbResult3 = $System->Database->query('SELECT `Id`, '.
+    '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
+    'FROM `NetworkDevice` WHERE (`API` = 1) AND (`Used` = 1)');
+  while($Device = $DbResult3->fetch_assoc())
   {
-    echo($Subnet['AddressRange'].'/'.$Subnet['Mask'].' on router '.$Subnet['DHCP']."\n");
+    echo($Device['LocalIP']."\n");
     $Routerboard = new Routerboard();
     $Routerboard->UserName = $Config['MainRouter']['UserName'];
     $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-    $Routerboard->HostName = $Subnet['DHCP'];
-    $List = $Routerboard->ListGetPrint($Path, array('mac-address', 'signal-strength'));
+    $Routerboard->HostName = $Device['LocalIP'];
+    $Routerboard->Debug = true;
+    $List = $Routerboard->ListGetPrint($Path, array('mac-address', 'signal-strength'), array(), 'stats');
     foreach($List as $Properties)
     {
+      print_r($Properties);
+      $DbResult = $System->Database->select('NetworkInterface', 'Id', 'MAC="'.$Properties['mac-address'].'"');
+      if($DbResult->num_rows > 0)
+      {
+        $DbRow = $DbResult->fetch_assoc();
+        $Interface = $DbRow['Id'];
+      } else $Interface = null;
+      $System->Database->insert('NetworkSignal', array('MAC' => $Properties['mac-address'],
+        'Value' => $Properties['signal-strength'], 'Time' => $Time, 'Interface' => $Interface));
+      /*
       $DbResult = $System->Database->select('Measure', 'Id', '`Name` = "'.$Properties['mac-address'].'"');
       if($DbResult->num_rows > 0)
@@ -52 +67 @@
       $Measure->Load($Id);
       $Measure->AddValue($Properties['signal-strength']);
+      */
     }
-  } 
+  }
 }
 

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -11 +11 @@
   var $Timeout;        // Connection attempt timeout and data read timeout
   var $Socket;             // Variable for storing socket resource
-  
+
   function __construct()
   {
@@ -43 +43 @@
     if($this->Connected) $this->Disconnect();
     $this->Socket = @fsockopen($IP, $this->Port, $this->ErrorNo, $this->ErrorStr, $this->Timeout);
-    if($this->Socket) 
+    if($this->Socket)
     {
       socket_set_timeout($this->Socket, $this->Timeout);
@@ -59 +59 @@
         }
       }
-      if(!$this->Connected) fclose($this->Socket);      
-    }    
-  }
-  
+      if(!$this->Connected) fclose($this->Socket);
+    }
+  }
+
   function Connect($IP, $Login, $Password)
   {
-    for($Attempt = 1; $Attempt <= $this->Attempts; $Attempt++) 
+    for($Attempt = 1; $Attempt <= $this->Attempts; $Attempt++)
     {
       $this->ConnectOnce($IP, $Login, $Password);
@@ -182 +182 @@
         $Response[] = $Line;
       }
+      echo($Line."\n");
       // If we get a !done, make a note of it.
       if ($Line == "!done") $ReceivedDone = true;
+        else $ReceivedDone = false;
       $Status = socket_get_status($this->Socket);
-      if ((!$this->Connected && !$Status['unread_bytes']) || 
+      if ((!$this->Connected && !$Status['unread_bytes']) ||
           ($this->Connected && !$Status['unread_bytes'] && $ReceivedDone))
         break;
@@ -195 +197 @@
   function Write($Command, $Param2 = true)
   {
-    if($Command) 
+    if($Command)
     {
       $Data = explode("\n", $Command);
       foreach ($Data as $Com) {
         $Com = trim($Com);
-        fwrite($this->Socket, $this->EncodeLength(strlen($Com)).$Com);        
+        fwrite($this->Socket, $this->EncodeLength(strlen($Com)).$Com);
       }
       if (gettype($Param2) == 'integer') {