Changeset 671 for trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

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ů.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (4 diffs)

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']);
+      */
     }
-  } 
+  }
 }