Changeset 248 for trunk

Timestamp:

Sep 8, 2009, 9:03:14 AM (15 years ago)

Author:

george

Message:

• Opraveno: Import položek Netwatch z routerboardu do datbáze.

Location:

trunk/system

Files:

• generators/dhcp_routerboard.php (modified) (1 diff)
• generators/nat_routerboard.php (modified) (1 diff)
• generators/netwatch.php (modified) (1 diff)
• generators/netwatch_import.php (modified) (2 diffs)
• generators/traffic_shaping_routerboard.php (modified) (1 diff)
• routerboard.php (modified) (3 diffs)

trunk/system/generators/dhcp_routerboard.php

@@ -9 +9 @@
 $Routerboard->UserName = $Config['MainRouter']['UserName'];
 $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
+$Routerboard->Debug = true;
 
 $DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0');

trunk/system/generators/nat_routerboard.php

@@ -9 +9 @@
 $Routerboard->UserName = $Config['MainRouter']['UserName'];
 $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
+$Routerboard->Debug = true;
 
 $InetInterface = $Config['MainRouter']['InetInterface'];

trunk/system/generators/netwatch.php

@@ -9 +9 @@
 $Routerboard->UserName = $Config['MainRouter']['UserName'];
 $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
+$Routerboard->Debug = true;
 
 $DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Member` = 0');

trunk/system/generators/netwatch_import.php

@@ -16 +16 @@
   $List = $Routerboard->ListGetPrint($Path, array('host', 'status'));
   
-  //print_r($List);
   foreach($List as $Properties)
   {
     if(IsAddressInSubnet($Properties['host'], $Subnet['AddressRange'], $Subnet['Mask']))
     {
+      //echo($Properties['host'].', ');
       if($Properties['status'] == 'up')
       {
@@ -36 +36 @@
         $DbResult = $Database->select('NetworkInterface', 'Id', 'LocalIP = "'.$Properties['host'].'"');
         $DbRow = $DbResult->fetch_assoc();
-        $HostId = $DbRow['Id'];
-        $DbResult2 = $Database->select('stat_hosts', '*', '(host_id="'.$HostId.'") AND (time = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-        if($DbResult2->num_rows == 0) $Database->query('REPLACE INTO stat_hosts (host_id, time) VALUES ("'.$HostId.'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');          
-        $Database->query('UPDATE stat_hosts SET count = count + 1 WHERE (host_id="'.$HostId.'") AND (time = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+        $InterfaceId = $DbRow['Id'];
+        $DbResult2 = $Database->select('NetworkInterfaceStat', '*', '(NetworkInterface="'.$InterfaceId.'") AND (Time = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+        if($DbResult2->num_rows == 0) $Database->query('REPLACE INTO NetworkInterfaceStat (NetworkInterface, Time) VALUES ("'.$InterfaceId.'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');          
+        $Database->query('UPDATE NetworkInterfaceStat SET Count = Count + 1 WHERE (NetworkInterface="'.$InterfaceId.'") AND (Time = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
       }
     }

trunk/system/generators/traffic_shaping_routerboard.php

@@ -14 +14 @@
 $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
 $Routerboard->HostName = $Config['MainRouter']['HostName'];
+$Routerboard->Debug = true;
 
 $Finance = &$System->Modules['Finance'];

trunk/system/routerboard.php

@@ -10 +10 @@
   var $PrivateKey = 'id_dsa';
   var $MaxBurstLineCount = 100;
-  
+  var $Debug = false;
+
   function __construct($HostName = 'localhost', $UserName = 'admin', $Password = '')
   {
@@ -52 +53 @@
       $Commands = str_replace('$', '\$', $Commands);
       $Command = $this->SSHPath.' -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.' -i '.$this->PrivateKey.' '.$this->HostName.' "'.$Commands.'"';
-      echo($Command);
+      if($this->Debug) echo($Command);
       exec($Command, $Output);
     } else $Output = '';
-    print_r($Output);
+    if($this->Debug) print_r($Output);
     return($Output);
   }
@@ -235 +236 @@
       }
     }
-    print_r($Commands);
+    if($this->Debug) print_r($Commands);
     return($this->Execute($Commands));    
   }